Add incoming mweb->plain amounts to unconfirmed balance

2025-11-05 18:38:09 +01:00 · 2024-02-09 23:49:57 +02:00
208 changed files with 13339 additions and 46781 deletions
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -3,10 +3,11 @@ container:

 lint_task:
  setup_script:
-    - pip install flake8 codespell
+    - pip install flake8
+    - pip install codespell
  script:
    - flake8 --version
-    - PYTHONWARNINGS="ignore" flake8 --ignore=E501,F841,W503,E702,E131 --exclude=basicswap/contrib,basicswap/interface/contrib,messages_pb2.py,.eggs,.tox,bin/install_certifi.py
+    - PYTHONWARNINGS="ignore" flake8 --ignore=E501,F841,W503 --exclude=basicswap/contrib,basicswap/interface/contrib,messages_pb2.py,.eggs,.tox,bin/install_certifi.py
    - codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=tests/lint/spelling.ignore-words.txt -S .git,.eggs,.tox,pgp,*.pyc,*basicswap/contrib,*basicswap/interface/contrib,*mnemonics.py,bin/install_certifi.py,*basicswap/static

 test_task:
@@ -16,21 +17,25 @@ test_task:
    - BIN_DIR: /tmp/cached_bin
    - PARTICL_BINDIR: ${BIN_DIR}/particl
    - BITCOIN_BINDIR: ${BIN_DIR}/bitcoin
-    - BITCOINCASH_BINDIR: ${BIN_DIR}/bitcoincash
    - LITECOIN_BINDIR: ${BIN_DIR}/litecoin
    - XMR_BINDIR: ${BIN_DIR}/monero
  setup_script:
    - apt-get update
-    - apt-get install -y python3-pip pkg-config
+    - apt-get install -y wget python3-pip gnupg unzip protobuf-compiler automake libtool pkg-config
    - pip install tox pytest
-    - pip install .
+    - python3 setup.py install
+    - wget -O coincurve-anonswap.zip https://github.com/tecnovert/coincurve/archive/refs/tags/anonswap_v0.2.zip
+    - unzip -d coincurve-anonswap coincurve-anonswap.zip
+    - mv ./coincurve-anonswap/*/{.,}* ./coincurve-anonswap || true
+    - cd coincurve-anonswap
+    - python3 setup.py install --force
  bins_cache:
    folder: /tmp/cached_bin
    reupload_on_changes: false
    fingerprint_script:
      - basicswap-prepare -v
    populate_script:
-      - basicswap-prepare --bindir=/tmp/cached_bin --preparebinonly --withcoins=particl,bitcoin,bitcoincash,litecoin,monero
+      - basicswap-prepare --bindir=/tmp/cached_bin --preparebinonly --withcoins=particl,bitcoin,litecoin,monero
  script:
    - cd "${CIRRUS_WORKING_DIR}"
    - export DATADIRS="${TEST_DIR}"
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,26 +0,0 @@
-name: lint
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.12"]
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install flake8 codespell
-    - name: Running flake8
-      run: |
-        flake8 --ignore=E501,F841,W503 --per-file-ignores="basicswap/interface/bch.py:E131,E702" --exclude=basicswap/contrib,basicswap/interface/contrib,messages_pb2.py,.eggs,.tox,bin/install_certifi.py
-    - name: Running codespell
-      run: |
-        codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=tests/lint/spelling.ignore-words.txt -S .git,.eggs,.tox,pgp,*.pyc,*basicswap/contrib,*basicswap/interface/contrib,*mnemonics.py,bin/install_certifi.py,*basicswap/static
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,3 @@ __pycache__

 # geckodriver.log
 *.log
-docker/.env
-
-# vscode dev container settings
-compose-dev.yaml
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,60 @@
+dist: bionic
+os: linux
+language: python
+python: '3.7'
+stages:
+  - lint
+  - test
+env:
+  global:
+    - TEST_DIR=${HOME}/test_basicswap2
+    - TEST_RELOAD_PATH=~/test_basicswap1
+    - BIN_DIR=~/cached_bin
+    - PARTICL_BINDIR=${BIN_DIR}/particl
+    - BITCOIN_BINDIR=${BIN_DIR}/bitcoin
+    - LITECOIN_BINDIR=${BIN_DIR}/litecoin
+    - XMR_BINDIR=${BIN_DIR}/monero
+cache:
+  directories:
+    - "$BIN_DIR"
+before_install:
+  - sudo apt-get install -y wget python3-pip gnupg unzip protobuf-compiler automake libtool pkg-config
+install:
+  - travis_retry pip install tox pytest
+before_script:
+  - wget -O coincurve-anonswap.zip https://github.com/tecnovert/coincurve/archive/refs/tags/anonswap_v0.2.zip
+  - unzip -d coincurve-anonswap coincurve-anonswap.zip
+  - mv ./coincurve-anonswap/*/{.,}* ./coincurve-anonswap || true
+  - cd coincurve-anonswap
+  - python3 setup.py install --force
+script:
+  - cd $TRAVIS_BUILD_DIR
+  - python3 setup.py install
+  - basicswap-prepare --bindir=${BIN_DIR} --preparebinonly --withcoins=particl,bitcoin,litecoin,monero
+  - export DATADIRS="${TEST_DIR}"
+  - mkdir -p "${DATADIRS}/bin"
+  - cp -r ${BIN_DIR} "${DATADIRS}/bin"
+  - mkdir -p "${TEST_RELOAD_PATH}/bin"
+  - cp -r ${BIN_DIR} "${TEST_RELOAD_PATH}/bin"
+  - # tox
+  - pytest tests/basicswap/test_xmr.py
+  - pytest tests/basicswap/test_xmr_reload.py
+  - pytest tests/basicswap/test_xmr_bids_offline.py
+after_success:
+  - echo "End test"
+jobs:
+  include:
+    - stage: lint
+      env:
+      cache: false
+      install:
+        - travis_retry pip install flake8==3.7.0
+        - travis_retry pip install codespell==1.15.0
+      before_script:
+      script:
+        - PYTHONWARNINGS="ignore" flake8 --ignore=E501,F841,W503 --exclude=basicswap/contrib,basicswap/interface/contrib,messages_pb2.py,.eggs,.tox,bin/install_certifi.py
+        - codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=tests/lint/spelling.ignore-words.txt -S .git,.eggs,.tox,pgp,*.pyc,*basicswap/contrib,*basicswap/interface/contrib,*mnemonics.py,bin/install_certifi.py,*basicswap/static
+      after_success:
+        - echo "End lint"
+    - stage: test
+      env:
--- a/21
+++ b/21
@@ -5,15 +5,30 @@ ENV LANG=C.UTF-8 \
    DATADIRS="/coindata"

 RUN apt-get update; \
-    apt-get install -y --no-install-recommends \
-        python3-pip libpython3-dev gnupg pkg-config gcc libc-dev gosu tzdata;
+    apt-get install -y wget python3-pip gnupg unzip make g++ autoconf automake libtool pkg-config gosu tzdata;
+
+# Must install protoc directly as latest package is only on 3.12
+RUN wget -O protobuf_src.tar.gz https://github.com/protocolbuffers/protobuf/releases/download/v21.1/protobuf-python-4.21.1.tar.gz && \
+    tar xvf protobuf_src.tar.gz && \
+    cd protobuf-3.21.1 && \
+    ./configure --prefix=/usr && \
+    make -j$(nproc) install && \
+    ldconfig
+
+ARG COINCURVE_VERSION=v0.2
+RUN wget -O coincurve-anonswap.zip https://github.com/tecnovert/coincurve/archive/refs/tags/anonswap_$COINCURVE_VERSION.zip && \
+    unzip coincurve-anonswap.zip && \
+    mv ./coincurve-anonswap_$COINCURVE_VERSION ./coincurve-anonswap && \
+    cd coincurve-anonswap && \
+    python3 setup.py install --force

 # Install requirements first so as to skip in subsequent rebuilds
 COPY ./requirements.txt requirements.txt
-RUN pip3 install -r requirements.txt --require-hashes
+RUN pip3 install -r requirements.txt

 COPY . basicswap-master
 RUN cd basicswap-master; \
+    protoc -I=basicswap --python_out=basicswap basicswap/messages.proto; \
    pip3 install .;

 RUN useradd -ms /bin/bash swap_user && \
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -0,0 +1,5 @@
+include *.md LICENSE
+
+recursive-include doc *
+recursive-include basicswap/templates *
+recursive-include basicswap/static *
--- a/README.md
+++ b/README.md
@@ -15,31 +15,27 @@ Table of Contents

 ## About

-**BasicSwap** is the world’s most secure and decentralized DEX. It facilitates cross-chain atomic swaps by enabling peers to interact directly with each other within a free and open environment without central points of failure.
+The BasicSwap DEX is a privacy-first and decentralized exchange which features cross-chain atomic swaps and a distributed order book.

-This DEX is fully non-custodial and features a decentralized order book, letting you create or accept swap offers without any fees, counterparties, or the need for accounts.
+[BasicSwap](https://academy.particl.io/en/latest/glossary.html#term-BasicSwap) is a cross-chain and privacy-centric DEX (decentralized exchange) that lets you trade cryptocurrencies with no third party involvement. Its distributed order book lets you make or take orders at no cost and trade within a free and open environment without central points of failure.

-Built as a low-friction, highly secure solution to the frequent losses of funds on centralized exchanges (e.g., FTX, BitFinex, MtGox), **BasicSwap** aims to provide more reliable and secure cryptocurrency trading conditions for everyone.
+This DEX protocol was built in direct response to the increasingly invasive demands and data mining practices of today’s cryptocurrency exchanges. It strives to bring more decentralized and more private cryptocurrency trading conditions for all.

-**BasicSwap** is currently in active development by the community. While it already offers some of the essential trading features you'd expect from an exchange, more features and quality-of-life improvements are being worked on with the goal to provide a smoother user experience.
+BasicSwap is still in beta. This means that, while it already offers most of the vital trading features you’d expect to see on centralized exchanges, it is still in heavy development, and many more features will come about in the near future.
+
+Check out our [roadmap](https://basicswapdex.com/roadmap) to get a better idea of what we've got planned for it!

 ## Features

 * **True cross-chain support** — Swap cryptocurrencies that live on entirely different blockchain environments, like Bitcoin and Monero.
-* **Decentralized order book** — Make or take swap offers on a completely decentralized order book system.
-* **No third-party or middleman** — Trade crypto with no intermediaries, completely eliminating central points of failure.
+* **Distributed order book** — Make or take limit orders on a completely distributed order book system.
+* **No third-party or middleman** — Trade crypto with no intermediaries whatsoever.
 * **No trading fees** — Only pay the typical cryptocurrency network fee.
-* **Superior financial privacy** — Protect your financial information from unauthorized access with BasicSwap’s privacy-conscious technology.
-* **Full Monero support** — Swap Monero with a variety of other cryptocurrencies like Bitcoin or Particl. No wrapped assets or layer-2 involved.
+* **Privacy from the ground up** — Every component of BasicSwap is built with a privacy-first commitment.
+* **Full Monero support** — Swap Monero with a variety of other cryptocurrencies like Bitcoin or Particl. No wrapped assets or trickery involved.
 * **User-friendly interface** — Enjoy all these features within a user-friendly and intuitive interface that handles all the complicated parts for you.

-## Under the Hood
-
-**BasicSwap** can be best understood as the decentralized version of the SWIFT messaging network; providing a decentralized messaging protocol that allows for peers to connect directly with each other with the purpose of executing atomic swaps without central points of failure and using official core wallets (Bitcoin Core, Litecoin Core, etc).
-
-**BasicSwap** does not process, initiate, or execute swaps; it merely enables peers to communicate with each other and exchange the required information to simplify the process of using atomic swaps on the respective blockchains of the coins being swapped.
-
-In essence, **BasicSwap** operates merely as a decentralized messaging protocol supplemented by a user-friendly interface.
+BasicSwap is still in beta. This means that, while it already offers most of the vital trading features you’d expect to see on centralized exchanges, it is still in heavy development, and many more features will come about in the near future.

 ## Available Assets

@@ -88,18 +84,6 @@ BasicSwap is compatible with the following digital assets.
   <td>PIVX
   </td>
  </tr>
-  <tr>
-   <td>Decred
-   </td>
-   <td>DCR
-   </td>
-  </tr>
-  <tr>
-   <td>Wownero
-   </td>
-   <td>WOW
-   </td>
-  </tr>
  <tr>
   <td>Particl
   </td>
@@ -108,31 +92,39 @@ BasicSwap is compatible with the following digital assets.
  </tr>
 </table>

-If you’d like to add a cryptocurrency to BasicSwap, refer to how other cryptocurrencies have been integrated to the DEX by following [this link](https://academy.particl.io/en/latest/basicswap-guides/basicswapguides_apply.html).
+We plan on adding many other cryptocurrencies moving forward, including ETH and its ERC-20 tokens. However, due to the true cross-chain nature of the BasicSwap DEX protocol, each integration has to be done on a case-by-case basis.
+
+If you’d like to add a cryptocurrency to BasicSwap, either [apply for a listing using our listing application form](https://forms.gle/9DsHoHTJVqSiMNHW9), or try coding the integration yourself by referencing how other cryptocurrencies have been added. Follow [this link](https://academy.particl.io/en/latest/basicswap-guides/basicswapguides_apply.html) for more information on how to integrate a coin yourself.

 # Participate

 ### Chats

-* **For support** Join the community on [#basicswap:matrix.org](https://matrix.to/#/#basicswap:matrix.org) using a Matrix client.
+* **For developers** The chat [#particl-dev:matrix.org](https://app.element.io/#/room/#particl-dev:matrix.org) using [Element](https://element.io) (formerly Riot).
+* **For community** The community chat [https://discord.me/particl](https://discord.me/particl) [![Discord](https://img.shields.io/discord/391967609660112925)](https://discord.me/particl).

 [![Twitter Follow](https://img.shields.io/twitter/follow/BasicSwapDEX?label=follow%20us&style=social)](http://twitter.com/BasicSwapDEX)
+[![Subreddit subscribers](https://img.shields.io/reddit/subreddit-subscribers/particl?style=social)](http://reddit.com/r/particl)

 ### Documentation, installation

-Follow the guides on [Particl Academy](https://academy.particl.io) for tutorials and guides on how BasicSwap works.
+For non-developers curious to explore a new world of commerce, binaries can be downloaded and installed. It is the easiest way to get started. Following the guides on [Particl Academy](https://academy.particl.io), a reference book in straightforward language, is recommended.

-* [Download BasicSwapDEX](https://github.com/basicswap/basicswap/tree/master/doc)
+* [Download BasicSwapDEX](https://github.com/tecnovert/basicswap/tree/master/doc)

 #### Community chat support

-* [Matrix](https://matrix.to/#/#basicswap:matrix.org)
+* [Discord](https://discord.me/particl) navigate to the #support channel
+
+* [Telegram](https://t.me/particlhelp)
+
+* [Element](https://app.element.io/#/room/#particlhelp:matrix.org)

 # Tutorials

 You can find a wide variety of tutorials and step-by-step guides about BasicSwap on the [Particl Academy](https://academy.particl.io) or on Particl’s Youtube channel.

-If you encounter an issue or try to accomplish something not mentioned in any of the tutorials included in the links above, please join the community chat support channel; you’ll be sure to find help and support from current contributors there!
+If you encounter an issue or try to accomplish something not mentioned in any of the tutorials included in the links above, please join the community chat support channels; you’ll be sure to find help and support from our awesome community and open-source team there!

 # License

--- a/basicswap/init.py
+++ b/basicswap/init.py
@@ -1,3 +1,3 @@
 name = "basicswap"

-__version__ = "0.14.2"
+__version__ = "0.12.7"
--- a/basicswap/base.py
+++ b/basicswap/base.py
@@ -46,7 +46,7 @@ class BaseApp:
        self.settings = settings
        self.coin_clients = {}
        self.coin_interfaces = {}
-        self.mxDB = threading.Lock()
+        self.mxDB = threading.RLock()
        self.debug = self.settings.get('debug', False)
        self.delay_event = threading.Event()
        self.chainstate_delay_event = threading.Event()
@@ -126,8 +126,7 @@ class BaseApp:
    def callcoincli(self, coin_type, params, wallet=None, timeout=None):
        bindir = self.coin_clients[coin_type]['bindir']
        datadir = self.coin_clients[coin_type]['datadir']
-        cli_bin: str = chainparams[coin_type].get('cli_binname', chainparams[coin_type]['name'] + '-cli')
-        command_cli = os.path.join(bindir, cli_bin + ('.exe' if os.name == 'nt' else ''))
+        command_cli = os.path.join(bindir, chainparams[coin_type]['name'] + '-cli' + ('.exe' if os.name == 'nt' else ''))
        args = [command_cli, ]
        if self.chain != 'mainnet':
            args.append('-' + self.chain)
@@ -163,13 +162,12 @@ class BaseApp:
            socket.getaddrinfo = self.default_socket_getaddrinfo
        socket.setdefaulttimeout(self.default_socket_timeout)

-    def readURL(self, url: str, timeout: int = 120, headers={}) -> bytes:
+    def readURL(self, url: str, timeout: int = 120, headers=None) -> bytes:
        open_handler = None
        if self.use_tor_proxy:
            open_handler = SocksiPyHandler(socks.PROXY_TYPE_SOCKS5, self.tor_proxy_host, self.tor_proxy_port)
        opener = urllib.request.build_opener(open_handler) if self.use_tor_proxy else urllib.request.build_opener()
-        if headers is None:
-            opener.addheaders = [('User-agent', 'Mozilla/5.0')]
+        opener.addheaders = [('User-agent', 'Mozilla/5.0')]
        request = urllib.request.Request(url, headers=headers)
        return opener.open(request, timeout=timeout).read()

--- a/basicswap/basicswap.py
+++ b/basicswap/basicswap.py
--- a/basicswap/basicswap_util.py
+++ b/basicswap/basicswap_util.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-

-# Copyright (c) 2021-2024 tecnovert
+# Copyright (c) 2021-2023 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.

@@ -64,14 +64,12 @@ class SwapTypes(IntEnum):
    SELLER_FIRST_2MSG = auto()
    BUYER_FIRST_2MSG = auto()
    XMR_SWAP = auto()
-    XMR_BCH_SWAP = auto()


 class OfferStates(IntEnum):
    OFFER_SENT = 1
    OFFER_RECEIVED = 2
    OFFER_ABANDONED = 3
-    OFFER_EXPIRED = 4


 class BidStates(IntEnum):
@@ -105,7 +103,6 @@ class BidStates(IntEnum):
    XMR_SWAP_MSG_SCRIPT_LOCK_SPEND_TX = 28     # XmrBidLockSpendTxMessage
    BID_REQUEST_SENT = 29
    BID_REQUEST_ACCEPTED = 30
-    BID_EXPIRED = 31


 class TxStates(IntEnum):
@@ -137,8 +134,6 @@ class TxTypes(IntEnum):

    ITX_PRE_FUNDED = auto()

-    BCH_MERCY = auto()
-

 class ActionTypes(IntEnum):
    ACCEPT_BID = auto()
@@ -186,8 +181,6 @@ class EventLogTypes(IntEnum):
    PTX_REDEEM_PUBLISHED = auto()
    PTX_REFUND_PUBLISHED = auto()
    LOCK_TX_B_IN_MEMPOOL = auto()
-    BCH_MERCY_TX_PUBLISHED = auto()
-    BCH_MERCY_TX_FOUND = auto()


 class XmrSplitMsgTypes(IntEnum):
@@ -199,7 +192,6 @@ class DebugTypes(IntEnum):
    NONE = 0
    BID_STOP_AFTER_COIN_A_LOCK = auto()
    BID_DONT_SPEND_COIN_A_LOCK_REFUND = auto()
-    BID_DONT_SPEND_COIN_A_LOCK_REFUND2 = auto()  # continues
    CREATE_INVALID_COIN_B_LOCK = auto()
    BUYER_STOP_AFTER_ITX = auto()
    MAKE_INVALID_PTX = auto()
@@ -208,12 +200,6 @@ class DebugTypes(IntEnum):
    SEND_LOCKED_XMR = auto()
    B_LOCK_TX_MISSED_SEND = auto()
    DUPLICATE_ACTIONS = auto()
-    DONT_CONFIRM_PTX = auto()
-    OFFER_LOCK_2_VALUE_INC = auto()
-    BID_STOP_AFTER_COIN_B_LOCK = auto()
-    BID_DONT_SPEND_COIN_B_LOCK = auto()
-    WAIT_FOR_COIN_B_LOCK_BEFORE_REFUND = auto()
-    BID_DONT_SPEND_COIN_A_LOCK = auto()


 class NotificationTypes(IntEnum):
@@ -262,8 +248,6 @@ def strOfferState(state):
        return 'Received'
    if state == OfferStates.OFFER_ABANDONED:
        return 'Abandoned'
-    if state == OfferStates.OFFER_EXPIRED:
-        return 'Expired'
    return 'Unknown'


@@ -328,8 +312,7 @@ def strBidState(state):
        return 'Request accepted'
    if state == BidStates.BID_STATE_UNKNOWN:
        return 'Unknown bid state'
-    if state == BidStates.BID_EXPIRED:
-        return 'Expired'
+
    return 'Unknown' + ' ' + str(state)


@@ -365,9 +348,7 @@ def strTxType(tx_type):
    if tx_type == TxTypes.XMR_SWAP_B_LOCK:
        return 'Chain B Lock Tx'
    if tx_type == TxTypes.ITX_PRE_FUNDED:
-        return 'Funded mock initiate Tx'
-    if tx_type == TxTypes.BCH_MERCY:
-        return 'BCH Mercy Tx'
+        return 'Funded mock initiate tx'
    return 'Unknown'


@@ -455,10 +436,6 @@ def describeEventEntry(event_type, event_msg):
        return 'Participate tx redeem tx published'
    if event_type == EventLogTypes.PTX_REFUND_PUBLISHED:
        return 'Participate tx refund tx published'
-    if event_type == EventLogTypes.BCH_MERCY_TX_FOUND:
-        return 'BCH mercy tx found'
-    if event_type == EventLogTypes.BCH_MERCY_TX_PUBLISHED:
-        return 'Lock tx B mercy tx published'


 def getVoutByAddress(txjs, p2sh):
@@ -491,7 +468,7 @@ def getOfferProofOfFundsHash(offer_msg, offer_addr):
    # TODO: Hash must not include proof_of_funds sig if it exists in offer_msg
    h = hashlib.sha256()
    h.update(offer_addr.encode('utf-8'))
-    offer_bytes = offer_msg.to_bytes()
+    offer_bytes = offer_msg.SerializeToString()
    h.update(offer_bytes)
    return h.digest()

@@ -526,7 +503,7 @@ def strSwapDesc(swap_type):
    return None


-inactive_states = [BidStates.SWAP_COMPLETED, BidStates.BID_ERROR, BidStates.BID_REJECTED, BidStates.SWAP_TIMEDOUT, BidStates.BID_ABANDONED, BidStates.BID_EXPIRED]
+inactive_states = [BidStates.SWAP_COMPLETED, BidStates.BID_ERROR, BidStates.BID_REJECTED, BidStates.SWAP_TIMEDOUT, BidStates.BID_ABANDONED]


 def isActiveBidState(state):
--- a/basicswap/bin/init.py
+++ b/basicswap/bin/init.py
@@ -1 +0,0 @@
-name = "bin"
--- a/basicswap/chainparams.py
+++ b/basicswap/chainparams.py
@@ -1,36 +1,38 @@
 # -*- coding: utf-8 -*-

-# Copyright (c) 2019-2024 tecnovert
+# Copyright (c) 2019-2023 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.

+import threading
+
 from enum import IntEnum
 from .util import (
    COIN,
+    make_int,
+    format_amount,
+    TemporaryError,
 )

 XMR_COIN = 10 ** 12
-WOW_COIN = 10 ** 11


 class Coins(IntEnum):
    PART = 1
    BTC = 2
    LTC = 3
-    DCR = 4
+    # DCR = 4
    NMC = 5
    XMR = 6
    PART_BLIND = 7
    PART_ANON = 8
-    WOW = 9
+    # ZANO = 9
    # NDAU = 10
    PIVX = 11
    DASH = 12
    FIRO = 13
    NAV = 14
    LTC_MWEB = 15
-    # ZANO = 16
-    BCH = 17


 chainparams = {
@@ -153,41 +155,6 @@ chainparams = {
            'max_amount': 100000 * COIN,
        }
    },
-    Coins.DCR: {
-        'name': 'decred',
-        'ticker': 'DCR',
-        'message_magic': 'Decred Signed Message:\n',
-        'blocks_target': 60 * 5,
-        'decimal_places': 8,
-        'mainnet': {
-            'rpcport': 9109,
-            'pubkey_address': 0x073f,
-            'script_address': 0x071a,
-            'key_prefix': 0x22de,
-            'bip44': 42,
-            'min_amount': 1000,
-            'max_amount': 100000 * COIN,
-        },
-        'testnet': {
-            'rpcport': 19109,
-            'pubkey_address': 0x0f21,
-            'script_address': 0x0efc,
-            'key_prefix': 0x230e,
-            'bip44': 1,
-            'min_amount': 1000,
-            'max_amount': 100000 * COIN,
-            'name': 'testnet3',
-        },
-        'regtest': {  # simnet
-            'rpcport': 18656,
-            'pubkey_address': 0x0e91,
-            'script_address': 0x0e6c,
-            'key_prefix': 0x2307,
-            'bip44': 1,
-            'min_amount': 1000,
-            'max_amount': 100000 * COIN,
-        }
-    },
    Coins.NMC: {
        'name': 'namecoin',
        'ticker': 'NMC',
@@ -233,60 +200,30 @@ chainparams = {
            'walletrpcport': 18082,
            'min_amount': 100000,
            'max_amount': 10000 * XMR_COIN,
-            'address_prefix': 18,
        },
        'testnet': {
            'rpcport': 28081,
            'walletrpcport': 28082,
            'min_amount': 100000,
            'max_amount': 10000 * XMR_COIN,
-            'address_prefix': 18,
        },
        'regtest': {
            'rpcport': 18081,
            'walletrpcport': 18082,
            'min_amount': 100000,
            'max_amount': 10000 * XMR_COIN,
-            'address_prefix': 18,
-        }
-    },
-    Coins.WOW: {
-        'name': 'wownero',
-        'ticker': 'WOW',
-        'client': 'wow',
-        'decimal_places': 11,
-        'mainnet': {
-            'rpcport': 34568,
-            'walletrpcport': 34572,  # todo
-            'min_amount': 100000,
-            'max_amount': 10000 * WOW_COIN,
-            'address_prefix': 4146,
-        },
-        'testnet': {
-            'rpcport': 44568,
-            'walletrpcport': 44572,
-            'min_amount': 100000,
-            'max_amount': 10000 * WOW_COIN,
-            'address_prefix': 4146,
-        },
-        'regtest': {
-            'rpcport': 54568,
-            'walletrpcport': 54572,
-            'min_amount': 100000,
-            'max_amount': 10000 * WOW_COIN,
-            'address_prefix': 4146,
        }
    },
    Coins.PIVX: {
        'name': 'pivx',
        'ticker': 'PIVX',
-        'display_name': 'PIVX',
        'message_magic': 'DarkNet Signed Message:\n',
        'blocks_target': 60 * 1,
        'decimal_places': 8,
        'has_cltv': True,
        'has_csv': False,
        'has_segwit': False,
+        'use_ticker_as_name': True,
        'mainnet': {
            'rpcport': 51473,
            'pubkey_address': 30,
@@ -433,51 +370,7 @@ chainparams = {
            'min_amount': 1000,
            'max_amount': 100000 * COIN,
        }
-    },
-    Coins.BCH: {
-        'name': 'bitcoincash',
-        'ticker': 'BCH',
-        'display_name': 'Bitcoin Cash',
-        'message_magic': 'Bitcoin Signed Message:\n',
-        'blocks_target': 60 * 2,
-        'decimal_places': 8,
-        'has_cltv': True,
-        'has_csv': True,
-        'has_segwit': False,
-        'cli_binname': 'bitcoin-cli',
-        'core_binname': 'bitcoind',
-        'mainnet': {
-            'rpcport': 8332,
-            'pubkey_address': 0,
-            'script_address': 5,
-            'key_prefix': 128,
-            'hrp': 'bitcoincash',
-            'bip44': 0,
-            'min_amount': 1000,
-            'max_amount': 100000 * COIN,
-        },
-        'testnet': {
-            'rpcport': 18332,
-            'pubkey_address': 111,
-            'script_address': 196,
-            'key_prefix': 239,
-            'hrp': 'bchtest',
-            'bip44': 1,
-            'min_amount': 1000,
-            'max_amount': 100000 * COIN,
-            'name': 'testnet3',
-        },
-        'regtest': {
-            'rpcport': 18443,
-            'pubkey_address': 111,
-            'script_address': 196,
-            'key_prefix': 239,
-            'hrp': 'bchreg',
-            'bip44': 1,
-            'min_amount': 1000,
-            'max_amount': 100000 * COIN,
-        }
-    },
+    }
 }
 ticker_map = {}

@@ -486,8 +379,94 @@ for c, params in chainparams.items():
    ticker_map[params['ticker'].lower()] = c


-def getCoinIdFromTicker(ticker: str) -> str:
+def getCoinIdFromTicker(ticker):
    try:
        return ticker_map[ticker.lower()]
    except Exception:
        raise ValueError('Unknown coin')
+
+
+class CoinInterface:
+    def __init__(self, network):
+        self.setDefaults()
+        self._network = network
+        self._mx_wallet = threading.Lock()
+
+    def setDefaults(self):
+        self._unknown_wallet_seed = True
+        self._restore_height = None
+
+    def make_int(self, amount_in: int, r: int = 0) -> int:
+        return make_int(amount_in, self.exp(), r=r)
+
+    def format_amount(self, amount_in, conv_int=False, r=0):
+        amount_int = make_int(amount_in, self.exp(), r=r) if conv_int else amount_in
+        return format_amount(amount_int, self.exp())
+
+    def coin_name(self) -> str:
+        coin_chainparams = chainparams[self.coin_type()]
+        if coin_chainparams.get('use_ticker_as_name', False):
+            return coin_chainparams['ticker']
+        return coin_chainparams['name'].capitalize()
+
+    def ticker(self) -> str:
+        ticker = chainparams[self.coin_type()]['ticker']
+        if self._network == 'testnet':
+            ticker = 't' + ticker
+        elif self._network == 'regtest':
+            ticker = 'rt' + ticker
+        return ticker
+
+    def getExchangeTicker(self, exchange_name: str) -> str:
+        return chainparams[self.coin_type()]['ticker']
+
+    def getExchangeName(self, exchange_name: str) -> str:
+        return chainparams[self.coin_type()]['name']
+
+    def ticker_mainnet(self) -> str:
+        ticker = chainparams[self.coin_type()]['ticker']
+        return ticker
+
+    def min_amount(self) -> int:
+        return chainparams[self.coin_type()][self._network]['min_amount']
+
+    def max_amount(self) -> int:
+        return chainparams[self.coin_type()][self._network]['max_amount']
+
+    def setWalletSeedWarning(self, value: bool) -> None:
+        self._unknown_wallet_seed = value
+
+    def setWalletRestoreHeight(self, value: int) -> None:
+        self._restore_height = value
+
+    def knownWalletSeed(self) -> bool:
+        return not self._unknown_wallet_seed
+
+    def chainparams(self):
+        return chainparams[self.coin_type()]
+
+    def chainparams_network(self):
+        return chainparams[self.coin_type()][self._network]
+
+    def has_segwit(self) -> bool:
+        return chainparams[self.coin_type()].get('has_segwit', True)
+
+    def is_transient_error(self, ex) -> bool:
+        if isinstance(ex, TemporaryError):
+            return True
+        str_error: str = str(ex).lower()
+        if 'not enough unlocked money' in str_error:
+            return True
+        if 'no unlocked balance' in str_error:
+            return True
+        if 'transaction was rejected by daemon' in str_error:
+            return True
+        if 'invalid unlocked_balance' in str_error:
+            return True
+        if 'daemon is busy' in str_error:
+            return True
+        if 'timed out' in str_error:
+            return True
+        if 'request-sent' in str_error:
+            return True
+        return False
--- a/basicswap/config.py
+++ b/basicswap/config.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-

-# Copyright (c) 2019-2024 The Basicswap developers
+# Copyright (c) 2019-2023 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.

 import os

 CONFIG_FILENAME = 'basicswap.json'
-BASICSWAP_DATADIR = os.getenv('BASICSWAP_DATADIR', os.path.join('~', '.basicswap'))
+BASICSWAP_DATADIR = os.getenv('BASICSWAP_DATADIR', '~/.basicswap')
 DEFAULT_ALLOW_CORS = False
 TEST_DATADIRS = os.path.expanduser(os.getenv('DATADIRS', '/tmp/basicswap'))
-DEFAULT_TEST_BINDIR = os.path.expanduser(os.getenv('DEFAULT_TEST_BINDIR', os.path.join('~', '.basicswap', 'bin')))
+DEFAULT_TEST_BINDIR = os.path.expanduser(os.getenv('DEFAULT_TEST_BINDIR', '~/.basicswap/bin'))

 bin_suffix = ('.exe' if os.name == 'nt' else '')
 PARTICL_BINDIR = os.path.expanduser(os.getenv('PARTICL_BINDIR', os.path.join(DEFAULT_TEST_BINDIR, 'particl')))
@@ -36,5 +36,3 @@ NAMECOIN_TX = os.getenv('NAMECOIN_TX', 'namecoin-tx' + bin_suffix)
 XMR_BINDIR = os.path.expanduser(os.getenv('XMR_BINDIR', os.path.join(DEFAULT_TEST_BINDIR, 'monero')))
 XMRD = os.getenv('XMRD', 'monerod' + bin_suffix)
 XMR_WALLET_RPC = os.getenv('XMR_WALLET_RPC', 'monero-wallet-rpc' + bin_suffix)
-
-# NOTE: Adding coin definitions here is deprecated.  Please add in coin test file.
--- a/basicswap/contrib/blake256/init.py
+++ b/basicswap/contrib/blake256/init.py
@@ -1 +0,0 @@
-
--- a/basicswap/contrib/blake256/blake256.py
+++ b/basicswap/contrib/blake256/blake256.py
@@ -1,533 +0,0 @@
-
-
-intro = """
-    blake.py
-    version 5, 2-Apr-2014
-    
-    BLAKE is a SHA3 round-3 finalist designed and submitted by 
-    Jean-Philippe Aumasson et al.
-    
-    At the core of BLAKE is a ChaCha-like mixer, very similar 
-    to that found in the stream cipher, ChaCha8.  Besides being 
-    a very good mixer, ChaCha is fast.  
-    
-    References:
-      http://www.131002.net/blake/
-      http://csrc.nist.gov/groups/ST/hash/sha-3/index.html
-      http://en.wikipedia.org/wiki/BLAKE_(hash_function)
-    
-    This implementation assumes all data is in increments of 
-    whole bytes.  (The formal definition of BLAKE allows for 
-    hashing individual bits.)  Note too that this implementation 
-    does include the round-3 tweaks where the number of rounds 
-    was increased to 14/16 from 10/14.
-    
-    This version can be imported into both Python2 (2.6 and 2.7) 
-    and Python3 programs.  Python 2.5 requires an older version 
-    of blake.py (version 4).
-
-    Here are some comparative times for different versions of 
-    Python:
-
-      64-bit:
-        2.6         6.284s
-        2.7         6.343s
-        3.2         7.620s
-        pypy (2.7)  2.080s
-        
-      32-bit:
-        2.5 (32)   15.389s  (with psyco)
-        2.7-32     13.645s
-        3.2-32     12.574s
-
-    One test on a 2.0GHz Core 2 Duo of 10,000 iterations of 
-    BLAKE-256 on a short message produced a time of 5.7 seconds.  
-    Not bad, but if raw speed is what you want, look to the 
-    the C version.  It is 40x faster and did the same thing 
-    in 0.13 seconds.
-    
-        Copyright (c) 2009-2012 by Larry Bugbee, Kent, WA
-        ALL RIGHTS RESERVED.
-        
-        blake.py IS EXPERIMENTAL SOFTWARE FOR EDUCATIONAL
-        PURPOSES ONLY.  IT IS MADE AVAILABLE "AS-IS" WITHOUT 
-        WARRANTY OR GUARANTEE OF ANY KIND.  USE SIGNIFIES 
-        ACCEPTANCE OF ALL RISK.  
-
-    To make your learning and experimentation less cumbersome, 
-    blake.py is free for any use.      
-    
-    Enjoy,
-        
-    Larry Bugbee
-    March 2011
-    rev May 2011 - fixed Python version check (tx JP)
-    rev Apr 2012 - fixed an out-of-order bit set in final()
-                 - moved self-test to a separate test pgm
-                 - this now works with Python2 and Python3
-    rev Apr 2014 - added test and conversion of string input 
-                   to byte string in update() (tx Soham)
-                 - added hexdigest() method.
-                 - now support state 3 so only one call to 
-                   final() per instantiation is allowed.  all 
-                   subsequent calls to final(), digest() or 
-                   hexdigest() simply return the stored value.
-    
-"""
-
-import struct
-from binascii import hexlify, unhexlify
-
-#---------------------------------------------------------------
-
-class BLAKE(object):
-
-    # - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    # initial values, constants and padding
-    
-    # IVx for BLAKE-x
-    
-    IV64 = [
-        0x6A09E667F3BCC908, 0xBB67AE8584CAA73B,
-        0x3C6EF372FE94F82B, 0xA54FF53A5F1D36F1,
-        0x510E527FADE682D1, 0x9B05688C2B3E6C1F,
-        0x1F83D9ABFB41BD6B, 0x5BE0CD19137E2179,
-    ]
-    
-    IV48 = [
-        0xCBBB9D5DC1059ED8, 0x629A292A367CD507,
-        0x9159015A3070DD17, 0x152FECD8F70E5939,
-        0x67332667FFC00B31, 0x8EB44A8768581511,
-        0xDB0C2E0D64F98FA7, 0x47B5481DBEFA4FA4,
-    ]
-    
-    # note: the values here are the same as the high-order 
-    #       half-words of IV64
-    IV32 = [
-        0x6A09E667, 0xBB67AE85,
-        0x3C6EF372, 0xA54FF53A,
-        0x510E527F, 0x9B05688C,
-        0x1F83D9AB, 0x5BE0CD19,
-    ]
-    
-    # note: the values here are the same as the low-order 
-    #       half-words of IV48
-    IV28 = [
-        0xC1059ED8, 0x367CD507,
-        0x3070DD17, 0xF70E5939,
-        0xFFC00B31, 0x68581511,
-        0x64F98FA7, 0xBEFA4FA4,
-    ]
-    
-    # constants for BLAKE-64 and BLAKE-48
-    C64 = [
-        0x243F6A8885A308D3, 0x13198A2E03707344,
-        0xA4093822299F31D0, 0x082EFA98EC4E6C89,
-        0x452821E638D01377, 0xBE5466CF34E90C6C,
-        0xC0AC29B7C97C50DD, 0x3F84D5B5B5470917,
-        0x9216D5D98979FB1B, 0xD1310BA698DFB5AC,
-        0x2FFD72DBD01ADFB7, 0xB8E1AFED6A267E96,
-        0xBA7C9045F12C7F99, 0x24A19947B3916CF7,
-        0x0801F2E2858EFC16, 0x636920D871574E69,
-    ]
-    
-    # constants for BLAKE-32 and BLAKE-28
-    # note: concatenate and the values are the same as the values 
-    #       for the 1st half of C64
-    C32 = [
-        0x243F6A88, 0x85A308D3,
-        0x13198A2E, 0x03707344,
-        0xA4093822, 0x299F31D0,
-        0x082EFA98, 0xEC4E6C89,
-        0x452821E6, 0x38D01377,
-        0xBE5466CF, 0x34E90C6C,
-        0xC0AC29B7, 0xC97C50DD,
-        0x3F84D5B5, 0xB5470917,
-    ]
-    
-    # the 10 permutations of:0,...15}
-    SIGMA = [
-        [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15],
-        [14,10, 4, 8, 9,15,13, 6, 1,12, 0, 2,11, 7, 5, 3],
-        [11, 8,12, 0, 5, 2,15,13,10,14, 3, 6, 7, 1, 9, 4],
-        [ 7, 9, 3, 1,13,12,11,14, 2, 6, 5,10, 4, 0,15, 8],
-        [ 9, 0, 5, 7, 2, 4,10,15,14, 1,11,12, 6, 8, 3,13],
-        [ 2,12, 6,10, 0,11, 8, 3, 4,13, 7, 5,15,14, 1, 9],
-        [12, 5, 1,15,14,13, 4,10, 0, 7, 6, 3, 9, 2, 8,11],
-        [13,11, 7,14,12, 1, 3, 9, 5, 0,15, 4, 8, 6, 2,10],
-        [ 6,15,14, 9,11, 3, 0, 8,12, 2,13, 7, 1, 4,10, 5],
-        [10, 2, 8, 4, 7, 6, 1, 5,15,11, 9,14, 3,12,13, 0],
-        [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15],
-        [14,10, 4, 8, 9,15,13, 6, 1,12, 0, 2,11, 7, 5, 3],
-        [11, 8,12, 0, 5, 2,15,13,10,14, 3, 6, 7, 1, 9, 4],
-        [ 7, 9, 3, 1,13,12,11,14, 2, 6, 5,10, 4, 0,15, 8],
-        [ 9, 0, 5, 7, 2, 4,10,15,14, 1,11,12, 6, 8, 3,13],
-        [ 2,12, 6,10, 0,11, 8, 3, 4,13, 7, 5,15,14, 1, 9],
-        [12, 5, 1,15,14,13, 4,10, 0, 7, 6, 3, 9, 2, 8,11],
-        [13,11, 7,14,12, 1, 3, 9, 5, 0,15, 4, 8, 6, 2,10],
-        [ 6,15,14, 9,11, 3, 0, 8,12, 2,13, 7, 1, 4,10, 5],
-        [10, 2, 8, 4, 7, 6, 1, 5,15,11, 9,14, 3,12,13, 0],
-    ]
-        
-    MASK32BITS = 0xFFFFFFFF
-    MASK64BITS = 0xFFFFFFFFFFFFFFFF
-    
-    # - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    
-    def __init__(self, hashbitlen):
-        """
-          load the hashSate structure (copy hashbitlen...)
-          hashbitlen: length of the hash output
-        """
-        if hashbitlen not in [224, 256, 384, 512]:
-            raise Exception('hash length not 224, 256, 384 or 512')
-        
-        self.hashbitlen = hashbitlen
-        self.h     = [0]*8  # current chain value (initialized to the IV)
-        self.t     = 0      # number of *BITS* hashed so far
-        self.cache = b''    # cached leftover data not yet compressed
-        self.salt  = [0]*4  # salt (null by default)
-        self.state = 1      # set to 2 by update and 3 by final
-        self.nullt = 0      # Boolean value for special case \ell_i=0
-        
-        # The algorithm is the same for both the 32- and 64- versions 
-        # of BLAKE.  The difference is in word size (4 vs 8 bytes), 
-        # blocksize (64 vs 128 bytes), number of rounds (14 vs 16)
-        # and a few very specific constants.
-        if (hashbitlen == 224) or (hashbitlen == 256):
-            # setup for 32-bit words and 64-bit block
-            self.byte2int  = self._fourByte2int
-            self.int2byte  = self._int2fourByte
-            self.MASK      = self.MASK32BITS
-            self.WORDBYTES = 4
-            self.WORDBITS  = 32
-            self.BLKBYTES  = 64
-            self.BLKBITS   = 512
-            self.ROUNDS    = 14     # was 10 before round 3
-            self.cxx  = self.C32
-            self.rot1 = 16          # num bits to shift in G
-            self.rot2 = 12          # num bits to shift in G 
-            self.rot3 = 8           # num bits to shift in G 
-            self.rot4 = 7           # num bits to shift in G
-            self.mul  = 0   # for 32-bit words, 32<<self.mul where self.mul = 0
-            
-            # 224- and 256-bit versions (32-bit words)
-            if hashbitlen == 224:
-                self.h = self.IV28[:]
-            else:
-                self.h = self.IV32[:]
-    
-        elif (hashbitlen == 384) or (hashbitlen == 512):
-            # setup for 64-bit words and 128-bit block
-            self.byte2int  = self._eightByte2int
-            self.int2byte  = self._int2eightByte
-            self.MASK      = self.MASK64BITS
-            self.WORDBYTES = 8
-            self.WORDBITS  = 64
-            self.BLKBYTES  = 128
-            self.BLKBITS   = 1024
-            self.ROUNDS    = 16     # was 14 before round 3
-            self.cxx  = self.C64
-            self.rot1 = 32          # num bits to shift in G
-            self.rot2 = 25          # num bits to shift in G
-            self.rot3 = 16          # num bits to shift in G
-            self.rot4 = 11          # num bits to shift in G
-            self.mul  = 1   # for 64-bit words, 32<<self.mul where self.mul = 1
-            
-            # 384- and 512-bit versions (64-bit words)
-            if hashbitlen == 384:
-                self.h = self.IV48[:]
-            else:
-                self.h = self.IV64[:]
-    
-    # - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    
-    def _compress(self, block):
-        byte2int = self.byte2int
-        mul      = self.mul       # de-reference these for  ...speed?  ;-)
-        cxx      = self.cxx
-        rot1     = self.rot1
-        rot2     = self.rot2
-        rot3     = self.rot3
-        rot4     = self.rot4
-        MASK     = self.MASK
-        WORDBITS = self.WORDBITS
-        SIGMA    = self.SIGMA
-        
-        # get message       (<<2 is the same as *4 but faster)
-        m = [byte2int(block[i<<2<<mul:(i<<2<<mul)+(4<<mul)]) for i in range(16)]        
-        
-        # initialization
-        v = [0]*16
-        v[ 0: 8] = [self.h[i] for i in range(8)]
-        v[ 8:16] = [self.cxx[i] for i in range(8)]
-        v[ 8:12] = [v[8+i] ^ self.salt[i] for i in range(4)]
-        if self.nullt == 0:        #    (i>>1 is the same as i/2 but faster)
-            v[12] = v[12] ^ (self.t & MASK)
-            v[13] = v[13] ^ (self.t & MASK)
-            v[14] = v[14] ^ (self.t >> self.WORDBITS)
-            v[15] = v[15] ^ (self.t >> self.WORDBITS)
-        
-        # - - - - - - - - - - - - - - - - -
-        # ready?  let's ChaCha!!!
-        
-        def G(a, b, c, d, i):
-            va = v[a]   # it's faster to deref and reref later
-            vb = v[b]
-            vc = v[c]
-            vd = v[d]
-            
-            sri  = SIGMA[round][i]
-            sri1 = SIGMA[round][i+1]
-            
-            va = ((va + vb) + (m[sri] ^ cxx[sri1]) ) & MASK
-            x  =  vd ^ va
-            vd = (x >> rot1) | ((x << (WORDBITS-rot1)) & MASK)
-            vc = (vc + vd) & MASK
-            x  =  vb ^ vc
-            vb = (x >> rot2) | ((x << (WORDBITS-rot2)) & MASK)
-            
-            va = ((va + vb) + (m[sri1] ^ cxx[sri]) ) & MASK
-            x  =  vd ^ va
-            vd = (x >> rot3) | ((x << (WORDBITS-rot3)) & MASK)
-            vc = (vc + vd) & MASK
-            x  =  vb ^ vc
-            vb = (x >> rot4) | ((x << (WORDBITS-rot4)) & MASK)
-            
-            v[a] = va
-            v[b] = vb
-            v[c] = vc
-            v[d] = vd
-            
-        for round in range(self.ROUNDS):
-            # column step
-            G( 0, 4, 8,12, 0)
-            G( 1, 5, 9,13, 2)
-            G( 2, 6,10,14, 4)
-            G( 3, 7,11,15, 6)
-            # diagonal step
-            G( 0, 5,10,15, 8)
-            G( 1, 6,11,12,10)
-            G( 2, 7, 8,13,12)
-            G( 3, 4, 9,14,14)
-        
-        # - - - - - - - - - - - - - - - - -
-        
-        # save current hash value   (use i&0x3 to get 0,1,2,3,0,1,2,3)
-        self.h = [self.h[i]^v[i]^v[i+8]^self.salt[i&0x3] 
-                                                for i in range(8)]
-    #    print 'self.h', [num2hex(h) for h in self.h]
-    
-    # - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    
-    def addsalt(self, salt):
-        """ adds a salt to the hash function (OPTIONAL)
-            should be called AFTER Init, and BEFORE update
-            salt:  a bytestring, length determined by hashbitlen.
-                   if not of sufficient length, the bytestring 
-                   will be assumed to be a big endian number and 
-                   prefixed with an appropriate number of null 
-                   bytes, and if too large, only the low order 
-                   bytes will be used.
-            
-              if hashbitlen=224 or 256, then salt will be 16 bytes
-              if hashbitlen=384 or 512, then salt will be 32 bytes
-        """
-        # fail if addsalt() was not called at the right time
-        if self.state != 1:
-            raise Exception('addsalt() not called after init() and before update()')
-        # salt size is to be 4x word size
-        saltsize = self.WORDBYTES * 4
-        # if too short, prefix with null bytes.  if too long, 
-        # truncate high order bytes
-        if len(salt) < saltsize:
-            salt = (chr(0)*(saltsize-len(salt)) + salt)
-        else:
-            salt = salt[-saltsize:]
-        # prep the salt array
-        self.salt[0] = self.byte2int(salt[            : 4<<self.mul])
-        self.salt[1] = self.byte2int(salt[ 4<<self.mul: 8<<self.mul])
-        self.salt[2] = self.byte2int(salt[ 8<<self.mul:12<<self.mul])
-        self.salt[3] = self.byte2int(salt[12<<self.mul:            ])
-    
-    # - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    
-    def update(self, data):
-        """ update the state with new data, storing excess data 
-            as necessary.  may be called multiple times and if a 
-            call sends less than a full block in size, the leftover 
-            is cached and will be consumed in the next call 
-            data:  data to be hashed (bytestring)
-        """
-        self.state = 2
-        
-        BLKBYTES = self.BLKBYTES   # de-referenced for improved readability
-        BLKBITS  = self.BLKBITS
-        
-        datalen = len(data)
-        if not datalen:  return
-        
-        if type(data) == type(u''):
-            
-            # use either of the next two lines for a proper 
-            # response under both Python2 and Python3
-            data = data.encode('UTF-8')         # converts to byte string
-            #data = bytearray(data, 'utf-8')    # use if want mutable
-            
-            # This next line works for Py3 but fails under 
-            # Py2 because the Py2 version of bytes() will 
-            # accept only *one* argument.   Arrrrgh!!!
-            #data = bytes(data, 'utf-8')        # converts to immutable byte 
-                                                # string but... under p7 
-                                                # bytes() wants only 1 arg
-            # ...a dummy, 2nd argument like encoding=None 
-            # that does nothing would at least allow 
-            # compatibility between Python2 and Python3.
-        
-        left = len(self.cache)
-        fill = BLKBYTES - left
-        
-        # if any cached data and any added new data will fill a 
-        # full block, fill and compress
-        if left and datalen >= fill:
-            self.cache = self.cache + data[:fill]
-            self.t += BLKBITS           # update counter
-            self._compress(self.cache)
-            self.cache = b''
-            data = data[fill:]
-            datalen -= fill
-    
-        # compress new data until not enough for a full block
-        while datalen >= BLKBYTES:        
-            self.t += BLKBITS           # update counter
-            self._compress(data[:BLKBYTES])
-            data = data[BLKBYTES:]
-            datalen -= BLKBYTES
-        
-        # cache all leftover bytes until next call to update()
-        if datalen > 0:
-            self.cache = self.cache + data[:datalen]
-    
-    # - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    
-    def final(self, data=''):
-        """ finalize the hash -- pad and hash remaining data
-            returns hashval, the digest
-        """
-        if self.state == 3:
-            # we have already finalized so simply return the
-            # previously calculated/stored hash value
-            return self.hash
-            
-        if data:
-            self.update(data)
-            
-        ZZ = b'\x00'
-        ZO = b'\x01'
-        OZ = b'\x80'
-        OO = b'\x81'
-        PADDING = OZ + ZZ*128   # pre-formatted padding data    
-    
-        # copy nb. bits hash in total as a 64-bit BE word
-        # copy nb. bits hash in total as a 128-bit BE word
-        tt = self.t + (len(self.cache) << 3)
-        if self.BLKBYTES == 64:
-            msglen = self._int2eightByte(tt)
-        else:
-            low  = tt & self.MASK
-            high = tt >> self.WORDBITS
-            msglen = self._int2eightByte(high) + self._int2eightByte(low)
-        
-        # size of block without the words at the end that count 
-        # the number of bits, 55 or 111.
-        # Note: (((self.WORDBITS/8)*2)+1) equals ((self.WORDBITS>>2)+1)
-        sizewithout = self.BLKBYTES -  ((self.WORDBITS>>2)+1)
-    
-        if len(self.cache) == sizewithout:
-            # special case of one padding byte
-            self.t -= 8
-            if self.hashbitlen in [224, 384]:
-                self.update(OZ)
-            else:
-                self.update(OO)
-        else:
-            if len(self.cache) < sizewithout:
-                # enough space to fill the block
-                # use t=0 if no remaining data
-                if len(self.cache) == 0:
-                    self.nullt=1
-                self.t -= (sizewithout - len(self.cache)) << 3
-                self.update(PADDING[:sizewithout - len(self.cache)])
-            else: 
-                # NOT enough space, need 2 compressions
-                #   ...add marker, pad with nulls and compress
-                self.t -= (self.BLKBYTES - len(self.cache)) << 3 
-                self.update(PADDING[:self.BLKBYTES - len(self.cache)])
-                #   ...now pad w/nulls leaving space for marker & bit count
-                self.t -= (sizewithout+1) << 3
-                self.update(PADDING[1:sizewithout+1]) # pad with zeroes
-                
-                self.nullt = 1 # raise flag to set t=0 at the next _compress
-            
-            # append a marker byte
-            if self.hashbitlen in [224, 384]:
-                self.update(ZZ)
-            else:
-                self.update(ZO)
-            self.t -= 8
-        
-        # append the number of bits (long long)
-        self.t -= self.BLKBYTES
-        self.update(msglen)
-    
-        hashval = []
-        if self.BLKBYTES == 64:
-            for h in self.h:
-                hashval.append(self._int2fourByte(h))
-        else:
-            for h in self.h:
-                hashval.append(self._int2eightByte(h))
-        
-        self.hash  = b''.join(hashval)[:self.hashbitlen >> 3]
-        self.state = 3
-        
-        return self.hash
-    
-    digest = final      # may use digest() as a synonym for final()
-    
-    # - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    
-    def hexdigest(self, data=''):
-        return hexlify(self.final(data)).decode('UTF-8')
-    
-    # - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    # utility functions
-    
-    def _fourByte2int(self, bytestr):      # see also long2byt() below
-        """ convert a 4-byte string to an int (long) """
-        return struct.unpack('!L', bytestr)[0]
-    
-    def _eightByte2int(self, bytestr):
-        """ convert a 8-byte string to an int (long long) """
-        return struct.unpack('!Q', bytestr)[0]
-    
-    def _int2fourByte(self, x):            # see also long2byt() below
-        """ convert a number to a 4-byte string, high order 
-            truncation possible (in Python x could be a BIGNUM)
-        """
-        return struct.pack('!L', x)
-    
-    def _int2eightByte(self, x):
-        """ convert a number to a 8-byte string, high order 
-            truncation possible (in Python x could be a BIGNUM)
-        """
-        return struct.pack('!Q', x)
-
-
-#---------------------------------------------------------------
-#---------------------------------------------------------------
-#---------------------------------------------------------------
-
-
-def blake_hash(data):
-    return BLAKE(256).digest(data)
--- a/basicswap/contrib/blake256/test.py
+++ b/basicswap/contrib/blake256/test.py
@@ -1,37 +0,0 @@
-from blake256 import blake_hash
-
-testVectors = [
-    ["716f6e863f744b9ac22c97ec7b76ea5f5908bc5b2f67c61510bfc4751384ea7a", ""],
-    ["43234ff894a9c0590d0246cfc574eb781a80958b01d7a2fa1ac73c673ba5e311", "a"],
-    ["658c6d9019a1deddbcb3640a066dfd23471553a307ab941fd3e677ba887be329", "ab"],
-    ["1833a9fa7cf4086bd5fda73da32e5a1d75b4c3f89d5c436369f9d78bb2da5c28", "abc"],
-    ["35282468f3b93c5aaca6408582fced36e578f67671ed0741c332d68ac72d7aa2", "abcd"],
-    ["9278d633efce801c6aa62987d7483d50e3c918caed7d46679551eed91fba8904", "abcde"],
-    ["7a17ee5e289845adcafaf6ca1b05c4a281b232a71c7083f66c19ba1d1169a8d4", "abcdef"],
-    ["ee8c7f94ff805cb2e644643010ea43b0222056420917ec70c3da764175193f8f", "abcdefg"],
-    ["7b37c0876d29c5add7800a1823795a82b809fc12f799ff6a4b5e58d52c42b17e", "abcdefgh"],
-    ["bdc514bea74ffbb9c3aa6470b08ceb80a88e313ad65e4a01457bbffd0acc86de", "abcdefghi"],
-    ["12e3afb9739df8d727e93d853faeafc374cc55aedc937e5a1e66f5843b1d4c2e", "abcdefghij"],
-    ["22297d373b751f581944bb26315133f6fda2f0bf60f65db773900f61f81b7e79", "Discard medicine more than two years old."],
-    ["4d48d137bc9cf6d21415b805bf33f59320337d85c673998260e03a02a0d760cd", "He who has a shady past knows that nice guys finish last."],
-    ["beba299e10f93e17d45663a6dc4b8c9349e4f5b9bac0d7832389c40a1b401e5c", "I wouldn't marry him with a ten foot pole."],
-    ["42e082ae7f967781c6cd4e0ceeaeeb19fb2955adbdbaf8c7ec4613ac130071b3", "Free! Free!/A trip/to Mars/for 900/empty jars/Burma Shave"],
-    ["207d06b205bfb359df91b48b6fd8aa6e4798b712d1cc5e91a254da9cef8684a3", "The days of the digital watch are numbered.  -Tom Stoppard"],
-    ["d56eab6927e371e2148b0788779aaf565d30567af2af822b6be3b90db9767a70", "Nepal premier won't resign."],
-    ["01020709ca7fd10dc7756ce767d508d7206167d300b7a7ed76838a8547a7898c", "For every action there is an equal and opposite government program."],
-    ["5569a6cc6535a66da221d8f6ad25008f28752d0343f3f1d757f1ecc9b1c61536", "His money is twice tainted: 'taint yours and 'taint mine."],
-    ["8ff699b5ac7687c82600e89d0ff6cfa87e7179759184386971feb76fbae9975f", "There is no reason for any individual to have a computer in their home. -Ken Olsen, 1977"],
-    ["f4b3a7c85a418b15ce330fd41ae0254b036ad48dd98aa37f0506a995ba9c6029", "It's a tiny change to the code and not completely disgusting. - Bob Manchek"],
-    ["1ed94bab64fe560ef0983165fcb067e9a8a971c1db8e6fb151ff9a7c7fe877e3", "size:  a.out:  bad magic"],
-    ["ff15b54992eedf9889f7b4bbb16692881aa01ed10dfc860fdb04785d8185cd3c", "The major problem is with sendmail.  -Mark Horton"],
-    ["8a0a7c417a47deec0b6474d8c247da142d2e315113a2817af3de8f45690d8652", "Give me a rock, paper and scissors and I will move the world.  CCFestoon"],
-    ["310d263fdab056a930324cdea5f46f9ea70219c1a74b01009994484113222a62", "If the enemy is within range, then so are you."],
-    ["1aaa0903aa4cf872fe494c322a6e535698ea2140e15f26fb6088287aedceb6ba", "It's well we cannot hear the screams/That we create in others' dreams."],
-    ["2eb81bcaa9e9185a7587a1b26299dcfb30f2a58a7f29adb584b969725457ad4f", "You remind me of a TV show, but that's all right: I watch it anyway."],
-    ["c27b1683ef76e274680ab5492e592997b0d9d5ac5a5f4651b6036f64215256af", "C is as portable as Stonehedge!!"],
-    ["3995cce8f32b174c22ffac916124bd095c80205d9d5f1bb08a155ac24b40d6cb", "Even if I could be Shakespeare, I think I should still choose to be Faraday. - A. Huxley"],
-    ["496f7063f8bd479bf54e9d87e9ba53e277839ac7fdaecc5105f2879b58ee562f", "The fugacity of a constituent in a mixture of gases at a given temperature is proportional to its mole fraction.  Lewis-Randall Rule"],
-    ["2e0eff918940b01eea9539a02212f33ee84f77fab201f4287aa6167e4a1ed043", "How can you write a big system without C++?  -Paul Glick"]]
-
-for vectorSet in testVectors:
-    assert vectorSet[0] == blake_hash(vectorSet[1]).encode('hex')
--- a/basicswap/contrib/mnemonic/init.py
+++ b/basicswap/contrib/mnemonic/init.py
@@ -1,3 +0,0 @@
-from .mnemonic import Mnemonic
-
-__all__ = ["Mnemonic"]
--- a/basicswap/contrib/mnemonic/mnemonic.py
+++ b/basicswap/contrib/mnemonic/mnemonic.py
@@ -1,298 +0,0 @@
-#
-# Copyright (c) 2013 Pavol Rusnak
-# Copyright (c) 2017 mruddy
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-# of the Software, and to permit persons to whom the Software is furnished to do
-# so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-from __future__ import annotations
-
-import hashlib
-import hmac
-import itertools
-import os
-import secrets
-import typing as t
-import unicodedata
-
-PBKDF2_ROUNDS = 2048
-
-
-class ConfigurationError(Exception):
-    pass
-
-
-# Refactored code segments from <https://github.com/keis/base58>
-def b58encode(v: bytes) -> str:
-    alphabet = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
-
-    p, acc = 1, 0
-    for c in reversed(v):
-        acc += p * c
-        p = p << 8
-
-    string = ""
-    while acc:
-        acc, idx = divmod(acc, 58)
-        string = alphabet[idx : idx + 1] + string
-    return string
-
-
-class Mnemonic(object):
-    def __init__(self, language: str = "english", wordlist: list[str] | None = None):
-        self.radix = 2048
-        self.language = language
-
-        if wordlist is None:
-            d = os.path.join(os.path.dirname(__file__), f"wordlist/{language}.txt")
-            if os.path.exists(d) and os.path.isfile(d):
-                with open(d, "r", encoding="utf-8") as f:
-                    wordlist = [w.strip() for w in f.readlines()]
-            else:
-                raise ConfigurationError("Language not detected")
-
-        if len(wordlist) != self.radix:
-            raise ConfigurationError(f"Wordlist must contain {self.radix} words.")
-
-        self.wordlist = wordlist
-        # Japanese must be joined by ideographic space
-        self.delimiter = "\u3000" if language == "japanese" else " "
-
-    @classmethod
-    def list_languages(cls) -> list[str]:
-        return [
-            f.split(".")[0]
-            for f in os.listdir(os.path.join(os.path.dirname(__file__), "wordlist"))
-            if f.endswith(".txt")
-        ]
-
-    @staticmethod
-    def normalize_string(txt: t.AnyStr) -> str:
-        if isinstance(txt, bytes):
-            utxt = txt.decode("utf8")
-        elif isinstance(txt, str):
-            utxt = txt
-        else:
-            raise TypeError("String value expected")
-
-        return unicodedata.normalize("NFKD", utxt)
-
-    @classmethod
-    def detect_language(cls, code: str) -> str:
-        """Scan the Mnemonic until the language becomes unambiguous, including as abbreviation prefixes.
-
-        Unfortunately, there are valid words that are ambiguous between languages, which are complete words
-        in one language and are prefixes in another:
-
-            english: abandon ... about
-            french:  abandon ... aboutir
-
-        If prefixes remain ambiguous, require exactly one language where word(s) match exactly.
-        """
-        code = cls.normalize_string(code)
-        possible = set(cls(lang) for lang in cls.list_languages())
-        words = set(code.split())
-        for word in words:
-            # possible languages have candidate(s) starting with the word/prefix
-            possible = set(
-                p for p in possible if any(c.startswith(word) for c in p.wordlist)
-            )
-            if not possible:
-                raise ConfigurationError(f"Language unrecognized for {word!r}")
-        if len(possible) == 1:
-            return possible.pop().language
-        # Multiple languages match: A prefix in many, but an exact match in one determines language.
-        complete = set()
-        for word in words:
-            exact = set(p for p in possible if word in p.wordlist)
-            if len(exact) == 1:
-                complete.update(exact)
-        if len(complete) == 1:
-            return complete.pop().language
-        raise ConfigurationError(
-            f"Language ambiguous between {', '.join(p.language for p in possible)}"
-        )
-
-    def generate(self, strength: int = 128) -> str:
-        """
-        Create a new mnemonic using a random generated number as entropy.
-
-        As defined in BIP39, the entropy must be a multiple of 32 bits, and its size must be between 128 and 256 bits.
-        Therefore the possible values for `strength` are 128, 160, 192, 224 and 256.
-
-        If not provided, the default entropy length will be set to 128 bits.
-
-        The return is a list of words that encodes the generated entropy.
-
-        :param strength: Number of bytes used as entropy
-        :type strength: int
-        :return: A randomly generated mnemonic
-        :rtype: str
-        """
-        if strength not in [128, 160, 192, 224, 256]:
-            raise ValueError(
-                "Invalid strength value. Allowed values are [128, 160, 192, 224, 256]."
-            )
-        return self.to_mnemonic(secrets.token_bytes(strength // 8))
-
-    # Adapted from <http://tinyurl.com/oxmn476>
-    def to_entropy(self, words: list[str] | str) -> bytearray:
-        if not isinstance(words, list):
-            words = words.split(" ")
-        if len(words) not in [12, 15, 18, 21, 24]:
-            raise ValueError(
-                "Number of words must be one of the following: [12, 15, 18, 21, 24], but it is not (%d)."
-                % len(words)
-            )
-        # Look up all the words in the list and construct the
-        # concatenation of the original entropy and the checksum.
-        concatLenBits = len(words) * 11
-        concatBits = [False] * concatLenBits
-        wordindex = 0
-        for word in words:
-            # Find the words index in the wordlist
-            ndx = self.wordlist.index(self.normalize_string(word))
-            if ndx < 0:
-                raise LookupError('Unable to find "%s" in word list.' % word)
-            # Set the next 11 bits to the value of the index.
-            for ii in range(11):
-                concatBits[(wordindex * 11) + ii] = (ndx & (1 << (10 - ii))) != 0
-            wordindex += 1
-        checksumLengthBits = concatLenBits // 33
-        entropyLengthBits = concatLenBits - checksumLengthBits
-        # Extract original entropy as bytes.
-        entropy = bytearray(entropyLengthBits // 8)
-        for ii in range(len(entropy)):
-            for jj in range(8):
-                if concatBits[(ii * 8) + jj]:
-                    entropy[ii] |= 1 << (7 - jj)
-        # Take the digest of the entropy.
-        hashBytes = hashlib.sha256(entropy).digest()
-        hashBits = list(
-            itertools.chain.from_iterable(
-                [c & (1 << (7 - i)) != 0 for i in range(8)] for c in hashBytes
-            )
-        )
-        # Check all the checksum bits.
-        for i in range(checksumLengthBits):
-            if concatBits[entropyLengthBits + i] != hashBits[i]:
-                raise ValueError("Failed checksum.")
-        return entropy
-
-    def to_mnemonic(self, data: bytes) -> str:
-        if len(data) not in [16, 20, 24, 28, 32]:
-            raise ValueError(
-                f"Data length should be one of the following: [16, 20, 24, 28, 32], but it is not {len(data)}."
-            )
-        h = hashlib.sha256(data).hexdigest()
-        b = (
-            bin(int.from_bytes(data, byteorder="big"))[2:].zfill(len(data) * 8)
-            + bin(int(h, 16))[2:].zfill(256)[: len(data) * 8 // 32]
-        )
-        result = []
-        for i in range(len(b) // 11):
-            idx = int(b[i * 11 : (i + 1) * 11], 2)
-            result.append(self.wordlist[idx])
-        return self.delimiter.join(result)
-
-    def check(self, mnemonic: str) -> bool:
-        mnemonic_list = self.normalize_string(mnemonic).split(" ")
-        # list of valid mnemonic lengths
-        if len(mnemonic_list) not in [12, 15, 18, 21, 24]:
-            return False
-        try:
-            idx = map(
-                lambda x: bin(self.wordlist.index(x))[2:].zfill(11), mnemonic_list
-            )
-            b = "".join(idx)
-        except ValueError:
-            return False
-        l = len(b)  # noqa: E741
-        d = b[: l // 33 * 32]
-        h = b[-l // 33 :]
-        nd = int(d, 2).to_bytes(l // 33 * 4, byteorder="big")
-        nh = bin(int(hashlib.sha256(nd).hexdigest(), 16))[2:].zfill(256)[: l // 33]
-        return h == nh
-
-    def expand_word(self, prefix: str) -> str:
-        if prefix in self.wordlist:
-            return prefix
-        else:
-            matches = [word for word in self.wordlist if word.startswith(prefix)]
-            if len(matches) == 1:  # matched exactly one word in the wordlist
-                return matches[0]
-            else:
-                # exact match not found.
-                # this is not a validation routine, just return the input
-                return prefix
-
-    def expand(self, mnemonic: str) -> str:
-        return " ".join(map(self.expand_word, mnemonic.split(" ")))
-
-    @classmethod
-    def to_seed(cls, mnemonic: str, passphrase: str = "") -> bytes:
-        mnemonic = cls.normalize_string(mnemonic)
-        passphrase = cls.normalize_string(passphrase)
-        passphrase = "mnemonic" + passphrase
-        mnemonic_bytes = mnemonic.encode("utf-8")
-        passphrase_bytes = passphrase.encode("utf-8")
-        stretched = hashlib.pbkdf2_hmac(
-            "sha512", mnemonic_bytes, passphrase_bytes, PBKDF2_ROUNDS
-        )
-        return stretched[:64]
-
-    @staticmethod
-    def to_hd_master_key(seed: bytes, testnet: bool = False) -> str:
-        if len(seed) != 64:
-            raise ValueError("Provided seed should have length of 64")
-
-        # Compute HMAC-SHA512 of seed
-        seed = hmac.new(b"Bitcoin seed", seed, digestmod=hashlib.sha512).digest()
-
-        # Serialization format can be found at: https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki#serialization-format
-        xprv = b"\x04\x88\xad\xe4"  # Version for private mainnet
-        if testnet:
-            xprv = b"\x04\x35\x83\x94"  # Version for private testnet
-        xprv += b"\x00" * 9  # Depth, parent fingerprint, and child number
-        xprv += seed[32:]  # Chain code
-        xprv += b"\x00" + seed[:32]  # Master key
-
-        # Double hash using SHA256
-        hashed_xprv = hashlib.sha256(xprv).digest()
-        hashed_xprv = hashlib.sha256(hashed_xprv).digest()
-
-        # Append 4 bytes of checksum
-        xprv += hashed_xprv[:4]
-
-        # Return base58
-        return b58encode(xprv)
-
-
-def main() -> None:
-    import sys
-
-    if len(sys.argv) > 1:
-        hex_data = sys.argv[1]
-    else:
-        hex_data = sys.stdin.readline().strip()
-    data = bytes.fromhex(hex_data)
-    m = Mnemonic("english")
-    print(m.to_mnemonic(data))
-
-
-if __name__ == "__main__":
-    main()
--- a/basicswap/contrib/mnemonic/py.typed
+++ b/basicswap/contrib/mnemonic/py.typed
@@ -1 +0,0 @@
-# Marker file for PEP 561.
--- a/basicswap/contrib/mnemonic/wordlist/chinese_simplified.txt
+++ b/basicswap/contrib/mnemonic/wordlist/chinese_simplified.txt
--- a/basicswap/contrib/mnemonic/wordlist/chinese_traditional.txt
+++ b/basicswap/contrib/mnemonic/wordlist/chinese_traditional.txt
--- a/basicswap/contrib/mnemonic/wordlist/czech.txt
+++ b/basicswap/contrib/mnemonic/wordlist/czech.txt
--- a/basicswap/contrib/mnemonic/wordlist/english.txt
+++ b/basicswap/contrib/mnemonic/wordlist/english.txt
--- a/basicswap/contrib/mnemonic/wordlist/french.txt
+++ b/basicswap/contrib/mnemonic/wordlist/french.txt
--- a/basicswap/contrib/mnemonic/wordlist/italian.txt
+++ b/basicswap/contrib/mnemonic/wordlist/italian.txt
--- a/basicswap/contrib/mnemonic/wordlist/japanese.txt
+++ b/basicswap/contrib/mnemonic/wordlist/japanese.txt
--- a/basicswap/contrib/mnemonic/wordlist/korean.txt
+++ b/basicswap/contrib/mnemonic/wordlist/korean.txt
--- a/basicswap/contrib/mnemonic/wordlist/portuguese.txt
+++ b/basicswap/contrib/mnemonic/wordlist/portuguese.txt
--- a/basicswap/contrib/mnemonic/wordlist/russian.txt
+++ b/basicswap/contrib/mnemonic/wordlist/russian.txt
--- a/basicswap/contrib/mnemonic/wordlist/spanish.txt
+++ b/basicswap/contrib/mnemonic/wordlist/spanish.txt
--- a/basicswap/contrib/mnemonic/wordlist/turkish.txt
+++ b/basicswap/contrib/mnemonic/wordlist/turkish.txt
--- a/basicswap/db.py
+++ b/basicswap/db.py
@@ -1,17 +1,18 @@
 # -*- coding: utf-8 -*-

-# Copyright (c) 2019-2024 tecnovert
+# Copyright (c) 2019-2023 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.

 import time
+import struct
 import sqlalchemy as sa

 from enum import IntEnum, auto
-from sqlalchemy.orm import declarative_base
+from sqlalchemy.ext.declarative import declarative_base


-CURRENT_DB_VERSION = 24
+CURRENT_DB_VERSION = 22
 CURRENT_DB_DATA_VERSION = 4
 Base = declarative_base()

@@ -33,10 +34,6 @@ def strConcepts(state):
    return 'Unknown'


-def pack_state(new_state: int, now: int) -> bytes:
-    return int(new_state).to_bytes(4, 'little') + now.to_bytes(8, 'little')
-
-
 class DBKVInt(Base):
    __tablename__ = 'kv_int'

@@ -61,7 +58,6 @@ class Offer(Base):
    coin_from = sa.Column(sa.Integer)
    coin_to = sa.Column(sa.Integer)
    amount_from = sa.Column(sa.BigInteger)
-    amount_to = sa.Column(sa.BigInteger)
    rate = sa.Column(sa.BigInteger)
    min_bid_amount = sa.Column(sa.BigInteger)
    time_valid = sa.Column(sa.BigInteger)
@@ -100,9 +96,9 @@ class Offer(Base):
        now = int(time.time())
        self.state = new_state
        if self.states is None:
-            self.states = pack_state(new_state, now)
+            self.states = struct.pack('<iq', new_state, now)
        else:
-            self.states += pack_state(new_state, now)
+            self.states += struct.pack('<iq', new_state, now)


 class Bid(Base):
@@ -127,7 +123,6 @@ class Bid(Base):
    amount_to = sa.Column(sa.BigInteger)  # amount * offer.rate

    pkhash_buyer = sa.Column(sa.LargeBinary)
-    pkhash_buyer_to = sa.Column(sa.LargeBinary)  # Used for the ptx if coin pubkey hashes differ
    amount = sa.Column(sa.BigInteger)
    rate = sa.Column(sa.BigInteger)

@@ -188,14 +183,9 @@ class Bid(Base):
        if state_note is not None:
            self.state_note = state_note
        if self.states is None:
-            self.states = pack_state(new_state, now)
+            self.states = struct.pack('<iq', new_state, now)
        else:
-            self.states += pack_state(new_state, now)
-
-    def getLockTXBVout(self):
-        if self.xmr_b_lock_tx:
-            return self.xmr_b_lock_tx.vout
-        return None
+            self.states += struct.pack('<iq', new_state, now)


 class SwapTx(Base):
@@ -232,11 +222,7 @@ class SwapTx(Base):
        if self.state == new_state:
            return
        self.state = new_state
-        now: int = int(time.time())
-        if self.states is None:
-            self.states = pack_state(new_state, now)
-        else:
-            self.states += pack_state(new_state, now)
+        self.states = (self.states if self.states is not None else bytes()) + struct.pack('<iq', new_state, int(time.time()))


 class PrefundedTx(Base):
@@ -351,7 +337,7 @@ class XmrSwap(Base):

    vkbv = sa.Column(sa.LargeBinary)        # chain b view private key
    pkbv = sa.Column(sa.LargeBinary)        # chain b view public key
-    pkbs = sa.Column(sa.LargeBinary)        # chain b spend public key
+    pkbs = sa.Column(sa.LargeBinary)        # chain b view spend key

    a_lock_tx = sa.Column(sa.LargeBinary)
    a_lock_tx_script = sa.Column(sa.LargeBinary)
@@ -528,14 +514,3 @@ class MessageLink(Base):
    msg_type = sa.Column(sa.Integer)
    msg_sequence = sa.Column(sa.Integer)
    msg_id = sa.Column(sa.LargeBinary)
-
-
-class CheckedBlock(Base):
-    __tablename__ = 'checkedblocks'
-
-    record_id = sa.Column(sa.Integer, primary_key=True, autoincrement=True)
-    created_at = sa.Column(sa.BigInteger)
-    coin_type = sa.Column(sa.Integer)
-    block_height = sa.Column(sa.Integer)
-    block_hash = sa.Column(sa.LargeBinary)
-    block_time = sa.Column(sa.BigInteger)
--- a/basicswap/db_upgrades.py
+++ b/basicswap/db_upgrades.py
@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-

-# Copyright (c) 2022-2024 tecnovert
+# Copyright (c) 2022-2023 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.

 import json
 import time

-from sqlalchemy.sql import text
 from sqlalchemy.orm import scoped_session
 from .db import (
    BidState,
@@ -80,7 +79,7 @@ def upgradeDatabaseData(self, data_version):
                    in_error = isErrorBidState(state)
                    swap_failed = isFailingBidState(state)
                    swap_ended = isFinalBidState(state)
-                    session.execute(text('UPDATE bidstates SET in_error = :in_error, swap_failed = :swap_failed, swap_ended = :swap_ended WHERE state_id = :state_id', {'in_error': in_error, 'swap_failed': swap_failed, 'swap_ended': swap_ended, 'state_id': int(state)}))
+                    session.execute('UPDATE bidstates SET in_error = :in_error, swap_failed = :swap_failed, swap_ended = :swap_ended WHERE state_id = :state_id', {'in_error': in_error, 'swap_failed': swap_failed, 'swap_ended': swap_ended, 'state_id': int(state)})
            if data_version > 0 and data_version < 4:
                for state in (BidStates.BID_REQUEST_SENT, BidStates.BID_REQUEST_ACCEPTED):
                    session.add(BidState(
@@ -94,7 +93,7 @@ def upgradeDatabaseData(self, data_version):
                        created_at=now))

            self.db_data_version = CURRENT_DB_DATA_VERSION
-            self.setIntKV('db_data_version', self.db_data_version, session)
+            self.setIntKVInSession('db_data_version', self.db_data_version, session)
            session.commit()
            self.log.info('Upgraded database records to version {}'.format(self.db_data_version))
        finally:
@@ -113,16 +112,16 @@ def upgradeDatabase(self, db_version):

        current_version = db_version
        if current_version == 6:
-            session.execute(text('ALTER TABLE bids ADD COLUMN security_token BLOB'))
-            session.execute(text('ALTER TABLE offers ADD COLUMN security_token BLOB'))
+            session.execute('ALTER TABLE bids ADD COLUMN security_token BLOB')
+            session.execute('ALTER TABLE offers ADD COLUMN security_token BLOB')
            db_version += 1
        elif current_version == 7:
-            session.execute(text('ALTER TABLE transactions ADD COLUMN block_hash BLOB'))
-            session.execute(text('ALTER TABLE transactions ADD COLUMN block_height INTEGER'))
-            session.execute(text('ALTER TABLE transactions ADD COLUMN block_time INTEGER'))
+            session.execute('ALTER TABLE transactions ADD COLUMN block_hash BLOB')
+            session.execute('ALTER TABLE transactions ADD COLUMN block_height INTEGER')
+            session.execute('ALTER TABLE transactions ADD COLUMN block_time INTEGER')
            db_version += 1
        elif current_version == 8:
-            session.execute(text('''
+            session.execute('''
                CREATE TABLE wallets (
                    record_id INTEGER NOT NULL,
                    coin_id INTEGER,
@@ -130,30 +129,30 @@ def upgradeDatabase(self, db_version):
                    wallet_data VARCHAR,
                    balance_type INTEGER,
                    created_at BIGINT,
-                    PRIMARY KEY (record_id))'''))
+                    PRIMARY KEY (record_id))''')
            db_version += 1
        elif current_version == 9:
-            session.execute(text('ALTER TABLE wallets ADD COLUMN wallet_data VARCHAR'))
+            session.execute('ALTER TABLE wallets ADD COLUMN wallet_data VARCHAR')
            db_version += 1
        elif current_version == 10:
-            session.execute(text('ALTER TABLE smsgaddresses ADD COLUMN active_ind INTEGER'))
-            session.execute(text('ALTER TABLE smsgaddresses ADD COLUMN created_at INTEGER'))
-            session.execute(text('ALTER TABLE smsgaddresses ADD COLUMN note VARCHAR'))
-            session.execute(text('ALTER TABLE smsgaddresses ADD COLUMN pubkey VARCHAR'))
-            session.execute(text('UPDATE smsgaddresses SET active_ind = 1, created_at = 1'))
+            session.execute('ALTER TABLE smsgaddresses ADD COLUMN active_ind INTEGER')
+            session.execute('ALTER TABLE smsgaddresses ADD COLUMN created_at INTEGER')
+            session.execute('ALTER TABLE smsgaddresses ADD COLUMN note VARCHAR')
+            session.execute('ALTER TABLE smsgaddresses ADD COLUMN pubkey VARCHAR')
+            session.execute('UPDATE smsgaddresses SET active_ind = 1, created_at = 1')

-            session.execute(text('ALTER TABLE offers ADD COLUMN addr_to VARCHAR'))
-            session.execute(text(f'UPDATE offers SET addr_to = "{self.network_addr}"'))
+            session.execute('ALTER TABLE offers ADD COLUMN addr_to VARCHAR')
+            session.execute(f'UPDATE offers SET addr_to = "{self.network_addr}"')
            db_version += 1
        elif current_version == 11:
-            session.execute(text('ALTER TABLE bids ADD COLUMN chain_a_height_start INTEGER'))
-            session.execute(text('ALTER TABLE bids ADD COLUMN chain_b_height_start INTEGER'))
-            session.execute(text('ALTER TABLE bids ADD COLUMN protocol_version INTEGER'))
-            session.execute(text('ALTER TABLE offers ADD COLUMN protocol_version INTEGER'))
-            session.execute(text('ALTER TABLE transactions ADD COLUMN tx_data BLOB'))
+            session.execute('ALTER TABLE bids ADD COLUMN chain_a_height_start INTEGER')
+            session.execute('ALTER TABLE bids ADD COLUMN chain_b_height_start INTEGER')
+            session.execute('ALTER TABLE bids ADD COLUMN protocol_version INTEGER')
+            session.execute('ALTER TABLE offers ADD COLUMN protocol_version INTEGER')
+            session.execute('ALTER TABLE transactions ADD COLUMN tx_data BLOB')
            db_version += 1
        elif current_version == 12:
-            session.execute(text('''
+            session.execute('''
                CREATE TABLE knownidentities (
                    record_id INTEGER NOT NULL,
                    address VARCHAR,
@@ -168,15 +167,15 @@ def upgradeDatabase(self, db_version):
                    note VARCHAR,
                    updated_at BIGINT,
                    created_at BIGINT,
-                    PRIMARY KEY (record_id))'''))
-            session.execute(text('ALTER TABLE bids ADD COLUMN reject_code INTEGER'))
-            session.execute(text('ALTER TABLE bids ADD COLUMN rate INTEGER'))
-            session.execute(text('ALTER TABLE offers ADD COLUMN amount_negotiable INTEGER'))
-            session.execute(text('ALTER TABLE offers ADD COLUMN rate_negotiable INTEGER'))
+                    PRIMARY KEY (record_id))''')
+            session.execute('ALTER TABLE bids ADD COLUMN reject_code INTEGER')
+            session.execute('ALTER TABLE bids ADD COLUMN rate INTEGER')
+            session.execute('ALTER TABLE offers ADD COLUMN amount_negotiable INTEGER')
+            session.execute('ALTER TABLE offers ADD COLUMN rate_negotiable INTEGER')
            db_version += 1
        elif current_version == 13:
            db_version += 1
-            session.execute(text('''
+            session.execute('''
                CREATE TABLE automationstrategies (
                    record_id INTEGER NOT NULL,
                    active_ind INTEGER,
@@ -188,9 +187,9 @@ def upgradeDatabase(self, db_version):

                    note VARCHAR,
                    created_at BIGINT,
-                    PRIMARY KEY (record_id))'''))
+                    PRIMARY KEY (record_id))''')

-            session.execute(text('''
+            session.execute('''
                CREATE TABLE automationlinks (
                    record_id INTEGER NOT NULL,
                    active_ind INTEGER,
@@ -205,9 +204,9 @@ def upgradeDatabase(self, db_version):

                    note VARCHAR,
                    created_at BIGINT,
-                    PRIMARY KEY (record_id))'''))
+                    PRIMARY KEY (record_id))''')

-            session.execute(text('''
+            session.execute('''
                CREATE TABLE history (
                    record_id INTEGER NOT NULL,
                    concept_type INTEGER,
@@ -216,9 +215,9 @@ def upgradeDatabase(self, db_version):

                    note VARCHAR,
                    created_at BIGINT,
-                    PRIMARY KEY (record_id))'''))
+                    PRIMARY KEY (record_id))''')

-            session.execute(text('''
+            session.execute('''
                CREATE TABLE bidstates (
                    record_id INTEGER NOT NULL,
                    active_ind INTEGER,
@@ -228,31 +227,31 @@ def upgradeDatabase(self, db_version):

                    note VARCHAR,
                    created_at BIGINT,
-                    PRIMARY KEY (record_id))'''))
+                    PRIMARY KEY (record_id))''')

-            session.execute(text('ALTER TABLE wallets ADD COLUMN active_ind INTEGER'))
-            session.execute(text('ALTER TABLE knownidentities ADD COLUMN active_ind INTEGER'))
-            session.execute(text('ALTER TABLE eventqueue RENAME TO actions'))
-            session.execute(text('ALTER TABLE actions RENAME COLUMN event_id TO action_id'))
-            session.execute(text('ALTER TABLE actions RENAME COLUMN event_type TO action_type'))
-            session.execute(text('ALTER TABLE actions RENAME COLUMN event_data TO action_data'))
+            session.execute('ALTER TABLE wallets ADD COLUMN active_ind INTEGER')
+            session.execute('ALTER TABLE knownidentities ADD COLUMN active_ind INTEGER')
+            session.execute('ALTER TABLE eventqueue RENAME TO actions')
+            session.execute('ALTER TABLE actions RENAME COLUMN event_id TO action_id')
+            session.execute('ALTER TABLE actions RENAME COLUMN event_type TO action_type')
+            session.execute('ALTER TABLE actions RENAME COLUMN event_data TO action_data')
        elif current_version == 14:
            db_version += 1
-            session.execute(text('ALTER TABLE xmr_swaps ADD COLUMN coin_a_lock_release_msg_id BLOB'))
-            session.execute(text('ALTER TABLE xmr_swaps RENAME COLUMN coin_a_lock_refund_spend_tx_msg_id TO coin_a_lock_spend_tx_msg_id'))
+            session.execute('ALTER TABLE xmr_swaps ADD COLUMN coin_a_lock_release_msg_id BLOB')
+            session.execute('ALTER TABLE xmr_swaps RENAME COLUMN coin_a_lock_refund_spend_tx_msg_id TO coin_a_lock_spend_tx_msg_id')
        elif current_version == 15:
            db_version += 1
-            session.execute(text('''
+            session.execute('''
                CREATE TABLE notifications (
                    record_id INTEGER NOT NULL,
                    active_ind INTEGER,
                    event_type INTEGER,
                    event_data BLOB,
                    created_at BIGINT,
-                    PRIMARY KEY (record_id))'''))
+                    PRIMARY KEY (record_id))''')
        elif current_version == 16:
            db_version += 1
-            session.execute(text('''
+            session.execute('''
                CREATE TABLE prefunded_transactions (
                    record_id INTEGER NOT NULL,
                    active_ind INTEGER,
@@ -262,25 +261,25 @@ def upgradeDatabase(self, db_version):
                    tx_type INTEGER,
                    tx_data BLOB,
                    used_by BLOB,
-                    PRIMARY KEY (record_id))'''))
+                    PRIMARY KEY (record_id))''')
        elif current_version == 17:
            db_version += 1
-            session.execute(text('ALTER TABLE knownidentities ADD COLUMN automation_override INTEGER'))
-            session.execute(text('ALTER TABLE knownidentities ADD COLUMN visibility_override INTEGER'))
-            session.execute(text('ALTER TABLE knownidentities ADD COLUMN data BLOB'))
-            session.execute(text('UPDATE knownidentities SET active_ind = 1'))
+            session.execute('ALTER TABLE knownidentities ADD COLUMN automation_override INTEGER')
+            session.execute('ALTER TABLE knownidentities ADD COLUMN visibility_override INTEGER')
+            session.execute('ALTER TABLE knownidentities ADD COLUMN data BLOB')
+            session.execute('UPDATE knownidentities SET active_ind = 1')
        elif current_version == 18:
            db_version += 1
-            session.execute(text('ALTER TABLE xmr_split_data ADD COLUMN addr_from STRING'))
-            session.execute(text('ALTER TABLE xmr_split_data ADD COLUMN addr_to STRING'))
+            session.execute('ALTER TABLE xmr_split_data ADD COLUMN addr_from STRING')
+            session.execute('ALTER TABLE xmr_split_data ADD COLUMN addr_to STRING')
        elif current_version == 19:
            db_version += 1
-            session.execute(text('ALTER TABLE bidstates ADD COLUMN in_error INTEGER'))
-            session.execute(text('ALTER TABLE bidstates ADD COLUMN swap_failed INTEGER'))
-            session.execute(text('ALTER TABLE bidstates ADD COLUMN swap_ended INTEGER'))
+            session.execute('ALTER TABLE bidstates ADD COLUMN in_error INTEGER')
+            session.execute('ALTER TABLE bidstates ADD COLUMN swap_failed INTEGER')
+            session.execute('ALTER TABLE bidstates ADD COLUMN swap_ended INTEGER')
        elif current_version == 20:
            db_version += 1
-            session.execute(text('''
+            session.execute('''
                CREATE TABLE message_links (
                    record_id INTEGER NOT NULL,
                    active_ind INTEGER,
@@ -292,30 +291,16 @@ def upgradeDatabase(self, db_version):
                    msg_type INTEGER,
                    msg_sequence INTEGER,
                    msg_id BLOB,
-                    PRIMARY KEY (record_id))'''))
-            session.execute(text('ALTER TABLE offers ADD COLUMN bid_reversed INTEGER'))
+                    PRIMARY KEY (record_id))''')
+            session.execute('ALTER TABLE offers ADD COLUMN bid_reversed INTEGER')
        elif current_version == 21:
            db_version += 1
-            session.execute(text('ALTER TABLE offers ADD COLUMN proof_utxos BLOB'))
-            session.execute(text('ALTER TABLE bids ADD COLUMN proof_utxos BLOB'))
-        elif current_version == 22:
-            db_version += 1
-            session.execute(text('ALTER TABLE offers ADD COLUMN amount_to INTEGER'))
-        elif current_version == 23:
-            db_version += 1
-            session.execute(text('''
-                CREATE TABLE checkedblocks (
-                    record_id INTEGER NOT NULL,
-                    created_at BIGINT,
-                    coin_type INTEGER,
-                    block_height INTEGER,
-                    block_hash BLOB,
-                    block_time INTEGER,
-                    PRIMARY KEY (record_id))'''))
-            session.execute(text('ALTER TABLE bids ADD COLUMN pkhash_buyer_to BLOB'))
+            session.execute('ALTER TABLE offers ADD COLUMN proof_utxos BLOB')
+            session.execute('ALTER TABLE bids ADD COLUMN proof_utxos BLOB')
+
        if current_version != db_version:
            self.db_version = db_version
-            self.setIntKV('db_version', db_version, session)
+            self.setIntKVInSession('db_version', db_version, session)
            session.commit()
            session.close()
            session.remove()
--- a/basicswap/db_util.py
+++ b/basicswap/db_util.py
@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-

-# Copyright (c) 2023-2024 The BSX Developers
+# Copyright (c) 2023 The BSX Developers
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.

-from sqlalchemy.sql import text
 from .db import (
    Concepts,
 )
@@ -22,38 +21,36 @@ def remove_expired_data(self, time_offset: int = 0):
                    '''
        num_offers = 0
        num_bids = 0
-        offer_rows = session.execute(text(query_str), {'expired_at': now - time_offset})
+        offer_rows = session.execute(query_str, {'expired_at': now - time_offset})
        for offer_row in offer_rows:
            num_offers += 1
-            bid_rows = session.execute(text('SELECT bids.bid_id FROM bids WHERE bids.offer_id = :offer_id'), {'offer_id': offer_row[0]})
+            bid_rows = session.execute('SELECT bids.bid_id FROM bids WHERE bids.offer_id = :offer_id', {'offer_id': offer_row[0]})
            for bid_row in bid_rows:
                num_bids += 1
-                session.execute(text('DELETE FROM transactions WHERE transactions.bid_id = :bid_id'), {'bid_id': bid_row[0]})
-                session.execute(text('DELETE FROM eventlog WHERE eventlog.linked_type = :type_ind AND eventlog.linked_id = :bid_id'), {'type_ind': int(Concepts.BID), 'bid_id': bid_row[0]})
-                session.execute(text('DELETE FROM automationlinks WHERE automationlinks.linked_type = :type_ind AND automationlinks.linked_id = :bid_id'), {'type_ind': int(Concepts.BID), 'bid_id': bid_row[0]})
-                session.execute(text('DELETE FROM prefunded_transactions WHERE prefunded_transactions.linked_type = :type_ind AND prefunded_transactions.linked_id = :bid_id'), {'type_ind': int(Concepts.BID), 'bid_id': bid_row[0]})
-                session.execute(text('DELETE FROM history WHERE history.concept_type = :type_ind AND history.concept_id = :bid_id'), {'type_ind': int(Concepts.BID), 'bid_id': bid_row[0]})
-                session.execute(text('DELETE FROM xmr_swaps WHERE xmr_swaps.bid_id = :bid_id'), {'bid_id': bid_row[0]})
-                session.execute(text('DELETE FROM actions WHERE actions.linked_id = :bid_id'), {'bid_id': bid_row[0]})
-                session.execute(text('DELETE FROM addresspool WHERE addresspool.bid_id = :bid_id'), {'bid_id': bid_row[0]})
-                session.execute(text('DELETE FROM xmr_split_data WHERE xmr_split_data.bid_id = :bid_id'), {'bid_id': bid_row[0]})
-                session.execute(text('DELETE FROM bids WHERE bids.bid_id = :bid_id'), {'bid_id': bid_row[0]})
-                session.execute(text('DELETE FROM message_links WHERE linked_type = :type_ind AND linked_id = :linked_id'), {'type_ind': int(Concepts.BID), 'linked_id': bid_row[0]})
+                session.execute('DELETE FROM transactions WHERE transactions.bid_id = :bid_id', {'bid_id': bid_row[0]})
+                session.execute('DELETE FROM eventlog WHERE eventlog.linked_type = :type_ind AND eventlog.linked_id = :bid_id', {'type_ind': int(Concepts.BID), 'bid_id': bid_row[0]})
+                session.execute('DELETE FROM automationlinks WHERE automationlinks.linked_type = :type_ind AND automationlinks.linked_id = :bid_id', {'type_ind': int(Concepts.BID), 'bid_id': bid_row[0]})
+                session.execute('DELETE FROM prefunded_transactions WHERE prefunded_transactions.linked_type = :type_ind AND prefunded_transactions.linked_id = :bid_id', {'type_ind': int(Concepts.BID), 'bid_id': bid_row[0]})
+                session.execute('DELETE FROM history WHERE history.concept_type = :type_ind AND history.concept_id = :bid_id', {'type_ind': int(Concepts.BID), 'bid_id': bid_row[0]})
+                session.execute('DELETE FROM xmr_swaps WHERE xmr_swaps.bid_id = :bid_id', {'bid_id': bid_row[0]})
+                session.execute('DELETE FROM actions WHERE actions.linked_id = :bid_id', {'bid_id': bid_row[0]})
+                session.execute('DELETE FROM addresspool WHERE addresspool.bid_id = :bid_id', {'bid_id': bid_row[0]})
+                session.execute('DELETE FROM xmr_split_data WHERE xmr_split_data.bid_id = :bid_id', {'bid_id': bid_row[0]})
+                session.execute('DELETE FROM bids WHERE bids.bid_id = :bid_id', {'bid_id': bid_row[0]})
+                session.execute('DELETE FROM message_links WHERE linked_type = :type_ind AND linked_id = :linked_id', {'type_ind': int(Concepts.BID), 'linked_id': bid_row[0]})

-            session.execute(text('DELETE FROM eventlog WHERE eventlog.linked_type = :type_ind AND eventlog.linked_id = :offer_id'), {'type_ind': int(Concepts.OFFER), 'offer_id': offer_row[0]})
-            session.execute(text('DELETE FROM automationlinks WHERE automationlinks.linked_type = :type_ind AND automationlinks.linked_id = :offer_id'), {'type_ind': int(Concepts.OFFER), 'offer_id': offer_row[0]})
-            session.execute(text('DELETE FROM prefunded_transactions WHERE prefunded_transactions.linked_type = :type_ind AND prefunded_transactions.linked_id = :offer_id'), {'type_ind': int(Concepts.OFFER), 'offer_id': offer_row[0]})
-            session.execute(text('DELETE FROM history WHERE history.concept_type = :type_ind AND history.concept_id = :offer_id'), {'type_ind': int(Concepts.OFFER), 'offer_id': offer_row[0]})
-            session.execute(text('DELETE FROM xmr_offers WHERE xmr_offers.offer_id = :offer_id'), {'offer_id': offer_row[0]})
-            session.execute(text('DELETE FROM sentoffers WHERE sentoffers.offer_id = :offer_id'), {'offer_id': offer_row[0]})
-            session.execute(text('DELETE FROM actions WHERE actions.linked_id = :offer_id'), {'offer_id': offer_row[0]})
-            session.execute(text('DELETE FROM offers WHERE offers.offer_id = :offer_id'), {'offer_id': offer_row[0]})
-            session.execute(text('DELETE FROM message_links WHERE linked_type = :type_ind AND linked_id = :offer_id'), {'type_ind': int(Concepts.OFFER), 'offer_id': offer_row[0]})
+            session.execute('DELETE FROM eventlog WHERE eventlog.linked_type = :type_ind AND eventlog.linked_id = :offer_id', {'type_ind': int(Concepts.OFFER), 'offer_id': offer_row[0]})
+            session.execute('DELETE FROM automationlinks WHERE automationlinks.linked_type = :type_ind AND automationlinks.linked_id = :offer_id', {'type_ind': int(Concepts.OFFER), 'offer_id': offer_row[0]})
+            session.execute('DELETE FROM prefunded_transactions WHERE prefunded_transactions.linked_type = :type_ind AND prefunded_transactions.linked_id = :offer_id', {'type_ind': int(Concepts.OFFER), 'offer_id': offer_row[0]})
+            session.execute('DELETE FROM history WHERE history.concept_type = :type_ind AND history.concept_id = :offer_id', {'type_ind': int(Concepts.OFFER), 'offer_id': offer_row[0]})
+            session.execute('DELETE FROM xmr_offers WHERE xmr_offers.offer_id = :offer_id', {'offer_id': offer_row[0]})
+            session.execute('DELETE FROM sentoffers WHERE sentoffers.offer_id = :offer_id', {'offer_id': offer_row[0]})
+            session.execute('DELETE FROM actions WHERE actions.linked_id = :offer_id', {'offer_id': offer_row[0]})
+            session.execute('DELETE FROM offers WHERE offers.offer_id = :offer_id', {'offer_id': offer_row[0]})
+            session.execute('DELETE FROM message_links WHERE linked_type = :type_ind AND linked_id = :offer_id', {'type_ind': int(Concepts.OFFER), 'offer_id': offer_row[0]})

        if num_offers > 0 or num_bids > 0:
            self.log.info('Removed data for {} expired offer{} and {} bid{}.'.format(num_offers, 's' if num_offers != 1 else '', num_bids, 's' if num_bids != 1 else ''))

-        session.execute(text('DELETE FROM checkedblocks WHERE created_at <= :expired_at'), {'expired_at': now - time_offset})
-
    finally:
        self.closeSession(session)
--- a/basicswap/http_server.py
+++ b/basicswap/http_server.py
@@ -98,8 +98,6 @@ def parse_cmd(cmd: str, type_map: str):
            type_ind = type_map[i]
        if type_ind == 'i':
            typed_params.append(int(param))
-        elif type_ind == 'f':
-            typed_params.append(float(param))
        elif type_ind == 'b':
            typed_params.append(toBool(param))
        elif type_ind == 'j':
@@ -111,6 +109,7 @@ def parse_cmd(cmd: str, type_map: str):


 class HttpHandler(BaseHTTPRequestHandler):
+
    def log_error(self, format, *args):
        super().log_message(format, *args)

@@ -135,7 +134,7 @@ class HttpHandler(BaseHTTPRequestHandler):
    def render_template(self, template, args_dict, status_code=200, version=__version__):
        swap_client = self.server.swap_client
        if swap_client.ws_server:
-            args_dict['ws_port'] = swap_client.ws_server.client_port
+            args_dict['ws_url'] = swap_client.ws_server.url
        if swap_client.debug:
            args_dict['debug_mode'] = True
        if swap_client.debug_ui:
@@ -144,12 +143,9 @@ class HttpHandler(BaseHTTPRequestHandler):
            args_dict['use_tor_proxy'] = True
            # TODO: Cache value?
            try:
-                tor_state = get_tor_established_state(swap_client)
-                args_dict['tor_established'] = True if tor_state == '1' else False
-            except Exception as e:
-                args_dict['tor_established'] = False
+                args_dict['tor_established'] = True if get_tor_established_state(swap_client) == '1' else False
+            except Exception:
                if swap_client.debug:
-                    swap_client.log.error(f"Error getting Tor state: {str(e)}")
                    swap_client.log.error(traceback.format_exc())

        if swap_client._show_notifications:
@@ -269,8 +265,6 @@ class HttpHandler(BaseHTTPRequestHandler):
        summary = swap_client.getSummary()

        result = None
-        cmd = ''
-        coin_type_selected = -1
        coin_type = -1
        coin_id = -1
        call_type = 'cli'
@@ -283,84 +277,71 @@ class HttpHandler(BaseHTTPRequestHandler):
                call_type = get_data_entry_or(form_data, 'call_type', 'cli')
                type_map = get_data_entry_or(form_data, 'type_map', '')
                try:
-                    coin_type_selected = get_data_entry(form_data, 'coin_type')
-                    coin_type_split = coin_type_selected.split(',')
-                    coin_type = Coins(int(coin_type_split[0]))
-                    coin_variant = int(coin_type_split[1])
+                    coin_id = int(get_data_entry(form_data, 'coin_type'))
+                    if coin_id in (-2, -3, -4):
+                        coin_type = Coins(Coins.XMR)
+                    elif coin_id in (-5,):
+                        coin_type = Coins(Coins.LTC)
+                    else:
+                        coin_type = Coins(coin_id)
                except Exception:
                    raise ValueError('Unknown Coin Type')

-                if coin_type in (Coins.DCR,):
-                    call_type = 'http'
-
                try:
                    cmd = get_data_entry(form_data, 'cmd')
                except Exception:
                    raise ValueError('Invalid command')
-                if coin_type in (Coins.XMR, Coins.WOW):
+                if coin_type == Coins.XMR:
                    ci = swap_client.ci(coin_type)
                    arr = cmd.split(None, 1)
                    method = arr[0]
                    params = json.loads(arr[1]) if len(arr) > 1 else []
-                    if coin_variant == 2:
+                    if coin_id == -4:
                        rv = ci.rpc_wallet(method, params)
-                    elif coin_variant == 0:
+                    elif coin_id == -3:
                        rv = ci.rpc(method, params)
-                    elif coin_variant == 1:
+                    elif coin_id == -2:
                        if params == []:
                            params = None
                        rv = ci.rpc2(method, params)
                    else:
-                        raise ValueError('Unknown RPC variant')
+                        raise ValueError('Unknown XMR RPC variant')
                    result = json.dumps(rv, indent=4)
                else:
                    if call_type == 'http':
-                        ci = swap_client.ci(coin_type)
                        method, params = parse_cmd(cmd, type_map)
-                        if coin_variant == 1:
-                            rv = ci.rpc_wallet(method, params)
-                        elif coin_variant == 2:
-                            rv = ci.rpc_wallet_mweb(method, params)
+                        if coin_id == -5:
+                            rv = swap_client.ci(coin_type).rpc_wallet_mweb(method, params)
                        else:
-                            if coin_type in (Coins.DCR, ):
-                                rv = ci.rpc(method, params)
-                            else:
-                                rv = ci.rpc_wallet(method, params)
+                            rv = swap_client.ci(coin_type).rpc_wallet(method, params)
                        if not isinstance(rv, str):
                            rv = json.dumps(rv, indent=4)
                        result = cmd + '\n' + rv
                    else:
                        result = cmd + '\n' + swap_client.callcoincli(coin_type, cmd)
            except Exception as ex:
-                result = cmd + '\n' + str(ex)
+                result = str(ex)
                if self.server.swap_client.debug is True:
                    self.server.swap_client.log.error(traceback.format_exc())

        template = env.get_template('rpc.html')

-        coin_available = listAvailableCoins(swap_client, with_variants=False)
-        with_xmr: bool = any(c[0] == Coins.XMR for c in coin_available)
-        with_wow: bool = any(c[0] == Coins.WOW for c in coin_available)
-        coins = [(str(c[0]) + ',0', c[1]) for c in coin_available if c[0] not in (Coins.XMR, Coins.WOW)]
+        coins = listAvailableCoins(swap_client, with_variants=False)
+        with_xmr: bool = any(c[0] == Coins.XMR for c in coins)
+        coins = [c for c in coins if c[0] != Coins.XMR]

-        if any(c[0] == Coins.DCR for c in coin_available):
-            coins.append((str(int(Coins.DCR)) + ',1', 'Decred Wallet'))
-        if any(c[0] == Coins.LTC for c in coin_available):
-            coins.append((str(int(Coins.LTC)) + ',2', 'Litecoin MWEB Wallet'))
+        if any(c[0] == Coins.LTC for c in coins):
+            coins.append((-5, 'Litecoin MWEB Wallet'))
        if with_xmr:
-            coins.append((str(int(Coins.XMR)) + ',0', 'Monero'))
-            coins.append((str(int(Coins.XMR)) + ',1', 'Monero JSON'))
-            coins.append((str(int(Coins.XMR)) + ',2', 'Monero Wallet'))
-        if with_wow:
-            coins.append((str(int(Coins.WOW)) + ',0', 'Wownero'))
-            coins.append((str(int(Coins.WOW)) + ',1', 'Wownero JSON'))
-            coins.append((str(int(Coins.WOW)) + ',2', 'Wownero Wallet'))
+            coins.append((-2, 'Monero'))
+            coins.append((-3, 'Monero JSON'))
+            coins.append((-4, 'Monero Wallet'))

        return self.render_template(template, {
            'messages': messages,
            'err_messages': err_messages,
            'coins': coins,
-            'coin_type': coin_type_selected,
+            'coin_type': coin_id,
            'call_type': call_type,
            'result': result,
            'messages': messages,
@@ -411,10 +392,12 @@ class HttpHandler(BaseHTTPRequestHandler):
        swap_client = self.server.swap_client
        swap_client.checkSystemStatus()
        summary = swap_client.getSummary()
-        self.send_response(302)
-        self.send_header('Location', '/offers')
-        self.end_headers()
-        return b''
+        template = env.get_template('index.html')
+        return self.render_template(template, {
+            'refresh': 30,
+            'summary': summary,
+            'use_tor_proxy': swap_client.use_tor_proxy
+        })

    def page_404(self, url_split):
        swap_client = self.server.swap_client
--- a/basicswap/interface/init.py
+++ b/basicswap/interface/init.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2023 tecnovert
+# Distributed under the MIT software license, see the accompanying
+# file LICENSE or http://www.opensource.org/licenses/mit-license.php.
+
+from enum import IntEnum
+
+
+class Curves(IntEnum):
+    secp256k1 = 1
+    ed25519 = 2
--- a/basicswap/interface/base.py
+++ b/basicswap/interface/base.py
@@ -1,242 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2024 tecnovert
-# Distributed under the MIT software license, see the accompanying
-# file LICENSE or http://www.opensource.org/licenses/mit-license.php.
-
-import threading
-
-from enum import IntEnum
-
-from basicswap.chainparams import (
-    chainparams,
-)
-from basicswap.util import (
-    ensure,
-    i2b, b2i,
-    make_int,
-    format_amount,
-    TemporaryError,
-)
-from basicswap.util.crypto import (
-    hash160,
-)
-from basicswap.util.ecc import (
-    ep,
-    getSecretInt,
-)
-from coincurve.dleag import (
-    verify_secp256k1_point
-)
-from coincurve.keys import (
-    PublicKey,
-)
-
-
-class Curves(IntEnum):
-    secp256k1 = 1
-    ed25519 = 2
-
-
-class CoinInterface:
-    @staticmethod
-    def watch_blocks_for_scripts() -> bool:
-        return False
-
-    @staticmethod
-    def compareFeeRates(a, b) -> bool:
-        return abs(a - b) < 20
-
-    def __init__(self, network):
-        self.setDefaults()
-        self._network = network
-        self._mx_wallet = threading.Lock()
-        self._altruistic = True
-
-    def setDefaults(self):
-        self._unknown_wallet_seed = True
-        self._restore_height = None
-
-    def make_int(self, amount_in: int, r: int = 0) -> int:
-        return make_int(amount_in, self.exp(), r=r)
-
-    def format_amount(self, amount_in, conv_int=False, r=0):
-        amount_int = make_int(amount_in, self.exp(), r=r) if conv_int else amount_in
-        return format_amount(amount_int, self.exp())
-
-    def coin_name(self) -> str:
-        coin_chainparams = chainparams[self.coin_type()]
-        if 'display_name' in coin_chainparams:
-            return coin_chainparams['display_name']
-        return coin_chainparams['name'].capitalize()
-
-    def ticker(self) -> str:
-        ticker = chainparams[self.coin_type()]['ticker']
-        if self._network == 'testnet':
-            ticker = 't' + ticker
-        elif self._network == 'regtest':
-            ticker = 'rt' + ticker
-        return ticker
-
-    def getExchangeTicker(self, exchange_name: str) -> str:
-        return chainparams[self.coin_type()]['ticker']
-
-    def getExchangeName(self, exchange_name: str) -> str:
-        return chainparams[self.coin_type()]['name']
-
-    def ticker_mainnet(self) -> str:
-        ticker = chainparams[self.coin_type()]['ticker']
-        return ticker
-
-    def min_amount(self) -> int:
-        return chainparams[self.coin_type()][self._network]['min_amount']
-
-    def max_amount(self) -> int:
-        return chainparams[self.coin_type()][self._network]['max_amount']
-
-    def setWalletSeedWarning(self, value: bool) -> None:
-        self._unknown_wallet_seed = value
-
-    def setWalletRestoreHeight(self, value: int) -> None:
-        self._restore_height = value
-
-    def knownWalletSeed(self) -> bool:
-        return not self._unknown_wallet_seed
-
-    def chainparams(self):
-        return chainparams[self.coin_type()]
-
-    def chainparams_network(self):
-        return chainparams[self.coin_type()][self._network]
-
-    def has_segwit(self) -> bool:
-        return chainparams[self.coin_type()].get('has_segwit', True)
-
-    def use_p2shp2wsh(self) -> bool:
-        # p2sh-p2wsh
-        return False
-
-    def is_transient_error(self, ex) -> bool:
-        if isinstance(ex, TemporaryError):
-            return True
-        str_error: str = str(ex).lower()
-        if 'not enough unlocked money' in str_error:
-            return True
-        if 'no unlocked balance' in str_error:
-            return True
-        if 'transaction was rejected by daemon' in str_error:
-            return True
-        if 'invalid unlocked_balance' in str_error:
-            return True
-        if 'daemon is busy' in str_error:
-            return True
-        if 'timed out' in str_error:
-            return True
-        if 'request-sent' in str_error:
-            return True
-        return False
-
-    def setConfTarget(self, new_conf_target: int) -> None:
-        ensure(new_conf_target >= 1 and new_conf_target < 33, 'Invalid conf_target value')
-        self._conf_target = new_conf_target
-
-    def walletRestoreHeight(self) -> int:
-        return self._restore_height
-
-    def get_connection_type(self):
-        return self._connection_type
-
-    def using_segwit(self) -> bool:
-        # Using btc native segwit
-        return self._use_segwit
-
-    def use_tx_vsize(self) -> bool:
-        return self._use_segwit
-
-    def getLockTxSwapOutputValue(self, bid, xmr_swap) -> int:
-        return bid.amount
-
-    def getLockRefundTxSwapOutputValue(self, bid, xmr_swap) -> int:
-        return xmr_swap.a_swap_refund_value
-
-    def getLockRefundTxSwapOutput(self, xmr_swap) -> int:
-        # Only one prevout exists
-        return 0
-
-    def checkWallets(self) -> int:
-        return 1
-
-    def altruistic(self) -> bool:
-        return self._altruistic
-
-
-class AdaptorSigInterface():
-    def getScriptLockTxDummyWitness(self, script: bytes):
-        return [
-            b'',
-            bytes(72),
-            bytes(72),
-            bytes(len(script))
-        ]
-
-    def getScriptLockRefundSpendTxDummyWitness(self, script: bytes):
-        return [
-            b'',
-            bytes(72),
-            bytes(72),
-            bytes((1,)),
-            bytes(len(script))
-        ]
-
-    def getScriptLockRefundSwipeTxDummyWitness(self, script: bytes):
-        return [
-            bytes(72),
-            b'',
-            bytes(len(script))
-        ]
-
-
-class Secp256k1Interface(CoinInterface, AdaptorSigInterface):
-    @staticmethod
-    def curve_type():
-        return Curves.secp256k1
-
-    def getNewSecretKey(self) -> bytes:
-        return i2b(getSecretInt())
-
-    def getPubkey(self, privkey: bytes) -> bytes:
-        return PublicKey.from_secret(privkey).format()
-
-    def pkh(self, pubkey: bytes) -> bytes:
-        return hash160(pubkey)
-
-    def verifyKey(self, k: bytes) -> bool:
-        i = b2i(k)
-        return (i < ep.o and i > 0)
-
-    def verifyPubkey(self, pubkey_bytes: bytes) -> bool:
-        return verify_secp256k1_point(pubkey_bytes)
-
-    def isValidAddressHash(self, address_hash: bytes) -> bool:
-        hash_len = len(address_hash)
-        if hash_len == 20:
-            return True
-
-    def isValidPubkey(self, pubkey: bytes) -> bool:
-        try:
-            self.verifyPubkey(pubkey)
-            return True
-        except Exception:
-            return False
-
-    def verifySig(self, pubkey: bytes, signed_hash: bytes, sig: bytes) -> bool:
-        pubkey = PublicKey(pubkey)
-        return pubkey.verify(sig, signed_hash, hasher=None)
-
-    def sumKeys(self, ka: bytes, kb: bytes) -> bytes:
-        # TODO: Add to coincurve
-        return i2b((b2i(ka) + b2i(kb)) % ep.o)
-
-    def sumPubkeys(self, Ka: bytes, Kb: bytes) -> bytes:
-        return PublicKey.combine_keys([PublicKey(Ka), PublicKey(Kb)]).format()
--- a/basicswap/interface/bch.py
+++ b/basicswap/interface/bch.py
@@ -1,843 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2024 The Basicswap developers
-# Distributed under the MIT software license, see the accompanying
-# file LICENSE or http://www.opensource.org/licenses/mit-license.php.
-
-from typing import Union
-from basicswap.contrib.test_framework.messages import COutPoint, CTransaction, CTxIn
-from basicswap.util import b2h, b2i, ensure, i2h
-from basicswap.util.script import decodePushData, decodeScriptNum
-from .btc import BTCInterface, ensure_op, findOutput
-from basicswap.rpc import make_rpc_func
-from basicswap.chainparams import Coins
-from basicswap.interface.contrib.bch_test_framework.cashaddress import Address
-from basicswap.util.crypto import hash160, sha256
-from basicswap.interface.contrib.bch_test_framework.script import (
-    OP_TXINPUTCOUNT,
-    OP_1,
-    OP_NUMEQUALVERIFY,
-    OP_TXOUTPUTCOUNT,
-    OP_0,
-    OP_UTXOVALUE,
-    OP_OUTPUTVALUE,
-    OP_SUB,
-    OP_UTXOTOKENCATEGORY,
-    OP_OUTPUTTOKENCATEGORY,
-    OP_EQUALVERIFY,
-    OP_UTXOTOKENCOMMITMENT,
-    OP_OUTPUTTOKENCOMMITMENT,
-    OP_UTXOTOKENAMOUNT,
-    OP_OUTPUTTOKENAMOUNT,
-    OP_INPUTSEQUENCENUMBER,
-    OP_NOTIF,
-    OP_OUTPUTBYTECODE,
-    OP_OVER,
-    OP_CHECKDATASIG,
-    OP_ELSE,
-    OP_CHECKSEQUENCEVERIFY,
-    OP_DROP,
-    OP_EQUAL,
-    OP_ENDIF,
-    OP_HASH160,
-    OP_DUP,
-    OP_CHECKSIG,
-    OP_HASH256,
-)
-from basicswap.contrib.test_framework.script import OP_RETURN, CScript
-from coincurve.keys import (
-    PrivateKey,
-    PublicKey,
-)
-from coincurve.ecdsaotves import (
-    ecdsaotves_enc_sign,
-    ecdsaotves_enc_verify,
-    ecdsaotves_dec_sig,
-    ecdsaotves_rec_enc_key,
-)
-
-
-class BCHInterface(BTCInterface):
-    @staticmethod
-    def coin_type():
-        return Coins.BCH
-
-    @staticmethod
-    def xmr_swap_a_lock_spend_tx_vsize() -> int:
-        return 302
-
-    @staticmethod
-    def watch_blocks_for_scripts() -> bool:
-        # TODO: BCH Watchonly: Remove when BCH watchonly works.
-        return True
-
-    def __init__(self, coin_settings, network, swap_client=None):
-        super(BCHInterface, self).__init__(coin_settings, network, swap_client)
-        # No multiwallet support
-        self.swap_client = swap_client
-        self.rpc_wallet = make_rpc_func(self._rpcport, self._rpcauth, host=self._rpc_host)
-
-    def has_segwit(self) -> bool:
-        # bch does not have segwit, but we return true here to avoid extra checks in basicswap.py
-        return True
-
-    def getExchangeName(self, exchange_name: str) -> str:
-        return 'bitcoin-cash'
-
-    def getNewAddress(self, use_segwit: bool = False, label: str = 'swap_receive') -> str:
-        args = [label]
-        return self.rpc_wallet('getnewaddress', args)
-
-    def getUnspentsByAddr(self):
-        unspent_addr = dict()
-        unspent = self.rpc_wallet('listunspent')
-        for u in unspent:
-            if u.get('spendable', False) is False:
-                continue
-            if 'address' not in u:
-                continue
-            unspent_addr[u['address']] = unspent_addr.get(u['address'], 0) + self.make_int(u['amount'], r=1)
-        return unspent_addr
-
-    # returns pkh
-    def decodeAddress(self, address: str) -> bytes:
-        return bytes(Address.from_string(address).payload)
-
-    def encodeSegwitAddress(self, script):
-        raise ValueError('Segwit not supported')
-
-    def decodeSegwitAddress(self, addr):
-        raise ValueError('Segwit not supported')
-
-    def getSCLockScriptAddress(self, lock_script: bytes) -> str:
-        lock_tx_dest = self.getScriptDest(lock_script)
-        address = self.encodeScriptDest(lock_tx_dest)
-
-        if not self.isAddressMine(address, or_watch_only=True):
-            # Expects P2WSH nested in BIP16_P2SH
-            ro = self.rpc('importaddress', [lock_tx_dest.hex(), 'bid lock', False, True])
-            addr_info = self.rpc('validateaddress', [address])
-
-        return address
-
-    def importWatchOnlyAddress(self, address: str, label: str):
-        self.rpc_wallet('importaddress', [address, label, False, True])
-
-    def createRawFundedTransaction(self, addr_to: str, amount: int, sub_fee: bool = False, lock_unspents: bool = True) -> str:
-        txn = self.rpc('createrawtransaction', [[], {addr_to: self.format_amount(amount)}])
-
-        options = {
-            'lockUnspents': lock_unspents,
-            # 'conf_target': self._conf_target,
-        }
-        if sub_fee:
-            options['subtractFeeFromOutputs'] = [0,]
-        return self.rpc_wallet('fundrawtransaction', [txn, options])['hex']
-
-    def getScriptForPubkeyHash(self, pkh: bytes) -> bytearray:
-        # Return P2PKH
-        return CScript([OP_DUP, OP_HASH160, pkh, OP_EQUALVERIFY, OP_CHECKSIG])
-
-    def encodeScriptDest(self, script_dest: bytes) -> str:
-        # Extract hash from script
-        script_hash = script_dest[2:-1]
-        return self.sh_to_address(script_hash)
-
-    def sh_to_address(self, sh: bytes) -> str:
-        assert (len(sh) == 20 or len(sh) == 32)
-        network = self._network.upper()
-        address = None
-        if len(sh) == 20:
-            address = Address("P2SH20" if network == "MAINNET" else "P2SH20-" + network, sh)
-        else:
-            address = Address("P2SH32" if network == "MAINNET" else "P2SH32-" + network, sh)
-
-        return address.cash_address()
-
-    def getDestForScriptHash(self, script_hash):
-        assert (len(script_hash) == 20 or len(script_hash) == 32)
-        if len(script_hash) == 20:
-            return CScript([OP_HASH160, script_hash, OP_EQUAL])
-        else:
-            return CScript([OP_HASH256, script_hash, OP_EQUAL])
-
-    def withdrawCoin(self, value: float, addr_to: str, subfee: bool):
-        params = [addr_to, value, '', '', subfee, 0, False]
-        return self.rpc_wallet('sendtoaddress', params)
-
-    def getBLockSpendTxFee(self, tx, fee_rate: int) -> int:
-        add_bytes = 107
-        size = len(tx.serialize_with_witness()) + add_bytes
-        pay_fee = round(fee_rate * size / 1000)
-        self._log.info(f'BLockSpendTx fee_rate, size, fee: {fee_rate}, {size}, {pay_fee}.')
-        return pay_fee
-
-    def findTxnByHash(self, txid_hex: str):
-        # Only works for wallet txns
-        try:
-            rv = self.rpc('gettransaction', [txid_hex])
-        except Exception as ex:
-            self._log.debug('findTxnByHash getrawtransaction failed: {}'.format(txid_hex))
-            return None
-        if 'confirmations' in rv and rv['confirmations'] >= self.blocks_confirmed:
-            block_height = self.getBlockHeader(rv['blockhash'])['height']
-            return {'txid': txid_hex, 'amount': 0, 'height': block_height}
-        return None
-
-    def getLockTxHeight(self, txid: bytes, dest_address: str, bid_amount: int, rescan_from: int, find_index: bool = False, vout: int = -1):
-
-        '''
-            TODO: BCH Watchonly
-            Replace with importWatchOnlyAddress when it works again
-            Currently importing the watchonly address only works if rescanblockchain is run on every iteration
-        '''
-        if txid is None:
-            self._log.debug('TODO: getLockTxHeight')
-            return None
-
-        found_vout = None
-        # Search for txo at vout 0 and 1 if vout is not known
-        if vout is None:
-            test_range = range(2)
-        else:
-            test_range = (vout, )
-        for try_vout in test_range:
-            try:
-                txout = self.rpc('gettxout', [txid.hex(), try_vout, True])
-                addresses = txout['scriptPubKey']['addresses']
-                if len(addresses) != 1 or addresses[0] != dest_address:
-                    continue
-                if self.make_int(txout['value']) != bid_amount:
-                    self._log.warning('getLockTxHeight found txout {} with incorrect amount {}'.format(txid.hex(), txout['value']))
-                    continue
-                found_vout = try_vout
-                break
-            except Exception as e:
-                # self._log.warning('gettxout {}'.format(e))
-                return None
-
-        if found_vout is None:
-            return None
-
-        block_height: int = 0
-        confirmations: int = 0 if 'confirmations' not in txout else txout['confirmations']
-
-        # TODO: Better way?
-        if confirmations > 0:
-            block_height = self.getChainHeight() - confirmations
-
-        rv = {
-            'txid': txid.hex(),
-            'depth': confirmations,
-            'index': found_vout,
-            'height': block_height}
-
-        return rv
-
-    def genScriptLockTxScript(self, ci, Kal: bytes, Kaf: bytes, **kwargs) -> CScript:
-        mining_fee: int = kwargs['mining_fee'] if 'mining_fee' in kwargs else 1000
-        out_1: bytes = kwargs['out_1']
-        out_2: bytes = kwargs['out_2']
-        public_key: bytes = kwargs['public_key'] if 'public_key' in kwargs else Kal
-        timelock: int = kwargs['timelock']
-
-        # fmt: off
-        return CScript([
-            # // v4.1.0-CashTokens-Optimized
-            # // Based on swaplock.cash v4.1.0-CashTokens
-            #
-            # // Alice has XMR, wants BCH and/or CashTokens.
-            # // Bob has BCH and/or CashTokens, wants XMR.
-            #
-            # // Verify 1-in-1-out TX form
-            OP_TXINPUTCOUNT,
-            OP_1, OP_NUMEQUALVERIFY,
-            OP_TXOUTPUTCOUNT,
-            OP_1, OP_NUMEQUALVERIFY,
-
-            # // int miningFee
-            mining_fee,
-            # // Verify pre-agreed mining fee and that the rest of BCH is forwarded
-            # // to the output.
-            OP_0, OP_UTXOVALUE,
-            OP_0, OP_OUTPUTVALUE,
-            OP_SUB, OP_NUMEQUALVERIFY,
-
-            # # // Verify that any CashTokens are forwarded to the output.
-            OP_0, OP_UTXOTOKENCATEGORY,
-            OP_0, OP_OUTPUTTOKENCATEGORY,
-            OP_EQUALVERIFY,
-            OP_0, OP_UTXOTOKENCOMMITMENT,
-            OP_0, OP_OUTPUTTOKENCOMMITMENT,
-            OP_EQUALVERIFY,
-            OP_0, OP_UTXOTOKENAMOUNT,
-            OP_0, OP_OUTPUTTOKENAMOUNT,
-            OP_NUMEQUALVERIFY,
-
-            # // If sequence is not used then it is a regular swap TX.
-            OP_0, OP_INPUTSEQUENCENUMBER,
-            OP_NOTIF,
-                # // bytes aliceOutput
-                out_1,
-                # // Verify that the BCH and/or CashTokens are forwarded to Alice's
-                # // output.
-                OP_0, OP_OUTPUTBYTECODE,
-                OP_OVER, OP_EQUALVERIFY,
-
-                # // pubkey bobPubkeyVES
-                public_key,
-                # // Require Alice to decrypt and publish Bob's VES signature.
-                # // The "message" signed is simply a sha256 hash of Alice's output
-                # // locking bytecode.
-                # // By decrypting Bob's VES and publishing it, Alice reveals her
-                # // XMR key share to Bob.
-                OP_CHECKDATASIG,
-
-                # // If a TX using this path is mined then Alice gets her BCH.
-                # // Bob uses the revealed XMR key share to collect his XMR.
-
-            # // Refund will become available when timelock expires, and it would
-            # // expire because Alice didn't collect on time, either of her own accord
-            # // or because Bob bailed out and withheld the encrypted signature.
-            OP_ELSE,
-                # // int timelock_0
-                timelock,
-                # // Verify refund timelock.
-                OP_CHECKSEQUENCEVERIFY, OP_DROP,
-
-                # // bytes refundLockingBytecode
-                out_2,
-
-                # // Verify that the BCH and/or CashTokens are forwarded to Refund
-                # // contract.
-                OP_0, OP_OUTPUTBYTECODE,
-                OP_EQUAL,
-
-                # // BCH and/or CashTokens are simply forwarded to Refund contract.
-            OP_ENDIF
-        ])
-        # fmt: on
-
-    def pubkey_to_segwit_address(self, pk: bytes) -> str:
-        raise NotImplementedError()
-
-    def pkh_to_address(self, pkh: bytes) -> str:
-        # pkh is ripemd160(sha256(pk))
-        assert (len(pkh) == 20)
-        network = self._network.upper()
-        address = Address("P2PKH" if network == "MAINNET" else "P2PKH-" + network, pkh)
-
-        return address.cash_address()
-
-    def encodeSharedAddress(self, Kbv: bytes, Kbs: bytes) -> str:
-        return self.pkh_to_address(hash160(Kbs))
-
-    def addressToLockingBytecode(self, address: str) -> bytes:
-        return b'\x76\xa9\x14' + bytes(Address.from_string(address).payload) + b'\x88\xac'
-
-    def getSpendableBalance(self) -> int:
-        return self.make_int(self.rpc_wallet('getbalance', ["*", 1, False]))
-
-    def getScriptDest(self, script):
-        return self.scriptToP2SH32LockingBytecode(script)
-
-    def scriptToP2SH32LockingBytecode(self, script: Union[bytes, str]) -> bytes:
-        return CScript([
-            OP_HASH256,
-            sha256(sha256(script)),
-            OP_EQUAL,
-        ])
-
-    def createSCLockTx(self, value: int, script: bytearray, vkbv: bytes = None) -> bytes:
-        tx = CTransaction()
-        tx.nVersion = self.txVersion()
-        tx.vout.append(self.txoType()(value, self.getScriptDest(script)))
-        return tx.serialize_without_witness()
-
-    def getTxSize(self, tx: CTransaction) -> int:
-        return len(tx.serialize_without_witness())
-
-    def getScriptScriptSig(self, script: bytes, ves: bytes = None) -> bytes:
-        if ves is not None:
-            return CScript([ves, script])
-        else:
-            return CScript([script])
-
-    def createSCLockSpendTx(self, tx_lock_bytes, script_lock, pkh_dest, tx_fee_rate, vkbv=None, fee_info={}, **kwargs):
-        # tx_fee_rate in this context is equal to `mining_fee` contract param
-        ves = kwargs['ves'] if 'ves' in kwargs else None
-        tx_lock = self.loadTx(tx_lock_bytes)
-        output_script = self.getScriptDest(script_lock)
-        locked_n = findOutput(tx_lock, output_script)
-        ensure(locked_n is not None, 'Output not found in tx')
-        locked_coin = tx_lock.vout[locked_n].nValue
-
-        tx_lock.rehash()
-        tx_lock_id_int = tx_lock.sha256
-
-        tx = CTransaction()
-        tx.nVersion = self.txVersion()
-        tx.vin.append(CTxIn(COutPoint(tx_lock_id_int, locked_n),
-                            scriptSig=self.getScriptScriptSig(script_lock, ves),
-                            nSequence=0))
-
-        tx.vout.append(self.txoType()(locked_coin, self.getScriptForPubkeyHash(pkh_dest)))
-        pay_fee = tx_fee_rate
-        tx.vout[0].nValue = locked_coin - pay_fee
-
-        size = self.getTxSize(tx)
-
-        fee_info['fee_paid'] = pay_fee
-        fee_info['rate_used'] = tx_fee_rate
-        fee_info['size'] = size
-        # vsize is the same as size for BCH
-        fee_info['vsize'] = size
-
-        tx.rehash()
-        self._log.info('createSCLockSpendTx %s:\n    fee_rate, size, fee: %ld, %ld, %ld.',
-                       i2h(tx.sha256), tx_fee_rate, size, pay_fee)
-
-        return tx.serialize_without_witness()
-
-    def createSCLockRefundTx(self, tx_lock_bytes, script_lock, Kal, Kaf, lock1_value, csv_val, tx_fee_rate, vkbv=None, **kwargs):
-        tx_lock = CTransaction()
-        tx_lock = self.loadTx(tx_lock_bytes)
-
-        output_script = self.getScriptDest(script_lock)
-        locked_n = findOutput(tx_lock, output_script)
-        ensure(locked_n is not None, 'Output not found in tx')
-        locked_coin = tx_lock.vout[locked_n].nValue
-
-        tx_lock.rehash()
-        tx_lock_id_int = tx_lock.sha256
-
-        refund_script = kwargs['refund_lock_tx_script']
-        tx = CTransaction()
-        tx.nVersion = self.txVersion()
-        tx.vin.append(CTxIn(COutPoint(tx_lock_id_int, locked_n),
-                            nSequence=kwargs['timelock'] if 'timelock' in kwargs else lock1_value,
-                            scriptSig=self.getScriptScriptSig(script_lock, None)))
-        tx.vout.append(self.txoType()(locked_coin, self.getScriptDest(refund_script)))
-
-        pay_fee = kwargs['mining_fee'] if 'mining_fee' in kwargs else tx_fee_rate
-        tx.vout[0].nValue = locked_coin - pay_fee
-
-        size = self.getTxSize(tx)
-        vsize = size
-
-        tx.rehash()
-        self._log.info('createSCLockRefundTx %s:\n    fee_rate, vsize, fee: %ld, %ld, %ld.',
-                       i2h(tx.sha256), tx_fee_rate, vsize, pay_fee)
-
-        return tx.serialize_without_witness(), refund_script, tx.vout[0].nValue
-
-    def createSCLockRefundSpendTx(self, tx_lock_refund_bytes, script_lock_refund, pkh_refund_to, tx_fee_rate, vkbv=None, **kwargs):
-        # it is not possible to create the refund spend tx without the prior knowledge of the VES which is part of transaction preimage
-        # but it is better and more secure to create a lock spend transaction committing to zero VES than returning static data
-        kwargs['ves'] = bytes(73)
-        return self.createSCLockSpendTx(tx_lock_refund_bytes, script_lock_refund, pkh_refund_to, tx_fee_rate, vkbv, **kwargs)
-
-    def createSCLockRefundSpendToFTx(self, tx_lock_refund_bytes, script_lock_refund, pkh_dest, tx_fee_rate, vkbv=None, kbsf=None):
-        # lock refund swipe tx
-        # Sends the coinA locked coin to the follower
-
-        tx_lock_refund = self.loadTx(tx_lock_refund_bytes)
-
-        output_script = self.getScriptDest(script_lock_refund)
-        locked_n = findOutput(tx_lock_refund, output_script)
-        ensure(locked_n is not None, 'Output not found in tx')
-        locked_coin = tx_lock_refund.vout[locked_n].nValue
-
-        mining_fee, out_1, out_2, public_key, timelock = self.extractScriptLockScriptValues(script_lock_refund)
-
-        tx_lock_refund.rehash()
-        tx_lock_refund_hash_int = tx_lock_refund.sha256
-
-        tx = CTransaction()
-        tx.nVersion = self.txVersion()
-        tx.vin.append(CTxIn(COutPoint(tx_lock_refund_hash_int, locked_n),
-                            nSequence=timelock,
-                            scriptSig=self.getScriptScriptSig(script_lock_refund, None)))
-
-        tx.vout.append(self.txoType()(locked_coin, CScript(out_2)))
-
-        size = self.getTxSize(tx)
-        vsize = size
-
-        pay_fee = mining_fee
-        tx.vout[0].nValue = locked_coin - pay_fee
-
-        tx.rehash()
-        self._log.info('createSCLockRefundSpendToFTx %s:\n    fee_rate, vsize, fee: %ld, %ld, %ld.',
-                       i2h(tx.sha256), tx_fee_rate, vsize, pay_fee)
-
-        return tx.serialize_without_witness()
-
-    def signTx(self, key_bytes: bytes, tx_bytes: bytes, input_n: int, prevout_script: bytes, prevout_value: int) -> bytes:
-        # simply sign the entire tx data, as this is not a preimage signature
-        eck = PrivateKey(key_bytes)
-        return eck.sign(sha256(tx_bytes), hasher=None)
-
-    def verifyTxSig(self, tx_bytes: bytes, sig: bytes, K: bytes, input_n: int, prevout_script: bytes, prevout_value: int) -> bool:
-        # simple ecdsa signature verification
-        return self.verifyDataSig(tx_bytes, sig, K)
-
-    def verifyDataSig(self, data: bytes, sig: bytes, K: bytes) -> bool:
-        # simple ecdsa signature verification
-        pubkey = PublicKey(K)
-        return pubkey.verify(sig, sha256(data), hasher=None)
-
-    def setTxSignature(self, tx_bytes: bytes, stack) -> bytes:
-        return tx_bytes
-
-    def extractScriptLockScriptValuesFromScriptSig(self, script_bytes):
-        signature, nb = decodePushData(script_bytes, 0)
-        if nb == len(script_bytes):
-            unlock_script = signature[:]
-            signature = None
-        else:
-            unlock_script, _ = decodePushData(script_bytes, nb)
-        mining_fee, out_1, out_2, public_key, timelock = self.extractScriptLockScriptValues(unlock_script)
-
-        return signature, mining_fee, out_1, out_2, public_key, timelock
-
-    def extractScriptLockScriptValues(self, script_bytes):
-        # see BCHInterface.genScriptLockTxScript for reference
-
-        o = 0
-
-        script_len = len(script_bytes)
-        # TODO: stricter script_len checks
-
-        ensure_op(script_bytes[o] == OP_TXINPUTCOUNT); o += 1
-        ensure_op(script_bytes[o] == OP_1); o += 1
-        ensure_op(script_bytes[o] == OP_NUMEQUALVERIFY); o += 1
-        ensure_op(script_bytes[o] == OP_TXOUTPUTCOUNT); o += 1
-        ensure_op(script_bytes[o] == OP_1); o += 1
-        ensure_op(script_bytes[o] == OP_NUMEQUALVERIFY); o += 1
-        mining_fee, nb = decodeScriptNum(script_bytes, o); o += nb
-
-        ensure_op(script_bytes[o] == OP_0); o += 1
-        ensure_op(script_bytes[o] == OP_UTXOVALUE); o += 1
-        ensure_op(script_bytes[o] == OP_0); o += 1
-        ensure_op(script_bytes[o] == OP_OUTPUTVALUE); o += 1
-        ensure_op(script_bytes[o] == OP_SUB); o += 1
-        ensure_op(script_bytes[o] == OP_NUMEQUALVERIFY); o += 1
-
-        ensure_op(script_bytes[o] == OP_0); o += 1
-        ensure_op(script_bytes[o] == OP_UTXOTOKENCATEGORY); o += 1
-        ensure_op(script_bytes[o] == OP_0); o += 1
-        ensure_op(script_bytes[o] == OP_OUTPUTTOKENCATEGORY); o += 1
-
-        ensure_op(script_bytes[o] == OP_EQUALVERIFY); o += 1
-        ensure_op(script_bytes[o] == OP_0); o += 1
-        ensure_op(script_bytes[o] == OP_UTXOTOKENCOMMITMENT); o += 1
-        ensure_op(script_bytes[o] == OP_0); o += 1
-        ensure_op(script_bytes[o] == OP_OUTPUTTOKENCOMMITMENT); o += 1
-        ensure_op(script_bytes[o] == OP_EQUALVERIFY); o += 1
-        ensure_op(script_bytes[o] == OP_0); o += 1
-        ensure_op(script_bytes[o] == OP_UTXOTOKENAMOUNT); o += 1
-        ensure_op(script_bytes[o] == OP_0); o += 1
-        ensure_op(script_bytes[o] == OP_OUTPUTTOKENAMOUNT); o += 1
-        ensure_op(script_bytes[o] == OP_NUMEQUALVERIFY); o += 1
-
-        ensure_op(script_bytes[o] == OP_0); o += 1
-        ensure_op(script_bytes[o] == OP_INPUTSEQUENCENUMBER); o += 1
-        ensure_op(script_bytes[o] == OP_NOTIF); o += 1
-        out_1, nb = decodePushData(script_bytes, o); o += nb
-
-        ensure_op(script_bytes[o] == OP_0); o += 1
-        ensure_op(script_bytes[o] == OP_OUTPUTBYTECODE); o += 1
-        ensure_op(script_bytes[o] == OP_OVER); o += 1
-        ensure_op(script_bytes[o] == OP_EQUALVERIFY); o += 1
-        public_key, nb = decodePushData(script_bytes, o); o += nb
-        ensure_op(script_bytes[o] == OP_CHECKDATASIG); o += 1
-
-        ensure_op(script_bytes[o] == OP_ELSE); o += 1
-        timelock, nb = decodeScriptNum(script_bytes, o); o += nb
-        ensure_op(script_bytes[o] == OP_CHECKSEQUENCEVERIFY); o += 1
-        ensure_op(script_bytes[o] == OP_DROP); o += 1
-
-        out_2, nb = decodePushData(script_bytes, o); o += nb
-
-        ensure_op(script_bytes[o] == OP_0); o += 1
-        ensure_op(script_bytes[o] == OP_OUTPUTBYTECODE); o += 1
-        ensure_op(script_bytes[o] == OP_EQUAL); o += 1
-
-        ensure_op(script_bytes[o] == OP_ENDIF); o += 1
-
-        ensure(o == script_len, 'Unexpected script length')
-
-        ensure(mining_fee >= 700 and mining_fee <= 10000, 'Bad mining_fee')
-        ensure(len(out_1) == 25, 'Bad out_1')
-        ensure(len(out_2) == 25 or len(out_2) == 35, 'Bad out_2')
-        ensure(len(public_key) == 33, 'Bad public_key')
-        ensure(timelock >= 0, 'Bad timelock')
-
-        return mining_fee, out_1, out_2, public_key, timelock
-
-    def verifySCLockTx(self, tx_bytes, script_out,
-                       swap_value,
-                       Kal, Kaf,
-                       feerate,
-                       check_lock_tx_inputs, vkbv=None,
-                       **kwargs):
-
-        # Verify:
-        #
-
-        # Not necessary to check the lock txn is mineable, as protocol will wait for it to confirm
-        # However by checking early we can avoid wasting time processing unmineable txns
-        # Check fee is reasonable
-
-        tx = self.loadTx(tx_bytes)
-        txid = self.getTxid(tx)
-        self._log.info('Verifying lock tx: {}.'.format(b2h(txid)))
-
-        ensure(tx.nVersion == self.txVersion(), 'Bad version')
-        ensure(tx.nLockTime == 0, 'Bad nLockTime')  # TODO match txns created by cores
-
-        script_pk = self.getScriptDest(script_out)
-        locked_n = findOutput(tx, script_pk)
-        ensure(locked_n is not None, 'Output not found in tx')
-        locked_coin = tx.vout[locked_n].nValue
-
-        # Check value
-        ensure(locked_coin == swap_value, 'Bad locked value')
-
-        # Check script
-        mining_fee: int = kwargs['mining_fee'] if 'mining_fee' in kwargs else 1000
-        out_1: bytes = kwargs['out_1']
-        out_2: bytes = kwargs['out_2']
-        public_key: bytes = kwargs['public_key'] if 'public_key' in kwargs else Kal
-        timelock: int = kwargs['timelock']
-
-        _mining_fee, _out_1, _out_2, _public_key, _timelock = self.extractScriptLockScriptValues(script_out)
-        ensure(mining_fee == _mining_fee, 'mining mismatch fee')
-        ensure(out_1 == _out_1, 'out_1 mismatch')
-        ensure(out_2 == _out_2, 'out_2 mismatch')
-        ensure(public_key == _public_key, 'public_key mismatch')
-        ensure(timelock == _timelock, 'timelock mismatch')
-
-        return txid, locked_n
-
-    def verifySCLockRefundTx(self, tx_bytes, lock_tx_bytes, script_out,
-                             prevout_id, prevout_n, prevout_seq, prevout_script,
-                             Kal, Kaf, csv_val_expect, swap_value, feerate, vkbv=None, **kwargs):
-        # Verify:
-        #   Must have only one input with correct prevout and sequence
-        #   Must have only one output to the p2wsh of the lock refund script
-        #   Output value must be locked_coin - lock tx fee
-
-        tx = self.loadTx(tx_bytes)
-        txid = self.getTxid(tx)
-        self._log.info('Verifying lock refund tx: {}.'.format(b2h(txid)))
-
-        ensure(tx.nVersion == self.txVersion(), 'Bad version')
-        ensure(tx.nLockTime == 0, 'nLockTime not 0')
-        ensure(len(tx.vin) == 1, 'tx doesn\'t have one input')
-
-        ensure(tx.vin[0].nSequence == prevout_seq, 'Bad input nSequence')
-        ensure(tx.vin[0].scriptSig == self.getScriptScriptSig(prevout_script, None), 'Input scriptsig mismatch')
-        ensure(tx.vin[0].prevout.hash == b2i(prevout_id) and tx.vin[0].prevout.n == prevout_n, 'Input prevout mismatch')
-
-        ensure(len(tx.vout) == 1, 'tx doesn\'t have one output')
-
-        script_pk = self.getScriptDest(script_out)
-        locked_n = findOutput(tx, script_pk)
-        ensure(locked_n is not None, 'Output not found in tx')
-        locked_coin = tx.vout[locked_n].nValue
-
-        # Check script
-        mining_fee: int = kwargs['mining_fee'] if 'mining_fee' in kwargs else 1000
-        out_1: bytes = kwargs['out_1']
-        out_2: bytes = kwargs['out_2']
-        public_key: bytes = kwargs['public_key'] if 'public_key' in kwargs else Kal
-        timelock: int = kwargs['timelock']
-
-        _mining_fee, _out_1, _out_2, _public_key, _timelock = self.extractScriptLockScriptValues(script_out)
-        ensure(mining_fee == _mining_fee, 'mining mismatch fee')
-        ensure(out_1 == _out_1, 'out_1 mismatch')
-        ensure(out_2 == _out_2, 'out_2 mismatch')
-        ensure(public_key == _public_key, 'public_key mismatch')
-        ensure(timelock == _timelock, 'timelock mismatch')
-
-        fee_paid = locked_coin - mining_fee
-        assert (fee_paid > 0)
-
-        size = self.getTxSize(tx)
-        vsize = size
-
-        self._log.info('tx amount, vsize, fee: %ld, %ld, %ld', locked_coin, vsize, fee_paid)
-
-        return txid, locked_coin, locked_n
-
-    def verifySCLockRefundSpendTx(self, tx_bytes, lock_refund_tx_bytes,
-                                  lock_refund_tx_id, prevout_script,
-                                  Kal,
-                                  prevout_n, prevout_value, feerate, vkbv=None, **kwargs):
-        # Verify:
-        #   Must have only one input with correct prevout (n is always 0) and sequence
-        #   Must have only one output sending lock refund tx value - fee to leader's address, TODO: follower shouldn't need to verify destination addr
-        tx = self.loadTx(tx_bytes)
-        txid = self.getTxid(tx)
-        self._log.info('Verifying lock refund spend tx: {}.'.format(b2h(txid)))
-
-        ensure(tx.nVersion == self.txVersion(), 'Bad version')
-        ensure(tx.nLockTime == 0, 'nLockTime not 0')
-        ensure(len(tx.vin) == 1, 'tx doesn\'t have one input')
-
-        ensure(tx.vin[0].nSequence == 0, 'Bad input nSequence')
-        ensure(tx.vin[0].scriptSig == self.getScriptScriptSig(prevout_script, bytes(73)), 'Input scriptsig mismatch')
-        ensure(tx.vin[0].prevout.hash == b2i(lock_refund_tx_id) and tx.vin[0].prevout.n == 0, 'Input prevout mismatch')
-
-        ensure(len(tx.vout) == 1, 'tx doesn\'t have one output')
-
-        # Check script
-        mining_fee: int = kwargs['mining_fee'] if 'mining_fee' in kwargs else 1000
-        out_1: bytes = kwargs['out_1']
-        out_2: bytes = kwargs['out_2']
-        public_key: bytes = kwargs['public_key'] if 'public_key' in kwargs else Kal
-        timelock: int = kwargs['timelock']
-
-        _mining_fee, _out_1, _out_2, _public_key, _timelock = self.extractScriptLockScriptValues(prevout_script)
-        ensure(mining_fee == _mining_fee, 'mining mismatch fee')
-        ensure(out_1 == _out_1, 'out_1 mismatch')
-        ensure(out_2 == _out_2, 'out_2 mismatch')
-        ensure(public_key == _public_key, 'public_key mismatch')
-        ensure(timelock == _timelock, 'timelock mismatch')
-
-        tx_value = tx.vout[0].nValue
-        fee_paid = tx_value - mining_fee
-        assert (fee_paid > 0)
-
-        size = self.getTxSize(tx)
-        vsize = size
-
-        self._log.info('tx amount, vsize, fee: %ld, %ld, %ld', tx_value, vsize, fee_paid)
-
-        return True
-
-    def verifySCLockSpendTx(self, tx_bytes,
-                            lock_tx_bytes, lock_tx_script,
-                            a_pkhash_f, feerate, vkbv=None):
-        # Verify:
-        #   Must have only one input with correct prevout (n is always 0) and sequence
-        #   Must have only one output with destination and amount
-
-        tx = self.loadTx(tx_bytes)
-        txid = self.getTxid(tx)
-        self._log.info('Verifying lock spend tx: {}.'.format(b2h(txid)))
-
-        ensure(tx.nVersion == self.txVersion(), 'Bad version')
-        ensure(tx.nLockTime == 0, 'nLockTime not 0')
-        ensure(len(tx.vin) == 1, 'tx doesn\'t have one input')
-
-        lock_tx = self.loadTx(lock_tx_bytes)
-        lock_tx_id = self.getTxid(lock_tx)
-
-        output_script = self.getScriptDest(lock_tx_script)
-        locked_n = findOutput(lock_tx, output_script)
-        ensure(locked_n is not None, 'Output not found in tx')
-        locked_coin = lock_tx.vout[locked_n].nValue
-
-        ensure(tx.vin[0].nSequence == 0, 'Bad input nSequence')
-        ensure(tx.vin[0].scriptSig == self.getScriptScriptSig(lock_tx_script), 'Input scriptsig mismatch')
-
-        # allow for this mismatch in BCH, since the lock txid will get changed after signing
-        # ensure(tx.vin[0].prevout.hash == b2i(lock_tx_id) and tx.vin[0].prevout.n == locked_n, 'Input prevout mismatch')
-
-        ensure(len(tx.vout) == 1, 'tx doesn\'t have one output')
-        p2pkh = self.getScriptForPubkeyHash(a_pkhash_f)
-        ensure(tx.vout[0].scriptPubKey == p2pkh, 'Bad output destination')
-
-        # The value of the lock tx output should already be verified, if the fee is as expected the difference will be the correct amount
-        fee_paid = locked_coin - tx.vout[0].nValue
-        assert (fee_paid > 0)
-
-        size = self.getTxSize(tx)
-        vsize = size
-
-        self._log.info('tx amount, vsize, fee: %ld, %ld, %ld', tx.vout[0].nValue, vsize, fee_paid)
-
-        return True
-
-    def signTxOtVES(self, key_sign: bytes, pubkey_encrypt: bytes, tx_bytes: bytes, input_n: int, prevout_script: bytes, prevout_value: int) -> bytes:
-        _, out_1, _, _, _ = self.extractScriptLockScriptValues(prevout_script)
-        msg = sha256(out_1)
-
-        return ecdsaotves_enc_sign(key_sign, pubkey_encrypt, msg)
-
-    def decryptOtVES(self, k: bytes, esig: bytes) -> bytes:
-        return ecdsaotves_dec_sig(k, esig)
-
-    def recoverEncKey(self, esig, sig, K):
-        return ecdsaotves_rec_enc_key(K, esig, sig)
-
-    def verifyTxOtVES(self, tx_bytes: bytes, ct: bytes, Ks: bytes, Ke: bytes, input_n: int, prevout_script: bytes, prevout_value):
-        _, out_1, _, _, _ = self.extractScriptLockScriptValues(prevout_script)
-        msg = sha256(out_1)
-
-        return ecdsaotves_enc_verify(Ks, Ke, msg, ct)
-
-    def extractLeaderSig(self, tx_bytes: bytes) -> bytes:
-        tx = self.loadTx(tx_bytes)
-        signature, _, _, _, _, _ = self.extractScriptLockScriptValuesFromScriptSig(tx.vin[0].scriptSig)
-        return signature
-
-    def extractFollowerSig(self, tx_bytes: bytes) -> bytes:
-        tx = self.loadTx(tx_bytes)
-        signature, _, _, _, _, _ = self.extractScriptLockScriptValuesFromScriptSig(tx.vin[0].scriptSig)
-        return signature
-
-    def isSpendingLockTx(self, spend_tx: CTransaction) -> bool:
-        signature, _, _, _, _, _ = self.extractScriptLockScriptValuesFromScriptSig(spend_tx.vin[0].scriptSig)
-        return spend_tx.vin[0].nSequence == 0 and signature is not None
-
-    def isSpendingLockRefundTx(self, spend_tx: CTransaction) -> bool:
-        signature, _, _, _, _, _ = self.extractScriptLockScriptValuesFromScriptSig(spend_tx.vin[0].scriptSig)
-        return spend_tx.vin[0].nSequence == 0 and signature is not None
-
-    def isTxExistsError(self, err_str: str) -> bool:
-        return 'transaction already in block chain' in err_str
-
-    def getRefundOutputScript(self, xmr_swap) -> bytes:
-        _, out_1, _, _, _ = self.extractScriptLockScriptValues(xmr_swap.a_lock_refund_tx_script)
-        return out_1
-
-    def createMercyTx(self, refund_swipe_tx_bytes: bytes, refund_swipe_tx_id: bytes, lock_refund_tx_script: bytes, keyshare: bytes) -> str:
-        refund_swipe_tx = self.loadTx(refund_swipe_tx_bytes)
-        refund_output_value = refund_swipe_tx.vout[0].nValue
-        refund_output_script = refund_swipe_tx.vout[0].scriptPubKey
-
-        # mercy transaction size consisting of one input of freshly received funds,
-        # one op_return with mercy information, a dust output to the leader and change back to the follower
-        tx_size = 275
-        dust_limit = 546
-
-        outValue = refund_output_value - tx_size - dust_limit
-
-        _, out_1, _, _, _ = self.extractScriptLockScriptValues(lock_refund_tx_script)
-
-        tx = CTransaction()
-        tx.nVersion = self.txVersion()
-        tx.vin.append(CTxIn(COutPoint(b2i(refund_swipe_tx_id), 0),
-                            nSequence=0,
-                            scriptSig=CScript(out_1)))
-
-        tx.vout.append(self.txoType()(0, CScript([OP_RETURN, b'XBSW', keyshare])))
-        tx.vout.append(self.txoType()(dust_limit, CScript(out_1)))
-        tx.vout.append(self.txoType()(outValue, refund_output_script))
-
-        size = tx_size
-        vsize = size
-
-        pay_fee = size
-
-        tx.rehash()
-        self._log.info('createMercyTx %s:\n    fee_rate, vsize, fee: %ld, %ld, %ld.',
-                       i2h(tx.sha256), 1, vsize, pay_fee)
-
-        txHex = tx.serialize_without_witness()
-        return self.signTxWithWallet(txHex)
--- a/basicswap/interface/btc.py
+++ b/basicswap/interface/btc.py
@@ -5,31 +5,25 @@
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.

+import json
 import base64
 import hashlib
-import json
 import logging
 import traceback
-
 from io import BytesIO

-from basicswap.basicswap_util import (
-    getVoutByAddress,
-    getVoutByScriptPubKey,
-)
-from basicswap.contrib.test_framework import (
-    segwit_addr,
-)
-from basicswap.interface.base import (
-    Secp256k1Interface,
-)
+from basicswap.contrib.test_framework import segwit_addr
+
+from basicswap.interface import (
+    Curves)
 from basicswap.util import (
    ensure,
-    b2h, i2b, b2i, i2h,
-)
+    make_int,
+    b2h, i2b, b2i, i2h)
 from basicswap.util.ecc import (
+    ep,
    pointToCPK, CPKToPoint,
-)
+    getSecretInt)
 from basicswap.util.script import (
    decodeScriptNum,
    getCompactSizeLen,
@@ -43,20 +37,16 @@ from basicswap.util.address import (
    decodeAddress,
    pubkeyToAddress,
 )
-from basicswap.util.crypto import (
-    hash160,
-    sha256,
-)
 from coincurve.keys import (
    PrivateKey,
-    PublicKey,
-)
+    PublicKey)
+from coincurve.dleag import (
+    verify_secp256k1_point)
 from coincurve.ecdsaotves import (
    ecdsaotves_enc_sign,
    ecdsaotves_enc_verify,
    ecdsaotves_dec_sig,
-    ecdsaotves_rec_enc_key
-)
+    ecdsaotves_rec_enc_key)

 from basicswap.contrib.test_framework.messages import (
    COIN,
@@ -65,7 +55,8 @@ from basicswap.contrib.test_framework.messages import (
    CTxIn,
    CTxInWitness,
    CTxOut,
-)
+    uint256_from_str)
+
 from basicswap.contrib.test_framework.script import (
    CScript, CScriptOp,
    OP_IF, OP_ELSE, OP_ENDIF,
@@ -75,15 +66,14 @@ from basicswap.contrib.test_framework.script import (
    OP_CHECKSEQUENCEVERIFY,
    OP_DROP,
    OP_HASH160, OP_EQUAL,
-    OP_RETURN,
    SIGHASH_ALL,
    SegwitV0SignatureHash,
-)
-from basicswap.basicswap_util import (
-    TxLockTypes
-)
+    hash160)

-from basicswap.chainparams import Coins
+from basicswap.basicswap_util import (
+    TxLockTypes)
+
+from basicswap.chainparams import CoinInterface, Coins
 from basicswap.rpc import make_rpc_func, openrpc


@@ -119,58 +109,10 @@ def find_vout_for_address_from_txobj(tx_obj, addr: str) -> int:
    raise RuntimeError("Vout not found for address: txid={}, addr={}".format(tx_obj['txid'], addr))


-def extractScriptLockScriptValues(script_bytes: bytes) -> (bytes, bytes):
-    script_len = len(script_bytes)
-    ensure(script_len == 71, 'Bad script length')
-    o = 0
-    ensure_op(script_bytes[o] == OP_2)
-    ensure_op(script_bytes[o + 1] == 33)
-    o += 2
-    pk1 = script_bytes[o: o + 33]
-    o += 33
-    ensure_op(script_bytes[o] == 33)
-    o += 1
-    pk2 = script_bytes[o: o + 33]
-    o += 33
-    ensure_op(script_bytes[o] == OP_2)
-    ensure_op(script_bytes[o + 1] == OP_CHECKMULTISIG)
-
-    return pk1, pk2
-
-
-def extractScriptLockRefundScriptValues(script_bytes: bytes):
-    script_len = len(script_bytes)
-    ensure(script_len > 73, 'Bad script length')
-    ensure_op(script_bytes[0] == OP_IF)
-    ensure_op(script_bytes[1] == OP_2)
-    ensure_op(script_bytes[2] == 33)
-    pk1 = script_bytes[3: 3 + 33]
-    ensure_op(script_bytes[36] == 33)
-    pk2 = script_bytes[37: 37 + 33]
-    ensure_op(script_bytes[70] == OP_2)
-    ensure_op(script_bytes[71] == OP_CHECKMULTISIG)
-    ensure_op(script_bytes[72] == OP_ELSE)
-    o = 73
-    csv_val, nb = decodeScriptNum(script_bytes, o)
-    o += nb
-
-    ensure(script_len == o + 5 + 33, 'Bad script length')  # Fails if script too long
-    ensure_op(script_bytes[o] == OP_CHECKSEQUENCEVERIFY)
-    o += 1
-    ensure_op(script_bytes[o] == OP_DROP)
-    o += 1
-    ensure_op(script_bytes[o] == 33)
-    o += 1
-    pk3 = script_bytes[o: o + 33]
-    o += 33
-    ensure_op(script_bytes[o] == OP_CHECKSIG)
-    o += 1
-    ensure_op(script_bytes[o] == OP_ENDIF)
-
-    return pk1, pk2, csv_val, pk3
-
-
-class BTCInterface(Secp256k1Interface):
+class BTCInterface(CoinInterface):
+    @staticmethod
+    def curve_type():
+        return Curves.secp256k1

    @staticmethod
    def coin_type():
@@ -207,6 +149,10 @@ class BTCInterface(Secp256k1Interface):
            rv += output.nValue
        return rv

+    @staticmethod
+    def compareFeeRates(a, b) -> bool:
+        return abs(a - b) < 20
+
    @staticmethod
    def xmr_swap_a_lock_spend_tx_vsize() -> int:
        return 147
@@ -221,7 +167,7 @@ class BTCInterface(Secp256k1Interface):

    @staticmethod
    def getExpectedSequence(lockType: int, lockVal: int) -> int:
-        ensure(lockVal >= 1, 'Bad lockVal')
+        assert (lockVal >= 1), 'Bad lockVal'
        if lockType == TxLockTypes.SEQUENCE_LOCK_BLOCKS:
            return lockVal
        if lockType == TxLockTypes.SEQUENCE_LOCK_TIME:
@@ -259,24 +205,6 @@ class BTCInterface(Secp256k1Interface):
        self._sc = swap_client
        self._log = self._sc.log if self._sc and self._sc.log else logging
        self._expect_seedid_hex = None
-        self._altruistic = coin_settings.get('altruistic', True)
-
-    def open_rpc(self, wallet=None):
-        return openrpc(self._rpcport, self._rpcauth, wallet=wallet, host=self._rpc_host)
-
-    def json_request(self, rpc_conn, method, params):
-        try:
-            v = rpc_conn.json_request(method, params)
-            r = json.loads(v.decode('utf-8'))
-        except Exception as ex:
-            traceback.print_exc()
-            raise ValueError('RPC Server Error ' + str(ex))
-        if 'error' in r and r['error'] is not None:
-            raise ValueError('RPC error ' + str(r['error']))
-        return r['result']
-
-    def close_rpc(self, rpc_conn):
-        rpc_conn.close()

    def checkWallets(self) -> int:
        wallets = self.rpc('listwallets')
@@ -295,6 +223,40 @@ class BTCInterface(Secp256k1Interface):

        return len(wallets)

+    def using_segwit(self) -> bool:
+        # Using btc native segwit
+        return self._use_segwit
+
+    def use_p2shp2wsh(self) -> bool:
+        # p2sh-p2wsh
+        return False
+
+    def get_connection_type(self):
+        return self._connection_type
+
+    def open_rpc(self, wallet=None):
+        return openrpc(self._rpcport, self._rpcauth, wallet=wallet, host=self._rpc_host)
+
+    def json_request(self, rpc_conn, method, params):
+        try:
+            v = rpc_conn.json_request(method, params)
+            r = json.loads(v.decode('utf-8'))
+        except Exception as ex:
+            traceback.print_exc()
+            raise ValueError('RPC Server Error ' + str(ex))
+
+        if 'error' in r and r['error'] is not None:
+            raise ValueError('RPC error ' + str(r['error']))
+
+        return r['result']
+
+    def close_rpc(self, rpc_conn):
+        rpc_conn.close()
+
+    def setConfTarget(self, new_conf_target: int) -> None:
+        ensure(new_conf_target >= 1 and new_conf_target < 33, 'Invalid conf_target value')
+        self._conf_target = new_conf_target
+
    def testDaemonRPC(self, with_wallet=True) -> None:
        self.rpc_wallet('getwalletinfo' if with_wallet else 'getblockchaininfo')

@@ -323,7 +285,7 @@ class BTCInterface(Secp256k1Interface):

        max_tries = 5000
        for i in range(max_tries):
-            prev_block_header = self.rpc('getblockheader', [last_block_header['previousblockhash']])
+            prev_block_header = self.rpc('getblock', [last_block_header['previousblockhash']])
            if prev_block_header['time'] <= time:
                return last_block_header if block_after else prev_block_header

@@ -333,7 +295,6 @@ class BTCInterface(Secp256k1Interface):
    def initialiseWallet(self, key_bytes: bytes) -> None:
        key_wif = self.encodeKey(key_bytes)
        self.rpc_wallet('sethdseed', [True, key_wif])
-        self._have_checked_seed = False

    def getWalletInfo(self):
        rv = self.rpc_wallet('getwalletinfo')
@@ -342,6 +303,9 @@ class BTCInterface(Secp256k1Interface):
        rv['locked_utxos'] = len(self.rpc_wallet('listlockunspent'))
        return rv

+    def walletRestoreHeight(self) -> int:
+        return self._restore_height
+
    def getWalletRestoreHeight(self) -> int:
        start_time = self.rpc_wallet('getwalletinfo')['keypoololdest']

@@ -370,11 +334,9 @@ class BTCInterface(Secp256k1Interface):
        wi = self.rpc_wallet('getwalletinfo')
        return 'Not found' if 'hdseedid' not in wi else wi['hdseedid']

-    def checkExpectedSeed(self, expect_seedid: str) -> bool:
-        wallet_seed_id = self.getWalletSeedID()
+    def checkExpectedSeed(self, expect_seedid) -> bool:
        self._expect_seedid_hex = expect_seedid
-        self._have_checked_seed = True
-        return expect_seedid == wallet_seed_id
+        return expect_seedid == self.getWalletSeedID()

    def getNewAddress(self, use_segwit: bool, label: str = 'swap_receive') -> str:
        args = [label]
@@ -391,6 +353,18 @@ class BTCInterface(Secp256k1Interface):
            self._log.debug('validateaddress failed: {}'.format(address))
        return False

+    def isValidAddressHash(self, address_hash: bytes) -> bool:
+        hash_len = len(address_hash)
+        if hash_len == 20:
+            return True
+
+    def isValidPubkey(self, pubkey: bytes) -> bool:
+        try:
+            self.verifyPubkey(pubkey)
+            return True
+        except Exception:
+            return False
+
    def isAddressMine(self, address: str, or_watch_only: bool = False) -> bool:
        addr_info = self.rpc_wallet('getaddressinfo', [address])
        if not or_watch_only:
@@ -448,11 +422,11 @@ class BTCInterface(Secp256k1Interface):
        return segwit_addr.encode(bech32_prefix, version, pkh)

    def pkh_to_address(self, pkh: bytes) -> str:
-        # pkh is ripemd160(sha256(pk))
+        # pkh is hash160(pk)
        assert (len(pkh) == 20)
        prefix = self.chainparams_network()['pubkey_address']
        data = bytes((prefix,)) + pkh
-        checksum = sha256(sha256(data))
+        checksum = hashlib.sha256(hashlib.sha256(data).digest()).digest()
        return b58encode(data + checksum[0:4])

    def sh_to_address(self, sh: bytes) -> str:
@@ -478,6 +452,12 @@ class BTCInterface(Secp256k1Interface):
        assert (len(pk) == 33)
        return self.pkh_to_address(hash160(pk))

+    def getNewSecretKey(self) -> bytes:
+        return i2b(getSecretInt())
+
+    def getPubkey(self, privkey):
+        return PublicKey.from_secret(privkey).format()
+
    def getAddressHashFromKey(self, key: bytes) -> bytes:
        pk = self.getPubkey(key)
        return hash160(pk)
@@ -485,6 +465,13 @@ class BTCInterface(Secp256k1Interface):
    def getSeedHash(self, seed) -> bytes:
        return self.getAddressHashFromKey(seed)[::-1]

+    def verifyKey(self, k: bytes) -> bool:
+        i = b2i(k)
+        return (i < ep.o and i > 0)
+
+    def verifyPubkey(self, pubkey_bytes: bytes) -> bool:
+        return verify_secp256k1_point(pubkey_bytes)
+
    def encodeKey(self, key_bytes: bytes) -> str:
        wif_prefix = self.chainparams_network()['key_prefix']
        return toWIF(wif_prefix, key_bytes)
@@ -504,6 +491,13 @@ class BTCInterface(Secp256k1Interface):
    def decodeKey(self, k: str) -> bytes:
        return decodeWif(k)

+    def sumKeys(self, ka, kb):
+        # TODO: Add to coincurve
+        return i2b((b2i(ka) + b2i(kb)) % ep.o)
+
+    def sumPubkeys(self, Ka, Kb):
+        return PublicKey.combine_keys([PublicKey(Ka), PublicKey(Kb)]).format()
+
    def getScriptForPubkeyHash(self, pkh: bytes) -> CScript:
        # p2wpkh
        return CScript([OP_0, pkh])
@@ -514,6 +508,24 @@ class BTCInterface(Secp256k1Interface):
        tx.deserialize(BytesIO(tx_bytes))
        return tx

+    def extractScriptLockScriptValues(self, script_bytes: bytes):
+        script_len = len(script_bytes)
+        ensure(script_len == 71, 'Bad script length')
+        o = 0
+        ensure_op(script_bytes[o] == OP_2)
+        ensure_op(script_bytes[o + 1] == 33)
+        o += 2
+        pk1 = script_bytes[o: o + 33]
+        o += 33
+        ensure_op(script_bytes[o] == 33)
+        o += 1
+        pk2 = script_bytes[o: o + 33]
+        o += 33
+        ensure_op(script_bytes[o] == OP_2)
+        ensure_op(script_bytes[o + 1] == OP_CHECKMULTISIG)
+
+        return pk1, pk2
+
    def createSCLockTx(self, value: int, script: bytearray, vkbv: bytes = None) -> bytes:
        tx = CTransaction()
        tx.nVersion = self.txVersion()
@@ -523,6 +535,37 @@ class BTCInterface(Secp256k1Interface):
    def fundSCLockTx(self, tx_bytes, feerate, vkbv=None):
        return self.fundTx(tx_bytes, feerate)

+    def extractScriptLockRefundScriptValues(self, script_bytes: bytes):
+        script_len = len(script_bytes)
+        ensure(script_len > 73, 'Bad script length')
+        ensure_op(script_bytes[0] == OP_IF)
+        ensure_op(script_bytes[1] == OP_2)
+        ensure_op(script_bytes[2] == 33)
+        pk1 = script_bytes[3: 3 + 33]
+        ensure_op(script_bytes[36] == 33)
+        pk2 = script_bytes[37: 37 + 33]
+        ensure_op(script_bytes[70] == OP_2)
+        ensure_op(script_bytes[71] == OP_CHECKMULTISIG)
+        ensure_op(script_bytes[72] == OP_ELSE)
+        o = 73
+        csv_val, nb = decodeScriptNum(script_bytes, o)
+        o += nb
+
+        ensure(script_len == o + 5 + 33, 'Bad script length')  # Fails if script too long
+        ensure_op(script_bytes[o] == OP_CHECKSEQUENCEVERIFY)
+        o += 1
+        ensure_op(script_bytes[o] == OP_DROP)
+        o += 1
+        ensure_op(script_bytes[o] == 33)
+        o += 1
+        pk3 = script_bytes[o: o + 33]
+        o += 33
+        ensure_op(script_bytes[o] == OP_CHECKSIG)
+        o += 1
+        ensure_op(script_bytes[o] == OP_ENDIF)
+
+        return pk1, pk2, csv_val, pk3
+
    def genScriptLockRefundTxScript(self, Kal, Kaf, csv_val) -> CScript:

        Kal_enc = Kal if len(Kal) == 33 else self.encodePubkey(Kal)
@@ -603,7 +646,7 @@ class BTCInterface(Secp256k1Interface):

        return tx.serialize()

-    def createSCLockRefundSpendToFTx(self, tx_lock_refund_bytes, script_lock_refund, pkh_dest, tx_fee_rate, vkbv=None, kbsf=None):
+    def createSCLockRefundSpendToFTx(self, tx_lock_refund_bytes, script_lock_refund, pkh_dest, tx_fee_rate, vkbv=None):
        # lock refund swipe tx
        # Sends the coinA locked coin to the follower

@@ -614,7 +657,7 @@ class BTCInterface(Secp256k1Interface):
        ensure(locked_n is not None, 'Output not found in tx')
        locked_coin = tx_lock_refund.vout[locked_n].nValue

-        A, B, lock2_value, C = extractScriptLockRefundScriptValues(script_lock_refund)
+        A, B, lock2_value, C = self.extractScriptLockRefundScriptValues(script_lock_refund)

        tx_lock_refund.rehash()
        tx_lock_refund_hash_int = tx_lock_refund.sha256
@@ -627,12 +670,6 @@ class BTCInterface(Secp256k1Interface):

        tx.vout.append(self.txoType()(locked_coin, self.getScriptForPubkeyHash(pkh_dest)))

-        if self.altruistic() and kbsf:
-            # Add mercy_keyshare
-            tx.vout.append(self.txoType()(0, CScript([OP_RETURN, b'XBSW', kbsf])))
-        else:
-            self._log.debug('Not attaching mercy output, have kbsf {}.'.format('true' if kbsf else 'false'))
-
        dummy_witness_stack = self.getScriptLockRefundSwipeTxDummyWitness(script_lock_refund)
        witness_bytes = self.getWitnessStackSerialisedLength(dummy_witness_stack)
        vsize = self.getTxVSize(tx, add_witness_bytes=witness_bytes)
@@ -707,7 +744,7 @@ class BTCInterface(Secp256k1Interface):
        ensure(locked_coin == swap_value, 'Bad locked value')

        # Check script
-        A, B = extractScriptLockScriptValues(script_out)
+        A, B = self.extractScriptLockScriptValues(script_out)
        ensure(A == Kal, 'Bad script pubkey')
        ensure(B == Kaf, 'Bad script pubkey')

@@ -720,7 +757,7 @@ class BTCInterface(Secp256k1Interface):
            for pi in tx.vin:
                ptx = self.rpc('getrawtransaction', [i2h(pi.prevout.hash), True])
                prevout = ptx['vout'][pi.prevout.n]
-                inputs_value += self.make_int(prevout['value'])
+                inputs_value += make_int(prevout['value'])

                prevout_type = prevout['scriptPubKey']['type']
                if prevout_type == 'witness_v0_keyhash':
@@ -775,7 +812,7 @@ class BTCInterface(Secp256k1Interface):
        locked_coin = tx.vout[locked_n].nValue

        # Check script and values
-        A, B, csv_val, C = extractScriptLockRefundScriptValues(script_out)
+        A, B, csv_val, C = self.extractScriptLockRefundScriptValues(script_out)
        ensure(A == Kal, 'Bad script pubkey')
        ensure(B == Kaf, 'Bad script pubkey')
        ensure(csv_val == csv_val_expect, 'Bad script csv value')
@@ -887,30 +924,27 @@ class BTCInterface(Secp256k1Interface):

        return True

-    def signTx(self, key_bytes: bytes, tx_bytes: bytes, input_n: int, prevout_script: bytes, prevout_value: int) -> bytes:
+    def signTx(self, key_bytes, tx_bytes, input_n, prevout_script, prevout_value):
        tx = self.loadTx(tx_bytes)
        sig_hash = SegwitV0SignatureHash(prevout_script, tx, input_n, SIGHASH_ALL, prevout_value)

        eck = PrivateKey(key_bytes)
        return eck.sign(sig_hash, hasher=None) + bytes((SIGHASH_ALL,))

-    def signTxOtVES(self, key_sign: bytes, pubkey_encrypt: bytes, tx_bytes: bytes, input_n: int, prevout_script: bytes, prevout_value: int) -> bytes:
+    def signTxOtVES(self, key_sign, pubkey_encrypt, tx_bytes, input_n, prevout_script, prevout_value):
        tx = self.loadTx(tx_bytes)
        sig_hash = SegwitV0SignatureHash(prevout_script, tx, input_n, SIGHASH_ALL, prevout_value)

        return ecdsaotves_enc_sign(key_sign, pubkey_encrypt, sig_hash)

-    def verifyTxOtVES(self, tx_bytes: bytes, ct: bytes, Ks: bytes, Ke: bytes, input_n: int, prevout_script: bytes, prevout_value):
+    def verifyTxOtVES(self, tx_bytes, ct, Ks, Ke, input_n, prevout_script, prevout_value):
        tx = self.loadTx(tx_bytes)
        sig_hash = SegwitV0SignatureHash(prevout_script, tx, input_n, SIGHASH_ALL, prevout_value)
        return ecdsaotves_enc_verify(Ks, Ke, sig_hash, ct)

-    def decryptOtVES(self, k: bytes, esig: bytes) -> bytes:
+    def decryptOtVES(self, k, esig):
        return ecdsaotves_dec_sig(k, esig) + bytes((SIGHASH_ALL,))

-    def recoverEncKey(self, esig, sig, K):
-        return ecdsaotves_rec_enc_key(K, esig, sig[:-1])  # Strip sighash type
-
    def verifyTxSig(self, tx_bytes: bytes, sig: bytes, K: bytes, input_n: int, prevout_script: bytes, prevout_value: int) -> bool:
        tx = self.loadTx(tx_bytes)
        sig_hash = SegwitV0SignatureHash(prevout_script, tx, input_n, SIGHASH_ALL, prevout_value)
@@ -918,7 +952,11 @@ class BTCInterface(Secp256k1Interface):
        pubkey = PublicKey(K)
        return pubkey.verify(sig[: -1], sig_hash, hasher=None)  # Pop the hashtype byte

-    def fundTx(self, tx: bytes, feerate) -> bytes:
+    def verifySig(self, pubkey, signed_hash, sig):
+        pubkey = PublicKey(pubkey)
+        return pubkey.verify(sig, signed_hash, hasher=None)
+
+    def fundTx(self, tx, feerate):
        feerate_str = self.format_amount(feerate)
        # TODO: unlock unspents if bid cancelled
        options = {
@@ -928,7 +966,7 @@ class BTCInterface(Secp256k1Interface):
        rv = self.rpc_wallet('fundrawtransaction', [tx.hex(), options])
        return bytes.fromhex(rv['hex'])

-    def listInputs(self, tx_bytes: bytes):
+    def listInputs(self, tx_bytes):
        tx = self.loadTx(tx_bytes)

        all_locked = self.rpc_wallet('listlockunspent')
@@ -980,20 +1018,20 @@ class BTCInterface(Secp256k1Interface):
        return hash160(K)

    def getScriptDest(self, script):
-        return CScript([OP_0, sha256(script)])
+        return CScript([OP_0, hashlib.sha256(script).digest()])

    def getScriptScriptSig(self, script: bytes) -> bytes:
        return bytes()

    def getP2SHP2WSHDest(self, script):
-        script_hash = sha256(script)
+        script_hash = hashlib.sha256(script).digest()
        assert len(script_hash) == 32
        p2wsh_hash = hash160(CScript([OP_0, script_hash]))
        assert len(p2wsh_hash) == 20
        return CScript([OP_HASH160, p2wsh_hash, OP_EQUAL])

    def getP2SHP2WSHScriptSig(self, script):
-        script_hash = sha256(script)
+        script_hash = hashlib.sha256(script).digest()
        assert len(script_hash) == 32
        return CScript([CScript([OP_0, script_hash, ]), ])

@@ -1012,7 +1050,7 @@ class BTCInterface(Secp256k1Interface):

    def getWalletTransaction(self, txid: bytes):
        try:
-            return bytes.fromhex(self.rpc_wallet('gettransaction', [txid.hex()]))
+            return bytes.fromhex(self.rpc('gettransaction', [txid.hex()]))
        except Exception as ex:
            # TODO: filter errors
            return None
@@ -1034,11 +1072,11 @@ class BTCInterface(Secp256k1Interface):
        tx.wit.vtxinwit.clear()
        return tx.serialize()

-    def extractLeaderSig(self, tx_bytes: bytes) -> bytes:
+    def extractLeaderSig(self, tx_bytes) -> bytes:
        tx = self.loadTx(tx_bytes)
        return tx.wit.vtxinwit[0].scriptWitness.stack[1]

-    def extractFollowerSig(self, tx_bytes: bytes) -> bytes:
+    def extractFollowerSig(self, tx_bytes) -> bytes:
        tx = self.loadTx(tx_bytes)
        return tx.wit.vtxinwit[0].scriptWitness.stack[2]

@@ -1052,7 +1090,7 @@ class BTCInterface(Secp256k1Interface):
    def encodeSharedAddress(self, Kbv, Kbs):
        return self.pubkey_to_segwit_address(Kbs)

-    def publishBLockTx(self, kbv, Kbs, output_amount, feerate, unlock_time: int = 0) -> bytes:
+    def publishBLockTx(self, kbv, Kbs, output_amount, feerate, delay_for: int = 10, unlock_time: int = 0) -> bytes:
        b_lock_tx = self.createBLockTx(Kbs, output_amount)

        b_lock_tx = self.fundTx(b_lock_tx, feerate)
@@ -1061,6 +1099,9 @@ class BTCInterface(Secp256k1Interface):

        return bytes.fromhex(self.publishTx(b_lock_tx))

+    def recoverEncKey(self, esig, sig, K):
+        return ecdsaotves_rec_enc_key(K, esig, sig[:-1])  # Strip sighash type
+
    def getTxVSize(self, tx, add_bytes: int = 0, add_witness_bytes: int = 0) -> int:
        wsf = self.witnessScaleFactor()
        len_full = len(tx.serialize_with_witness()) + add_bytes + add_witness_bytes
@@ -1090,29 +1131,25 @@ class BTCInterface(Secp256k1Interface):
        witness_bytes = 109
        vsize = self.getTxVSize(tx, add_witness_bytes=witness_bytes)
        pay_fee = round(fee_rate * vsize / 1000)
-        self._log.info(f'BLockSpendTx fee_rate, vsize, fee: {fee_rate}, {vsize}, {pay_fee}.')
+        self._log.info(f'BLockSpendTx  fee_rate, vsize, fee: {fee_rate}, {vsize}, {pay_fee}.')
        return pay_fee

-    def spendBLockTx(self, chain_b_lock_txid: bytes, address_to: str, kbv: bytes, kbs: bytes, cb_swap_value: int, b_fee: int, restore_height: int, lock_tx_vout=None) -> bytes:
-        self._log.info('spendBLockTx: {} {}\n'.format(chain_b_lock_txid.hex(), lock_tx_vout))
-        locked_n = lock_tx_vout
+    def spendBLockTx(self, chain_b_lock_txid: bytes, address_to: str, kbv: bytes, kbs: bytes, cb_swap_value: int, b_fee: int, restore_height: int) -> bytes:
+        self._log.info('spendBLockTx %s:\n', chain_b_lock_txid.hex())
+        wtx = self.rpc_wallet('gettransaction', [chain_b_lock_txid.hex(), ])
+        lock_tx = self.loadTx(bytes.fromhex(wtx['hex']))

        Kbs = self.getPubkey(kbs)
        script_pk = self.getPkDest(Kbs)
-
-        if locked_n is None:
-            wtx = self.rpc_wallet('gettransaction', [chain_b_lock_txid.hex(), ])
-            lock_tx = self.loadTx(bytes.fromhex(wtx['hex']))
-            locked_n = findOutput(lock_tx, script_pk)
+        locked_n = findOutput(lock_tx, script_pk)
        ensure(locked_n is not None, 'Output not found in tx')
-
        pkh_to = self.decodeAddress(address_to)

        tx = CTransaction()
        tx.nVersion = self.txVersion()

        script_lock = self.getScriptForPubkeyHash(Kbs)
-        chain_b_lock_txid_int = b2i(chain_b_lock_txid)
+        chain_b_lock_txid_int = uint256_from_str(chain_b_lock_txid[::-1])

        tx.vin.append(CTxIn(COutPoint(chain_b_lock_txid_int, locked_n),
                            nSequence=0,
@@ -1134,11 +1171,11 @@ class BTCInterface(Secp256k1Interface):
        addr_info = self.rpc_wallet('getaddressinfo', [address])
        return addr_info['iswatchonly']

-    def getSCLockScriptAddress(self, lock_script: bytes) -> str:
+    def getSCLockScriptAddress(self, lock_script):
        lock_tx_dest = self.getScriptDest(lock_script)
        return self.encodeScriptDest(lock_tx_dest)

-    def getLockTxHeight(self, txid, dest_address, bid_amount, rescan_from, find_index: bool = False, vout: int = -1):
+    def getLockTxHeight(self, txid, dest_address, bid_amount, rescan_from, find_index: bool = False):
        # Add watchonly address and rescan if required

        if not self.isAddressMine(dest_address, or_watch_only=True):
@@ -1160,8 +1197,7 @@ class BTCInterface(Secp256k1Interface):
            return None

        try:
-            # set `include_watchonly` explicitly to `True` to get transactions for watchonly addresses also in BCH
-            tx = self.rpc_wallet('gettransaction', [txid.hex(), True])
+            tx = self.rpc_wallet('gettransaction', [txid.hex()])

            block_height = 0
            if 'blockhash' in tx:
@@ -1208,30 +1244,30 @@ class BTCInterface(Secp256k1Interface):
                'vout': utxo['vout']})
        return rv, chain_height

-    def withdrawCoin(self, value: float, addr_to: str, subfee: bool):
+    def withdrawCoin(self, value, addr_to, subfee):
        params = [addr_to, value, '', '', subfee, True, self._conf_target]
        return self.rpc_wallet('sendtoaddress', params)

-    def signCompact(self, k, message: str) -> bytes:
-        message_hash = sha256(bytes(message, 'utf-8'))
+    def signCompact(self, k, message):
+        message_hash = hashlib.sha256(bytes(message, 'utf-8')).digest()

        privkey = PrivateKey(k)
        return privkey.sign_recoverable(message_hash, hasher=None)[:64]

-    def signRecoverable(self, k, message: str) -> bytes:
-        message_hash = sha256(bytes(message, 'utf-8'))
+    def signRecoverable(self, k, message):
+        message_hash = hashlib.sha256(bytes(message, 'utf-8')).digest()

        privkey = PrivateKey(k)
        return privkey.sign_recoverable(message_hash, hasher=None)

-    def verifyCompactSig(self, K, message: str, sig) -> None:
-        message_hash = sha256(bytes(message, 'utf-8'))
+    def verifyCompactSig(self, K, message, sig):
+        message_hash = hashlib.sha256(bytes(message, 'utf-8')).digest()
        pubkey = PublicKey(K)
        rv = pubkey.verify_compact(sig, message_hash, hasher=None)
        assert (rv is True)

-    def verifySigAndRecover(self, sig, message: str) -> bytes:
-        message_hash = sha256(bytes(message, 'utf-8'))
+    def verifySigAndRecover(self, sig, message):
+        message_hash = hashlib.sha256(bytes(message, 'utf-8')).digest()
        pubkey = PublicKey.from_signature_and_message(sig, message_hash, hasher=None)
        return pubkey.format()

@@ -1240,7 +1276,7 @@ class BTCInterface(Secp256k1Interface):
            message_magic = self.chainparams()['message_magic']

        message_bytes = SerialiseNumCompact(len(message_magic)) + bytes(message_magic, 'utf-8') + SerialiseNumCompact(len(message)) + bytes(message, 'utf-8')
-        message_hash = sha256(sha256(message_bytes))
+        message_hash = hashlib.sha256(hashlib.sha256(message_bytes).digest()).digest()
        signature_bytes = base64.b64decode(signature)
        rec_id = (signature_bytes[0] - 27) & 3
        signature_bytes = signature_bytes[1:] + bytes((rec_id,))
@@ -1258,6 +1294,40 @@ class BTCInterface(Secp256k1Interface):
    def showLockTransfers(self, kbv, Kbs, restore_height):
        raise ValueError('Unimplemented')

+    def getLockTxSwapOutputValue(self, bid, xmr_swap):
+        return bid.amount
+
+    def getLockRefundTxSwapOutputValue(self, bid, xmr_swap):
+        return xmr_swap.a_swap_refund_value
+
+    def getLockRefundTxSwapOutput(self, xmr_swap):
+        # Only one prevout exists
+        return 0
+
+    def getScriptLockTxDummyWitness(self, script: bytes):
+        return [
+            b'',
+            bytes(72),
+            bytes(72),
+            bytes(len(script))
+        ]
+
+    def getScriptLockRefundSpendTxDummyWitness(self, script: bytes):
+        return [
+            b'',
+            bytes(72),
+            bytes(72),
+            bytes((1,)),
+            bytes(len(script))
+        ]
+
+    def getScriptLockRefundSwipeTxDummyWitness(self, script: bytes):
+        return [
+            bytes(72),
+            b'',
+            bytes(len(script))
+        ]
+
    def getWitnessStackSerialisedLength(self, witness_stack):
        length = getCompactSizeLen(len(witness_stack))
        for e in witness_stack:
@@ -1306,7 +1376,7 @@ class BTCInterface(Secp256k1Interface):
        unspent_addr = dict()
        unspent = self.rpc_wallet('listunspent')
        for u in unspent:
-            if u.get('spendable', False) is False:
+            if u['spendable'] is not True:
                continue
            if 'address' not in u:
                continue
@@ -1339,6 +1409,7 @@ class BTCInterface(Secp256k1Interface):
    def getProofOfFunds(self, amount_for, extra_commit_bytes):
        # TODO: Lock unspent and use same output/s to fund bid
        unspent_addr = self.getUnspentsByAddr()
+
        sign_for_addr = None
        for addr, value in unspent_addr.items():
            if value >= amount_for:
@@ -1360,12 +1431,6 @@ class BTCInterface(Secp256k1Interface):
        prove_utxos = []  # TODO: Send specific utxos
        return (sign_for_addr, signature, prove_utxos)

-    def encodeProofUtxos(self, proof_utxos):
-        packed_utxos = bytes()
-        for utxo in proof_utxos:
-            packed_utxos += utxo[0] + utxo[1].to_bytes(2, 'big')
-        return packed_utxos
-
    def decodeProofUtxos(self, msg_utxos):
        proof_utxos = []
        if len(msg_utxos) > 0:
@@ -1395,7 +1460,7 @@ class BTCInterface(Secp256k1Interface):
            return True
        return False

-    def isWalletEncryptedLocked(self) -> (bool, bool):
+    def isWalletEncryptedLocked(self):
        wallet_info = self.rpc_wallet('getwalletinfo')
        encrypted = 'unlocked_until' in wallet_info
        locked = encrypted and wallet_info['unlocked_until'] <= 0
@@ -1438,7 +1503,7 @@ class BTCInterface(Secp256k1Interface):
        return CScript([OP_HASH160, script_hash, OP_EQUAL])

    def get_p2wsh_script_pubkey(self, script: bytearray) -> bytearray:
-        return CScript([OP_0, sha256(script)])
+        return CScript([OP_0, hashlib.sha256(script).digest()])

    def findTxnByHash(self, txid_hex: str):
        # Only works for wallet txns
@@ -1451,10 +1516,10 @@ class BTCInterface(Secp256k1Interface):
            return {'txid': txid_hex, 'amount': 0, 'height': rv['blockheight']}
        return None

-    def createRedeemTxn(self, prevout, output_addr: str, output_value: int, txn_script: bytes = None) -> str:
+    def createRedeemTxn(self, prevout, output_addr: str, output_value: int) -> str:
        tx = CTransaction()
        tx.nVersion = self.txVersion()
-        prev_txid = b2i(bytes.fromhex(prevout['txid']))
+        prev_txid = uint256_from_str(bytes.fromhex(prevout['txid'])[::-1])
        tx.vin.append(CTxIn(COutPoint(prev_txid, prevout['vout'])))
        pkh = self.decodeAddress(output_addr)
        script = self.getScriptForPubkeyHash(pkh)
@@ -1462,11 +1527,11 @@ class BTCInterface(Secp256k1Interface):
        tx.rehash()
        return tx.serialize().hex()

-    def createRefundTxn(self, prevout, output_addr: str, output_value: int, locktime: int, sequence: int, txn_script: bytes = None) -> str:
+    def createRefundTxn(self, prevout, output_addr: str, output_value: int, locktime: int, sequence: int) -> str:
        tx = CTransaction()
        tx.nVersion = self.txVersion()
        tx.nLockTime = locktime
-        prev_txid = b2i(bytes.fromhex(prevout['txid']))
+        prev_txid = uint256_from_str(bytes.fromhex(prevout['txid'])[::-1])
        tx.vin.append(CTxIn(COutPoint(prev_txid, prevout['vout']), nSequence=sequence,))
        pkh = self.decodeAddress(output_addr)
        script = self.getScriptForPubkeyHash(pkh)
@@ -1486,42 +1551,6 @@ class BTCInterface(Secp256k1Interface):
            tx_vsize += 323 if redeem else 287
        return tx_vsize

-    def find_prevout_info(self, txn_hex: str, txn_script: bytes):
-        txjs = self.rpc('decoderawtransaction', [txn_hex])
-
-        if self.using_segwit():
-            p2wsh = self.getScriptDest(txn_script)
-            n = getVoutByScriptPubKey(txjs, p2wsh.hex())
-        else:
-            addr_to = self.encode_p2sh(txn_script)
-            n = getVoutByAddress(txjs, addr_to)
-
-        return {
-            'txid': txjs['txid'],
-            'vout': n,
-            'scriptPubKey': txjs['vout'][n]['scriptPubKey']['hex'],
-            'redeemScript': txn_script.hex(),
-            'amount': txjs['vout'][n]['value']
-        }
-
-    def inspectSwipeTx(self, tx: dict):
-        mercy_keyshare = None
-        for vout in tx['vout']:
-            script_bytes = bytes.fromhex(vout['scriptPubKey']['hex'])
-            if len(script_bytes) < 39:
-                continue
-            if script_bytes[0] != OP_RETURN:
-                continue
-            script_bytes[0]
-            return script_bytes[7: 7 + 32]
-        return None
-
-    def isTxExistsError(self, err_str: str) -> bool:
-        return 'Transaction already in block chain' in err_str
-
-    def isTxNonFinalError(self, err_str: str) -> bool:
-        return 'non-BIP68-final' in err_str or 'non-final' in err_str
-

 def testBTCInterface():
    print('TODO: testBTCInterface')
--- a/basicswap/interface/contrib/bch_test_framework/init.py
+++ b/basicswap/interface/contrib/bch_test_framework/init.py
--- a/basicswap/interface/contrib/bch_test_framework/cashaddress.py
+++ b/basicswap/interface/contrib/bch_test_framework/cashaddress.py
@@ -1,247 +0,0 @@
-import unittest
-
-
-CHARSET = "qpzry9x8gf2tvdw0s3jn54khce6mua7l"
-
-def polymod(values):
-    chk = 1
-    generator = [
-        (0x01, 0x98F2BC8E61),
-        (0x02, 0x79B76D99E2),
-        (0x04, 0xF33E5FB3C4),
-        (0x08, 0xAE2EABE2A8),
-        (0x10, 0x1E4F43E470),
-    ]
-    for value in values:
-        top = chk >> 35
-        chk = ((chk & 0x07FFFFFFFF) << 5) ^ value
-        for i in generator:
-            if top & i[0] != 0:
-                chk ^= i[1]
-    return chk ^ 1
-
-
-def calculate_checksum(prefix, payload):
-    poly = polymod(prefix_expand(prefix) + payload + [0, 0, 0, 0, 0, 0, 0, 0])
-    out = list()
-    for i in range(8):
-        out.append((poly >> 5 * (7 - i)) & 0x1F)
-    return out
-
-
-def verify_checksum(prefix, payload):
-    return polymod(prefix_expand(prefix) + payload) == 0
-
-
-def b32decode(inputs):
-    out = list()
-    for letter in inputs:
-        out.append(CHARSET.find(letter))
-    return out
-
-
-def b32encode(inputs):
-    out = ""
-    for char_code in inputs:
-        out += CHARSET[char_code]
-    return out
-
-
-def convertbits(data, frombits, tobits, pad=True):
-    acc = 0
-    bits = 0
-    ret = []
-    maxv = (1 << tobits) - 1
-    max_acc = (1 << (frombits + tobits - 1)) - 1
-    for value in data:
-        if value < 0 or (value >> frombits):
-            return None
-        acc = ((acc << frombits) | value) & max_acc
-        bits += frombits
-        while bits >= tobits:
-            bits -= tobits
-            ret.append((acc >> bits) & maxv)
-    if pad:
-        if bits:
-            ret.append((acc << (tobits - bits)) & maxv)
-    elif bits >= frombits or ((acc << (tobits - bits)) & maxv):
-        return None
-    return ret
-
-
-def prefix_expand(prefix):
-    return [ord(x) & 0x1F for x in prefix] + [0]
-
-
-class Address:
-    """
-    Class to handle CashAddr.
-
-    :param version: Version of CashAddr
-    :type version: ``str``
-    :param payload: Payload of CashAddr as int list of the bytearray
-    :type payload: ``list`` of ``int``
-    """
-
-    VERSIONS = {
-        "P2SH20": {"prefix": "bitcoincash", "version_bit": 8, "network": "mainnet"},
-        "P2SH32": {"prefix": "bitcoincash", "version_bit": 11, "network": "mainnet"},
-        "P2PKH": {"prefix": "bitcoincash", "version_bit": 0, "network": "mainnet"},
-        "P2SH20-TESTNET": {"prefix": "bchtest", "version_bit": 8, "network": "testnet"},
-        "P2SH32-TESTNET": {
-            "prefix": "bchtest",
-            "version_bit": 11,
-            "network": "testnet",
-        },
-        "P2PKH-TESTNET": {"prefix": "bchtest", "version_bit": 0, "network": "testnet"},
-        "P2SH20-REGTEST": {"prefix": "bchreg", "version_bit": 8, "network": "regtest"},
-        "P2SH32-REGTEST": {"prefix": "bchreg", "version_bit": 11, "network": "regtest"},
-        "P2PKH-REGTEST": {"prefix": "bchreg", "version_bit": 0, "network": "regtest"},
-        "P2SH20-CATKN": {
-            "prefix": "bitcoincash",
-            "version_bit": 24,
-            "network": "mainnet",
-        },
-        "P2SH32-CATKN": {
-            "prefix": "bitcoincash",
-            "version_bit": 27,
-            "network": "mainnet",
-        },
-        "P2PKH-CATKN": {
-            "prefix": "bitcoincash",
-            "version_bit": 16,
-            "network": "mainnet",
-        },
-        "P2SH20-CATKN-TESTNET": {
-            "prefix": "bchtest",
-            "version_bit": 24,
-            "network": "testnet",
-        },
-        "P2SH32-CATKN-TESTNET": {
-            "prefix": "bchtest",
-            "version_bit": 27,
-            "network": "testnet",
-        },
-        "P2PKH-CATKN-TESTNET": {
-            "prefix": "bchtest",
-            "version_bit": 16,
-            "network": "testnet",
-        },
-        "P2SH20-CATKN-REGTEST": {
-            "prefix": "bchreg",
-            "version_bit": 24,
-            "network": "regtest",
-        },
-        "P2SH32-CATKN-REGTEST": {
-            "prefix": "bchreg",
-            "version_bit": 27,
-            "network": "regtest",
-        },
-        "P2PKH-CATKN-REGTEST": {
-            "prefix": "bchreg",
-            "version_bit": 16,
-            "network": "regtest",
-        },
-    }
-
-    VERSION_SUFFIXES = {"bitcoincash": "", "bchtest": "-TESTNET", "bchreg": "-REGTEST"}
-
-    ADDRESS_TYPES = {
-        0: "P2PKH",
-        8: "P2SH20",
-        11: "P2SH32",
-        16: "P2PKH-CATKN",
-        24: "P2SH20-CATKN",
-        27: "P2SH32-CATKN",
-    }
-
-    def __init__(self, version, payload):
-        if version not in Address.VERSIONS:
-            raise ValueError("Invalid address version provided")
-
-        self.version = version
-        self.payload = payload
-        self.prefix = Address.VERSIONS[self.version]["prefix"]
-
-    def __str__(self):
-        return (
-            f"version: {self.version}\npayload: {self.payload}\nprefix: {self.prefix}"
-        )
-
-    def __repr__(self):
-        return f"Address('{self.cash_address()}')"
-
-    def __eq__(self, other):
-        if isinstance(other, str):
-            return self.cash_address() == other
-        elif isinstance(other, Address):
-            return self.cash_address() == other.cash_address()
-        else:
-            raise ValueError(
-                "Address can be compared to a string address"
-                " or an instance of Address"
-            )
-
-    def cash_address(self):
-        """
-        Generate CashAddr of the Address
-
-        :rtype: ``str``
-        """
-        version_bit = Address.VERSIONS[self.version]["version_bit"]
-        payload = [version_bit] + list(self.payload)
-        payload = convertbits(payload, 8, 5)
-        checksum = calculate_checksum(self.prefix, payload)
-        return self.prefix + ":" + b32encode(payload + checksum)
-
-    @staticmethod
-    def from_string(address):
-        """
-        Generate Address from a cashadress string
-
-        :param scriptcode: The cashaddress string
-        :type scriptcode: ``str``
-        :returns: Instance of :class:~bitcash.cashaddress.Address
-        """
-        try:
-            address = str(address)
-        except Exception:
-            raise ValueError("Expected string as input")
-
-        if address.upper() != address and address.lower() != address:
-            raise ValueError(
-                "Cash address contains uppercase and lowercase characters: " + address
-            )
-
-        address = address.lower()
-        colon_count = address.count(":")
-        if colon_count == 0:
-            raise ValueError("Cash address is missing prefix")
-        if colon_count > 1:
-            raise ValueError("Cash address contains more than one colon character")
-
-        prefix, base32string = address.split(":")
-        decoded = b32decode(base32string)
-
-        if not verify_checksum(prefix, decoded):
-            raise ValueError(
-                "Bad cash address checksum for address {}".format(address)
-            )
-        converted = convertbits(decoded, 5, 8)
-
-        try:
-            version = Address.ADDRESS_TYPES[converted[0]]
-        except Exception:
-            raise ValueError("Could not determine address version")
-
-        version += Address.VERSION_SUFFIXES[prefix]
-
-        payload = converted[1:-6]
-        return Address(version, payload)
-
-class TestFrameworkScript(unittest.TestCase):
-    def test_base58encodedecode(self):
-        def check_cashaddress(address: str):
-            self.assertEqual(Address.from_string(address).cash_address(), address)
-    
-        check_cashaddress("bitcoincash:qzfyvx77v2pmgc0vulwlfkl3uzjgh5gnmqk5hhyaa6")
--- a/basicswap/interface/contrib/bch_test_framework/script.py
+++ b/basicswap/interface/contrib/bch_test_framework/script.py
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2024 tecnovert
-# Distributed under the MIT software license, see the accompanying
-# file LICENSE or http://www.opensource.org/licenses/mit-license.php.
-
-
-from basicswap.contrib.test_framework.script import CScriptOp
-
-
-OP_TXINPUTCOUNT = CScriptOp(0xc3)
-OP_1 = CScriptOp(0x51)
-OP_NUMEQUALVERIFY = CScriptOp(0x9d)
-OP_TXOUTPUTCOUNT = CScriptOp(0xc4)
-OP_0 = CScriptOp(0x00)
-OP_UTXOVALUE = CScriptOp(0xc6)
-OP_OUTPUTVALUE = CScriptOp(0xcc)
-OP_SUB = CScriptOp(0x94)
-OP_UTXOTOKENCATEGORY = CScriptOp(0xce)
-OP_OUTPUTTOKENCATEGORY = CScriptOp(0xd1)
-OP_EQUALVERIFY = CScriptOp(0x88)
-OP_UTXOTOKENCOMMITMENT = CScriptOp(0xcf)
-OP_OUTPUTTOKENCOMMITMENT = CScriptOp(0xd2)
-OP_UTXOTOKENAMOUNT = CScriptOp(0xd0)
-OP_OUTPUTTOKENAMOUNT = CScriptOp(0xd3)
-OP_INPUTSEQUENCENUMBER = CScriptOp(0xcb)
-OP_NOTIF = CScriptOp(0x64)
-OP_OUTPUTBYTECODE = CScriptOp(0xcd)
-OP_OVER = CScriptOp(0x78)
-OP_CHECKDATASIG = CScriptOp(0xba)
-OP_CHECKDATASIGVERIFY = CScriptOp(0xbb)
-OP_ELSE = CScriptOp(0x67)
-OP_CHECKSEQUENCEVERIFY = CScriptOp(0xb2)
-OP_DROP = CScriptOp(0x75)
-OP_EQUAL = CScriptOp(0x87)
-OP_ENDIF = CScriptOp(0x68)
-OP_HASH256 = CScriptOp(0xaa)
-OP_PUSHBYTES_32 = CScriptOp(0x20)
-OP_DUP = CScriptOp(0x76)
-OP_HASH160 = CScriptOp(0xa9)
-OP_CHECKSIG = CScriptOp(0xac)
-OP_SHA256 = CScriptOp(0xa8)
-OP_VERIFY = CScriptOp(0x69)
--- a/basicswap/interface/dash.py
+++ b/basicswap/interface/dash.py
@@ -1,14 +1,14 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-

-# Copyright (c) 2022-2024 tecnovert
+# Copyright (c) 2022 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.

 from .btc import BTCInterface
 from basicswap.chainparams import Coins
 from basicswap.util.address import decodeAddress
-from basicswap.contrib.mnemonic import Mnemonic
+from mnemonic import Mnemonic
 from basicswap.contrib.test_framework.script import (
    CScript,
    OP_DUP, OP_HASH160, OP_EQUALVERIFY, OP_CHECKSIG
@@ -25,44 +25,31 @@ class DASHInterface(BTCInterface):
        self._wallet_passphrase = ''
        self._have_checked_seed = False

-        self._wallet_v20_compatible = False if not swap_client else swap_client.getChainClientSettings(self.coin_type()).get('wallet_v20_compatible', False)
+    def seedToMnemonic(self, key: bytes) -> str:
+        return Mnemonic('english').to_mnemonic(key)
+
+    def initialiseWallet(self, key: bytes):
+        words = self.seedToMnemonic(key)
+
+        mnemonic_passphrase = ''
+        self.rpc_wallet('upgradetohd', [words, mnemonic_passphrase, self._wallet_passphrase])
+        self._have_checked_seed = False
+        if self._wallet_passphrase != '':
+            self.unlockWallet(self._wallet_passphrase)

    def decodeAddress(self, address: str) -> bytes:
        return decodeAddress(address)[1:]

-    def getWalletSeedID(self) -> str:
-        hdseed: str = self.rpc_wallet('dumphdinfo')['hdseed']
-        return self.getSeedHash(bytes.fromhex(hdseed)).hex()
-
-    def entropyToMnemonic(self, key: bytes) -> None:
-        return Mnemonic('english').to_mnemonic(key)
-
-    def initialiseWallet(self, key_bytes: bytes) -> None:
-        self._have_checked_seed = False
-        if self._wallet_v20_compatible:
-            self._log.warning('Generating wallet compatible with v20 seed.')
-            words = self.entropyToMnemonic(key_bytes)
-            mnemonic_passphrase = ''
-            self.rpc_wallet('upgradetohd', [words, mnemonic_passphrase, self._wallet_passphrase])
-            self._have_checked_seed = False
-            if self._wallet_passphrase != '':
-                self.unlockWallet(self._wallet_passphrase)
-            return
-
-        key_wif = self.encodeKey(key_bytes)
-        self.rpc_wallet('sethdseed', [True, key_wif])
-
-    def checkExpectedSeed(self, expect_seedid: str) -> bool:
-        self._expect_seedid_hex = expect_seedid
-        rv = self.rpc_wallet('dumphdinfo')
-        if rv['mnemonic'] != '':
+    def checkExpectedSeed(self, key_hash: str):
+        try:
+            rv = self.rpc_wallet('dumphdinfo')
            entropy = Mnemonic('english').to_entropy(rv['mnemonic'].split(' '))
            entropy_hash = self.getAddressHashFromKey(entropy)[::-1].hex()
-            have_expected_seed: bool = expect_seedid == entropy_hash
-        else:
-            have_expected_seed: bool = expect_seedid == self.getWalletSeedID()
-        self._have_checked_seed = True
-        return have_expected_seed
+            self._have_checked_seed = True
+            return entropy_hash == key_hash
+        except Exception as e:
+            self._log.warning('checkExpectedSeed failed: {}'.format(str(e)))
+        return False

    def withdrawCoin(self, value, addr_to, subfee):
        params = [addr_to, value, '', '', subfee, False, False, self._conf_target]
@@ -79,7 +66,7 @@ class DASHInterface(BTCInterface):
        add_bytes = 107
        size = len(tx.serialize_with_witness()) + add_bytes
        pay_fee = round(fee_rate * size / 1000)
-        self._log.info(f'BLockSpendTx fee_rate, size, fee: {fee_rate}, {size}, {pay_fee}.')
+        self._log.info(f'BLockSpendTx  fee_rate, size, fee: {fee_rate}, {size}, {pay_fee}.')
        return pay_fee

    def findTxnByHash(self, txid_hex: str):
@@ -97,15 +84,10 @@ class DASHInterface(BTCInterface):

    def unlockWallet(self, password: str):
        super().unlockWallet(password)
-        if self._wallet_v20_compatible:
-            # Store password for initialiseWallet
-            self._wallet_passphrase = password
+        # Store password for initialiseWallet
+        self._wallet_passphrase = password
        if not self._have_checked_seed:
-            try:
-                self._sc.checkWalletSeed(self.coin_type())
-            except Exception as ex:
-                # dumphdinfo can fail if the wallet is not initialised
-                self._log.debug(f'DASH checkWalletSeed failed: {ex}.')
+            self._sc.checkWalletSeed(self.coin_type())

    def lockWallet(self):
        super().lockWallet()
--- a/basicswap/interface/dcr/init.py
+++ b/basicswap/interface/dcr/init.py
@@ -1,4 +0,0 @@
-
-from .dcr import DCRInterface
-
-__all__ = ['DCRInterface',]
--- a/basicswap/interface/dcr/dcr.py
+++ b/basicswap/interface/dcr/dcr.py
--- a/basicswap/interface/dcr/messages.py
+++ b/basicswap/interface/dcr/messages.py
@@ -1,204 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2024 tecnovert
-# Distributed under the MIT software license, see the accompanying
-# file LICENSE or http://www.opensource.org/licenses/mit-license.php.
-
-import copy
-from enum import IntEnum
-from basicswap.util.crypto import blake256
-from basicswap.util.integer import decode_compactsize, encode_compactsize
-
-
-class TxSerializeType(IntEnum):
-    Full = 0
-    NoWitness = 1
-    OnlyWitness = 2
-
-
-class SigHashType(IntEnum):
-    SigHashAll = 0x1
-    SigHashNone = 0x2
-    SigHashSingle = 0x3
-    SigHashAnyOneCanPay = 0x80
-
-    SigHashMask = 0x1f
-
-
-class SignatureType(IntEnum):
-    STEcdsaSecp256k1 = 0
-    STEd25519 = 1
-    STSchnorrSecp256k1 = 2
-
-
-class COutPoint:
-    __slots__ = ('hash', 'n', 'tree')
-
-    def __init__(self, hash=0, n=0, tree=0):
-        self.hash = hash
-        self.n = n
-        self.tree = tree
-
-    def get_hash(self) -> bytes:
-        return self.hash.to_bytes(32, 'big')
-
-
-class CTxIn:
-    __slots__ = ('prevout', 'sequence',
-                 'value_in', 'block_height', 'block_index', 'signature_script')  # Witness
-
-    def __init__(self, prevout=COutPoint(), sequence=0):
-        self.prevout = prevout
-        self.sequence = sequence
-        self.value_in = -1
-        self.block_height = 0
-        self.block_index = 0xffffffff
-        self.signature_script = bytes()
-
-
-class CTxOut:
-    __slots__ = ('value', 'version', 'script_pubkey')
-
-    def __init__(self, value=0, script_pubkey=bytes()):
-        self.value = value
-        self.version = 0
-        self.script_pubkey = script_pubkey
-
-
-class CTransaction:
-    __slots__ = ('hash', 'version', 'vin', 'vout', 'locktime', 'expiry')
-
-    def __init__(self, tx=None):
-        if tx is None:
-            self.version = 1
-            self.vin = []
-            self.vout = []
-            self.locktime = 0
-            self.expiry = 0
-        else:
-            self.version = tx.version
-            self.vin = copy.deepcopy(tx.vin)
-            self.vout = copy.deepcopy(tx.vout)
-            self.locktime = tx.locktime
-            self.expiry = tx.expiry
-
-    def deserialize(self, data: bytes) -> None:
-
-        version = int.from_bytes(data[:4], 'little')
-        self.version = version & 0xffff
-        ser_type: int = version >> 16
-        o = 4
-
-        if ser_type == TxSerializeType.Full or ser_type == TxSerializeType.NoWitness:
-            num_txin, nb = decode_compactsize(data, o)
-            o += nb
-
-            for i in range(num_txin):
-                txi = CTxIn()
-                txi.prevout = COutPoint()
-                txi.prevout.hash = int.from_bytes(data[o:o + 32], 'little')
-                o += 32
-                txi.prevout.n = int.from_bytes(data[o:o + 4], 'little')
-                o += 4
-                txi.prevout.tree = data[o]
-                o += 1
-                txi.sequence = int.from_bytes(data[o:o + 4], 'little')
-                o += 4
-                self.vin.append(txi)
-
-            num_txout, nb = decode_compactsize(data, o)
-            o += nb
-
-            for i in range(num_txout):
-                txo = CTxOut()
-                txo.value = int.from_bytes(data[o:o + 8], 'little')
-                o += 8
-                txo.version = int.from_bytes(data[o:o + 2], 'little')
-                o += 2
-                script_bytes, nb = decode_compactsize(data, o)
-                o += nb
-                txo.script_pubkey = data[o:o + script_bytes]
-                o += script_bytes
-                self.vout.append(txo)
-
-            self.locktime = int.from_bytes(data[o:o + 4], 'little')
-            o += 4
-            self.expiry = int.from_bytes(data[o:o + 4], 'little')
-            o += 4
-
-        if ser_type == TxSerializeType.NoWitness:
-            return
-
-        num_wit_scripts, nb = decode_compactsize(data, o)
-        o += nb
-
-        if ser_type == TxSerializeType.OnlyWitness:
-            self.vin = [CTxIn() for _ in range(num_wit_scripts)]
-        else:
-            if num_wit_scripts != len(self.vin):
-                raise ValueError('non equal witness and prefix txin quantities')
-
-        for i in range(num_wit_scripts):
-            txi = self.vin[i]
-            txi.value_in = int.from_bytes(data[o:o + 8], 'little')
-            o += 8
-            txi.block_height = int.from_bytes(data[o:o + 4], 'little')
-            o += 4
-            txi.block_index = int.from_bytes(data[o:o + 4], 'little')
-            o += 4
-            script_bytes, nb = decode_compactsize(data, o)
-            o += nb
-            txi.signature_script = data[o:o + script_bytes]
-            o += script_bytes
-
-    def serialize(self, ser_type=TxSerializeType.Full) -> bytes:
-        data = bytes()
-        version = (self.version & 0xffff) | (ser_type << 16)
-        data += version.to_bytes(4, 'little')
-
-        if ser_type == TxSerializeType.Full or ser_type == TxSerializeType.NoWitness:
-            data += encode_compactsize(len(self.vin))
-            for txi in self.vin:
-                data += txi.prevout.hash.to_bytes(32, 'little')
-                data += txi.prevout.n.to_bytes(4, 'little')
-                data += txi.prevout.tree.to_bytes(1, 'little')
-                data += txi.sequence.to_bytes(4, 'little')
-
-            data += encode_compactsize(len(self.vout))
-            for txo in self.vout:
-                data += txo.value.to_bytes(8, 'little')
-                data += txo.version.to_bytes(2, 'little')
-                data += encode_compactsize(len(txo.script_pubkey))
-                data += txo.script_pubkey
-
-            data += self.locktime.to_bytes(4, 'little')
-            data += self.expiry.to_bytes(4, 'little')
-
-        if ser_type == TxSerializeType.Full or ser_type == TxSerializeType.OnlyWitness:
-            data += encode_compactsize(len(self.vin))
-            for txi in self.vin:
-                tc_value_in = txi.value_in & 0xffffffffffffffff  # Convert negative values
-                data += tc_value_in.to_bytes(8, 'little')
-                data += txi.block_height.to_bytes(4, 'little')
-                data += txi.block_index.to_bytes(4, 'little')
-                data += encode_compactsize(len(txi.signature_script))
-                data += txi.signature_script
-
-        return data
-
-    def TxHash(self) -> bytes:
-        return blake256(self.serialize(TxSerializeType.NoWitness))[::-1]
-
-    def TxHashWitness(self) -> bytes:
-        raise ValueError('todo')
-
-    def TxHashFull(self) -> bytes:
-        raise ValueError('todo')
-
-
-def findOutput(tx, script_pk: bytes):
-    for i in range(len(tx.vout)):
-        if tx.vout[i].script_pubkey == script_pk:
-            return i
-    return None
--- a/basicswap/interface/dcr/rpc.py
+++ b/basicswap/interface/dcr/rpc.py
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2024 tecnovert
-# Distributed under the MIT software license, see the accompanying
-# file LICENSE or http://www.opensource.org/licenses/mit-license.php.
-
-import json
-import traceback
-from basicswap.rpc import Jsonrpc
-
-
-def callrpc(rpc_port, auth, method, params=[], host='127.0.0.1'):
-    try:
-        url = 'http://{}@{}:{}/'.format(auth, host, rpc_port)
-        x = Jsonrpc(url)
-        x.__handler = None
-        v = x.json_request(method, params)
-        x.close()
-        r = json.loads(v.decode('utf-8'))
-    except Exception as ex:
-        traceback.print_exc()
-        raise ValueError('RPC server error ' + str(ex) + ', method: ' + method)
-
-    if 'error' in r and r['error'] is not None:
-        raise ValueError('RPC error ' + str(r['error']))
-
-    return r['result']
-
-
-def openrpc(rpc_port, auth, host='127.0.0.1'):
-    try:
-        url = 'http://{}@{}:{}/'.format(auth, host, rpc_port)
-        return Jsonrpc(url)
-    except Exception as ex:
-        traceback.print_exc()
-        raise ValueError('RPC error ' + str(ex))
-
-
-def make_rpc_func(port, auth, host='127.0.0.1'):
-    port = port
-    auth = auth
-    host = host
-
-    def rpc_func(method, params=None):
-        nonlocal port, auth, host
-        return callrpc(port, auth, method, params, host)
-    return rpc_func
--- a/basicswap/interface/dcr/script.py
+++ b/basicswap/interface/dcr/script.py
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2024 tecnovert
-# Distributed under the MIT software license, see the accompanying
-# file LICENSE or http://www.opensource.org/licenses/mit-license.php.
-
-
-OP_0 = 0x00
-OP_DATA_1 = 0x01
-OP_1NEGATE = 0x4f
-OP_1 = 0x51
-OP_IF = 0x63
-OP_ELSE = 0x67
-OP_ENDIF = 0x68
-OP_DROP = 0x75
-OP_DUP = 0x76
-OP_EQUAL = 0x87
-OP_EQUALVERIFY = 0x88
-OP_PUSHDATA1 = 0x4c
-OP_PUSHDATA2 = 0x4d
-OP_PUSHDATA4 = 0x4e
-OP_HASH160 = 0xa9
-OP_CHECKSIG = 0xac
-OP_CHECKMULTISIG = 0xae
-OP_CHECKSEQUENCEVERIFY = 0xb2
-
-
-def push_script_data(data_array: bytearray, data: bytes) -> None:
-    len_data: int = len(data)
-
-    if len_data == 0 or (len_data == 1 and data[0] == 0):
-        data_array += bytes((OP_0,))
-        return
-    if len_data == 1 and data[0] <= 16:
-        data_array += bytes((OP_1 - 1 + data[0],))
-        return
-    if len_data == 1 and data[0] == 0x81:
-        data_array += bytes((OP_1NEGATE,))
-        return
-
-    if len_data < OP_PUSHDATA1:
-        data_array += len_data.to_bytes(1, 'little')
-    elif len_data <= 0xff:
-        data_array += bytes((OP_PUSHDATA1, len_data))
-    elif len_data <= 0xffff:
-        data_array += bytes((OP_PUSHDATA2,)) + len_data.to_bytes(2, 'little')
-    else:
-        data_array += bytes((OP_PUSHDATA4,)) + len_data.to_bytes(4, 'little')
-
-    data_array += data
--- a/basicswap/interface/dcr/util.py
+++ b/basicswap/interface/dcr/util.py
@@ -1,66 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2024 tecnovert
-# Distributed under the MIT software license, see the accompanying
-# file LICENSE or http://www.opensource.org/licenses/mit-license.php.
-
-import os
-import select
-import subprocess
-
-
-def createDCRWallet(args, hex_seed, logging, delay_event):
-    logging.info('Creating DCR wallet')
-
-    (pipe_r, pipe_w) = os.pipe()  # subprocess.PIPE is buffered, blocks when read
-
-    if os.name == 'nt':
-        str_args = ' '.join(args)
-        p = subprocess.Popen(str_args, shell=True, stdin=subprocess.PIPE, stdout=pipe_w, stderr=pipe_w)
-    else:
-        p = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=pipe_w, stderr=pipe_w)
-
-    def readOutput():
-        buf = os.read(pipe_r, 1024).decode('utf-8')
-        response = None
-        if 'Opened wallet' in buf:
-            pass
-        elif 'Use the existing configured private passphrase' in buf:
-            response = b'y\n'
-        elif 'Do you want to add an additional layer of encryption' in buf:
-            response = b'n\n'
-        elif 'Do you have an existing wallet seed' in buf:
-            response = b'y\n'
-        elif 'Enter existing wallet seed' in buf:
-            response = (hex_seed + '\n').encode('utf-8')
-        elif 'Seed input successful' in buf:
-            pass
-        elif 'Upgrading database from version' in buf:
-            pass
-        elif 'Ticket commitments db upgrade done' in buf:
-            pass
-        elif 'The wallet has been created successfully' in buf:
-            pass
-        else:
-            raise ValueError(f'Unexpected output: {buf}')
-        if response is not None:
-            p.stdin.write(response)
-            p.stdin.flush()
-
-    try:
-        while p.poll() is None:
-            if os.name == 'nt':
-                readOutput()
-                delay_event.wait(0.1)
-                continue
-            while len(select.select([pipe_r], [], [], 0)[0]) == 1:
-                readOutput()
-                delay_event.wait(0.1)
-    except Exception as e:
-        logging.error(f'dcrwallet --create failed: {e}')
-    finally:
-        if p.poll() is None:
-            p.terminate()
-        os.close(pipe_r)
-        os.close(pipe_w)
-        p.stdin.close()
--- a/basicswap/interface/firo.py
+++ b/basicswap/interface/firo.py
@@ -5,8 +5,8 @@
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.

-import hashlib
 import random
+import hashlib

 from .btc import BTCInterface, find_vout_for_address_from_txobj
 from basicswap.util import (
@@ -42,16 +42,16 @@ class FIROInterface(BTCInterface):
        # No multiwallet support
        self.rpc_wallet = make_rpc_func(self._rpcport, self._rpcauth, host=self._rpc_host)

-    def getExchangeName(self, exchange_name: str) -> str:
+    def checkWallets(self) -> int:
+        return 1
+
+    def getExchangeName(self, exchange_name):
        return 'zcoin'

    def initialiseWallet(self, key):
        # load with -hdseed= parameter
        pass

-    def checkWallets(self) -> int:
-        return 1
-
    def getNewAddress(self, use_segwit, label='swap_receive'):
        return self.rpc('getnewaddress', [label])
        # addr_plain = self.rpc('getnewaddress', [label])
@@ -76,7 +76,7 @@ class FIROInterface(BTCInterface):
            return addr_info['ismine']
        return addr_info['ismine'] or addr_info['iswatchonly']

-    def getSCLockScriptAddress(self, lock_script: bytes) -> str:
+    def getSCLockScriptAddress(self, lock_script):
        lock_tx_dest = self.getScriptDest(lock_script)
        address = self.encodeScriptDest(lock_tx_dest)

@@ -87,7 +87,7 @@ class FIROInterface(BTCInterface):

        return address

-    def getLockTxHeight(self, txid, dest_address, bid_amount, rescan_from, find_index: bool = False, vout: int = -1):
+    def getLockTxHeight(self, txid, dest_address, bid_amount, rescan_from, find_index: bool = False):
        # Add watchonly address and rescan if required

        if not self.isAddressMine(dest_address, or_watch_only=True):
@@ -201,7 +201,7 @@ class FIROInterface(BTCInterface):
        add_bytes = 107
        size = len(tx.serialize_with_witness()) + add_bytes
        pay_fee = round(fee_rate * size / 1000)
-        self._log.info(f'BLockSpendTx fee_rate, size, fee: {fee_rate}, {size}, {pay_fee}.')
+        self._log.info(f'BLockSpendTx  fee_rate, size, fee: {fee_rate}, {size}, {pay_fee}.')
        return pay_fee

    def signTxWithKey(self, tx: bytes, key: bytes) -> bytes:
@@ -277,6 +277,8 @@ class FIROInterface(BTCInterface):
                break
        utxos_hash = hasher.digest()

+        self._log.debug('sign_for_addr %s', sign_for_addr)
+
        if self.using_segwit():  # TODO: Use isSegwitAddress when scantxoutset can use combo
            # 'Address does not refer to key' for non p2pkh
            pkh = self.decodeAddress(sign_for_addr)
@@ -337,7 +339,7 @@ class FIROInterface(BTCInterface):
                        return
            current_height -= 1

-    def getBlockWithTxns(self, block_hash: str):
+    def getBlockWithTxns(self, block_hash):
        # TODO: Bypass decoderawtransaction and getblockheader
        block = self.rpc('getblock', [block_hash, False])
        block_header = self.rpc('getblockheader', [block_hash])
@@ -355,11 +357,9 @@ class FIROInterface(BTCInterface):

        block_rv = {
            'hash': block_hash,
-            'previousblockhash': block_header['previousblockhash'],
            'tx': tx_rv,
            'confirmations': block_header['confirmations'],
            'height': block_header['height'],
-            'time': block_header['time'],
            'version': block_header['version'],
            'merkleroot': block_header['merkleroot'],
        }
--- a/basicswap/interface/ltc.py
+++ b/basicswap/interface/ltc.py
@@ -32,16 +32,6 @@ class LTCInterface(BTCInterface):
            return self.rpc_wallet_mweb('sendtoaddress', params)
        return self.rpc_wallet('sendtoaddress', params)

-    def createUTXO(self, value_sats: int):
-        # Create a new address and send value_sats to it
-
-        spendable_balance = self.getSpendableBalance()
-        if spendable_balance < value_sats:
-            raise ValueError('Balance too low')
-
-        address = self.getNewAddress(self._use_segwit, 'create_utxo')
-        return self.withdrawCoin(self.format_amount(value_sats), 'plain', address, False), address
-
    def getWalletInfo(self):
        rv = super(LTCInterface, self).getWalletInfo()

@@ -49,32 +39,14 @@ class LTCInterface(BTCInterface):
        rv['mweb_balance'] = mweb_info['balance']
        rv['mweb_unconfirmed'] = mweb_info['unconfirmed_balance']
        rv['mweb_immature'] = mweb_info['immature_balance']
-        return rv

-    def getUnspentsByAddr(self):
-        unspent_addr = dict()
-        unspent = self.rpc_wallet('listunspent')
-        for u in unspent:
-            if u.get('spendable', False) is False:
-                continue
-            if u.get('solvable', False) is False:  # Filter out mweb outputs
-                continue
-            if 'address' not in u:
-                continue
-            if 'desc' in u:
-                desc = u['desc']
-                if self.using_segwit:
-                    if self.use_p2shp2wsh():
-                        if not desc.startswith('sh(wpkh'):
-                            continue
-                    else:
-                        if not desc.startswith('wpkh'):
-                            continue
-                else:
-                    if not desc.startswith('pkh'):
-                        continue
-            unspent_addr[u['address']] = unspent_addr.get(u['address'], 0) + self.make_int(u['amount'], r=1)
-        return unspent_addr
+        # Add unconfirmed mweb -> plain txns to the unconfirmed_balance
+        txns = self.rpc_wallet('listtransactions')
+        for tx in reversed(txns):
+            amount: float = tx.get('amount', 0.0)
+            if tx['confirmations'] == 0 and tx.get('mweb_out', None) and amount > 0.0:
+                rv['unconfirmed_balance'] += amount
+        return rv


 class LTCInterfaceMWEB(LTCInterface):
@@ -95,6 +67,8 @@ class LTCInterfaceMWEB(LTCInterface):

    def coin_name(self) -> str:
        coin_chainparams = chainparams[Coins.LTC]
+        if coin_chainparams.get('use_ticker_as_name', False):
+            return coin_chainparams['ticker'] + ' MWEB'
        return coin_chainparams['name'].capitalize() + ' MWEB'

    def ticker(self) -> str:
--- a/basicswap/interface/nav.py
+++ b/basicswap/interface/nav.py
@@ -13,15 +13,9 @@ from coincurve.keys import (
    PublicKey,
    PrivateKey,
 )
-from basicswap.interface.btc import (
-    BTCInterface,
-    extractScriptLockRefundScriptValues,
-    findOutput,
-    find_vout_for_address_from_txobj,
-)
+from .btc import BTCInterface, find_vout_for_address_from_txobj, findOutput
 from basicswap.rpc import make_rpc_func
 from basicswap.chainparams import Coins
-from basicswap.contrib.mnemonic import Mnemonic
 from basicswap.interface.contrib.nav_test_framework.mininode import (
    CTxIn,
    CTxOut,
@@ -30,6 +24,7 @@ from basicswap.interface.contrib.nav_test_framework.mininode import (
    CTransaction,
    CTxInWitness,
    FromHex,
+    uint256_from_str,
 )
 from basicswap.util.crypto import hash160
 from basicswap.util.address import (
@@ -38,7 +33,7 @@ from basicswap.util.address import (
    encodeAddress,
 )
 from basicswap.util import (
-    b2i, i2b, i2h,
+    i2b, i2h,
    ensure,
 )
 from basicswap.basicswap_util import (
@@ -53,6 +48,7 @@ from basicswap.interface.contrib.nav_test_framework.script import (
    SIGHASH_ALL,
    SegwitVersion1SignatureHash,
 )
+from mnemonic import Mnemonic


 class NAVInterface(BTCInterface):
@@ -73,16 +69,19 @@ class NAVInterface(BTCInterface):
        # No multiwallet support
        self.rpc_wallet = make_rpc_func(self._rpcport, self._rpcauth, host=self._rpc_host)

+    def checkWallets(self) -> int:
+        return 1
+
    def use_p2shp2wsh(self) -> bool:
        # p2sh-p2wsh
        return True

-    def initialiseWallet(self, key):
-        # Load with -importmnemonic= parameter
-        pass
+    def seedToMnemonic(self, key):
+        return Mnemonic('english').to_mnemonic(key)

-    def checkWallets(self) -> int:
-        return 1
+    def initialiseWallet(self, key):
+        # load with -importmnemonic= parameter
+        pass

    def getWalletSeedID(self):
        return self.rpc('getwalletinfo')['hdmasterkeyid']
@@ -217,6 +216,8 @@ class NAVInterface(BTCInterface):
                break
        utxos_hash = hasher.digest()

+        self._log.debug('sign_for_addr %s', sign_for_addr)
+
        if self.using_segwit():  # TODO: Use isSegwitAddress when scantxoutset can use combo
            # 'Address does not refer to key' for non p2pkh
            addr_info = self.rpc('validateaddress', [addr, ])
@@ -306,7 +307,7 @@ class NAVInterface(BTCInterface):
    def createRedeemTxn(self, prevout, output_addr: str, output_value: int, txn_script: bytes) -> str:
        tx = CTransaction()
        tx.nVersion = self.txVersion()
-        prev_txid = b2i(bytes.fromhex(prevout['txid']))
+        prev_txid = uint256_from_str(bytes.fromhex(prevout['txid'])[::-1])

        tx.vin.append(CTxIn(COutPoint(prev_txid, prevout['vout']),
                            scriptSig=self.getScriptScriptSig(txn_script)))
@@ -320,7 +321,7 @@ class NAVInterface(BTCInterface):
        tx = CTransaction()
        tx.nVersion = self.txVersion()
        tx.nLockTime = locktime
-        prev_txid = b2i(bytes.fromhex(prevout['txid']))
+        prev_txid = uint256_from_str(bytes.fromhex(prevout['txid'])[::-1])
        tx.vin.append(CTxIn(COutPoint(prev_txid, prevout['vout']),
                            nSequence=sequence,
                            scriptSig=self.getScriptScriptSig(txn_script)))
@@ -416,7 +417,7 @@ class NAVInterface(BTCInterface):
                        return
            current_height -= 1

-    def getLockTxHeight(self, txid, dest_address, bid_amount, rescan_from, find_index: bool = False, vout: int = -1):
+    def getLockTxHeight(self, txid, dest_address, bid_amount, rescan_from, find_index: bool = False):
        # Add watchonly address and rescan if required

        if not self.isAddressMine(dest_address, or_watch_only=True):
@@ -480,18 +481,16 @@ class NAVInterface(BTCInterface):

        block_rv = {
            'hash': block_hash,
-            'previousblockhash': block_header['previousblockhash'],
            'tx': tx_rv,
            'confirmations': block_header['confirmations'],
            'height': block_header['height'],
-            'time': block_header['time'],
            'version': block_header['version'],
            'merkleroot': block_header['merkleroot'],
        }

        return block_rv

-    def getScriptScriptSig(self, script: bytes) -> bytes:
+    def getScriptScriptSig(self, script: bytes) -> bytearray:
        return self.getP2SHP2WSHScriptSig(script)

    def getScriptDest(self, script):
@@ -513,7 +512,7 @@ class NAVInterface(BTCInterface):
        tx.vout.append(self.txoType()(output_amount, script_pk))
        return tx.serialize()

-    def spendBLockTx(self, chain_b_lock_txid: bytes, address_to: str, kbv: bytes, kbs: bytes, cb_swap_value: int, b_fee: int, restore_height: int, lock_tx_vout=None) -> bytes:
+    def spendBLockTx(self, chain_b_lock_txid: bytes, address_to: str, kbv: bytes, kbs: bytes, cb_swap_value: int, b_fee: int, restore_height: int) -> bytes:
        self._log.info('spendBLockTx %s:\n', chain_b_lock_txid.hex())
        wtx = self.rpc('gettransaction', [chain_b_lock_txid.hex(), ])
        lock_tx = self.loadTx(bytes.fromhex(wtx['hex']))
@@ -527,7 +526,7 @@ class NAVInterface(BTCInterface):
        tx = CTransaction()
        tx.nVersion = self.txVersion()

-        chain_b_lock_txid_int = b2i(chain_b_lock_txid)
+        chain_b_lock_txid_int = uint256_from_str(chain_b_lock_txid[::-1])

        script_sig = self.getInputScriptForPubkeyHash(self.getPubkeyHash(Kbs))

@@ -668,7 +667,7 @@ class NAVInterface(BTCInterface):

        return tx.serialize()

-    def createSCLockRefundSpendToFTx(self, tx_lock_refund_bytes, script_lock_refund, pkh_dest, tx_fee_rate, vkbv=None, kbsf=None):
+    def createSCLockRefundSpendToFTx(self, tx_lock_refund_bytes, script_lock_refund, pkh_dest, tx_fee_rate, vkbv=None):
        # lock refund swipe tx
        # Sends the coinA locked coin to the follower

@@ -679,7 +678,7 @@ class NAVInterface(BTCInterface):
        ensure(locked_n is not None, 'Output not found in tx')
        locked_coin = tx_lock_refund.vout[locked_n].nValue

-        A, B, lock2_value, C = extractScriptLockRefundScriptValues(script_lock_refund)
+        A, B, lock2_value, C = self.extractScriptLockRefundScriptValues(script_lock_refund)

        tx_lock_refund.rehash()
        tx_lock_refund_hash_int = tx_lock_refund.sha256
--- a/basicswap/interface/nmc.py
+++ b/basicswap/interface/nmc.py
@@ -7,6 +7,9 @@

 from .btc import BTCInterface
 from basicswap.chainparams import Coins
+from basicswap.util import (
+    make_int,
+)


 class NMCInterface(BTCInterface):
@@ -14,7 +17,7 @@ class NMCInterface(BTCInterface):
    def coin_type():
        return Coins.NMC

-    def getLockTxHeight(self, txid, dest_address, bid_amount, rescan_from, find_index: bool = False, vout: int = -1):
+    def getLockTxHeight(self, txid, dest_address, bid_amount, rescan_from, find_index=False):
        self._log.debug('[rm] scantxoutset start')  # scantxoutset is slow
        ro = self.rpc('scantxoutset', ['start', ['addr({})'.format(dest_address)]])  # TODO: Use combo(address) where possible
        self._log.debug('[rm] scantxoutset end')
@@ -23,7 +26,7 @@ class NMCInterface(BTCInterface):
            if txid and o['txid'] != txid.hex():
                continue
            # Verify amount
-            if self.make_int(o['amount']) != int(bid_amount):
+            if make_int(o['amount']) != int(bid_amount):
                self._log.warning('Found output to lock tx address of incorrect value: %s, %s', str(o['amount']), o['txid'])
                continue

--- a/basicswap/interface/part.py
+++ b/basicswap/interface/part.py
@@ -14,10 +14,11 @@ from basicswap.contrib.test_framework.messages import (
 from basicswap.contrib.test_framework.script import (
    CScript,
    OP_0,
-    OP_DUP, OP_HASH160, OP_EQUALVERIFY, OP_CHECKSIG,
+    OP_DUP, OP_HASH160, OP_EQUALVERIFY, OP_CHECKSIG
 )
 from basicswap.util import (
    ensure,
+    make_int,
    TemporaryError,
 )
 from basicswap.util.script import (
@@ -26,15 +27,10 @@ from basicswap.util.script import (
    getWitnessElementLen,
 )
 from basicswap.util.address import (
-    encodeStealthAddress,
-)
-from basicswap.interface.btc import (
-    BTCInterface,
-    extractScriptLockScriptValues,
-    extractScriptLockRefundScriptValues,
-)
-
+    toWIF,
+    encodeStealthAddress)
 from basicswap.chainparams import Coins, chainparams
+from .btc import BTCInterface


 class BalanceTypes(IntEnum):
@@ -78,9 +74,6 @@ class PARTInterface(BTCInterface):
        super().__init__(coin_settings, network, swap_client)
        self.setAnonTxRingSize(int(coin_settings.get('anon_tx_ring_size', 12)))

-    def use_tx_vsize(self) -> bool:
-        return True
-
    def setAnonTxRingSize(self, value):
        ensure(value >= 3 and value < 33, 'Invalid anon_tx_ring_size value')
        self._anon_tx_ring_size = value
@@ -100,7 +93,7 @@ class PARTInterface(BTCInterface):
        index_info = self.rpc('getinsightinfo' if int(str(version)[:2]) > 19 else 'getindexinfo')
        return index_info['spentindex']

-    def initialiseWallet(self, key: bytes) -> None:
+    def initialiseWallet(self, key):
        raise ValueError('TODO')

    def withdrawCoin(self, value, addr_to, subfee):
@@ -352,21 +345,21 @@ class PARTInterfaceBlind(PARTInterface):
        ensure(lock_output_n is not None, 'Output not found in tx')

        # Check value
-        locked_txo_value = self.make_int(blinded_info['amount'])
+        locked_txo_value = make_int(blinded_info['amount'])
        ensure(locked_txo_value == swap_value, 'Bad locked value')

        # Check script
        lock_txo_scriptpk = bytes.fromhex(lock_tx_obj['vout'][lock_output_n]['scriptPubKey']['hex'])
        script_pk = CScript([OP_0, hashlib.sha256(script_out).digest()])
        ensure(lock_txo_scriptpk == script_pk, 'Bad output script')
-        A, B = extractScriptLockScriptValues(script_out)
+        A, B = self.extractScriptLockScriptValues(script_out)
        ensure(A == Kal, 'Bad script leader pubkey')
        ensure(B == Kaf, 'Bad script follower pubkey')

        # TODO: Check that inputs are unspent, rangeproofs and commitments sum
        # Verify fee rate
        vsize = lock_tx_obj['vsize']
-        fee_paid = self.make_int(lock_tx_obj['vout'][0]['ct_fee'])
+        fee_paid = make_int(lock_tx_obj['vout'][0]['ct_fee'])

        fee_rate_paid = fee_paid * 1000 // vsize

@@ -401,13 +394,13 @@ class PARTInterfaceBlind(PARTInterface):
        lock_refund_output_n, blinded_info = self.findOutputByNonce(lock_refund_tx_obj, nonce)
        ensure(lock_refund_output_n is not None, 'Output not found in tx')

-        lock_refund_txo_value = self.make_int(blinded_info['amount'])
+        lock_refund_txo_value = make_int(blinded_info['amount'])

        # Check script
        lock_refund_txo_scriptpk = bytes.fromhex(lock_refund_tx_obj['vout'][lock_refund_output_n]['scriptPubKey']['hex'])
        script_pk = CScript([OP_0, hashlib.sha256(script_out).digest()])
        ensure(lock_refund_txo_scriptpk == script_pk, 'Bad output script')
-        A, B, csv_val, C = extractScriptLockRefundScriptValues(script_out)
+        A, B, csv_val, C = self.extractScriptLockRefundScriptValues(script_out)
        ensure(A == Kal, 'Bad script pubkey')
        ensure(B == Kaf, 'Bad script pubkey')
        ensure(csv_val == csv_val_expect, 'Bad script csv value')
@@ -422,7 +415,7 @@ class PARTInterfaceBlind(PARTInterface):
        ensure(rv['inputs_valid'] is True, 'Invalid inputs')

        # Check value
-        fee_paid = self.make_int(lock_refund_tx_obj['vout'][0]['ct_fee'])
+        fee_paid = make_int(lock_refund_tx_obj['vout'][0]['ct_fee'])
        ensure(swap_value - lock_refund_txo_value == fee_paid, 'Bad output value')

        # Check fee rate
@@ -470,7 +463,7 @@ class PARTInterfaceBlind(PARTInterface):
        dummy_witness_stack = self.getScriptLockRefundSpendTxDummyWitness(prevout_script)
        witness_bytes = self.getWitnessStackSerialisedLength(dummy_witness_stack)
        vsize = self.getTxVSize(self.loadTx(tx_bytes), add_witness_bytes=witness_bytes)
-        fee_paid = self.make_int(lock_refund_spend_tx_obj['vout'][0]['ct_fee'])
+        fee_paid = make_int(lock_refund_spend_tx_obj['vout'][0]['ct_fee'])
        fee_rate_paid = fee_paid * 1000 // vsize
        ensure(self.compareFeeRates(fee_rate_paid, feerate), 'Bad fee rate, expected: {}'.format(feerate))

@@ -534,7 +527,7 @@ class PARTInterfaceBlind(PARTInterface):
        rv = self.rpc_wallet('fundrawtransactionfrom', ['blind', lock_spend_tx_hex, inputs_info, outputs_info, options])
        lock_spend_tx_hex = rv['hex']
        lock_spend_tx_obj = self.rpc('decoderawtransaction', [lock_spend_tx_hex])
-        pay_fee = self.make_int(lock_spend_tx_obj['vout'][0]['ct_fee'])
+        pay_fee = make_int(lock_spend_tx_obj['vout'][0]['ct_fee'])

        # lock_spend_tx_hex does not include the dummy witness stack
        witness_bytes = self.getWitnessStackSerialisedLength(dummy_witness_stack)
@@ -606,8 +599,8 @@ class PARTInterfaceBlind(PARTInterface):
        ensure(rv['inputs_valid'] is True, 'Invalid inputs')

        # Check amount
-        fee_paid = self.make_int(lock_spend_tx_obj['vout'][0]['ct_fee'])
-        amount_difference = self.make_int(input_blinded_info['amount']) - self.make_int(output_blinded_info['amount'])
+        fee_paid = make_int(lock_spend_tx_obj['vout'][0]['ct_fee'])
+        amount_difference = make_int(input_blinded_info['amount']) - make_int(output_blinded_info['amount'])
        ensure(fee_paid == amount_difference, 'Invalid output amount')

        # Check fee
@@ -622,7 +615,7 @@ class PARTInterfaceBlind(PARTInterface):

        return True

-    def createSCLockRefundSpendToFTx(self, tx_lock_refund_bytes, script_lock_refund, pkh_dest, tx_fee_rate, vkbv, kbsf=None):
+    def createSCLockRefundSpendToFTx(self, tx_lock_refund_bytes, script_lock_refund, pkh_dest, tx_fee_rate, vkbv):
        # lock refund swipe tx
        # Sends the coinA locked coin to the follower
        lock_refund_tx_obj = self.rpc('decoderawtransaction', [tx_lock_refund_bytes.hex()])
@@ -637,7 +630,7 @@ class PARTInterfaceBlind(PARTInterface):
        addr_info = self.rpc_wallet('getaddressinfo', [addr_out])
        output_pubkey_hex = addr_info['pubkey']

-        A, B, lock2_value, C = extractScriptLockRefundScriptValues(script_lock_refund)
+        A, B, lock2_value, C = self.extractScriptLockRefundScriptValues(script_lock_refund)

        # Follower won't be able to decode output to check amount, shouldn't matter as fee is public and output is to leader, sum has to balance

@@ -671,7 +664,7 @@ class PARTInterfaceBlind(PARTInterface):
    def getSpendableBalance(self) -> int:
        return self.make_int(self.rpc_wallet('getbalances')['mine']['blind_trusted'])

-    def publishBLockTx(self, vkbv: bytes, Kbs: bytes, output_amount: int, feerate: int, unlock_time: int = 0) -> bytes:
+    def publishBLockTx(self, vkbv: bytes, Kbs: bytes, output_amount: int, feerate: int, delay_for: int = 10, unlock_time: int = 0) -> bytes:
        Kbv = self.getPubkey(vkbv)
        sx_addr = self.formatStealthAddress(Kbv, Kbs)
        self._log.debug('sx_addr: {}'.format(sx_addr))
@@ -695,7 +688,8 @@ class PARTInterfaceBlind(PARTInterface):
        else:
            addr_info = self.rpc_wallet('getaddressinfo', [sx_addr])
            if not addr_info['iswatchonly']:
-                wif_scan_key = self.encodeKey(kbv)
+                wif_prefix = self.chainparams_network()['key_prefix']
+                wif_scan_key = toWIF(wif_prefix, kbv)
                self.rpc_wallet('importstealthaddress', [wif_scan_key, Kbs.hex()])
                self._log.info('Imported watch-only sx_addr: {}'.format(sx_addr))
                self._log.info('Rescanning {} chain from height: {}'.format(self.coin_name(), restore_height))
@@ -709,7 +703,7 @@ class PARTInterfaceBlind(PARTInterface):
            assert (tx['outputs'][0]['stealth_address'] == sx_addr)  # Should not be possible
            ensure(tx['outputs'][0]['type'] == 'blind', 'Output is not anon')

-            if self.make_int(tx['outputs'][0]['amount']) == cb_swap_value:
+            if make_int(tx['outputs'][0]['amount']) == cb_swap_value:
                height = 0
                if tx['confirmations'] > 0:
                    chain_height = self.rpc('getblockcount')
@@ -720,14 +714,15 @@ class PARTInterfaceBlind(PARTInterface):
                return -1
        return None

-    def spendBLockTx(self, chain_b_lock_txid: bytes, address_to: str, kbv: bytes, kbs: bytes, cb_swap_value: int, b_fee: int, restore_height: int, spend_actual_balance: bool = False, lock_tx_vout=None) -> bytes:
+    def spendBLockTx(self, chain_b_lock_txid: bytes, address_to: str, kbv: bytes, kbs: bytes, cb_swap_value: int, b_fee: int, restore_height: int, spend_actual_balance: bool = False) -> bytes:
        Kbv = self.getPubkey(kbv)
        Kbs = self.getPubkey(kbs)
        sx_addr = self.formatStealthAddress(Kbv, Kbs)
        addr_info = self.rpc_wallet('getaddressinfo', [sx_addr])
        if not addr_info['ismine']:
-            wif_scan_key = self.encodeKey(kbv)
-            wif_spend_key = self.encodeKey(kbs)
+            wif_prefix = self.chainparams_network()['key_prefix']
+            wif_scan_key = toWIF(wif_prefix, kbv)
+            wif_spend_key = toWIF(wif_prefix, kbs)
            self.rpc_wallet('importstealthaddress', [wif_scan_key, wif_spend_key])
            self._log.info('Imported spend key for sx_addr: {}'.format(sx_addr))
            self._log.info('Rescanning {} chain from height: {}'.format(self.coin_name(), restore_height))
@@ -746,7 +741,7 @@ class PARTInterfaceBlind(PARTInterface):
            raise ValueError('Too many spendable outputs')

        utxo = utxos[0]
-        utxo_sats = self.make_int(utxo['amount'])
+        utxo_sats = make_int(utxo['amount'])

        if spend_actual_balance and utxo_sats != cb_swap_value:
            self._log.warning('Spending actual balance {}, not swap value {}.'.format(utxo_sats, cb_swap_value))
@@ -807,7 +802,7 @@ class PARTInterfaceAnon(PARTInterface):
    def coin_name(self) -> str:
        return super().coin_name() + ' Anon'

-    def publishBLockTx(self, kbv: bytes, Kbs: bytes, output_amount: int, feerate: int, unlock_time: int = 0) -> bytes:
+    def publishBLockTx(self, kbv: bytes, Kbs: bytes, output_amount: int, feerate: int, delay_for: int = 10, unlock_time: int = 0) -> bytes:
        Kbv = self.getPubkey(kbv)
        sx_addr = self.formatStealthAddress(Kbv, Kbs)

@@ -831,7 +826,8 @@ class PARTInterfaceAnon(PARTInterface):
        else:
            addr_info = self.rpc_wallet('getaddressinfo', [sx_addr])
            if not addr_info['iswatchonly']:
-                wif_scan_key = self.encodeKey(kbv)
+                wif_prefix = self.chainparams_network()['key_prefix']
+                wif_scan_key = toWIF(wif_prefix, kbv)
                self.rpc_wallet('importstealthaddress', [wif_scan_key, Kbs.hex()])
                self._log.info('Imported watch-only sx_addr: {}'.format(sx_addr))
                self._log.info('Rescanning {} chain from height: {}'.format(self.coin_name(), restore_height))
@@ -845,7 +841,7 @@ class PARTInterfaceAnon(PARTInterface):
            assert (tx['outputs'][0]['stealth_address'] == sx_addr)  # Should not be possible
            ensure(tx['outputs'][0]['type'] == 'anon', 'Output is not anon')

-            if self.make_int(tx['outputs'][0]['amount']) == cb_swap_value:
+            if make_int(tx['outputs'][0]['amount']) == cb_swap_value:
                height = 0
                if tx['confirmations'] > 0:
                    chain_height = self.rpc('getblockcount')
@@ -856,14 +852,15 @@ class PARTInterfaceAnon(PARTInterface):
                return -1
        return None

-    def spendBLockTx(self, chain_b_lock_txid: bytes, address_to: str, kbv: bytes, kbs: bytes, cb_swap_value: int, b_fee: int, restore_height: int, spend_actual_balance: bool = False, lock_tx_vout=None) -> bytes:
+    def spendBLockTx(self, chain_b_lock_txid: bytes, address_to: str, kbv: bytes, kbs: bytes, cb_swap_value: int, b_fee: int, restore_height: int, spend_actual_balance: bool = False) -> bytes:
        Kbv = self.getPubkey(kbv)
        Kbs = self.getPubkey(kbs)
        sx_addr = self.formatStealthAddress(Kbv, Kbs)
        addr_info = self.rpc_wallet('getaddressinfo', [sx_addr])
        if not addr_info['ismine']:
-            wif_scan_key = self.encodeKey(kbv)
-            wif_spend_key = self.encodeKey(kbs)
+            wif_prefix = self.chainparams_network()['key_prefix']
+            wif_scan_key = toWIF(wif_prefix, kbv)
+            wif_spend_key = toWIF(wif_prefix, kbs)
            self.rpc_wallet('importstealthaddress', [wif_scan_key, wif_spend_key])
            self._log.info('Imported spend key for sx_addr: {}'.format(sx_addr))
            self._log.info('Rescanning {} chain from height: {}'.format(self.coin_name(), restore_height))
@@ -877,7 +874,7 @@ class PARTInterfaceAnon(PARTInterface):
            raise ValueError('Too many spendable outputs')

        utxo = autxos[0]
-        utxo_sats = self.make_int(utxo['amount'])
+        utxo_sats = make_int(utxo['amount'])

        if spend_actual_balance and utxo_sats != cb_swap_value:
            self._log.warning('Spending actual balance {}, not swap value {}.'.format(utxo_sats, cb_swap_value))
--- a/basicswap/interface/pivx.py
+++ b/basicswap/interface/pivx.py
@@ -75,11 +75,9 @@ class PIVXInterface(BTCInterface):

        block_rv = {
            'hash': block_hash,
-            'previousblockhash': block_header['previousblockhash'],
            'tx': tx_rv,
            'confirmations': block_header['confirmations'],
            'height': block_header['height'],
-            'time': block_header['time'],
            'version': block_header['version'],
            'merkleroot': block_header['merkleroot'],
        }
@@ -107,7 +105,7 @@ class PIVXInterface(BTCInterface):
        add_bytes = 107
        size = len(tx.serialize_with_witness()) + add_bytes
        pay_fee = round(fee_rate * size / 1000)
-        self._log.info(f'BLockSpendTx fee_rate, size, fee: {fee_rate}, {size}, {pay_fee}.')
+        self._log.info(f'BLockSpendTx  fee_rate, size, fee: {fee_rate}, {size}, {pay_fee}.')
        return pay_fee

    def signTxWithKey(self, tx: bytes, key: bytes) -> bytes:
--- a/basicswap/interface/wow.py
+++ b/basicswap/interface/wow.py
@@ -1,31 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# Distributed under the MIT software license, see the accompanying
-# file LICENSE or http://www.opensource.org/licenses/mit-license.php.
-
-from basicswap.chainparams import WOW_COIN, Coins
-from .xmr import XMRInterface
-
-
-class WOWInterface(XMRInterface):
-
-    @staticmethod
-    def coin_type():
-        return Coins.WOW
-
-    @staticmethod
-    def ticker_str() -> int:
-        return Coins.WOW.name
-
-    @staticmethod
-    def COIN():
-        return WOW_COIN
-
-    @staticmethod
-    def exp() -> int:
-        return 11
-
-    @staticmethod
-    def depth_spendable() -> int:
-        return 3
--- a/basicswap/interface/xmr.py
+++ b/basicswap/interface/xmr.py
@@ -5,6 +5,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.

+import json
 import logging

 import basicswap.contrib.ed25519_fast as edf
@@ -23,21 +24,20 @@ from coincurve.dleag import (
    verify_ed25519_point,
 )

-from basicswap.interface.base import (
-    Curves,
-)
+from basicswap.interface import (
+    Curves)
 from basicswap.util import (
    i2b, b2i, b2h,
    dumpj,
    ensure,
+    make_int,
    TemporaryError)
 from basicswap.util.network import (
    is_private_ip_address)
 from basicswap.rpc_xmr import (
    make_xmr_rpc_func,
    make_xmr_rpc2_func)
-from basicswap.chainparams import XMR_COIN, Coins
-from basicswap.interface.base import CoinInterface
+from basicswap.chainparams import XMR_COIN, CoinInterface, Coins


 class XMRInterface(CoinInterface):
@@ -49,10 +49,6 @@ class XMRInterface(CoinInterface):
    def coin_type():
        return Coins.XMR

-    @staticmethod
-    def ticker_str() -> int:
-        return Coins.XMR.name
-
    @staticmethod
    def COIN():
        return XMR_COIN
@@ -80,19 +76,11 @@ class XMRInterface(CoinInterface):
    @staticmethod
    def xmr_swap_b_lock_spend_tx_vsize() -> int:
        # TODO: Estimate with ringsize
-        return 1604
-
-    def is_transient_error(self, ex) -> bool:
-        str_error: str = str(ex).lower()
-        if 'failed to get output distribution' in str_error:
-            return True
-        return super().is_transient_error(ex)
+        return 1507

    def __init__(self, coin_settings, network, swap_client=None):
        super().__init__(network)

-        self._addr_prefix = self.chainparams_network()['address_prefix']
-
        self.blocks_confirmed = coin_settings['blocks_confirmed']
        self._restore_height = coin_settings.get('restore_height', 0)
        self.setFeePriority(coin_settings.get('fee_priority', 0))
@@ -138,6 +126,9 @@ class XMRInterface(CoinInterface):
        self.rpc2 = make_xmr_rpc2_func(coin_settings['rpcport'], daemon_login, host=rpchost, proxy_host=proxy_host, proxy_port=proxy_port, default_timeout=self._rpctimeout, tag='Node ')  # non-json endpoint
        self.rpc_wallet = make_xmr_rpc_func(coin_settings['walletrpcport'], coin_settings['walletrpcauth'], host=coin_settings.get('walletrpchost', '127.0.0.1'), default_timeout=self._walletrpctimeout, tag='Wallet ')

+    def checkWallets(self) -> int:
+        return 1
+
    def setFeePriority(self, new_priority):
        ensure(new_priority >= 0 and new_priority < 4, 'Invalid fee_priority value')
        self._fee_priority = new_priority
@@ -163,7 +154,7 @@ class XMRInterface(CoinInterface):
            pass
        self.rpc_wallet('open_wallet', params)

-    def initialiseWallet(self, key_view: bytes, key_spend: bytes, restore_height=None) -> None:
+    def initialiseWallet(self, key_view, key_spend, restore_height=None):
        with self._mx_wallet:
            try:
                self.openWallet(self._wallet_filename)
@@ -174,7 +165,7 @@ class XMRInterface(CoinInterface):

            Kbv = self.getPubkey(key_view)
            Kbs = self.getPubkey(key_spend)
-            address_b58 = xmr_util.encode_address(Kbv, Kbs, self._addr_prefix)
+            address_b58 = xmr_util.encode_address(Kbv, Kbs)

            params = {
                'filename': self._wallet_filename,
@@ -219,7 +210,7 @@ class XMRInterface(CoinInterface):
                rv['known_block_count'] = self.rpc('get_block_count', timeout=self._rpctimeout)['count']
                rv['verificationprogress'] = rv['blocks'] / rv['known_block_count']
        except Exception as e:
-            self._log.warning(f'{self.ticker_str()} get_block_count failed with: {e}')
+            self._log.warning('XMR get_block_count failed with: %s', str(e))
            rv['verificationprogress'] = 0.0

        return rv
@@ -240,13 +231,15 @@ class XMRInterface(CoinInterface):
            rv = {}
            self.rpc_wallet('refresh')
            balance_info = self.rpc_wallet('get_balance')
-
            rv['balance'] = self.format_amount(balance_info['unlocked_balance'])
            rv['unconfirmed_balance'] = self.format_amount(balance_info['balance'] - balance_info['unlocked_balance'])
            rv['encrypted'] = False if self._wallet_password is None else True
            rv['locked'] = False
            return rv

+    def walletRestoreHeight(self):
+        return self._restore_height
+
    def getMainWalletAddress(self) -> str:
        with self._mx_wallet:
            self.openWallet(self._wallet_filename)
@@ -260,15 +253,8 @@ class XMRInterface(CoinInterface):
            return new_address

    def get_fee_rate(self, conf_target: int = 2):
-        # fees - array of unsigned int; Represents the base fees at different priorities [slow, normal, fast, fastest].
-        fee_est = self.rpc('get_fee_estimate')
-        if conf_target <= 1:
-            conf_target = 1  # normal
-        else:
-            conf_target = 0  # slow
-        fee_per_k_bytes = fee_est['fees'][conf_target] * 1000
-
-        return float(self.format_amount(fee_per_k_bytes)), 'get_fee_estimate'
+        self._log.warning('TODO - estimate XMR fee rate?')
+        return 0.0, 'unused'

    def getNewSecretKey(self) -> bytes:
        # Note: Returned bytes are in big endian order
@@ -295,7 +281,7 @@ class XMRInterface(CoinInterface):
    def getAddressFromKeys(self, key_view: bytes, key_spend: bytes) -> str:
        pk_view = self.getPubkey(key_view)
        pk_spend = self.getPubkey(key_spend)
-        return xmr_util.encode_address(pk_view, pk_spend, self._addr_prefix)
+        return xmr_util.encode_address(pk_view, pk_spend)

    def verifyKey(self, k: int) -> bool:
        i = b2i(k)
@@ -323,15 +309,15 @@ class XMRInterface(CoinInterface):
        return ed25519_add(Ka, Kb)

    def encodeSharedAddress(self, Kbv: bytes, Kbs: bytes) -> str:
-        return xmr_util.encode_address(Kbv, Kbs, self._addr_prefix)
+        return xmr_util.encode_address(Kbv, Kbs)

-    def publishBLockTx(self, kbv: bytes, Kbs: bytes, output_amount: int, feerate: int, unlock_time: int = 0) -> bytes:
+    def publishBLockTx(self, kbv: bytes, Kbs: bytes, output_amount: int, feerate: int, delay_for: int = 10, unlock_time: int = 0) -> bytes:
        with self._mx_wallet:
            self.openWallet(self._wallet_filename)
            self.rpc_wallet('refresh')

            Kbv = self.getPubkey(kbv)
-            shared_addr = xmr_util.encode_address(Kbv, Kbs, self._addr_prefix)
+            shared_addr = xmr_util.encode_address(Kbv, Kbs)

            params = {'destinations': [{'amount': output_amount, 'address': shared_addr}], 'unlock_time': unlock_time}
            if self._fee_priority > 0:
@@ -340,12 +326,24 @@ class XMRInterface(CoinInterface):
            self._log.info('publishBLockTx %s to address_b58 %s', rv['tx_hash'], shared_addr)
            tx_hash = bytes.fromhex(rv['tx_hash'])

+            if self._sc.debug:
+                i = 0
+                while not self._sc.delay_event.is_set():
+                    gt_params = {'out': True, 'pending': True, 'failed': True, 'pool': True, }
+                    rv = self.rpc_wallet('get_transfers', gt_params)
+                    self._log.debug('get_transfers {}'.format(dumpj(rv)))
+                    if 'pending' not in rv:
+                        break
+                    if i >= delay_for:
+                        break
+                    self._sc.delay_event.wait(1.0)
+
            return tx_hash

    def findTxB(self, kbv, Kbs, cb_swap_value, cb_block_confirmed, restore_height, bid_sender):
        with self._mx_wallet:
            Kbv = self.getPubkey(kbv)
-            address_b58 = xmr_util.encode_address(Kbv, Kbs, self._addr_prefix)
+            address_b58 = xmr_util.encode_address(Kbv, Kbs)

            kbv_le = kbv[::-1]
            params = {
@@ -400,7 +398,7 @@ class XMRInterface(CoinInterface):

            try:
                current_height = self.rpc2('get_height', timeout=self._rpctimeout)['height']
-                self._log.info(f'findTxnByHash {self.ticker_str()} current_height {current_height}\nhash: {txid}')
+                self._log.info('findTxnByHash XMR current_height %d\nhash: %s', current_height, txid)
            except Exception as e:
                self._log.info('rpc failed %s', str(e))
                current_height = None  # If the transfer is available it will be deep enough
@@ -415,7 +413,7 @@ class XMRInterface(CoinInterface):

            return None

-    def spendBLockTx(self, chain_b_lock_txid: bytes, address_to: str, kbv: bytes, kbs: bytes, cb_swap_value: int, b_fee_rate: int, restore_height: int, spend_actual_balance: bool = False, lock_tx_vout=None) -> bytes:
+    def spendBLockTx(self, chain_b_lock_txid: bytes, address_to: str, kbv: bytes, kbs: bytes, cb_swap_value: int, b_fee_rate: int, restore_height: int, spend_actual_balance: bool = False) -> bytes:
        '''
        Notes:
        "Error: No unlocked balance in the specified subaddress(es)" can mean not enough funds after tx fee.
@@ -423,7 +421,7 @@ class XMRInterface(CoinInterface):
        with self._mx_wallet:
            Kbv = self.getPubkey(kbv)
            Kbs = self.getPubkey(kbs)
-            address_b58 = xmr_util.encode_address(Kbv, Kbs, self._addr_prefix)
+            address_b58 = xmr_util.encode_address(Kbv, Kbs)

            wallet_filename = address_b58 + '_spend'

@@ -451,8 +449,6 @@ class XMRInterface(CoinInterface):
                    if len(txns) > 0:
                        txid = txns[0]['txid']
                        self._log.warning(f'spendBLockTx detected spending tx: {txid}.')
-
-                        # Should check for address_to, but only the from address is found in the output
                        if txns[0]['address'] == address_b58:
                            return bytes.fromhex(txid)

@@ -473,45 +469,40 @@ class XMRInterface(CoinInterface):
                params['priority'] = self._fee_priority

            rv = self.rpc_wallet('sweep_all', params)
+            self._log.debug('sweep_all {}'.format(json.dumps(rv)))

            return bytes.fromhex(rv['tx_hash_list'][0])

-    def withdrawCoin(self, value, addr_to: str, sweepall: bool, estimate_fee: bool = False) -> str:
+    def withdrawCoin(self, value: int, addr_to: str, subfee: bool) -> str:
        with self._mx_wallet:
+            value_sats = make_int(value, self.exp())
+
            self.openWallet(self._wallet_filename)
            self.rpc_wallet('refresh')

-            if sweepall:
+            if subfee:
                balance = self.rpc_wallet('get_balance')
-                if balance['balance'] != balance['unlocked_balance']:
-                    raise ValueError('Balance must be fully confirmed to use sweep all.')
-                self._log.info('{} {} sweep_all.'.format(self.ticker_str(), 'estimate fee' if estimate_fee else 'withdraw'))
-                self._log.debug('{} balance: {}'.format(self.ticker_str(), balance['balance']))
-                params = {'address': addr_to, 'do_not_relay': estimate_fee, 'subaddr_indices_all': True}
-                if self._fee_priority > 0:
-                    params['priority'] = self._fee_priority
-                rv = self.rpc_wallet('sweep_all', params)
-                if estimate_fee:
-                    return {'num_txns': len(rv['fee_list']), 'sum_amount': sum(rv['amount_list']), 'sum_fee': sum(rv['fee_list']), 'sum_weight': sum(rv['weight_list'])}
-                return rv['tx_hash_list'][0]
+                diff = balance['unlocked_balance'] - value_sats
+                if diff >= 0 and diff <= 10:
+                    self._log.info('subfee enabled and value close to total, using sweep_all.')
+                    params = {'address': addr_to}
+                    if self._fee_priority > 0:
+                        params['priority'] = self._fee_priority
+                    rv = self.rpc_wallet('sweep_all', params)
+                    return rv['tx_hash_list'][0]
+                raise ValueError('Withdraw value must be close to total to use subfee/sweep_all.')

-            value_sats: int = self.make_int(value)
-            params = {'destinations': [{'amount': value_sats, 'address': addr_to}], 'do_not_relay': estimate_fee}
+            params = {'destinations': [{'amount': value_sats, 'address': addr_to}]}
            if self._fee_priority > 0:
                params['priority'] = self._fee_priority
            rv = self.rpc_wallet('transfer', params)
-            if estimate_fee:
-                return {'num_txns': 1, 'sum_amount': rv['amount'], 'sum_fee': rv['fee'], 'sum_weight': rv['weight']}
            return rv['tx_hash']

-    def estimateFee(self, value: int, addr_to: str, sweepall: bool) -> str:
-        return self.withdrawCoin(value, addr_to, sweepall, estimate_fee=True)
-
    def showLockTransfers(self, kbv, Kbs, restore_height):
        with self._mx_wallet:
            try:
                Kbv = self.getPubkey(kbv)
-                address_b58 = xmr_util.encode_address(Kbv, Kbs, self._addr_prefix)
+                address_b58 = xmr_util.encode_address(Kbv, Kbs)
                wallet_file = address_b58 + '_spend'
                try:
                    self.openWallet(wallet_file)
--- a/basicswap/js_server.py
+++ b/basicswap/js_server.py
@@ -52,20 +52,12 @@ def getFormData(post_string: str, is_json: bool):

 def withdraw_coin(swap_client, coin_type, post_string, is_json):
    post_data = getFormData(post_string, is_json)
-    address = get_data_entry(post_data, 'address')

-    if coin_type in (Coins.XMR, Coins.WOW):
-        value = None
-        sweepall = get_data_entry(post_data, 'sweepall')
-        if not isinstance(sweepall, bool):
-            sweepall = toBool(sweepall)
-        if not sweepall:
-            value = get_data_entry(post_data, 'value')
-    else:
-        value = get_data_entry(post_data, 'value')
-        subfee = get_data_entry(post_data, 'subfee')
-        if not isinstance(subfee, bool):
-            subfee = toBool(subfee)
+    value = get_data_entry(post_data, 'value')
+    address = get_data_entry(post_data, 'address')
+    subfee = get_data_entry(post_data, 'subfee')
+    if not isinstance(subfee, bool):
+        subfee = toBool(subfee)

    if coin_type == Coins.PART:
        type_from = get_data_entry_or(post_data, 'type_from', 'plain')
@@ -74,8 +66,6 @@ def withdraw_coin(swap_client, coin_type, post_string, is_json):
    elif coin_type == Coins.LTC:
        type_from = get_data_entry_or(post_data, 'type_from', 'plain')
        txid_hex = swap_client.withdrawLTC(type_from, value, address, subfee)
-    elif coin_type in (Coins.XMR, Coins.WOW):
-        txid_hex = swap_client.withdrawCoin(coin_type, value, address, sweepall)
    else:
        txid_hex = swap_client.withdrawCoin(coin_type, value, address, subfee)

@@ -191,18 +181,18 @@ def js_offers(self, url_split, post_string, is_json, sent=False) -> bytes:

        if have_data_entry(post_data, 'sort_by'):
            sort_by = get_data_entry(post_data, 'sort_by')
-            ensure(sort_by in ['created_at', 'rate'], 'Invalid sort by')
+            assert (sort_by in ['created_at', 'rate']), 'Invalid sort by'
            filters['sort_by'] = sort_by
        if have_data_entry(post_data, 'sort_dir'):
            sort_dir = get_data_entry(post_data, 'sort_dir')
-            ensure(sort_dir in ['asc', 'desc'], 'Invalid sort dir')
+            assert (sort_dir in ['asc', 'desc']), 'Invalid sort dir'
            filters['sort_dir'] = sort_dir

        if have_data_entry(post_data, 'offset'):
            filters['offset'] = int(get_data_entry(post_data, 'offset'))
        if have_data_entry(post_data, 'limit'):
            filters['limit'] = int(get_data_entry(post_data, 'limit'))
-            ensure(filters['limit'] > 0, 'Invalid limit')
+            assert (filters['limit'] > 0 and filters['limit'] <= PAGE_LIMIT), 'Invalid limit'
        if have_data_entry(post_data, 'active'):
            filters['active'] = get_data_entry(post_data, 'active')
        if have_data_entry(post_data, 'include_sent'):
@@ -228,14 +218,11 @@ def js_offers(self, url_split, post_string, is_json, sent=False) -> bytes:
            'amount_from': ci_from.format_amount(o.amount_from),
            'amount_to': ci_to.format_amount((o.amount_from * o.rate) // ci_from.COIN()),
            'rate': ci_to.format_amount(o.rate),
-            'min_bid_amount': ci_from.format_amount(o.min_bid_amount),
-            'is_expired': o.expire_at <= swap_client.getTime(),
-            'is_own_offer': o.was_sent,
-            'is_revoked': True if o.active_ind == 2 else False,
        }
        if with_extra_info:
            offer_data['amount_negotiable'] = o.amount_negotiable
            offer_data['rate_negotiable'] = o.rate_negotiable
+
            if o.swap_type == SwapTypes.XMR_SWAP:
                _, xmr_offer = swap_client.getXmrOffer(o.offer_id)
                offer_data['lock_time_1'] = xmr_offer.lock_time_1
@@ -342,10 +329,7 @@ def js_bids(self, url_split, post_string: str, is_json: bool) -> bytes:
            extra_options = {
                'valid_for_seconds': valid_for_seconds,
            }
-
-            if have_data_entry(post_data, 'amount_to'):
-                extra_options['amount_to'] = inputAmount(get_data_entry(post_data, 'amount_to'), ci_to)
-            elif have_data_entry(post_data, 'bid_rate'):
+            if have_data_entry(post_data, 'bid_rate'):
                extra_options['bid_rate'] = ci_to.make_int(get_data_entry(post_data, 'bid_rate'), r=1)
            if have_data_entry(post_data, 'bid_amount'):
                amount_from = inputAmount(get_data_entry(post_data, 'bid_amount'), ci_from)
@@ -364,8 +348,7 @@ def js_bids(self, url_split, post_string: str, is_json: bool) -> bytes:
        bid_id = bytes.fromhex(url_split[3])
        assert (len(bid_id) == 28)

-        show_txns: bool = False
-        with_events: bool = False
+        show_txns = False
        if post_string != '':
            post_data = getFormData(post_string, is_json)
            if have_data_entry(post_data, 'accept'):
@@ -377,8 +360,6 @@ def js_bids(self, url_split, post_string: str, is_json: bool) -> bytes:

            if have_data_entry(post_data, 'show_extra'):
                show_txns = True
-            if have_data_entry(post_data, 'with_events'):
-                with_events = True

        bid, xmr_swap, offer, xmr_offer, events = swap_client.getXmrBidAndOffer(bid_id)
        assert (bid), 'Unknown bid ID'
@@ -392,17 +373,6 @@ def js_bids(self, url_split, post_string: str, is_json: bool) -> bytes:

        if len(url_split) > 4 and url_split[4] == 'states':
            old_states = listOldBidStates(bid)
-
-            if with_events:
-                new_list = []
-                for entry in old_states:
-                    entry_list = list(entry)
-                    entry_list.insert(1, 'state')
-                    new_list.append(entry_list)
-                for event in events:
-                    new_list.append([event['at'], 'event', event['desc']])
-                old_states = sorted(new_list, key=lambda x: x[0])
-
            return bytes(json.dumps(old_states), 'UTF-8')

        edit_bid = False
@@ -445,31 +415,27 @@ def js_smsgaddresses(self, url_split, post_string, is_json) -> bytes:
    swap_client = self.server.swap_client
    swap_client.checkSystemStatus()
    post_data = {} if post_string == '' else getFormData(post_string, is_json)
-
    if len(url_split) > 3:
-        mode: str = url_split[3]
-        if mode == 'new':
+        if url_split[3] == 'new':
            addressnote = get_data_entry_or(post_data, 'addressnote', '')
            new_addr, pubkey = swap_client.newSMSGAddress(addressnote=addressnote)
            return bytes(json.dumps({'new_address': new_addr, 'pubkey': pubkey}), 'UTF-8')
-        if mode == 'add':
+        if url_split[3] == 'add':
            addressnote = get_data_entry_or(post_data, 'addressnote', '')
            pubkey_hex = get_data_entry(post_data, 'addresspubkey')
            added_address = swap_client.addSMSGAddress(pubkey_hex, addressnote)
            return bytes(json.dumps({'added_address': added_address, 'pubkey': pubkey_hex}), 'UTF-8')
-        elif mode == 'edit':
+        elif url_split[3] == 'edit':
            address = get_data_entry(post_data, 'address')
            activeind = int(get_data_entry(post_data, 'active_ind'))
            addressnote = get_data_entry_or(post_data, 'addressnote', '')
            new_addr = swap_client.editSMSGAddress(address, activeind, addressnote)
            return bytes(json.dumps({'edited_address': address}), 'UTF-8')
-        elif mode == 'disableall':
-            rv = swap_client.disableAllSMSGAddresses()
-            return bytes(json.dumps(rv), 'UTF-8')

    filters = {
        'exclude_inactive': post_data.get('exclude_inactive', True),
    }
+
    return bytes(json.dumps(swap_client.listAllSMSGAddresses(filters)), 'UTF-8')


@@ -517,10 +483,10 @@ def js_rate(self, url_split, post_string, is_json) -> bytes:
            amount_from = ci_from.format_amount(int((amt_to * rate) // ci_to.COIN()), r=1)
            return bytes(json.dumps({'amount_from': amount_from}), 'UTF-8')

-    amt_from: int = inputAmount(get_data_entry(post_data, 'amt_from'), ci_from)
-    amt_to: int = inputAmount(get_data_entry(post_data, 'amt_to'), ci_to)
+    amt_from = inputAmount(get_data_entry(post_data, 'amt_from'), ci_from)
+    amt_to = inputAmount(get_data_entry(post_data, 'amt_to'), ci_to)

-    rate: int = ci_to.format_amount(ci_from.make_int(amt_to / amt_from, r=1))
+    rate = ci_to.format_amount(ci_from.make_int(amt_to / amt_from, r=1))
    return bytes(json.dumps({'rate': rate}), 'UTF-8')


@@ -656,33 +622,6 @@ def js_automationstrategies(self, url_split, post_string: str, is_json: bool) ->
    return bytes(json.dumps(rv), 'UTF-8')


-def js_validateamount(self, url_split, post_string: str, is_json: bool) -> bytes:
-    swap_client = self.server.swap_client
-    swap_client.checkSystemStatus()
-
-    post_data = getFormData(post_string, is_json)
-
-    ticker_str = post_data['coin']
-    amount = post_data['amount']
-    round_method = post_data.get('method', 'none')
-
-    valid_round_methods = ('roundoff', 'rounddown', 'none')
-    if round_method not in valid_round_methods:
-        raise ValueError(f'Unknown rounding method, must be one of {valid_round_methods}')
-
-    coin_type = tickerToCoinId(ticker_str)
-    ci = swap_client.ci(coin_type)
-
-    r = 0
-    if round_method == 'roundoff':
-        r = 1
-    elif round_method == 'rounddown':
-        r = -1
-
-    output_amount = ci.format_amount(amount, conv_int=True, r=r)
-    return bytes(json.dumps(output_amount), 'UTF-8')
-
-
 def js_vacuumdb(self, url_split, post_string, is_json) -> bytes:
    swap_client = self.server.swap_client
    swap_client.checkSystemStatus()
@@ -701,13 +640,15 @@ def js_getcoinseed(self, url_split, post_string, is_json) -> bytes:
        raise ValueError('Particl wallet seed is set from the Basicswap mnemonic.')

    ci = swap_client.ci(coin)
-    if coin in (Coins.XMR, Coins.WOW):
+    if coin == Coins.XMR:
        key_view = swap_client.getWalletKey(coin, 1, for_ed25519=True)
        key_spend = swap_client.getWalletKey(coin, 2, for_ed25519=True)
        address = ci.getAddressFromKeys(key_view, key_spend)
        return bytes(json.dumps({'coin': ci.ticker(), 'key_view': ci.encodeKey(key_view), 'key_spend': ci.encodeKey(key_spend), 'address': address}), 'UTF-8')

    seed_key = swap_client.getWalletKey(coin, 1)
+    if coin == Coins.DASH:
+        return bytes(json.dumps({'coin': ci.ticker(), 'seed': seed_key.hex(), 'mnemonic': ci.seedToMnemonic(seed_key)}), 'UTF-8')
    seed_id = ci.getSeedHash(seed_key)
    return bytes(json.dumps({'coin': ci.ticker(), 'seed': seed_key.hex(), 'seed_id': seed_id.hex()}), 'UTF-8')

@@ -779,27 +720,6 @@ def js_help(self, url_split, post_string, is_json) -> bytes:
    return bytes(json.dumps({'commands': commands}), 'UTF-8')


-def js_readurl(self, url_split, post_string, is_json) -> bytes:
-    swap_client = self.server.swap_client
-    post_data = {} if post_string == '' else getFormData(post_string, is_json)
-    if have_data_entry(post_data, 'url'):
-        url = get_data_entry(post_data, 'url')
-        default_headers = {
-            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36',
-            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
-            'Accept-Language': 'en-US,en;q=0.5',
-        }
-        response = swap_client.readURL(url, headers=default_headers)
-        try:
-            error = json.loads(response.decode())
-            if "Error" in error:
-                return json.dumps({"Error": error['Error']}).encode()
-        except json.JSONDecodeError:
-            pass
-        return response
-    raise ValueError('Requires URL.')
-
-
 pages = {
    'coins': js_coins,
    'wallets': js_wallets,
@@ -817,14 +737,12 @@ pages = {
    'notifications': js_notifications,
    'identities': js_identities,
    'automationstrategies': js_automationstrategies,
-    'validateamount': js_validateamount,
    'vacuumdb': js_vacuumdb,
    'getcoinseed': js_getcoinseed,
    'setpassword': js_setpassword,
    'unlock': js_unlock,
    'lock': js_lock,
    'help': js_help,
-    'readurl': js_readurl,
 }


--- a/basicswap/messages.proto
+++ b/basicswap/messages.proto
@@ -0,0 +1,171 @@
+syntax = "proto3";
+
+package basicswap;
+
+/* Step 1, seller -> network */
+message OfferMessage {
+    uint32 coin_from = 1;
+    uint32 coin_to = 2;
+    uint64 amount_from = 3;
+    uint64 rate = 4;
+    uint64 min_bid_amount = 5;
+    uint64 time_valid = 6;
+    enum LockType {
+        NOT_SET = 0;
+        SEQUENCE_LOCK_BLOCKS = 1;
+        SEQUENCE_LOCK_TIME = 2;
+        ABS_LOCK_BLOCKS = 3;
+        ABS_LOCK_TIME = 4;
+    }
+    LockType lock_type = 7;
+    uint32 lock_value = 8;
+    uint32 swap_type = 9;
+
+    /* optional */
+    string proof_address = 10;
+    string proof_signature = 11;
+    bytes pkhash_seller = 12;
+    bytes secret_hash = 13;
+
+    uint64 fee_rate_from = 14;
+    uint64 fee_rate_to = 15;
+
+    uint32 protocol_version = 16;
+    bool amount_negotiable = 17;
+    bool rate_negotiable = 18;
+
+    bytes proof_utxos = 19;          /* 32 byte txid 2 byte vout, repeated */
+}
+
+/* Step 2, buyer -> seller */
+message BidMessage {
+    bytes offer_msg_id = 1;
+    uint64 time_valid = 2;          /* seconds bid is valid for */
+    uint64 amount = 3;              /* amount of amount_from bid is for */
+    uint64 rate = 4;
+    bytes pkhash_buyer = 5;         /* buyer's address to receive amount_from */
+    string proof_address = 6;
+    string proof_signature = 7;
+
+    uint32 protocol_version = 8;
+
+    bytes proof_utxos = 9;          /* 32 byte txid 2 byte vout, repeated */
+}
+
+/* For tests */
+message BidMessage_v1Deprecated {
+    bytes offer_msg_id = 1;
+    uint64 time_valid = 2;          /* seconds bid is valid for */
+    uint64 amount = 3;              /* amount of amount_from bid is for */
+    uint64 rate = 4;
+    bytes pkhash_buyer = 5;         /* buyer's address to receive amount_from */
+    string proof_address = 6;
+    string proof_signature = 7;
+
+    uint32 protocol_version = 8;
+}
+
+
+
+/* Step 3, seller -> buyer */
+message BidAcceptMessage {
+    bytes bid_msg_id = 1;
+    bytes initiate_txid = 2;
+    bytes contract_script = 3;
+}
+
+message OfferRevokeMessage {
+    bytes offer_msg_id = 1;
+    bytes signature = 2;
+}
+
+message BidRejectMessage {
+    bytes bid_msg_id = 1;
+
+    uint32 reject_code = 2;
+}
+
+message XmrBidMessage {
+    /* MSG1L, F -> L */
+    bytes offer_msg_id = 1;
+    uint64 time_valid = 2;          /* seconds bid is valid for */
+    uint64 amount = 3;              /* amount of amount_from bid is for */
+    uint64 rate = 4;
+
+    bytes pkaf = 5;
+
+    bytes kbvf = 6;
+    bytes kbsf_dleag = 7;
+
+    bytes dest_af = 8;
+
+    uint32 protocol_version = 9;
+}
+
+message XmrSplitMessage {
+    bytes msg_id = 1;
+    uint32 msg_type = 2;  /* 1 XmrBid, 2 XmrBidAccept */
+    uint32 sequence = 3;
+    bytes dleag = 4;
+}
+
+message XmrBidAcceptMessage {
+    bytes bid_msg_id = 1;
+
+    bytes pkal = 3;
+
+    bytes kbvl = 4;
+    bytes kbsl_dleag = 5;
+
+    /* MSG2F */
+    bytes a_lock_tx = 6;
+    bytes a_lock_tx_script = 7;
+    bytes a_lock_refund_tx = 8;
+    bytes a_lock_refund_tx_script = 9;
+    bytes a_lock_refund_spend_tx = 10;
+    bytes al_lock_refund_tx_sig = 11;
+}
+
+message XmrBidLockTxSigsMessage {
+    /* MSG3L */
+    bytes bid_msg_id = 1;
+
+    bytes af_lock_refund_spend_tx_esig = 2;
+    bytes af_lock_refund_tx_sig = 3;
+}
+
+message XmrBidLockSpendTxMessage {
+    /* MSG4F */
+    bytes bid_msg_id = 1;
+
+    bytes a_lock_spend_tx = 2;
+    bytes kal_sig = 3;
+}
+
+message XmrBidLockReleaseMessage {
+    /* MSG5F */
+    bytes bid_msg_id = 1;
+
+    bytes al_lock_spend_tx_esig = 2;
+}
+
+message ADSBidIntentMessage {
+    /* L -> F Sent from bidder, construct a reverse bid */
+    bytes offer_msg_id = 1;
+    uint64 time_valid = 2;          /* seconds bid is valid for */
+    uint64 amount_from = 3;         /* amount of offer.coin_from bid is for */
+    uint64 amount_to = 4;           /* amount of offer.coin_to bid is for, equivalent to bid.amount */
+    uint64 rate = 5;                /* amount of offer.coin_from bid is for */
+
+    uint32 protocol_version = 6;
+}
+
+message ADSBidIntentAcceptMessage {
+    /* F -> L Sent from offerer, construct a reverse bid */
+    bytes bid_msg_id = 1;
+
+    bytes pkaf = 2;
+    bytes kbvf = 3;
+    bytes kbsf_dleag = 4;
+    bytes dest_af = 5;
+}
--- a/basicswap/messages_npb.py
+++ b/basicswap/messages_npb.py
@@ -1,265 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2024 tecnovert
-# Distributed under the MIT software license, see the accompanying
-# file LICENSE or http://www.opensource.org/licenses/mit-license.php.
-
-
-'''
-syntax = "proto3";
-
-0 VARINT int32, int64, uint32, uint64, sint32, sint64, bool, enum
-1 I64 fixed64, sfixed64, double
-2 LEN string, bytes, embedded messages, packed repeated fields
-5 I32 fixed32, sfixed32, float
-
-Don't encode fields of default values.
-When decoding initialise all fields not set from data.
-
-protobuf ParseFromString would reset the whole object, from_bytes won't.
-'''
-
-from basicswap.util.integer import encode_varint, decode_varint
-
-
-class NonProtobufClass():
-    def __init__(self, init_all: bool = True, **kwargs):
-        for key, value in kwargs.items():
-            found_field: bool = False
-            for field_num, v in self._map.items():
-                field_name, wire_type, field_type = v
-                if field_name == key:
-                    setattr(self, field_name, value)
-                    found_field = True
-                    break
-            if found_field is False:
-                raise ValueError(f'got an unexpected keyword argument \'{key}\'')
-
-        if init_all:
-            self.init_fields()
-
-    def init_fields(self) -> None:
-        # Set default values for missing fields
-        for field_num, v in self._map.items():
-            field_name, wire_type, field_type = v
-            if hasattr(self, field_name):
-                continue
-            if wire_type == 0:
-                setattr(self, field_name, 0)
-            elif wire_type == 2:
-                if field_type == 1:
-                    setattr(self, field_name, str())
-                else:
-                    setattr(self, field_name, bytes())
-            else:
-                raise ValueError(f'Unknown wire_type {wire_type}')
-
-    def to_bytes(self) -> bytes:
-        rv = bytes()
-
-        for field_num, v in self._map.items():
-            field_name, wire_type, field_type = v
-            if not hasattr(self, field_name):
-                continue
-            field_value = getattr(self, field_name)
-            tag = (field_num << 3) | wire_type
-            if wire_type == 0:
-                if field_value == 0:
-                    continue
-                rv += encode_varint(tag)
-                rv += encode_varint(field_value)
-            elif wire_type == 2:
-                if len(field_value) == 0:
-                    continue
-                rv += encode_varint(tag)
-                if isinstance(field_value, str):
-                    field_value = field_value.encode('utf-8')
-                rv += encode_varint(len(field_value))
-                rv += field_value
-            else:
-                raise ValueError(f'Unknown wire_type {wire_type}')
-        return rv
-
-    def from_bytes(self, b: bytes, init_all: bool = True) -> None:
-        max_len: int = len(b)
-        o: int = 0
-        while o < max_len:
-            tag, lv = decode_varint(b, o)
-            o += lv
-            wire_type = tag & 7
-            field_num = tag >> 3
-
-            field_name, wire_type_expect, field_type = self._map[field_num]
-            if wire_type != wire_type_expect:
-                raise ValueError(f'Unexpected wire_type {wire_type} for field {field_num}')
-
-            if wire_type == 0:
-                field_value, lv = decode_varint(b, o)
-                o += lv
-            elif wire_type == 2:
-                field_len, lv = decode_varint(b, o)
-                o += lv
-                field_value = b[o: o + field_len]
-                o += field_len
-                if field_type == 1:
-                    field_value = field_value.decode('utf-8')
-            else:
-                raise ValueError(f'Unknown wire_type {wire_type}')
-
-            setattr(self, field_name, field_value)
-
-        if init_all:
-            self.init_fields()
-
-
-class OfferMessage(NonProtobufClass):
-    _map = {
-        1: ('protocol_version', 0, 0),
-        2: ('coin_from', 0, 0),
-        3: ('coin_to', 0, 0),
-        4: ('amount_from', 0, 0),
-        5: ('amount_to', 0, 0),
-        6: ('min_bid_amount', 0, 0),
-        7: ('time_valid', 0, 0),
-        8: ('lock_type', 0, 0),
-        9: ('lock_value', 0, 0),
-        10: ('swap_type', 0, 0),
-        11: ('proof_address', 2, 1),
-        12: ('proof_signature', 2, 1),
-        13: ('pkhash_seller', 2, 0),
-        14: ('secret_hash', 2, 0),
-        15: ('fee_rate_from', 0, 0),
-        16: ('fee_rate_to', 0, 0),
-        17: ('amount_negotiable', 0, 2),
-        18: ('rate_negotiable', 0, 2),
-        19: ('proof_utxos', 2, 0),
-    }
-
-
-class BidMessage(NonProtobufClass):
-    _map = {
-        1: ('protocol_version', 0, 0),
-        2: ('offer_msg_id', 2, 0),
-        3: ('time_valid', 0, 0),
-        4: ('amount', 0, 0),
-        5: ('amount_to', 0, 0),
-        6: ('pkhash_buyer', 2, 0),
-        7: ('proof_address', 2, 1),
-        8: ('proof_signature', 2, 1),
-        9: ('proof_utxos', 2, 0),
-        10: ('pkhash_buyer_to', 2, 0),
-    }
-
-
-class BidAcceptMessage(NonProtobufClass):
-    # Step 3, seller -> buyer
-    _map = {
-        1: ('bid_msg_id', 2, 0),
-        2: ('initiate_txid', 2, 0),
-        3: ('contract_script', 2, 0),
-        4: ('pkhash_seller', 2, 0),
-    }
-
-
-class OfferRevokeMessage(NonProtobufClass):
-    _map = {
-        1: ('offer_msg_id', 2, 0),
-        2: ('signature', 2, 0),
-    }
-
-
-class BidRejectMessage(NonProtobufClass):
-    _map = {
-        1: ('bid_msg_id', 2, 0),
-        2: ('reject_code', 0, 0),
-    }
-
-
-class XmrBidMessage(NonProtobufClass):
-    # MSG1L, F -> L
-    _map = {
-        1: ('protocol_version', 0, 0),
-        2: ('offer_msg_id', 2, 0),
-        3: ('time_valid', 0, 0),
-        4: ('amount', 0, 0),
-        5: ('amount_to', 0, 0),
-        6: ('pkaf', 2, 0),
-        7: ('kbvf', 2, 0),
-        8: ('kbsf_dleag', 2, 0),
-        9: ('dest_af', 2, 0),
-    }
-
-
-class XmrSplitMessage(NonProtobufClass):
-    _map = {
-        1: ('msg_id', 2, 0),
-        2: ('msg_type', 0, 0),
-        3: ('sequence', 0, 0),
-        4: ('dleag', 2, 0),
-    }
-
-
-class XmrBidAcceptMessage(NonProtobufClass):
-    _map = {
-        1: ('bid_msg_id', 2, 0),
-        2: ('pkal', 2, 0),
-        3: ('kbvl', 2, 0),
-        4: ('kbsl_dleag', 2, 0),
-
-        # MSG2F
-        5: ('a_lock_tx', 2, 0),
-        6: ('a_lock_tx_script', 2, 0),
-        7: ('a_lock_refund_tx', 2, 0),
-        8: ('a_lock_refund_tx_script', 2, 0),
-        9: ('a_lock_refund_spend_tx', 2, 0),
-        10: ('al_lock_refund_tx_sig', 2, 0),
-    }
-
-
-class XmrBidLockTxSigsMessage(NonProtobufClass):
-    # MSG3L
-    _map = {
-        1: ('bid_msg_id', 2, 0),
-        2: ('af_lock_refund_spend_tx_esig', 2, 0),
-        3: ('af_lock_refund_tx_sig', 2, 0),
-    }
-
-
-class XmrBidLockSpendTxMessage(NonProtobufClass):
-    # MSG4F
-    _map = {
-        1: ('bid_msg_id', 2, 0),
-        2: ('a_lock_spend_tx', 2, 0),
-        3: ('kal_sig', 2, 0),
-    }
-
-
-class XmrBidLockReleaseMessage(NonProtobufClass):
-    # MSG5F
-    _map = {
-        1: ('bid_msg_id', 2, 0),
-        2: ('al_lock_spend_tx_esig', 2, 0),
-    }
-
-
-class ADSBidIntentMessage(NonProtobufClass):
-    # L -> F Sent from bidder, construct a reverse bid
-    _map = {
-        1: ('protocol_version', 0, 0),
-        2: ('offer_msg_id', 2, 0),
-        3: ('time_valid', 0, 0),
-        4: ('amount_from', 0, 0),
-        5: ('amount_to', 0, 0),
-    }
-
-
-class ADSBidIntentAcceptMessage(NonProtobufClass):
-    # F -> L Sent from offerer, construct a reverse bid
-    _map = {
-        1: ('bid_msg_id', 2, 0),
-        2: ('pkaf', 2, 0),
-        3: ('kbvf', 2, 0),
-        4: ('kbsf_dleag', 2, 0),
-        5: ('dest_af', 2, 0),
-    }
--- a/basicswap/messages_pb2.py
+++ b/basicswap/messages_pb2.py
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: messages.proto
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0emessages.proto\x12\tbasicswap\"\xa6\x04\n\x0cOfferMessage\x12\x11\n\tcoin_from\x18\x01 \x01(\r\x12\x0f\n\x07\x63oin_to\x18\x02 \x01(\r\x12\x13\n\x0b\x61mount_from\x18\x03 \x01(\x04\x12\x0c\n\x04rate\x18\x04 \x01(\x04\x12\x16\n\x0emin_bid_amount\x18\x05 \x01(\x04\x12\x12\n\ntime_valid\x18\x06 \x01(\x04\x12\x33\n\tlock_type\x18\x07 \x01(\x0e\x32 .basicswap.OfferMessage.LockType\x12\x12\n\nlock_value\x18\x08 \x01(\r\x12\x11\n\tswap_type\x18\t \x01(\r\x12\x15\n\rproof_address\x18\n \x01(\t\x12\x17\n\x0fproof_signature\x18\x0b \x01(\t\x12\x15\n\rpkhash_seller\x18\x0c \x01(\x0c\x12\x13\n\x0bsecret_hash\x18\r \x01(\x0c\x12\x15\n\rfee_rate_from\x18\x0e \x01(\x04\x12\x13\n\x0b\x66\x65\x65_rate_to\x18\x0f \x01(\x04\x12\x18\n\x10protocol_version\x18\x10 \x01(\r\x12\x19\n\x11\x61mount_negotiable\x18\x11 \x01(\x08\x12\x17\n\x0frate_negotiable\x18\x12 \x01(\x08\"q\n\x08LockType\x12\x0b\n\x07NOT_SET\x10\x00\x12\x18\n\x14SEQUENCE_LOCK_BLOCKS\x10\x01\x12\x16\n\x12SEQUENCE_LOCK_TIME\x10\x02\x12\x13\n\x0f\x41\x42S_LOCK_BLOCKS\x10\x03\x12\x11\n\rABS_LOCK_TIME\x10\x04\"\xc9\x01\n\nBidMessage\x12\x14\n\x0coffer_msg_id\x18\x01 \x01(\x0c\x12\x12\n\ntime_valid\x18\x02 \x01(\x04\x12\x0e\n\x06\x61mount\x18\x03 \x01(\x04\x12\x0c\n\x04rate\x18\x04 \x01(\x04\x12\x14\n\x0cpkhash_buyer\x18\x05 \x01(\x0c\x12\x15\n\rproof_address\x18\x06 \x01(\t\x12\x17\n\x0fproof_signature\x18\x07 \x01(\t\x12\x18\n\x10protocol_version\x18\x08 \x01(\r\x12\x13\n\x0bproof_utxos\x18\t \x01(\x0c\"\xc1\x01\n\x17\x42idMessage_v1Deprecated\x12\x14\n\x0coffer_msg_id\x18\x01 \x01(\x0c\x12\x12\n\ntime_valid\x18\x02 \x01(\x04\x12\x0e\n\x06\x61mount\x18\x03 \x01(\x04\x12\x0c\n\x04rate\x18\x04 \x01(\x04\x12\x14\n\x0cpkhash_buyer\x18\x05 \x01(\x0c\x12\x15\n\rproof_address\x18\x06 \x01(\t\x12\x17\n\x0fproof_signature\x18\x07 \x01(\t\x12\x18\n\x10protocol_version\x18\x08 \x01(\r\"V\n\x10\x42idAcceptMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12\x15\n\rinitiate_txid\x18\x02 \x01(\x0c\x12\x17\n\x0f\x63ontract_script\x18\x03 \x01(\x0c\"=\n\x12OfferRevokeMessage\x12\x14\n\x0coffer_msg_id\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c\";\n\x10\x42idRejectMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12\x13\n\x0breject_code\x18\x02 \x01(\r\"\xb2\x01\n\rXmrBidMessage\x12\x14\n\x0coffer_msg_id\x18\x01 \x01(\x0c\x12\x12\n\ntime_valid\x18\x02 \x01(\x04\x12\x0e\n\x06\x61mount\x18\x03 \x01(\x04\x12\x0c\n\x04rate\x18\x04 \x01(\x04\x12\x0c\n\x04pkaf\x18\x05 \x01(\x0c\x12\x0c\n\x04kbvf\x18\x06 \x01(\x0c\x12\x12\n\nkbsf_dleag\x18\x07 \x01(\x0c\x12\x0f\n\x07\x64\x65st_af\x18\x08 \x01(\x0c\x12\x18\n\x10protocol_version\x18\t \x01(\r\"T\n\x0fXmrSplitMessage\x12\x0e\n\x06msg_id\x18\x01 \x01(\x0c\x12\x10\n\x08msg_type\x18\x02 \x01(\r\x12\x10\n\x08sequence\x18\x03 \x01(\r\x12\r\n\x05\x64leag\x18\x04 \x01(\x0c\"\x80\x02\n\x13XmrBidAcceptMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12\x0c\n\x04pkal\x18\x03 \x01(\x0c\x12\x0c\n\x04kbvl\x18\x04 \x01(\x0c\x12\x12\n\nkbsl_dleag\x18\x05 \x01(\x0c\x12\x11\n\ta_lock_tx\x18\x06 \x01(\x0c\x12\x18\n\x10\x61_lock_tx_script\x18\x07 \x01(\x0c\x12\x18\n\x10\x61_lock_refund_tx\x18\x08 \x01(\x0c\x12\x1f\n\x17\x61_lock_refund_tx_script\x18\t \x01(\x0c\x12\x1e\n\x16\x61_lock_refund_spend_tx\x18\n \x01(\x0c\x12\x1d\n\x15\x61l_lock_refund_tx_sig\x18\x0b \x01(\x0c\"r\n\x17XmrBidLockTxSigsMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12$\n\x1c\x61\x66_lock_refund_spend_tx_esig\x18\x02 \x01(\x0c\x12\x1d\n\x15\x61\x66_lock_refund_tx_sig\x18\x03 \x01(\x0c\"X\n\x18XmrBidLockSpendTxMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12\x17\n\x0f\x61_lock_spend_tx\x18\x02 \x01(\x0c\x12\x0f\n\x07kal_sig\x18\x03 \x01(\x0c\"M\n\x18XmrBidLockReleaseMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12\x1d\n\x15\x61l_lock_spend_tx_esig\x18\x02 \x01(\x0c\"\x8f\x01\n\x13\x41\x44SBidIntentMessage\x12\x14\n\x0coffer_msg_id\x18\x01 \x01(\x0c\x12\x12\n\ntime_valid\x18\x02 \x01(\x04\x12\x13\n\x0b\x61mount_from\x18\x03 \x01(\x04\x12\x11\n\tamount_to\x18\x04 \x01(\x04\x12\x0c\n\x04rate\x18\x05 \x01(\x04\x12\x18\n\x10protocol_version\x18\x06 \x01(\r\"p\n\x19\x41\x44SBidIntentAcceptMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12\x0c\n\x04pkaf\x18\x02 \x01(\x0c\x12\x0c\n\x04kbvf\x18\x03 \x01(\x0c\x12\x12\n\nkbsf_dleag\x18\x04 \x01(\x0c\x12\x0f\n\x07\x64\x65st_af\x18\x05 \x01(\x0c\x62\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'messages_pb2', _globals)
+if _descriptor._USE_C_DESCRIPTORS == False:
+  DESCRIPTOR._options = None
+  _globals['_OFFERMESSAGE']._serialized_start=30
+  _globals['_OFFERMESSAGE']._serialized_end=580
+  _globals['_OFFERMESSAGE_LOCKTYPE']._serialized_start=467
+  _globals['_OFFERMESSAGE_LOCKTYPE']._serialized_end=580
+  _globals['_BIDMESSAGE']._serialized_start=583
+  _globals['_BIDMESSAGE']._serialized_end=784
+  _globals['_BIDMESSAGE_V1DEPRECATED']._serialized_start=787
+  _globals['_BIDMESSAGE_V1DEPRECATED']._serialized_end=980
+  _globals['_BIDACCEPTMESSAGE']._serialized_start=982
+  _globals['_BIDACCEPTMESSAGE']._serialized_end=1068
+  _globals['_OFFERREVOKEMESSAGE']._serialized_start=1070
+  _globals['_OFFERREVOKEMESSAGE']._serialized_end=1131
+  _globals['_BIDREJECTMESSAGE']._serialized_start=1133
+  _globals['_BIDREJECTMESSAGE']._serialized_end=1192
+  _globals['_XMRBIDMESSAGE']._serialized_start=1195
+  _globals['_XMRBIDMESSAGE']._serialized_end=1373
+  _globals['_XMRSPLITMESSAGE']._serialized_start=1375
+  _globals['_XMRSPLITMESSAGE']._serialized_end=1459
+  _globals['_XMRBIDACCEPTMESSAGE']._serialized_start=1462
+  _globals['_XMRBIDACCEPTMESSAGE']._serialized_end=1718
+  _globals['_XMRBIDLOCKTXSIGSMESSAGE']._serialized_start=1720
+  _globals['_XMRBIDLOCKTXSIGSMESSAGE']._serialized_end=1834
+  _globals['_XMRBIDLOCKSPENDTXMESSAGE']._serialized_start=1836
+  _globals['_XMRBIDLOCKSPENDTXMESSAGE']._serialized_end=1924
+  _globals['_XMRBIDLOCKRELEASEMESSAGE']._serialized_start=1926
+  _globals['_XMRBIDLOCKRELEASEMESSAGE']._serialized_end=2003
+  _globals['_ADSBIDINTENTMESSAGE']._serialized_start=2006
+  _globals['_ADSBIDINTENTMESSAGE']._serialized_end=2149
+  _globals['_ADSBIDINTENTACCEPTMESSAGE']._serialized_start=2151
+  _globals['_ADSBIDINTENTACCEPTMESSAGE']._serialized_end=2263
+# @@protoc_insertion_point(module_scope)
--- a/basicswap/protocols/atomic_swap_1.py
+++ b/basicswap/protocols/atomic_swap_1.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-

-# Copyright (c) 2020-2024 tecnovert
+# Copyright (c) 2020-2023 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.

@@ -10,15 +10,12 @@ from basicswap.db import (
 from basicswap.util import (
    SerialiseNum,
 )
-from basicswap.util.script import (
-    decodeScriptNum,
-)
 from basicswap.script import (
    OpCodes,
 )
 from basicswap.basicswap_util import (
-    EventLogTypes,
    SwapTypes,
+    EventLogTypes,
 )
 from . import ProtocolInterface

@@ -26,13 +23,13 @@ INITIATE_TX_TIMEOUT = 40 * 60  # TODO: make variable per coin
 ABS_LOCK_TIME_LEEWAY = 10 * 60


-def buildContractScript(lock_val: int, secret_hash: bytes, pkh_redeem: bytes, pkh_refund: bytes, op_lock=OpCodes.OP_CHECKSEQUENCEVERIFY, op_hash=OpCodes.OP_SHA256) -> bytearray:
+def buildContractScript(lock_val: int, secret_hash: bytes, pkh_redeem: bytes, pkh_refund: bytes, op_lock=OpCodes.OP_CHECKSEQUENCEVERIFY) -> bytearray:
    script = bytearray([
        OpCodes.OP_IF,
        OpCodes.OP_SIZE,
        0x01, 0x20,  # 32
        OpCodes.OP_EQUALVERIFY,
-        op_hash,
+        OpCodes.OP_SHA256,
        0x20]) \
        + secret_hash \
        + bytearray([
@@ -57,46 +54,6 @@ def buildContractScript(lock_val: int, secret_hash: bytes, pkh_redeem: bytes, pk
    return script


-def verifyContractScript(script, op_lock=OpCodes.OP_CHECKSEQUENCEVERIFY, op_hash=OpCodes.OP_SHA256):
-    if script[0] != OpCodes.OP_IF or \
-       script[1] != OpCodes.OP_SIZE or \
-       script[2] != 0x01 or script[3] != 0x20 or \
-       script[4] != OpCodes.OP_EQUALVERIFY or \
-       script[5] != op_hash or \
-       script[6] != 0x20:
-        return False, None, None, None, None
-    o = 7
-    script_hash = script[o: o + 32]
-    o += 32
-    if script[o] != OpCodes.OP_EQUALVERIFY or \
-       script[o + 1] != OpCodes.OP_DUP or \
-       script[o + 2] != OpCodes.OP_HASH160 or \
-       script[o + 3] != 0x14:
-        return False, script_hash, None, None, None
-    o += 4
-    pkh_redeem = script[o: o + 20]
-    o += 20
-    if script[o] != OpCodes.OP_ELSE:
-        return False, script_hash, pkh_redeem, None, None
-    o += 1
-    lock_val, nb = decodeScriptNum(script, o)
-    o += nb
-    if script[o] != op_lock or \
-       script[o + 1] != OpCodes.OP_DROP or \
-       script[o + 2] != OpCodes.OP_DUP or \
-       script[o + 3] != OpCodes.OP_HASH160 or \
-       script[o + 4] != 0x14:
-        return False, script_hash, pkh_redeem, lock_val, None
-    o += 5
-    pkh_refund = script[o: o + 20]
-    o += 20
-    if script[o] != OpCodes.OP_ENDIF or \
-       script[o + 1] != OpCodes.OP_EQUALVERIFY or \
-       script[o + 2] != OpCodes.OP_CHECKSIG:
-        return False, script_hash, pkh_redeem, lock_val, pkh_refund
-    return True, script_hash, pkh_redeem, lock_val, pkh_refund
-
-
 def extractScriptSecretHash(script):
    return script[7:39]

@@ -105,7 +62,7 @@ def redeemITx(self, bid_id: bytes, session):
    bid, offer = self.getBidAndOffer(bid_id, session)
    ci_from = self.ci(offer.coin_from)

-    txn = self.createRedeemTxn(ci_from.coin_type(), bid, for_txn_type='initiate', session=session)
+    txn = self.createRedeemTxn(ci_from.coin_type(), bid, for_txn_type='initiate')
    txid = ci_from.publishTx(bytes.fromhex(txn))

    bid.initiate_tx.spend_txid = bytes.fromhex(txid)
--- a/basicswap/protocols/xmr_swap_1.py
+++ b/basicswap/protocols/xmr_swap_1.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-

-# Copyright (c) 2020-2024 tecnovert
+# Copyright (c) 2020-2023 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.

-import traceback
+from sqlalchemy.orm import scoped_session

 from basicswap.util import (
    ensure,
 )
-from basicswap.interface.base import Curves
+from basicswap.interface import Curves
 from basicswap.chainparams import (
    Coins,
 )
@@ -21,17 +21,13 @@ from basicswap.basicswap_util import (
 from . import ProtocolInterface
 from basicswap.contrib.test_framework.script import (
    CScript, CScriptOp,
-    OP_CHECKMULTISIG
-)
+    OP_CHECKMULTISIG)


 def addLockRefundSigs(self, xmr_swap, ci):
    self.log.debug('Setting lock refund tx sigs')
-
-    witness_stack = []
-    if ci.coin_type() not in (Coins.DCR, ):
-        witness_stack += [b'', ]
-    witness_stack += [
+    witness_stack = [
+        b'',
        xmr_swap.al_lock_refund_tx_sig,
        xmr_swap.af_lock_refund_tx_sig,
        xmr_swap.a_lock_tx_script,
@@ -42,87 +38,59 @@ def addLockRefundSigs(self, xmr_swap, ci):
    xmr_swap.a_lock_refund_tx = signed_tx


-def recoverNoScriptTxnWithKey(self, bid_id: bytes, encoded_key, session=None):
-    self.log.info(f'Manually recovering {bid_id.hex()}')
+def recoverNoScriptTxnWithKey(self, bid_id: bytes, encoded_key):
+    self.log.info('Manually recovering %s', bid_id.hex())
    # Manually recover txn if other key is known
+    session = scoped_session(self.session_factory)
    try:
-        use_session = self.openSession(session)
-        bid, xmr_swap = self.getXmrBidFromSession(use_session, bid_id)
+        bid, xmr_swap = self.getXmrBidFromSession(session, bid_id)
        ensure(bid, 'Bid not found: {}.'.format(bid_id.hex()))
        ensure(xmr_swap, 'Adaptor-sig swap not found: {}.'.format(bid_id.hex()))
-        offer, xmr_offer = self.getXmrOfferFromSession(use_session, bid.offer_id, sent=False)
+        offer, xmr_offer = self.getXmrOfferFromSession(session, bid.offer_id, sent=False)
        ensure(offer, 'Offer not found: {}.'.format(bid.offer_id.hex()))
        ensure(xmr_offer, 'Adaptor-sig offer not found: {}.'.format(bid.offer_id.hex()))
+        ci_to = self.ci(offer.coin_to)

-        # The no-script coin is always the follower
-        reverse_bid: bool = self.is_reverse_ads_bid(offer.coin_from)
-        ci_from = self.ci(Coins(offer.coin_from))
-        ci_to = self.ci(Coins(offer.coin_to))
-        ci_leader = ci_to if reverse_bid else ci_from
-        ci_follower = ci_from if reverse_bid else ci_to
+        for_ed25519 = True if Coins(offer.coin_to) == Coins.XMR else False

        try:
-            decoded_key_half = ci_follower.decodeKey(encoded_key)
+            decoded_key_half = ci_to.decodeKey(encoded_key)
        except Exception as e:
            raise ValueError('Failed to decode provided key-half: ', str(e))

-        was_sent: bool = bid.was_received if reverse_bid else bid.was_sent
-
-        localkeyhalf = ci_follower.decodeKey(getChainBSplitKey(self, bid, xmr_swap, offer))
-        if was_sent:
+        if bid.was_sent:
            kbsl = decoded_key_half
-            kbsf = localkeyhalf
+            kbsf = self.getPathKey(offer.coin_from, offer.coin_to, bid.created_at, xmr_swap.contract_count, KeyTypes.KBSF, for_ed25519)
        else:
-            kbsl = localkeyhalf
+            kbsl = self.getPathKey(offer.coin_from, offer.coin_to, bid.created_at, xmr_swap.contract_count, KeyTypes.KBSL, for_ed25519)
            kbsf = decoded_key_half
+        ensure(ci_to.verifyKey(kbsl), 'Invalid kbsl')
+        ensure(ci_to.verifyKey(kbsf), 'Invalid kbsf')
+        vkbs = ci_to.sumKeys(kbsl, kbsf)

-        ensure(ci_follower.verifyKey(kbsl), 'Invalid kbsl')
-        ensure(ci_follower.verifyKey(kbsf), 'Invalid kbsf')
-        if kbsl == kbsf:
-            raise ValueError('Provided key matches local key')
-        vkbs = ci_follower.sumKeys(kbsl, kbsf)
-
-        ensure(ci_follower.verifyPubkey(xmr_swap.pkbs), 'Invalid pkbs')  # Sanity check
-
-        # Ensure summed key matches the expected pubkey
-        summed_pkbs = ci_follower.getPubkey(vkbs)
-        if (summed_pkbs != xmr_swap.pkbs):
-            err_msg: str = 'Summed key does not match expected wallet spend pubkey'
-            have_pk = summed_pkbs.hex()
-            expect_pk = xmr_swap.pkbs.hex()
-            self.log.error(f'{err_msg}. Got: {have_pk}, Expect: {expect_pk}')
-            raise ValueError(err_msg)
-
-        if ci_follower.coin_type() in (Coins.XMR, Coins.WOW):
-            address_to = self.getCachedMainWalletAddress(ci_follower, use_session)
+        if offer.coin_to == Coins.XMR:
+            address_to = self.getCachedMainWalletAddress(ci_to)
        else:
-            address_to = self.getCachedStealthAddressForCoin(ci_follower.coin_type(), use_session)
+            address_to = self.getCachedStealthAddressForCoin(offer.coin_to)
+
        amount = bid.amount_to
-        lock_tx_vout = bid.getLockTXBVout()
-        txid = ci_follower.spendBLockTx(xmr_swap.b_lock_tx_id, address_to, xmr_swap.vkbv, vkbs, amount, xmr_offer.b_fee_rate, bid.chain_b_height_start, spend_actual_balance=True, lock_tx_vout=lock_tx_vout)
-        self.log.debug('Submitted lock B spend txn %s to %s chain for bid %s', txid.hex(), ci_follower.coin_name(), bid_id.hex())
-        self.logBidEvent(bid.bid_id, EventLogTypes.LOCK_TX_B_SPEND_TX_PUBLISHED, txid.hex(), use_session)
-        use_session.commit()
+        txid = ci_to.spendBLockTx(xmr_swap.b_lock_tx_id, address_to, xmr_swap.vkbv, vkbs, bid.amount_to, xmr_offer.b_fee_rate, bid.chain_b_height_start, spend_actual_balance=True)
+        self.log.debug('Submitted lock B spend txn %s to %s chain for bid %s', txid.hex(), ci_to.coin_name(), bid_id.hex())
+        self.logBidEvent(bid.bid_id, EventLogTypes.LOCK_TX_B_SPEND_TX_PUBLISHED, txid.hex(), session)
+        session.commit()

        return txid
-    except Exception as e:
-        self.log.error(traceback.format_exc())
-        raise (e)
    finally:
-        if session is None:
-            self.closeSession(use_session, commit=False)
+        session.close()
+        session.remove()


 def getChainBSplitKey(swap_client, bid, xmr_swap, offer):
    reverse_bid: bool = offer.bid_reversed
-    ci_leader = swap_client.ci(offer.coin_to if reverse_bid else offer.coin_from)
    ci_follower = swap_client.ci(offer.coin_from if reverse_bid else offer.coin_to)

-    for_ed25519: bool = True if ci_follower.curve_type() == Curves.ed25519 else False
-    was_sent: bool = bid.was_received if reverse_bid else bid.was_sent
-
-    key_type = KeyTypes.KBSF if was_sent else KeyTypes.KBSL
-    return ci_follower.encodeKey(swap_client.getPathKey(ci_leader.coin_type(), ci_follower.coin_type(), bid.created_at, xmr_swap.contract_count, key_type, for_ed25519))
+    key_type = KeyTypes.KBSF if bid.was_sent else KeyTypes.KBSL
+    return ci_follower.encodeKey(swap_client.getPathKey(offer.coin_from, offer.coin_to, bid.created_at, xmr_swap.contract_count, key_type, True if ci_follower.coin_type() == Coins.XMR else False))


 def getChainBRemoteSplitKey(swap_client, bid, xmr_swap, offer):
@@ -163,11 +131,7 @@ def setDLEAG(xmr_swap, ci_to, kbsf: bytes) -> None:
 class XmrSwapInterface(ProtocolInterface):
    swap_type = SwapTypes.XMR_SWAP

-    def genScriptLockTxScript(self, ci, Kal: bytes, Kaf: bytes, **kwargs) -> CScript:
-        # fallthrough to ci if genScriptLockTxScript is implemented there
-        if hasattr(ci, 'genScriptLockTxScript') and callable(ci.genScriptLockTxScript):
-            return ci.genScriptLockTxScript(ci, Kal, Kaf, **kwargs)
-
+    def genScriptLockTxScript(self, ci, Kal: bytes, Kaf: bytes) -> CScript:
        Kal_enc = Kal if len(Kal) == 33 else ci.encodePubkey(Kal)
        Kaf_enc = Kaf if len(Kaf) == 33 else ci.encodePubkey(Kaf)

--- a/basicswap/rpc.py
+++ b/basicswap/rpc.py
@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-

-# Copyright (c) 2020-2024 tecnovert
+# Copyright (c) 2020-2023 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.

 import os
+import time
 import json
 import shlex
 import urllib
+import logging
 import traceback
 import subprocess
 from xmlrpc.client import (
@@ -18,6 +20,18 @@ from xmlrpc.client import (
 from .util import jsonDecimal


+def waitForRPC(rpc_func, expect_wallet=True, max_tries=7):
+    for i in range(max_tries + 1):
+        try:
+            rpc_func('getwalletinfo' if expect_wallet else 'getblockchaininfo')
+            return
+        except Exception as ex:
+            if i < max_tries:
+                logging.warning('Can\'t connect to RPC: %s. Retrying in %d second/s.', str(ex), (i + 1))
+                time.sleep(i + 1)
+    raise ValueError('waitForRPC failed')
+
+
 class Jsonrpc():
    # __getattr__ complicates extending ServerProxy
    def __init__(self, uri, transport=None, encoding=None, verbose=False,
--- a/basicswap/script.py
+++ b/basicswap/script.py
@@ -26,5 +26,3 @@ class OpCodes(IntEnum):
    OP_CHECKSIG = 0xac,
    OP_CHECKLOCKTIMEVERIFY = 0xb1,
    OP_CHECKSEQUENCEVERIFY = 0xb2,
-
-    OP_SHA256_DECRED = 0xc0,
--- a/basicswap/static/css/style.css
+++ b/basicswap/static/css/style.css
@@ -1,63 +1,65 @@
-/* General Styles */
-.bold {
-  font-weight: bold;
+
+.padded_row td
+{
+  padding-top:1.5em;
 }

-.monospace {
-  font-family: monospace;
+.bold
+{
+  font-weight:bold;
 }

-.floatright {
+.monospace
+{
+  font-family:monospace;
+}
+
+.floatright
+{
  position: fixed;
-  top: 1.25rem;
-  right: 1.25rem;
+  top:1.25rem;
+  right:1.25rem;
  z-index: 9999;
 }

-/* Table Styles */
-.padded_row td {
-  padding-top: 1.5em;
+.error_msg
+{
+  color:red;
 }

-/* Modal Styles */
-.modal-highest {
-  z-index: 9999;
-}
-
-/* Animation */
 #hide {
-  -moz-animation: cssAnimation 0s ease-in 15s forwards;
-  -webkit-animation: cssAnimation 0s ease-in 15s forwards;
-  -o-animation: cssAnimation 0s ease-in 15s forwards;
-  animation: cssAnimation 0s ease-in 15s forwards;
-  -webkit-animation-fill-mode: forwards;
-  animation-fill-mode: forwards;
+    -moz-animation: cssAnimation 0s ease-in 15s forwards;
+    /* Firefox */
+    -webkit-animation: cssAnimation 0s ease-in 15s forwards;
+    /* Safari and Chrome */
+    -o-animation: cssAnimation 0s ease-in 15s forwards;
+    /* Opera */
+    animation: cssAnimation 0s ease-in 15s forwards;
+    -webkit-animation-fill-mode: forwards;
+    animation-fill-mode: forwards;
 }
-
@keyframes cssAnimation {
-  to {
-    width: 0;
-    height: 0;
-    overflow: hidden;
-  }
+    to {
+        width:0;
+        height:0;
+        overflow:hidden;
+    }
 }
-
@-webkit-keyframes cssAnimation {
-  to {
-    width: 0;
-    height: 0;
-    visibility: hidden;
-  }
+    to {
+        width:0;
+        height:0;
+        visibility:hidden;
+    }
 }

-/* Custom Select Styles */
 .custom-select .select {
-  appearance: none;
-  background-image: url('/static/images/other/coin.png');
-  background-position: 10px center;
-  background-repeat: no-repeat;
-  position: relative;
-}
+    appearance: none;
+    background-image: url('/static/images/other/coin.png');
+    background-position: 10px center;
+    background-repeat: no-repeat;
+    position: relative;
+  }

 .custom-select select::-webkit-scrollbar {
  width: 0;
@@ -94,20 +96,19 @@
  display: block;
 }

-/* Blur and Overlay Styles */
 .blurred {
-  filter: blur(3px);
-  pointer-events: none;
-  user-select: none;
+    filter: blur(4px);
+    pointer-events: none;
+    user-select: none; 
 }

 .error-overlay.non-blurred {
-  filter: none;
-  pointer-events: auto;
-  user-select: auto;
+    filter: none;
+    pointer-events: auto;
+    user-select: auto;
 }

-/* Form Element Styles */
+/* Disable opacity on disabled form elements in Chrome */
@media screen and (-webkit-min-device-pixel-ratio:0) {
  select:disabled,
  input:disabled,
@@ -116,14 +117,14 @@
  }
 }

+/* Add this to your existing CSS file */
 .error {
  border: 1px solid red !important;
 }

-/* Active Container Styles */
 .active-container {
  position: relative;
-  border-radius: 10px;
+  border-radius: 5px;
 }

 .active-container::before {
@@ -138,222 +139,3 @@
  pointer-events: none;
 }

-/* Center Spin Animation */
-.center-spin {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-@keyframes spin {
-  0% { transform: rotate(0deg); }
-  100% { transform: rotate(360deg); }
-}
-
-/* Hover Container Styles */
-.hover-container:hover #coin_to_button,
-.hover-container:hover #coin_to,
-.hover-container:hover #coin_from_button,
-.hover-container:hover #coin_from {
-  border-color: #3b82f6;
-}
-
-#coin_to_button, #coin_from_button {
-  background-repeat: no-repeat;
-  background-position: center;
-  background-size: 20px 20px;
-}
-
-/* Input-like Container Styles */
-.input-like-container {
-  max-width: 100%;
-  background-color: #ffffff;
-  width: 360px;
-  padding: 1rem;
-  color: #374151;
-  border-radius: 0.375rem;
-  font-size: 0.875rem;
-  line-height: 1.25rem;
-  outline: none;
-  word-wrap: break-word;
-  overflow-wrap: break-word;
-  word-break: break-all;
-  height: auto;
-  min-height: 90px;
-  max-height: 150px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  overflow-y: auto;
-}
-
-.input-like-container.dark {
-  background-color: #374151;
-  color: #ffffff;
-}
-
-.input-like-container.copying {
-  width: inherit;
-}
-
-/* QR Code Styles */
-.qrcode {
-  position: relative;
-  display: inline-block;
-  padding: 10px;
-  overflow: hidden;
-}
-
-.qrcode-border {
-  border: 2px solid;
-  background-color: #ffffff;
-  border-radius: 0px;
-}
-
-.qrcode img {
-  width: 100%;
-  height: auto;
-  border-radius: 0px;
-}
-
-#showQR {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  height: 25px;
-}
-
-.qrcode-container {
-  margin-top: 25px;
-}
-
-/* Disabled Element Styles */
-select.select-disabled,
-.disabled-input-enabled,
-select.disabled-select-enabled {
-  opacity: 0.40 !important;
-}
-
-/* Shutdown Modal Styles */
-#shutdownModal {
-  z-index: 50;
-}
-
-#shutdownModal > div:first-child {
-  z-index: 40;
-}
-
-#shutdownModal > div:last-child {
-  z-index: 50;
-}
-
-#shutdownModal > div {
-  transition: opacity 0.3s ease-out;
-}
-
-#shutdownModal.hidden > div {
-  opacity: 0;
-}
-
-#shutdownModal:not(.hidden) > div {
-  opacity: 1;
-}
-
-.shutdown-button {
-  transition: all 0.3s ease;
-}
-
-.shutdown-button.shutdown-disabled {
-  opacity: 0.6;
-  cursor: not-allowed;
-  color: #a0aec0;
-}
-
-.shutdown-button.shutdown-disabled:hover {
-  background-color: #4a5568;
-}
-
-.shutdown-button.shutdown-disabled svg {
-  opacity: 0.5;
-}
-
-
-/* Loading line animation */
-.loading-line {
-  width: 100%;
-  height: 2px;
-  background-color: #ccc;
-  overflow: hidden;
-  position: relative;
-}
-.loading-line::before {
-  content: '';
-  display: block;
-  width: 100%;
-  height: 100%;
-  background: linear-gradient(to right, transparent, #007bff, transparent);
-  animation: loading 1.5s infinite;
-}
-@keyframes loading {
-  0% {
-    transform: translateX(-100%);
-  }
-  100% {
-    transform: translateX(100%);
-  }
-}
-/* Hide the loading line once data is loaded */
-.usd-value:not(.loading) .loading-line,
-.profit-loss:not(.loading) .loading-line {
-  display: none;
-}
-
-  .resolution-button {
-    background: none;
-    border: none;
-    color: #4B5563; /* gray-600 */
-    font-size: 0.875rem; /* text-sm */
-    font-weight: 500; /* font-medium */
-    padding: 0.25rem 0.5rem;
-    border-radius: 0.25rem;
-    transition: all 0.2s;
-    outline: 2px solid transparent;
-    outline-offset: 2px;
-  }
-
-  .resolution-button:hover {
-    color: #1F2937; /* gray-800 */
-  }
-
-  .resolution-button:focus {
-    outline: 2px solid #3B82F6; /* blue-500 */
-  }
-
-  .resolution-button.active {
-    color: #3B82F6; /* blue-500 */
-    outline: 2px solid #3B82F6; /* blue-500 */
-  }
-
-  .dark .resolution-button {
-    color: #9CA3AF; /* gray-400 */
-  }
-
-  .dark .resolution-button:hover {
-    color: #F3F4F6; /* gray-100 */
-  }
-
-  .dark .resolution-button.active {
-    color: #60A5FA; /* blue-400 */
-    outline-color: #60A5FA; /* blue-400 */
-    color: #fff;
-  }
-  
-    #toggle-volume.active {
-    @apply bg-green-500 hover:bg-green-600 focus:ring-green-300;
-  }
-  #toggle-auto-refresh[data-enabled="true"] {
-    @apply bg-green-500 hover:bg-green-600 focus:ring-green-300;
-  }
-
--- a/basicswap/static/images/coins/Bitcoin%20Cash.png
+++ b/basicswap/static/images/coins/Bitcoin%20Cash.png
--- a/basicswap/static/images/coins/Bitcoin-Cash-20.png
+++ b/basicswap/static/images/coins/Bitcoin-Cash-20.png
--- a/basicswap/static/images/coins/Bitcoin-Cash.png
+++ b/basicswap/static/images/coins/Bitcoin-Cash.png
--- a/basicswap/static/images/coins/Decred-20.png
+++ b/basicswap/static/images/coins/Decred-20.png
--- a/basicswap/static/images/coins/Decred.png
+++ b/basicswap/static/images/coins/Decred.png
--- a/basicswap/static/images/coins/Wownero-20.png
+++ b/basicswap/static/images/coins/Wownero-20.png
--- a/basicswap/static/images/coins/Wownero.png
+++ b/basicswap/static/images/coins/Wownero.png
--- a/basicswap/static/images/coins/Zano-20.png
+++ b/basicswap/static/images/coins/Zano-20.png
--- a/basicswap/static/images/coins/Zano.png
+++ b/basicswap/static/images/coins/Zano.png
--- a/basicswap/static/js/coin_icons.js
+++ b/basicswap/static/js/coin_icons.js
@@ -1,68 +1,70 @@
-document.addEventListener('DOMContentLoaded', () => {
+// Define a cache object to store selected option data
+const selectCache = {};

-    const selectCache = {};
+// Function to update the cache with the selected option data for a given select element
+function updateSelectCache(select) {
+  const selectedOption = select.options[select.selectedIndex];
+  const image = selectedOption.getAttribute('data-image');
+  const name = selectedOption.textContent.trim();
+  selectCache[select.id] = { image, name };
+}

-    function updateSelectCache(select) {
-        const selectedOption = select.options[select.selectedIndex];
-        const image = selectedOption.getAttribute('data-image');
-        const name = selectedOption.textContent.trim();
-        selectCache[select.id] = { image, name };
-    }
+// Function to set the selected option and associated image and name for a given select element

-    function setSelectData(select) {
-        const selectedOption = select.options[select.selectedIndex];
-        const image = selectedOption.getAttribute('data-image') || '';
-        const name = selectedOption.textContent.trim();
-        select.style.backgroundImage = image ? `url(${image}?${new Date().getTime()})` : '';
-        
-        const selectImage = select.nextElementSibling.querySelector('.select-image');
-        if (selectImage) {
-            selectImage.src = image;
-        }

-        const selectNameElement = select.nextElementSibling.querySelector('.select-name');
-        if (selectNameElement) {
-            selectNameElement.textContent = name;
-        }
+function setSelectData(select) {
+  const selectedOption = select.options[select.selectedIndex];
+  const image = selectedOption.getAttribute('data-image') || '/static/images/other/coin.png'; // set a default image URL
+  const name = selectedOption.textContent.trim();
+  if (image) {
+    select.style.backgroundImage = `url(${image})`;
+    select.nextElementSibling.querySelector('.select-image').src = image;
+  } else {
+    select.style.backgroundImage = '';
+    select.nextElementSibling.querySelector('.select-image').src = '';
+  }
+  select.nextElementSibling.querySelector('.select-name').textContent = name;
+  updateSelectCache(select);
+}

-        updateSelectCache(select);
-    }

-    const selectIcons = document.querySelectorAll('.custom-select .select-icon');
-    const selectImages = document.querySelectorAll('.custom-select .select-image');
-    const selectNames = document.querySelectorAll('.custom-select .select-name');
+// Function to get the selected option data from cache for a given select element
+function getSelectData(select) {
+  return selectCache[select.id] || {};
+}

-    selectIcons.forEach(icon => icon.style.display = 'none');
-    selectImages.forEach(image => image.style.display = 'none');
-    selectNames.forEach(name => name.style.display = 'none');
+// Update all custom select elements on the page
+const selects = document.querySelectorAll('.custom-select .select');
+selects.forEach((select) => {
+  // Set the initial select data based on the cached data (if available) or the selected option (if any)
+  const cachedData = getSelectData(select);
+  if (cachedData.image) {
+    select.style.backgroundImage = `url(${cachedData.image})`;
+    select.nextElementSibling.querySelector('.select-image').src = cachedData.image;
+  }
+  if (cachedData.name) {
+    select.nextElementSibling.querySelector('.select-name').textContent = cachedData.name;
+  }
+  if (select.selectedIndex >= 0) {
+    setSelectData(select);
+  }

-    function setupCustomSelect(select) {
-        const options = select.querySelectorAll('option');
-        const selectIcon = select.parentElement.querySelector('.select-icon');
-        const selectImage = select.parentElement.querySelector('.select-image');
+  // Add event listener to update select data when an option is selected
+  select.addEventListener('change', () => {
+    setSelectData(select);
+  });
+});

-        options.forEach(option => {
-            const image = option.getAttribute('data-image');
-            if (image) {
-                option.style.backgroundImage = `url(${image})`;
-            }
-        });
-
-        const storedValue = localStorage.getItem(select.name);
-        if (storedValue && select.value == '-1') {
-            select.value = storedValue;
-        }
-
-        select.addEventListener('change', () => {
-            setSelectData(select);
-            localStorage.setItem(select.name, select.value);
-        });
-
-        setSelectData(select);
-        selectIcon.style.display = 'none';
-        selectImage.style.display = 'none';
-    }
-
-    const customSelects = document.querySelectorAll('.custom-select select');
-    customSelects.forEach(setupCustomSelect);
-});
+// Hide the select image and name on page load
+const selectIcons = document.querySelectorAll('.custom-select .select-icon');
+const selectImages = document.querySelectorAll('.custom-select .select-image');
+const selectNames = document.querySelectorAll('.custom-select .select-name');
+selectIcons.forEach((icon) => {
+  icon.style.display = 'none';
+});
+selectImages.forEach((image) => {
+  image.style.display = 'none';
+});
+selectNames.forEach((name) => {
+  name.style.display = 'none';
+});
--- a/basicswap/static/js/coin_icons_2.js
+++ b/basicswap/static/js/coin_icons_2.js
@@ -0,0 +1,60 @@
+// Define the function for setting up the custom select element
+function setupCustomSelect(select) {
+  const options = select.querySelectorAll('option');
+  const selectIcon = select.parentElement.querySelector('.select-icon');
+  const selectImage = select.parentElement.querySelector('.select-image');
+
+  // Set the background image for each option that has a data-image attribute
+  options.forEach(option => {
+    const image = option.getAttribute('data-image');
+    if (image) {
+      option.style.backgroundImage = `url(${image})`;
+    }
+  });
+
+  if (select.value == '-1') {
+    // Set the selected option based on the stored value
+    const storedValue = localStorage.getItem(select.name);
+    if (storedValue) {
+      select.value = storedValue;
+    }
+  }
+
+  // Set the selected option image based on the selected value
+  const selectedOption = select.querySelector(`option[value="${select.value}"]`);
+  if (selectedOption) {
+    const image = selectedOption.getAttribute('data-image');
+    if (image) {
+      select.style.backgroundImage = `url(${image})`;
+      selectImage.src = image;
+    }
+  }
+
+  // Update the select element and image when the user makes a selection
+  select.addEventListener('change', () => {
+    const selectedOption = select.options[select.selectedIndex];
+    const image = selectedOption.getAttribute('data-image');
+    if (image) {
+      select.style.backgroundImage = `url(${image})`;
+      selectImage.src = image;
+    } else {
+      select.style.backgroundImage = '';
+      selectImage.src = '';
+    }
+
+    // Save the selected value to localStorage
+    localStorage.setItem(select.name, select.value);
+  });
+
+  // Hide the select icon and image on page load
+  selectIcon.style.display = 'none';
+  selectImage.style.display = 'none';
+}
+
+// Call the setupCustomSelect function for each custom select element
+const customSelects = document.querySelectorAll('.custom-select select');
+customSelects.forEach(select => {
+  setupCustomSelect(select);
+});
+
+
--- a/basicswap/static/js/libs/chartjs-adapter-date-fns.bundle.min.js
+++ b/basicswap/static/js/libs/chartjs-adapter-date-fns.bundle.min.js
--- a/basicswap/static/js/libs/flowbite.js
+++ b/basicswap/static/js/libs/flowbite.js
--- a/basicswap/static/js/libs/qrcode.js
+++ b/basicswap/static/js/libs/qrcode.js
@@ -1,614 +0,0 @@
-/**
- * @fileoverview
- * - Using the 'QRCode for Javascript library'
- * - Fixed dataset of 'QRCode for Javascript library' for support full-spec.
- * - this library has no dependencies.
- *
- * @author davidshimjs
- * @see <a href="http://www.d-project.com/" target="_blank">http://www.d-project.com/</a>
- * @see <a href="http://jeromeetienne.github.com/jquery-qrcode/" target="_blank">http://jeromeetienne.github.com/jquery-qrcode/</a>
- */
-var QRCode;
-
-(function () {
-	//---------------------------------------------------------------------
-	// QRCode for JavaScript
-	//
-	// Copyright (c) 2009 Kazuhiko Arase
-	//
-	// URL: http://www.d-project.com/
-	//
-	// Licensed under the MIT license:
-	//   http://www.opensource.org/licenses/mit-license.php
-	//
-	// The word "QR Code" is registered trademark of
-	// DENSO WAVE INCORPORATED
-	//   http://www.denso-wave.com/qrcode/faqpatent-e.html
-	//
-	//---------------------------------------------------------------------
-	function QR8bitByte(data) {
-		this.mode = QRMode.MODE_8BIT_BYTE;
-		this.data = data;
-		this.parsedData = [];
-
-		// Added to support UTF-8 Characters
-		for (var i = 0, l = this.data.length; i < l; i++) {
-			var byteArray = [];
-			var code = this.data.charCodeAt(i);
-
-			if (code > 0x10000) {
-				byteArray[0] = 0xF0 | ((code & 0x1C0000) >>> 18);
-				byteArray[1] = 0x80 | ((code & 0x3F000) >>> 12);
-				byteArray[2] = 0x80 | ((code & 0xFC0) >>> 6);
-				byteArray[3] = 0x80 | (code & 0x3F);
-			} else if (code > 0x800) {
-				byteArray[0] = 0xE0 | ((code & 0xF000) >>> 12);
-				byteArray[1] = 0x80 | ((code & 0xFC0) >>> 6);
-				byteArray[2] = 0x80 | (code & 0x3F);
-			} else if (code > 0x80) {
-				byteArray[0] = 0xC0 | ((code & 0x7C0) >>> 6);
-				byteArray[1] = 0x80 | (code & 0x3F);
-			} else {
-				byteArray[0] = code;
-			}
-
-			this.parsedData.push(byteArray);
-		}
-
-		this.parsedData = Array.prototype.concat.apply([], this.parsedData);
-
-		if (this.parsedData.length != this.data.length) {
-			this.parsedData.unshift(191);
-			this.parsedData.unshift(187);
-			this.parsedData.unshift(239);
-		}
-	}
-
-	QR8bitByte.prototype = {
-		getLength: function (buffer) {
-			return this.parsedData.length;
-		},
-		write: function (buffer) {
-			for (var i = 0, l = this.parsedData.length; i < l; i++) {
-				buffer.put(this.parsedData[i], 8);
-			}
-		}
-	};
-
-	function QRCodeModel(typeNumber, errorCorrectLevel) {
-		this.typeNumber = typeNumber;
-		this.errorCorrectLevel = errorCorrectLevel;
-		this.modules = null;
-		this.moduleCount = 0;
-		this.dataCache = null;
-		this.dataList = [];
-	}
-
-	QRCodeModel.prototype={addData:function(data){var newData=new QR8bitByte(data);this.dataList.push(newData);this.dataCache=null;},isDark:function(row,col){if(row<0||this.moduleCount<=row||col<0||this.moduleCount<=col){throw new Error(row+","+col);}
-	return this.modules[row][col];},getModuleCount:function(){return this.moduleCount;},make:function(){this.makeImpl(false,this.getBestMaskPattern());},makeImpl:function(test,maskPattern){this.moduleCount=this.typeNumber*4+17;this.modules=new Array(this.moduleCount);for(var row=0;row<this.moduleCount;row++){this.modules[row]=new Array(this.moduleCount);for(var col=0;col<this.moduleCount;col++){this.modules[row][col]=null;}}
-	this.setupPositionProbePattern(0,0);this.setupPositionProbePattern(this.moduleCount-7,0);this.setupPositionProbePattern(0,this.moduleCount-7);this.setupPositionAdjustPattern();this.setupTimingPattern();this.setupTypeInfo(test,maskPattern);if(this.typeNumber>=7){this.setupTypeNumber(test);}
-	if(this.dataCache==null){this.dataCache=QRCodeModel.createData(this.typeNumber,this.errorCorrectLevel,this.dataList);}
-	this.mapData(this.dataCache,maskPattern);},setupPositionProbePattern:function(row,col){for(var r=-1;r<=7;r++){if(row+r<=-1||this.moduleCount<=row+r)continue;for(var c=-1;c<=7;c++){if(col+c<=-1||this.moduleCount<=col+c)continue;if((0<=r&&r<=6&&(c==0||c==6))||(0<=c&&c<=6&&(r==0||r==6))||(2<=r&&r<=4&&2<=c&&c<=4)){this.modules[row+r][col+c]=true;}else{this.modules[row+r][col+c]=false;}}}},getBestMaskPattern:function(){var minLostPoint=0;var pattern=0;for(var i=0;i<8;i++){this.makeImpl(true,i);var lostPoint=QRUtil.getLostPoint(this);if(i==0||minLostPoint>lostPoint){minLostPoint=lostPoint;pattern=i;}}
-	return pattern;},createMovieClip:function(target_mc,instance_name,depth){var qr_mc=target_mc.createEmptyMovieClip(instance_name,depth);var cs=1;this.make();for(var row=0;row<this.modules.length;row++){var y=row*cs;for(var col=0;col<this.modules[row].length;col++){var x=col*cs;var dark=this.modules[row][col];if(dark){qr_mc.beginFill(0,100);qr_mc.moveTo(x,y);qr_mc.lineTo(x+cs,y);qr_mc.lineTo(x+cs,y+cs);qr_mc.lineTo(x,y+cs);qr_mc.endFill();}}}
-	return qr_mc;},setupTimingPattern:function(){for(var r=8;r<this.moduleCount-8;r++){if(this.modules[r][6]!=null){continue;}
-	this.modules[r][6]=(r%2==0);}
-	for(var c=8;c<this.moduleCount-8;c++){if(this.modules[6][c]!=null){continue;}
-	this.modules[6][c]=(c%2==0);}},setupPositionAdjustPattern:function(){var pos=QRUtil.getPatternPosition(this.typeNumber);for(var i=0;i<pos.length;i++){for(var j=0;j<pos.length;j++){var row=pos[i];var col=pos[j];if(this.modules[row][col]!=null){continue;}
-	for(var r=-2;r<=2;r++){for(var c=-2;c<=2;c++){if(r==-2||r==2||c==-2||c==2||(r==0&&c==0)){this.modules[row+r][col+c]=true;}else{this.modules[row+r][col+c]=false;}}}}}},setupTypeNumber:function(test){var bits=QRUtil.getBCHTypeNumber(this.typeNumber);for(var i=0;i<18;i++){var mod=(!test&&((bits>>i)&1)==1);this.modules[Math.floor(i/3)][i%3+this.moduleCount-8-3]=mod;}
-	for(var i=0;i<18;i++){var mod=(!test&&((bits>>i)&1)==1);this.modules[i%3+this.moduleCount-8-3][Math.floor(i/3)]=mod;}},setupTypeInfo:function(test,maskPattern){var data=(this.errorCorrectLevel<<3)|maskPattern;var bits=QRUtil.getBCHTypeInfo(data);for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<6){this.modules[i][8]=mod;}else if(i<8){this.modules[i+1][8]=mod;}else{this.modules[this.moduleCount-15+i][8]=mod;}}
-	for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<8){this.modules[8][this.moduleCount-i-1]=mod;}else if(i<9){this.modules[8][15-i-1+1]=mod;}else{this.modules[8][15-i-1]=mod;}}
-	this.modules[this.moduleCount-8][8]=(!test);},mapData:function(data,maskPattern){var inc=-1;var row=this.moduleCount-1;var bitIndex=7;var byteIndex=0;for(var col=this.moduleCount-1;col>0;col-=2){if(col==6)col--;while(true){for(var c=0;c<2;c++){if(this.modules[row][col-c]==null){var dark=false;if(byteIndex<data.length){dark=(((data[byteIndex]>>>bitIndex)&1)==1);}
-	var mask=QRUtil.getMask(maskPattern,row,col-c);if(mask){dark=!dark;}
-	this.modules[row][col-c]=dark;bitIndex--;if(bitIndex==-1){byteIndex++;bitIndex=7;}}}
-	row+=inc;if(row<0||this.moduleCount<=row){row-=inc;inc=-inc;break;}}}}};QRCodeModel.PAD0=0xEC;QRCodeModel.PAD1=0x11;QRCodeModel.createData=function(typeNumber,errorCorrectLevel,dataList){var rsBlocks=QRRSBlock.getRSBlocks(typeNumber,errorCorrectLevel);var buffer=new QRBitBuffer();for(var i=0;i<dataList.length;i++){var data=dataList[i];buffer.put(data.mode,4);buffer.put(data.getLength(),QRUtil.getLengthInBits(data.mode,typeNumber));data.write(buffer);}
-	var totalDataCount=0;for(var i=0;i<rsBlocks.length;i++){totalDataCount+=rsBlocks[i].dataCount;}
-	if(buffer.getLengthInBits()>totalDataCount*8){throw new Error("code length overflow. ("
-	+buffer.getLengthInBits()
-	+">"
-	+totalDataCount*8
-	+")");}
-	if(buffer.getLengthInBits()+4<=totalDataCount*8){buffer.put(0,4);}
-	while(buffer.getLengthInBits()%8!=0){buffer.putBit(false);}
-	while(true){if(buffer.getLengthInBits()>=totalDataCount*8){break;}
-	buffer.put(QRCodeModel.PAD0,8);if(buffer.getLengthInBits()>=totalDataCount*8){break;}
-	buffer.put(QRCodeModel.PAD1,8);}
-	return QRCodeModel.createBytes(buffer,rsBlocks);};QRCodeModel.createBytes=function(buffer,rsBlocks){var offset=0;var maxDcCount=0;var maxEcCount=0;var dcdata=new Array(rsBlocks.length);var ecdata=new Array(rsBlocks.length);for(var r=0;r<rsBlocks.length;r++){var dcCount=rsBlocks[r].dataCount;var ecCount=rsBlocks[r].totalCount-dcCount;maxDcCount=Math.max(maxDcCount,dcCount);maxEcCount=Math.max(maxEcCount,ecCount);dcdata[r]=new Array(dcCount);for(var i=0;i<dcdata[r].length;i++){dcdata[r][i]=0xff&buffer.buffer[i+offset];}
-	offset+=dcCount;var rsPoly=QRUtil.getErrorCorrectPolynomial(ecCount);var rawPoly=new QRPolynomial(dcdata[r],rsPoly.getLength()-1);var modPoly=rawPoly.mod(rsPoly);ecdata[r]=new Array(rsPoly.getLength()-1);for(var i=0;i<ecdata[r].length;i++){var modIndex=i+modPoly.getLength()-ecdata[r].length;ecdata[r][i]=(modIndex>=0)?modPoly.get(modIndex):0;}}
-	var totalCodeCount=0;for(var i=0;i<rsBlocks.length;i++){totalCodeCount+=rsBlocks[i].totalCount;}
-	var data=new Array(totalCodeCount);var index=0;for(var i=0;i<maxDcCount;i++){for(var r=0;r<rsBlocks.length;r++){if(i<dcdata[r].length){data[index++]=dcdata[r][i];}}}
-	for(var i=0;i<maxEcCount;i++){for(var r=0;r<rsBlocks.length;r++){if(i<ecdata[r].length){data[index++]=ecdata[r][i];}}}
-	return data;};var QRMode={MODE_NUMBER:1<<0,MODE_ALPHA_NUM:1<<1,MODE_8BIT_BYTE:1<<2,MODE_KANJI:1<<3};var QRErrorCorrectLevel={L:1,M:0,Q:3,H:2};var QRMaskPattern={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7};var QRUtil={PATTERN_POSITION_TABLE:[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],G15:(1<<10)|(1<<8)|(1<<5)|(1<<4)|(1<<2)|(1<<1)|(1<<0),G18:(1<<12)|(1<<11)|(1<<10)|(1<<9)|(1<<8)|(1<<5)|(1<<2)|(1<<0),G15_MASK:(1<<14)|(1<<12)|(1<<10)|(1<<4)|(1<<1),getBCHTypeInfo:function(data){var d=data<<10;while(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G15)>=0){d^=(QRUtil.G15<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G15)));}
-	return((data<<10)|d)^QRUtil.G15_MASK;},getBCHTypeNumber:function(data){var d=data<<12;while(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)>=0){d^=(QRUtil.G18<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)));}
-	return(data<<12)|d;},getBCHDigit:function(data){var digit=0;while(data!=0){digit++;data>>>=1;}
-	return digit;},getPatternPosition:function(typeNumber){return QRUtil.PATTERN_POSITION_TABLE[typeNumber-1];},getMask:function(maskPattern,i,j){switch(maskPattern){case QRMaskPattern.PATTERN000:return(i+j)%2==0;case QRMaskPattern.PATTERN001:return i%2==0;case QRMaskPattern.PATTERN010:return j%3==0;case QRMaskPattern.PATTERN011:return(i+j)%3==0;case QRMaskPattern.PATTERN100:return(Math.floor(i/2)+Math.floor(j/3))%2==0;case QRMaskPattern.PATTERN101:return(i*j)%2+(i*j)%3==0;case QRMaskPattern.PATTERN110:return((i*j)%2+(i*j)%3)%2==0;case QRMaskPattern.PATTERN111:return((i*j)%3+(i+j)%2)%2==0;default:throw new Error("bad maskPattern:"+maskPattern);}},getErrorCorrectPolynomial:function(errorCorrectLength){var a=new QRPolynomial([1],0);for(var i=0;i<errorCorrectLength;i++){a=a.multiply(new QRPolynomial([1,QRMath.gexp(i)],0));}
-	return a;},getLengthInBits:function(mode,type){if(1<=type&&type<10){switch(mode){case QRMode.MODE_NUMBER:return 10;case QRMode.MODE_ALPHA_NUM:return 9;case QRMode.MODE_8BIT_BYTE:return 8;case QRMode.MODE_KANJI:return 8;default:throw new Error("mode:"+mode);}}else if(type<27){switch(mode){case QRMode.MODE_NUMBER:return 12;case QRMode.MODE_ALPHA_NUM:return 11;case QRMode.MODE_8BIT_BYTE:return 16;case QRMode.MODE_KANJI:return 10;default:throw new Error("mode:"+mode);}}else if(type<41){switch(mode){case QRMode.MODE_NUMBER:return 14;case QRMode.MODE_ALPHA_NUM:return 13;case QRMode.MODE_8BIT_BYTE:return 16;case QRMode.MODE_KANJI:return 12;default:throw new Error("mode:"+mode);}}else{throw new Error("type:"+type);}},getLostPoint:function(qrCode){var moduleCount=qrCode.getModuleCount();var lostPoint=0;for(var row=0;row<moduleCount;row++){for(var col=0;col<moduleCount;col++){var sameCount=0;var dark=qrCode.isDark(row,col);for(var r=-1;r<=1;r++){if(row+r<0||moduleCount<=row+r){continue;}
-	for(var c=-1;c<=1;c++){if(col+c<0||moduleCount<=col+c){continue;}
-	if(r==0&&c==0){continue;}
-	if(dark==qrCode.isDark(row+r,col+c)){sameCount++;}}}
-	if(sameCount>5){lostPoint+=(3+sameCount-5);}}}
-	for(var row=0;row<moduleCount-1;row++){for(var col=0;col<moduleCount-1;col++){var count=0;if(qrCode.isDark(row,col))count++;if(qrCode.isDark(row+1,col))count++;if(qrCode.isDark(row,col+1))count++;if(qrCode.isDark(row+1,col+1))count++;if(count==0||count==4){lostPoint+=3;}}}
-	for(var row=0;row<moduleCount;row++){for(var col=0;col<moduleCount-6;col++){if(qrCode.isDark(row,col)&&!qrCode.isDark(row,col+1)&&qrCode.isDark(row,col+2)&&qrCode.isDark(row,col+3)&&qrCode.isDark(row,col+4)&&!qrCode.isDark(row,col+5)&&qrCode.isDark(row,col+6)){lostPoint+=40;}}}
-	for(var col=0;col<moduleCount;col++){for(var row=0;row<moduleCount-6;row++){if(qrCode.isDark(row,col)&&!qrCode.isDark(row+1,col)&&qrCode.isDark(row+2,col)&&qrCode.isDark(row+3,col)&&qrCode.isDark(row+4,col)&&!qrCode.isDark(row+5,col)&&qrCode.isDark(row+6,col)){lostPoint+=40;}}}
-	var darkCount=0;for(var col=0;col<moduleCount;col++){for(var row=0;row<moduleCount;row++){if(qrCode.isDark(row,col)){darkCount++;}}}
-	var ratio=Math.abs(100*darkCount/moduleCount/moduleCount-50)/5;lostPoint+=ratio*10;return lostPoint;}};var QRMath={glog:function(n){if(n<1){throw new Error("glog("+n+")");}
-	return QRMath.LOG_TABLE[n];},gexp:function(n){while(n<0){n+=255;}
-	while(n>=256){n-=255;}
-	return QRMath.EXP_TABLE[n];},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)};for(var i=0;i<8;i++){QRMath.EXP_TABLE[i]=1<<i;}
-	for(var i=8;i<256;i++){QRMath.EXP_TABLE[i]=QRMath.EXP_TABLE[i-4]^QRMath.EXP_TABLE[i-5]^QRMath.EXP_TABLE[i-6]^QRMath.EXP_TABLE[i-8];}
-	for(var i=0;i<255;i++){QRMath.LOG_TABLE[QRMath.EXP_TABLE[i]]=i;}
-	function QRPolynomial(num,shift){if(num.length==undefined){throw new Error(num.length+"/"+shift);}
-	var offset=0;while(offset<num.length&&num[offset]==0){offset++;}
-	this.num=new Array(num.length-offset+shift);for(var i=0;i<num.length-offset;i++){this.num[i]=num[i+offset];}}
-	QRPolynomial.prototype={get:function(index){return this.num[index];},getLength:function(){return this.num.length;},multiply:function(e){var num=new Array(this.getLength()+e.getLength()-1);for(var i=0;i<this.getLength();i++){for(var j=0;j<e.getLength();j++){num[i+j]^=QRMath.gexp(QRMath.glog(this.get(i))+QRMath.glog(e.get(j)));}}
-	return new QRPolynomial(num,0);},mod:function(e){if(this.getLength()-e.getLength()<0){return this;}
-	var ratio=QRMath.glog(this.get(0))-QRMath.glog(e.get(0));var num=new Array(this.getLength());for(var i=0;i<this.getLength();i++){num[i]=this.get(i);}
-	for(var i=0;i<e.getLength();i++){num[i]^=QRMath.gexp(QRMath.glog(e.get(i))+ratio);}
-	return new QRPolynomial(num,0).mod(e);}};function QRRSBlock(totalCount,dataCount){this.totalCount=totalCount;this.dataCount=dataCount;}
-	QRRSBlock.RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]];QRRSBlock.getRSBlocks=function(typeNumber,errorCorrectLevel){var rsBlock=QRRSBlock.getRsBlockTable(typeNumber,errorCorrectLevel);if(rsBlock==undefined){throw new Error("bad rs block @ typeNumber:"+typeNumber+"/errorCorrectLevel:"+errorCorrectLevel);}
-	var length=rsBlock.length/3;var list=[];for(var i=0;i<length;i++){var count=rsBlock[i*3+0];var totalCount=rsBlock[i*3+1];var dataCount=rsBlock[i*3+2];for(var j=0;j<count;j++){list.push(new QRRSBlock(totalCount,dataCount));}}
-	return list;};QRRSBlock.getRsBlockTable=function(typeNumber,errorCorrectLevel){switch(errorCorrectLevel){case QRErrorCorrectLevel.L:return QRRSBlock.RS_BLOCK_TABLE[(typeNumber-1)*4+0];case QRErrorCorrectLevel.M:return QRRSBlock.RS_BLOCK_TABLE[(typeNumber-1)*4+1];case QRErrorCorrectLevel.Q:return QRRSBlock.RS_BLOCK_TABLE[(typeNumber-1)*4+2];case QRErrorCorrectLevel.H:return QRRSBlock.RS_BLOCK_TABLE[(typeNumber-1)*4+3];default:return undefined;}};function QRBitBuffer(){this.buffer=[];this.length=0;}
-	QRBitBuffer.prototype={get:function(index){var bufIndex=Math.floor(index/8);return((this.buffer[bufIndex]>>>(7-index%8))&1)==1;},put:function(num,length){for(var i=0;i<length;i++){this.putBit(((num>>>(length-i-1))&1)==1);}},getLengthInBits:function(){return this.length;},putBit:function(bit){var bufIndex=Math.floor(this.length/8);if(this.buffer.length<=bufIndex){this.buffer.push(0);}
-	if(bit){this.buffer[bufIndex]|=(0x80>>>(this.length%8));}
-	this.length++;}};var QRCodeLimitLength=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]];
-
-	function _isSupportCanvas() {
-		return typeof CanvasRenderingContext2D != "undefined";
-	}
-
-	// android 2.x doesn't support Data-URI spec
-	function _getAndroid() {
-		var android = false;
-		var sAgent = navigator.userAgent;
-
-		if (/android/i.test(sAgent)) { // android
-			android = true;
-			var aMat = sAgent.toString().match(/android ([0-9]\.[0-9])/i);
-
-			if (aMat && aMat[1]) {
-				android = parseFloat(aMat[1]);
-			}
-		}
-
-		return android;
-	}
-
-	var svgDrawer = (function() {
-
-		var Drawing = function (el, htOption) {
-			this._el = el;
-			this._htOption = htOption;
-		};
-
-		Drawing.prototype.draw = function (oQRCode) {
-			var _htOption = this._htOption;
-			var _el = this._el;
-			var nCount = oQRCode.getModuleCount();
-			var nWidth = Math.floor(_htOption.width / nCount);
-			var nHeight = Math.floor(_htOption.height / nCount);
-
-			this.clear();
-
-			function makeSVG(tag, attrs) {
-				var el = document.createElementNS('http://www.w3.org/2000/svg', tag);
-				for (var k in attrs)
-					if (attrs.hasOwnProperty(k)) el.setAttribute(k, attrs[k]);
-				return el;
-			}
-
-			var svg = makeSVG("svg" , {'viewBox': '0 0 ' + String(nCount) + " " + String(nCount), 'width': '100%', 'height': '100%', 'fill': _htOption.colorLight});
-			svg.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:xlink", "http://www.w3.org/1999/xlink");
-			_el.appendChild(svg);
-
-			svg.appendChild(makeSVG("rect", {"fill": _htOption.colorLight, "width": "100%", "height": "100%"}));
-			svg.appendChild(makeSVG("rect", {"fill": _htOption.colorDark, "width": "1", "height": "1", "id": "template"}));
-
-			for (var row = 0; row < nCount; row++) {
-				for (var col = 0; col < nCount; col++) {
-					if (oQRCode.isDark(row, col)) {
-						var child = makeSVG("use", {"x": String(row), "y": String(col)});
-						child.setAttributeNS("http://www.w3.org/1999/xlink", "href", "#template")
-						svg.appendChild(child);
-					}
-				}
-			}
-		};
-		Drawing.prototype.clear = function () {
-			while (this._el.hasChildNodes())
-				this._el.removeChild(this._el.lastChild);
-		};
-		return Drawing;
-	})();
-
-	var useSVG = document.documentElement.tagName.toLowerCase() === "svg";
-
-	// Drawing in DOM by using Table tag
-	var Drawing = useSVG ? svgDrawer : !_isSupportCanvas() ? (function () {
-		var Drawing = function (el, htOption) {
-			this._el = el;
-			this._htOption = htOption;
-		};
-
-		/**
-		 * Draw the QRCode
-		 *
-		 * @param {QRCode} oQRCode
-		 */
-		Drawing.prototype.draw = function (oQRCode) {
-            var _htOption = this._htOption;
-            var _el = this._el;
-			var nCount = oQRCode.getModuleCount();
-			var nWidth = Math.floor(_htOption.width / nCount);
-			var nHeight = Math.floor(_htOption.height / nCount);
-			var aHTML = ['<table style="border:0;border-collapse:collapse;">'];
-
-			for (var row = 0; row < nCount; row++) {
-				aHTML.push('<tr>');
-
-				for (var col = 0; col < nCount; col++) {
-					aHTML.push('<td style="border:0;border-collapse:collapse;padding:0;margin:0;width:' + nWidth + 'px;height:' + nHeight + 'px;background-color:' + (oQRCode.isDark(row, col) ? _htOption.colorDark : _htOption.colorLight) + ';"></td>');
-				}
-
-				aHTML.push('</tr>');
-			}
-
-			aHTML.push('</table>');
-			_el.innerHTML = aHTML.join('');
-
-			// Fix the margin values as real size.
-			var elTable = _el.childNodes[0];
-			var nLeftMarginTable = (_htOption.width - elTable.offsetWidth) / 2;
-			var nTopMarginTable = (_htOption.height - elTable.offsetHeight) / 2;
-
-			if (nLeftMarginTable > 0 && nTopMarginTable > 0) {
-				elTable.style.margin = nTopMarginTable + "px " + nLeftMarginTable + "px";
-			}
-		};
-
-		/**
-		 * Clear the QRCode
-		 */
-		Drawing.prototype.clear = function () {
-			this._el.innerHTML = '';
-		};
-
-		return Drawing;
-	})() : (function () { // Drawing in Canvas
-		function _onMakeImage() {
-			this._elImage.src = this._elCanvas.toDataURL("image/png");
-			this._elImage.style.display = "block";
-			this._elCanvas.style.display = "none";
-		}
-
-		// Android 2.1 bug workaround
-		// http://code.google.com/p/android/issues/detail?id=5141
-		if (this._android && this._android <= 2.1) {
-	    	var factor = 1 / window.devicePixelRatio;
-	        var drawImage = CanvasRenderingContext2D.prototype.drawImage;
-	    	CanvasRenderingContext2D.prototype.drawImage = function (image, sx, sy, sw, sh, dx, dy, dw, dh) {
-	    		if (("nodeName" in image) && /img/i.test(image.nodeName)) {
-		        	for (var i = arguments.length - 1; i >= 1; i--) {
-		            	arguments[i] = arguments[i] * factor;
-		        	}
-	    		} else if (typeof dw == "undefined") {
-	    			arguments[1] *= factor;
-	    			arguments[2] *= factor;
-	    			arguments[3] *= factor;
-	    			arguments[4] *= factor;
-	    		}
-
-	        	drawImage.apply(this, arguments);
-	    	};
-		}
-
-		/**
-		 * Check whether the user's browser supports Data URI or not
-		 *
-		 * @private
-		 * @param {Function} fSuccess Occurs if it supports Data URI
-		 * @param {Function} fFail Occurs if it doesn't support Data URI
-		 */
-		function _safeSetDataURI(fSuccess, fFail) {
-            var self = this;
-            self._fFail = fFail;
-            self._fSuccess = fSuccess;
-
-            // Check it just once
-            if (self._bSupportDataURI === null) {
-                var el = document.createElement("img");
-                var fOnError = function() {
-                    self._bSupportDataURI = false;
-
-                    if (self._fFail) {
-                        self._fFail.call(self);
-                    }
-                };
-                var fOnSuccess = function() {
-                    self._bSupportDataURI = true;
-
-                    if (self._fSuccess) {
-                        self._fSuccess.call(self);
-                    }
-                };
-
-                el.onabort = fOnError;
-                el.onerror = fOnError;
-                el.onload = fOnSuccess;
-                el.src = "data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg=="; // the Image contains 1px data.
-                return;
-            } else if (self._bSupportDataURI === true && self._fSuccess) {
-                self._fSuccess.call(self);
-            } else if (self._bSupportDataURI === false && self._fFail) {
-                self._fFail.call(self);
-            }
-		};
-
-		/**
-		 * Drawing QRCode by using canvas
-		 *
-		 * @constructor
-		 * @param {HTMLElement} el
-		 * @param {Object} htOption QRCode Options
-		 */
-		var Drawing = function (el, htOption) {
-    		this._bIsPainted = false;
-    		this._android = _getAndroid();
-
-			this._htOption = htOption;
-			this._elCanvas = document.createElement("canvas");
-			this._elCanvas.width = htOption.width;
-			this._elCanvas.height = htOption.height;
-			el.appendChild(this._elCanvas);
-			this._el = el;
-			this._oContext = this._elCanvas.getContext("2d");
-			this._bIsPainted = false;
-			this._elImage = document.createElement("img");
-			this._elImage.alt = "Scan me!";
-			this._elImage.style.display = "none";
-			this._el.appendChild(this._elImage);
-			this._bSupportDataURI = null;
-		};
-
-		/**
-		 * Draw the QRCode
-		 *
-		 * @param {QRCode} oQRCode
-		 */
-		Drawing.prototype.draw = function (oQRCode) {
-            var _elImage = this._elImage;
-            var _oContext = this._oContext;
-            var _htOption = this._htOption;
-
-			var nCount = oQRCode.getModuleCount();
-			var nWidth = _htOption.width / nCount;
-			var nHeight = _htOption.height / nCount;
-			var nRoundedWidth = Math.round(nWidth);
-			var nRoundedHeight = Math.round(nHeight);
-
-			_elImage.style.display = "none";
-			this.clear();
-
-			for (var row = 0; row < nCount; row++) {
-				for (var col = 0; col < nCount; col++) {
-					var bIsDark = oQRCode.isDark(row, col);
-					var nLeft = col * nWidth;
-					var nTop = row * nHeight;
-					_oContext.strokeStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight;
-					_oContext.lineWidth = 1;
-					_oContext.fillStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight;
-					_oContext.fillRect(nLeft, nTop, nWidth, nHeight);
-
-					// 안티 앨리어싱 방지 처리
-					_oContext.strokeRect(
-						Math.floor(nLeft) + 0.5,
-						Math.floor(nTop) + 0.5,
-						nRoundedWidth,
-						nRoundedHeight
-					);
-
-					_oContext.strokeRect(
-						Math.ceil(nLeft) - 0.5,
-						Math.ceil(nTop) - 0.5,
-						nRoundedWidth,
-						nRoundedHeight
-					);
-				}
-			}
-
-			this._bIsPainted = true;
-		};
-
-		/**
-		 * Make the image from Canvas if the browser supports Data URI.
-		 */
-		Drawing.prototype.makeImage = function () {
-			if (this._bIsPainted) {
-				_safeSetDataURI.call(this, _onMakeImage);
-			}
-		};
-
-		/**
-		 * Return whether the QRCode is painted or not
-		 *
-		 * @return {Boolean}
-		 */
-		Drawing.prototype.isPainted = function () {
-			return this._bIsPainted;
-		};
-
-		/**
-		 * Clear the QRCode
-		 */
-		Drawing.prototype.clear = function () {
-			this._oContext.clearRect(0, 0, this._elCanvas.width, this._elCanvas.height);
-			this._bIsPainted = false;
-		};
-
-		/**
-		 * @private
-		 * @param {Number} nNumber
-		 */
-		Drawing.prototype.round = function (nNumber) {
-			if (!nNumber) {
-				return nNumber;
-			}
-
-			return Math.floor(nNumber * 1000) / 1000;
-		};
-
-		return Drawing;
-	})();
-
-	/**
-	 * Get the type by string length
-	 *
-	 * @private
-	 * @param {String} sText
-	 * @param {Number} nCorrectLevel
-	 * @return {Number} type
-	 */
-	function _getTypeNumber(sText, nCorrectLevel) {
-		var nType = 1;
-		var length = _getUTF8Length(sText);
-
-		for (var i = 0, len = QRCodeLimitLength.length; i <= len; i++) {
-			var nLimit = 0;
-
-			switch (nCorrectLevel) {
-				case QRErrorCorrectLevel.L :
-					nLimit = QRCodeLimitLength[i][0];
-					break;
-				case QRErrorCorrectLevel.M :
-					nLimit = QRCodeLimitLength[i][1];
-					break;
-				case QRErrorCorrectLevel.Q :
-					nLimit = QRCodeLimitLength[i][2];
-					break;
-				case QRErrorCorrectLevel.H :
-					nLimit = QRCodeLimitLength[i][3];
-					break;
-			}
-
-			if (length <= nLimit) {
-				break;
-			} else {
-				nType++;
-			}
-		}
-
-		if (nType > QRCodeLimitLength.length) {
-			throw new Error("Too long data");
-		}
-
-		return nType;
-	}
-
-	function _getUTF8Length(sText) {
-		var replacedText = encodeURI(sText).toString().replace(/\%[0-9a-fA-F]{2}/g, 'a');
-		return replacedText.length + (replacedText.length != sText ? 3 : 0);
-	}
-
-	/**
-	 * @class QRCode
-	 * @constructor
-	 * @example
-	 * new QRCode(document.getElementById("test"), "http://jindo.dev.naver.com/collie");
-	 *
-	 * @example
-	 * var oQRCode = new QRCode("test", {
-	 *    text : "http://naver.com",
-	 *    width : 128,
-	 *    height : 128
-	 * });
-	 *
-	 * oQRCode.clear(); // Clear the QRCode.
-	 * oQRCode.makeCode("http://map.naver.com"); // Re-create the QRCode.
-	 *
-	 * @param {HTMLElement|String} el target element or 'id' attribute of element.
-	 * @param {Object|String} vOption
-	 * @param {String} vOption.text QRCode link data
-	 * @param {Number} [vOption.width=256]
-	 * @param {Number} [vOption.height=256]
-	 * @param {String} [vOption.colorDark="#000000"]
-	 * @param {String} [vOption.colorLight="#ffffff"]
-	 * @param {QRCode.CorrectLevel} [vOption.correctLevel=QRCode.CorrectLevel.H] [L|M|Q|H]
-	 */
-	QRCode = function (el, vOption) {
-		this._htOption = {
-			width : 256,
-			height : 256,
-			typeNumber : 4,
-			colorDark : "#000000",
-			colorLight : "#ffffff",
-			correctLevel : QRErrorCorrectLevel.H
-		};
-
-		if (typeof vOption === 'string') {
-			vOption	= {
-				text : vOption
-			};
-		}
-
-		// Overwrites options
-		if (vOption) {
-			for (var i in vOption) {
-				this._htOption[i] = vOption[i];
-			}
-		}
-
-		if (typeof el == "string") {
-			el = document.getElementById(el);
-		}
-
-		if (this._htOption.useSVG) {
-			Drawing = svgDrawer;
-		}
-
-		this._android = _getAndroid();
-		this._el = el;
-		this._oQRCode = null;
-		this._oDrawing = new Drawing(this._el, this._htOption);
-
-		if (this._htOption.text) {
-			this.makeCode(this._htOption.text);
-		}
-	};
-
-	/**
-	 * Make the QRCode
-	 *
-	 * @param {String} sText link data
-	 */
-	QRCode.prototype.makeCode = function (sText) {
-		this._oQRCode = new QRCodeModel(_getTypeNumber(sText, this._htOption.correctLevel), this._htOption.correctLevel);
-		this._oQRCode.addData(sText);
-		this._oQRCode.make();
-		this._el.title = sText;
-		this._oDrawing.draw(this._oQRCode);
-		this.makeImage();
-	};
-
-	/**
-	 * Make the Image from Canvas element
-	 * - It occurs automatically
-	 * - Android below 3 doesn't support Data-URI spec.
-	 *
-	 * @private
-	 */
-	QRCode.prototype.makeImage = function () {
-		if (typeof this._oDrawing.makeImage == "function" && (!this._android || this._android >= 3)) {
-			this._oDrawing.makeImage();
-		}
-	};
-
-	/**
-	 * Clear the QRCode
-	 */
-	QRCode.prototype.clear = function () {
-		this._oDrawing.clear();
-	};
-
-	/**
-	 * @name QRCode.CorrectLevel
-	 */
-	QRCode.CorrectLevel = QRErrorCorrectLevel;
-})();
--- a/basicswap/static/js/new_offer.js
+++ b/basicswap/static/js/new_offer.js
@@ -37,23 +37,4 @@ window.addEventListener('DOMContentLoaded', (event) => {
      event.target.classList.remove('error');
    });
  });
-});
-
-const selects = document.querySelectorAll('select.disabled-select');
-for (const select of selects) {
-    if (select.disabled) {
-        select.classList.add('disabled-select-enabled');
-    } else {
-        select.classList.remove('disabled-select-enabled');
-    }
-}
-
-
-const inputs = document.querySelectorAll('input.disabled-input, input[type="checkbox"].disabled-input');
-for (const input of inputs) {
-    if (input.readOnly) {
-        input.classList.add('disabled-input-enabled');
-    } else {
-        input.classList.remove('disabled-input-enabled');
-    }
-}
+});
--- a/basicswap/static/js/offerstable.js
+++ b/basicswap/static/js/offerstable.js
--- a/basicswap/static/js/pricechart.js
+++ b/basicswap/static/js/pricechart.js
--- a/basicswap/templates/404.html
+++ b/basicswap/templates/404.html
@@ -1,5 +1,4 @@
 {% include 'header.html' %}
-{% from 'style.html' import breadcrumb_line_svg %}
 <div class="container mx-auto">
 <section class="p-5 mt-5">
  <div class="flex flex-wrap items-center -m-2">
@@ -10,11 +9,19 @@
       <p>Home</p>
      </a>
     </li>
-    <li>{{ breadcrumb_line_svg | safe }}</li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
     <li>
      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/404">404</a>
     </li>
-    <li>{{ breadcrumb_line_svg | safe }}</li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
    </ul>
   </div>
  </div>
@@ -30,6 +37,7 @@
            <div class="flex flex-wrap">
              <div class="w-full lg:w-auto py-1 lg:py-0 lg:mr-6"><a class="inline-block py-5 px-7 w-full text-base md:text-lg leading-4 text-blue-50 font-medium text-center bg-blue-500 hover:bg-blue-600 border border-blue-500 rounded-md shadow-sm focus:ring-0 focus:outline-none" href="/">Go Back</a></div>
              <div class="w-full lg:w-auto py-1 lg:py-0"><a class="inline-block py-5 px-7 w-full text-base md:text-lg leading-4 text-coolGray-800 font-medium text-center bg-white hover:bg-coolGray-100 border border-coolGray-200 rounded-md shadow-sm focus:ring-0 focus:outline-none" href="/refresh">Try Again</a></div>
+              <!-- todo add last URL page visit -->
            </div>
          </div>
        </div>
--- a/basicswap/templates/active.html
+++ b/basicswap/templates/active.html
@@ -1,5 +1,4 @@
 {% include 'header.html' %}
-{% from 'style.html' import breadcrumb_line_svg, circular_arrows_svg %} 
 <div class="container mx-auto">
 <section class="p-5 mt-5">
  <div class="flex flex-wrap items-center -m-2">
@@ -10,11 +9,19 @@
       <p>Home</p>
      </a>
     </li>
-    <li>{{ breadcrumb_line_svg | safe }}</li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
     <li>
      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/active">Swaps In Progress</a>
     </li>
-    <li>{{ breadcrumb_line_svg | safe }}</li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
    </ul>
   </div>
  </div>
@@ -32,13 +39,23 @@
     </div>
     <div class="w-full md:w-1/2 p-3 p-6 container flex flex-wrap items-center justify-end items-center mx-auto">
      {% if refresh %}
-      <a id="refresh" href="/active" class="rounded-full flex flex-wrap justify-center px-5 py-3 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border dark:bg-gray-500 dark:hover:bg-gray-700 border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
-        {{ circular_arrows_svg | safe }}
+      <a id="refresh" href="/active" class="flex flex-wrap justify-center px-5 py-4 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white borderdark:text-white dark:hover:text-white dark:bg-gray-600 dark:hover:bg-gray-700 dark:border-gray-600 dark:hover:border-gray-600 border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+       <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+        <g fill="#ffffff">
+         <path fill="#ffffff" d="M12,3c1.989,0,3.873,0.65,5.43,1.833l-3.604,3.393l9.167,0.983L22.562,0l-3.655,3.442 C16.957,1.862,14.545,1,12,1C5.935,1,1,5.935,1,12h2C3,7.037,7.037,3,12,3z"></path>
+         <path data-color="color-2" d="M12,21c-1.989,0-3.873-0.65-5.43-1.833l3.604-3.393l-9.167-0.983L1.438,24l3.655-3.442 C7.043,22.138,9.455,23,12,23c6.065,0,11-4.935,11-11h-2C21,16.963,16.963,21,12,21z"></path>
+        </g>
+       </svg>
       <span>Refresh 30 seconds</span>
      </a>
      {% else %}
      <a id="refresh" href="/active" class="flex flex-wrap justify-center px-5 py-4 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white borderdark:text-white dark:hover:text-white dark:bg-gray-600 dark:hover:bg-gray-700 dark:border-gray-600 dark:hover:border-gray-600 border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
-        {{ circular_arrows_svg | safe }}
+       <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+        <g fill="#ffffff">
+         <path fill="#ffffff" d="M12,3c1.989,0,3.873,0.65,5.43,1.833l-3.604,3.393l9.167,0.983L22.562,0l-3.655,3.442 C16.957,1.862,14.545,1,12,1C5.935,1,1,5.935,1,12h2C3,7.037,7.037,3,12,3z"></path>
+         <path data-color="color-2" d="M12,21c-1.989,0-3.873-0.65-5.43-1.833l3.604-3.393l-9.167-0.983L1.438,24l3.655-3.442 C7.043,22.138,9.455,23,12,23c6.065,0,11-4.935,11-11h-2C21,16.963,16.963,21,12,21z"></path>
+        </g>
+       </svg>
       <span>Refresh</span>
      </a>
      {% endif %}
@@ -66,22 +83,22 @@
             </th>
             <th class="p-0">
              <div class="py-3 px-6 bg-coolGray-200 dark:bg-gray-600">
-               <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Offer ID</span>
+               <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Offer ID </span>
              </div>
             </th>
             <th class="p-0">
              <div class="py-3 px-6 bg-coolGray-200 dark:bg-gray-600">
-               <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Bid Status</span>
+               <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Bid Status </span>
              </div>
             </th>
             <th class="p-0">
              <div class="py-3 px-6 bg-coolGray-200 dark:bg-gray-600">
-               <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">ITX Status</span>
+               <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">ITX Status </span>
              </div>
             </th>
             <th class="p-0">
              <div class="py-3 px-6 rounded-tr-xl bg-coolGray-200 dark:bg-gray-600">
-               <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">PTX Status</span>
+               <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">PTX Status </span>
              </div>
             </th>
            </tr>
--- a/basicswap/templates/automation_strategies.html
+++ b/basicswap/templates/automation_strategies.html
@@ -1,5 +1,4 @@
 {% include 'header.html' %}
-{% from 'style.html' import breadcrumb_line_svg, white_automation_svg, page_forwards_svg, page_back_svg, filter_apply_svg %}
 <div class="container mx-auto">
 <section class="p-5 mt-5">
  <div class="flex flex-wrap items-center -m-2">
@@ -9,11 +8,19 @@
      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/">
       <p>Home</p>
      </a>
-        <li>{{ breadcrumb_line_svg | safe }}</li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
     <li>
      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/automation">Automation Strategies</a>
     </li>
-        <li>{{ breadcrumb_line_svg | safe }}</li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
    </ul>
    </ul>
   </div>
@@ -27,11 +34,25 @@
    <img class="absolute h-64 left-1/2 top-1/2 transform -translate-x-1/2 -translate-y-1/2 object-cover" src="/static/images/elements/wave.svg" alt="">
    <div class="relative z-20 flex flex-wrap items-center -m-3">
     <div class="w-full md:w-1/2 p-3">
-      <h2 class="text-4xl font-bold text-white tracking-tighter">Automation Strategies</h2>
+      <h2 class="mb-6 text-4xl font-bold text-white tracking-tighter">Automation Strategies</h2>
+      <p class="font-normal text-coolGray-200 dark:text-white"></p>
     </div>
     <div class="w-full md:w-1/2 p-3 p-6 container flex flex-wrap items-center justify-end items-center mx-auto">
-      <a href="/newautomationstrategy" class="rounded-full flex flex-wrap justify-center px-5 py-3 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border dark:bg-gray-500 dark:hover:bg-gray-700 border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
-        {{ white_automation_svg | safe }}
+      <a href="/newautomationstrategy" class="flex flex-wrap justify-center px-5 py-4 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white borderdark:text-white dark:hover:text-white dark:bg-gray-600 dark:hover:bg-gray-700 dark:border-gray-600 dark:hover:border-gray-600 border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+       <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+        <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="round">
+         <line data-cap="butt" x1="5" y1="1" x2="5" y2="6" stroke="#ffffff"></line>
+         <line x1="3" y1="1" x2="7" y2="1" stroke="#fffffwww"></line>
+         <line data-cap="butt" x1="19" y1="1" x2="19" y2="6" stroke="#ffffff"></line>
+         <line x1="17" y1="1" x2="21" y2="1" stroke="#ffffff"></line>
+         <rect x="6" y="15" width="12" height="4" stroke="#ffffff"></rect>
+         <line data-cap="butt" x1="10" y1="19" x2="10" y2="15" stroke="#ffffff"></line>
+         <line data-cap="butt" x1="14" y1="19" x2="14" y2="15" stroke="#ffffff"></line>
+         <line x1="6" y1="11" x2="8" y2="11" stroke="#ffffff"></line>
+         <line x1="16" y1="11" x2="18" y2="11" stroke="#fff"></line>
+         <polygon points="23 6 5 6 1 6 1 23 23 23 23 6"></polygon>
+        </g>
+       </svg>
       <span>Create New Strategy</span>
      </a>
     </div>
@@ -100,11 +121,30 @@
        <div class="px-6">
         <div class="flex flex-wrap justify-end">
          <div class="w-full md:w-auto p-1.5 ml-2">
-           <button name='clearfilters' value="Clear Filters" class="flex flex-wrap justify-center w-full px-4 py-2.5 font-medium text-sm hover:text-white dark:text-white dark:bg-gray-500 bg-coolGray-200 hover:bg-green-600 hover:border-green-600 rounded-lg transition duration-200 border border-coolGray-200 dark:border-gray-400 rounded-md shadow-button focus:ring-0 focus:outline-none">Clear Filters</button>
+           <button name='clearfilters' value="Clear Filters" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+            <svg class="mr-2 w-5 h-5" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+             <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="round">
+              <line x1="20" y1="2" x2="12.329" y2="11.506"></line>
+              <path d="M11,11a2,2,0,0,1,2,2,3.659,3.659,0,0,1-.2.891A9.958,9.958,0,0,0,13.258,23H1C1,16.373,4.373,11,11,11Z"></path>
+              <line x1="18" y1="15" x2="23" y2="15" stroke="#ffffff"></line>
+              <line x1="17" y1="19" x2="23" y2="19" stroke="#ffffff"></line>
+              <line x1="19" y1="23" x2="23" y2="23" stroke="#ffffff"></line>
+              <path d="M8.059,11.415A3.9,3.9,0,0,0,12,16c.041,0,.079-.011.12-.012" data-cap="butt"></path>
+              <path d="M5,23a13.279,13.279,0,0,1,.208-3.4" data-cap="butt"></path>
+              <path d="M9.042,23c-.688-1.083-.313-3.4-.313-3.4" data-cap="butt"></path>
+             </g>
+            </svg> Clear</button>
          </div>
          <div class="w-full md:w-auto p-1.5 ml-2">
-           <button name="" value="Submit" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 font-medium text-sm text-white bg-blue-600 hover:bg-green-600 hover:border-green-600 rounded-lg transition duration-200 border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
-            {{ filter_apply_svg | safe }} Apply Filters</button>
+           <button name="" value="Submit" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+            <svg class="mr-2 w-5 h-5" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+             <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="round">
+              <rect x="2" y="2" width="7" height="7"></rect>
+              <rect x="15" y="15" width="7" height="7"></rect>
+              <rect x="2" y="15" width="7" height="7"></rect>
+              <polyline points="15 6 17 8 22 3" stroke="#ffffff"></polyline>
+             </g>
+            </svg>Apply Filters</button>
          </div>
         </div>
        </div>
@@ -164,8 +204,10 @@
         <div class="flex flex-wrap justify-end">
          <div class="w-full md:w-auto p-1.5">
           <button type="submit" name='pageback' value="Page Back" class="inline-flex items-center h-9 py-1 px-4 text-xs text-blue-50 font-semibold bg-blue-500 hover:bg-blue-600 rounded-lg transition duration-200 focus:ring-0 focus:outline-none">
-            {{ page_back_svg | safe }}
-            <span>Previous</span>
+            <svg aria-hidden="true" class="mr-2 w-5 h-5" fill="#ffffff" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+             <path fill-rule="evenodd" d="M7.707 14.707a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 1.414L5.414 9H17a1 1 0 110 2H5.414l2.293 2.293a1 1 0 010 1.414z" clip-rule="evenodd"></path>
+            </svg>
+            <span>Page Back</span>
           </button>
          </div>
          <div class="flex items-center">
@@ -175,8 +217,10 @@
          </div>
          <div class="w-full md:w-auto p-1.5">
           <button type="submit" name='pageforwards' value="Page Forwards" class="inline-flex items-center h-9 py-1 px-4 text-xs text-blue-50 font-semibold bg-blue-500 hover:bg-blue-600 rounded-lg transition duration-200 focus:ring-0 focus:outline-none">
-            <span>Next</span>
-            {{ page_forwards_svg | safe }}
+            <span>Page Forwards</span>
+            <svg aria-hidden="true" class="ml-2 w-5 h-5" fill="#ffffff" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+             <path fill-rule="evenodd" d="M12.293 5.293a1 1 0 011.414 0l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-2.293-2.293a1 1 0 010-1.414z" clip-rule="evenodd"></path>
+            </svg>
           </button>
          </div>
         </div>
--- a/basicswap/templates/automation_strategy.html
+++ b/basicswap/templates/automation_strategy.html
@@ -1,5 +1,4 @@
 {% include 'header.html' %}
-{% from 'style.html' import breadcrumb_line_svg %}
 <div class="container mx-auto">
 <section class="p-5 mt-5">
  <div class="flex flex-wrap items-center -m-2">
@@ -9,13 +8,21 @@
      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/">
       <p>Home</p>
      </a>
-        <li>{{ breadcrumb_line_svg | safe }}</li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
     <li>
      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/automation">Automation Strategies</a>
     </li>
-        <li>{{ breadcrumb_line_svg | safe }}</li>
     <li>
-      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/automation">ID:<!-- todo ID here {{ strategy_id }} --></a>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
+     <li>
+      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/automation">ID: <!-- todo ID here {{ strategy_id }} --></a>
     </li>
    </ul>
    </ul>
@@ -31,7 +38,7 @@
    <div class="relative z-20 flex flex-wrap items-center -m-3">
     <div class="w-full md:w-1/2 p-3">
      <h2 class="mb-6 text-4xl font-bold text-white tracking-tighter">Automation Strategy {{ strategy_id }}</h2>
-      <p class="font-normal text-coolGray-200 dark:text-white"><span class="bold">ID:</span><!-- todo ID here  {{ strategy_id }} -->
+      <p class="font-normal text-coolGray-200 dark:text-white">ID: <!-- todo ID here  {{ strategy_id }} -->
      </p>
     </div>
    </div>
@@ -59,7 +66,7 @@
              </th>
              <th class="p-0">
               <div class="py-3 px-6 bg-coolGray-200 dark:bg-gray-600">
-                <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Input</span>
+                <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Type</span>
               </div>
              </th>
             </tr>
@@ -107,17 +114,42 @@
         <div class="flex flex-wrap justify-end">
          {% if show_edit_form %}
          <div class="w-full md:w-auto p-1.5 ml-2">
-           <button name="apply" value="Apply" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">Apply</button>
+           <button name="apply" value="Apply" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+            <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+             <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="round">
+              <polyline points=" 6,12 10,16 18,8 " stroke="#ffffff"></polyline>
+              <circle cx="12" cy="12" r="11"></circle>
+             </g>
+            </svg>Apply</button>
          </div>
          <div class="w-full md:w-auto p-1.5 ml-2">
-           <button name="cancel" value="Cancel" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-red-500 hover:bg-red-600 font-medium text-sm text-white border border-red-500 rounded-md shadow-button focus:ring-0 focus:outline-none">Cancel</button>
-          </div>
-          {% else %}
-          <div class="w-full md:w-auto p-1.5">
-           <button name="edit" value="edit" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">Edit</button>
+           <button name="cancel" value="Cancel" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-red-500 hover:bg-red-600 font-medium text-sm text-white border border-red-500 rounded-md shadow-button focus:ring-0 focus:outline-none" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+            <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ef5844" stroke-linejoin="round">
+             <line x1="16" y1="8" x2="8" y2="16" stroke="#ef5844"></line>
+             <line x1="16" y1="16" x2="8" y2="8" stroke="#ef5844"></line>
+             <circle cx="12" cy="12" r="11"></circle>
+            </g>
+            </svg>Cancel</button>
+          </div> {% else %} <div class="w-full md:w-auto p-1.5">
+           <button name="edit" value="edit" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+            <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+             <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="round">
+              <line x1="2" y1="23" x2="22" y2="23" stroke="#ffffff"></line>
+              <line data-cap="butt" x1="13" y1="5" x2="17" y2="9"></line>
+              <polygon points="8 18 3 19 4 14 16 2 20 6 8 18"></polygon>
+             </g>
+            </svg>Edit</button>
          </div>
          <div class="w-full md:w-auto p-1.5 ml-2">
-           <a href="/automation" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none"><span>Back</span>
+           <a href="/automation" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+            <svg class="text-gray-500 w-5 h-5 mr-2" height="24" width="24" viewBox="0 0 24 24">
+             <g stroke-linecap="square" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="miter" class="nc-icon-wrapper" stroke-miterlimit="10">
+              <line data-cap="butt" x1="18" y1="12" x2="7" y2="12" stroke-linecap="butt" stroke="#ffffff"></line>
+              <polyline points=" 11,16 7,12 11,8 " stroke="#ffffff"></polyline>
+              <circle cx="12" cy="12" r="11"></circle>
+             </g>
+            </svg>
+            <span>Back</span>
           </a>
          </div>
          {% endif %}
--- a/basicswap/templates/automation_strategy_new.html
+++ b/basicswap/templates/automation_strategy_new.html
@@ -1,44 +1,51 @@
 {% include 'header.html' %}
-{% from 'style.html' import breadcrumb_line_svg %}
 <div class="container mx-auto">
- <section class="p-5 mt-5">
-  <div class="flex flex-wrap items-center -m-2">
-   <div class="w-full md:w-1/2 p-2">
-    <ul class="flex flex-wrap items-center gap-x-3 mb-2">
-     <li>
-      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/">
-       <p>Home</p>
-      </a>
-        <li>{{ breadcrumb_line_svg | safe }}</li>
-     <li>
-      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/automation">Automation Strategies</a>
-     </li>
-        <li>{{ breadcrumb_line_svg | safe }}</li>
-     <li>
-      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/automation">New</a>
-     </li>
-    </ul>
-    </ul>
-   </div>
-  </div>
- </section>
- <section class="py-4">
-  <div class="container px-4 mx-auto">
-   <div class="relative py-11 px-16 bg-coolGray-900 dark:bg-blue-500 rounded-md overflow-hidden">
-    <img class="absolute z-10 left-4 top-4" src="/static/images/elements/dots-red.svg" alt="">
-    <img class="absolute z-10 right-4 bottom-4" src="/static/images/elements/dots-red.svg" alt="">
-    <img class="absolute h-64 left-1/2 top-1/2 transform -translate-x-1/2 -translate-y-1/2 object-cover" src="/static/images/elements/wave.svg" alt="">
-    <div class="relative z-20 flex flex-wrap items-center -m-3">
-     <div class="w-full md:w-1/2 p-3">
-      <h2 class="mb-6 text-4xl font-bold text-white tracking-tighter">New Automation Strategy</h2>
-      <p class="font-normal text-coolGray-200 dark:text-white"><span class="bold">TODO/WIP:</span>
-      </p>
+   <section class="p-5 mt-5">
+    <div class="flex flex-wrap items-center -m-2">
+     <div class="w-full md:w-1/2 p-2">
+      <ul class="flex flex-wrap items-center gap-x-3 mb-2">
+       <li>
+        <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/">
+         <p>Home</p>
+        </a>
+       <li>
+        <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+         <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+        </svg>
+       </li>
+       <li>
+        <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/automation">Automation Strategies</a>
+       </li>
+       <li>
+        <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+         <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+        </svg>
+       </li>
+       <li>
+        <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/newautomationstrategy">New</a>
+       </li>
+      </ul>
+      </ul>
     </div>
    </div>
-   </div>
-  </div>
- </section>
-{% include 'inc_messages.html' %}
+   </section>
+   <section class="py-4">
+    <div class="container px-4 mx-auto">
+     <div class="relative py-11 px-16 bg-coolGray-900 dark:bg-blue-500 rounded-md overflow-hidden">
+      <img class="absolute z-10 left-4 top-4" src="/static/images/elements/dots-red.svg" alt="">
+      <img class="absolute z-10 right-4 bottom-4" src="/static/images/elements/dots-red.svg" alt="">
+      <img class="absolute h-64 left-1/2 top-1/2 transform -translate-x-1/2 -translate-y-1/2 object-cover" src="/static/images/elements/wave.svg" alt="">
+      <div class="relative z-20 flex flex-wrap items-center -m-3">
+       <div class="w-full md:w-1/2 p-3">
+        <h2 class="mb-6 text-4xl font-bold text-white tracking-tighter">New Automation Strategy</h2>
+        <p class="font-normal text-coolGray-200 dark:text-white">Todo <!-- todo -->
+        </p>
+       </div>
+      </div>
+     </div>
+    </div>
+   </section>
+   {% include 'inc_messages.html' %}
   <section>
    <div class="pl-6 pr-6 pt-0 pb-0 mt-5 h-full overflow-hidden">
     <div class="pb-6 border-coolGray-100">
--- a/basicswap/templates/bid.html
+++ b/basicswap/templates/bid.html
@@ -1,6 +1,4 @@
 {% include 'header.html' %}
-{% from 'style.html' import breadcrumb_line_svg, circular_arrows_svg, input_arrow_down_svg, small_arrow_white_right_svg %}
-
 <div class="container mx-auto">
 <section class="p-5 mt-5">
  <div class="flex flex-wrap items-center -m-2">
@@ -11,11 +9,19 @@
       <p>Home</p>
      </a>
     </li>
-      <li> {{ breadcrumb_line_svg | safe }} </li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
     <li>
      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="#">Bids</a>
     </li>
-      <li> {{ breadcrumb_line_svg | safe }} </li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
     <li>
      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="{{ bid_id }}">BID ID: {{ bid_id }}</a>
     </li>
@@ -32,17 +38,23 @@
    <div class="relative z-20 flex flex-wrap items-center -m-3">
     <div class="w-full md:w-1/2 p-3">
      <h2 class="mb-6 text-4xl font-bold text-white tracking-tighter">Bid {% if debug_mode == true %} (Debug: bid template) {% endif %}</h2>
-      <p class="font-normal text-coolGray-200 dark:text-white"><span class="bold">BID ID:</span> {{ bid_id }}</p>
+      <p class="font-normal text-coolGray-200 dark:text-white">Bid ID: {{ bid_id }}</p>
     </div>
-     <div class="w-full md:w-1/2 p-3 p-6 container flex flex-wrap items-center justify-end items-center mx-auto">
-      {% if refresh %} 
-      <a id="refresh" href="/bid/{{ bid_id }}"  class="rounded-full flex flex-wrap justify-center px-5 py-3 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border dark:bg-gray-500 dark:hover:bg-gray-700 border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
-        {{ circular_arrows_svg | safe }}
+     <div class="w-full md:w-1/2 p-3 p-6 container flex flex-wrap items-center justify-end items-center mx-auto"> {% if refresh %} <a id="refresh" href="/bid/{{ bid_id }}" class="flex flex-wrap justify-center px-5 py-3 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border dark:bg-gray-500 dark:hover:bg-gray-700 border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+       <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+        <g fill="#ffffff">
+         <path fill="#ffffff" d="M12,3c1.989,0,3.873,0.65,5.43,1.833l-3.604,3.393l9.167,0.983L22.562,0l-3.655,3.442 C16.957,1.862,14.545,1,12,1C5.935,1,1,5.935,1,12h2C3,7.037,7.037,3,12,3z"></path>
+         <path data-color="color-2" d="M12,21c-1.989,0-3.873-0.65-5.43-1.833l3.604-3.393l-9.167-0.983L1.438,24l3.655-3.442 C7.043,22.138,9.455,23,12,23c6.065,0,11-4.935,11-11h-2C21,16.963,16.963,21,12,21z"></path>
+        </g>
+       </svg>
       <span>Refresh {{ refresh }} seconds</span>
-      </a>
-      {% else %}
-      <a id="refresh" href="/bid/{{ bid_id }}"  class="rounded-full flex flex-wrap justify-center px-5 py-3 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border dark:bg-gray-500 dark:hover:bg-gray-700 border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
-        {{ circular_arrows_svg | safe }}
+      </a> {% else %} <a id="refresh" href="/bid/{{ bid_id }}" class="flex flex-wrap justify-center px-5 py-3 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border dark:bg-gray-500 dark:hover:bg-gray-700 border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+       <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+        <g fill="#ffffff">
+         <path fill="#ffffff" d="M12,3c1.989,0,3.873,0.65,5.43,1.833l-3.604,3.393l9.167,0.983L22.562,0l-3.655,3.442 C16.957,1.862,14.545,1,12,1C5.935,1,1,5.935,1,12h2C3,7.037,7.037,3,12,3z"></path>
+         <path data-color="color-2" d="M12,21c-1.989,0-3.873-0.65-5.43-1.833l3.604-3.393l-9.167-0.983L1.438,24l3.655-3.442 C7.043,22.138,9.455,23,12,23c6.065,0,11-4.935,11-11h-2C21,16.963,16.963,21,12,21z"></path>
+        </g>
+       </svg>
       <span>Refresh</span>
      </a>
    {% endif %}
@@ -82,7 +94,9 @@
            <td class="py-3 px-6">
             <div class="content flex py-2">
              <span class="bold">{{ data.amt_to }} {{ data.ticker_to }}</span>
-                {{ small_arrow_white_right_svg | safe }}
+              <svg aria-hidden="true " class="w-5 h-5 ml-3 mr-3" fill="currentColor " viewBox="0 0 20 20 " xmlns="http://www.w3.org/2000/svg ">
+               <path fill-rule="evenodd " d="M12.293 5.293a1 1 0 011.414 0l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-2.293-2.293a1 1 0 010-1.414z " clip-rule="evenodd "></path>
+              </svg>
              <span class="text-xs bold">{{ data.amt_from }} {{ data.ticker_from }}</span>
             </div>
            </td>
@@ -93,7 +107,9 @@
            <td class="py-3 px-6">
             <div class="content flex py-2">
              <span class="bold">{{ data.amt_from }} {{ data.ticker_from }}</span>
-                {{ small_arrow_white_right_svg | safe }}
+              <svg aria-hidden="true " class="w-5 h-5 ml-3 mr-3" fill="currentColor " viewBox="0 0 20 20 " xmlns="http://www.w3.org/2000/svg ">
+               <path fill-rule="evenodd " d="M12.293 5.293a1 1 0 011.414 0l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-2.293-2.293a1 1 0 010-1.414z " clip-rule="evenodd "></path>
+              </svg>
              <span class="bold">{{ data.amt_to }} {{ data.ticker_to }}</span>
             </div>
            </td>
@@ -445,7 +461,9 @@
             <td class="py-3 px-6 bold">Change Bid State:</td>
             <td class="py-3 px-6">
              <div class="relative">
-                {{ input_arrow_down_svg| safe }}
+               <svg class="absolute right-4 top-1/2 transform -translate-y-1/2" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M11.3333 6.1133C11.2084 5.98913 11.0395 5.91943 10.8633 5.91943C10.6872 5.91943 10.5182 5.98913 10.3933 6.1133L8.00001 8.47329L5.64001 6.1133C5.5151 5.98913 5.34613 5.91943 5.17001 5.91943C4.99388 5.91943 4.82491 5.98913 4.70001 6.1133C4.63752 6.17527 4.58792 6.249 4.55408 6.33024C4.52023 6.41148 4.50281 6.49862 4.50281 6.58663C4.50281 6.67464 4.52023 6.76177 4.55408 6.84301C4.58792 6.92425 4.63752 6.99799 4.70001 7.05996L7.52667 9.88663C7.58865 9.94911 7.66238 9.99871 7.74362 10.0326C7.82486 10.0664 7.912 10.0838 8.00001 10.0838C8.08801 10.0838 8.17515 10.0664 8.25639 10.0326C8.33763 9.99871 8.41136 9.94911 8.47334 9.88663L11.3333 7.05996C11.3958 6.99799 11.4454 6.92425 11.4793 6.84301C11.5131 6.76177 11.5305 6.67464 11.5305 6.58663C11.5305 6.49862 11.5131 6.41148 11.4793 6.33024C11.4454 6.249 11.3958 6.17527 11.3333 6.1133Z" fill="#8896AB"></path>
+               </svg>
               <select class="bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-" name="new_state">
                {% for s in data.bid_states %}
                <option value="{{ s[0] }}" {% if data.bid_state_ind==s[0] %} selected{% endif %}>{{ s[1] }}</option>
@@ -459,7 +477,9 @@
             <td class="py-3 px-6 bold">Debug Option</td>
             <td class="py-3 px-6">
              <div class="relative">
-                {{ input_arrow_down_svg| safe }}
+               <svg class="absolute right-4 top-1/2 transform -translate-y-1/2" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M11.3333 6.1133C11.2084 5.98913 11.0395 5.91943 10.8633 5.91943C10.6872 5.91943 10.5182 5.98913 10.3933 6.1133L8.00001 8.47329L5.64001 6.1133C5.5151 5.98913 5.34613 5.91943 5.17001 5.91943C4.99388 5.91943 4.82491 5.98913 4.70001 6.1133C4.63752 6.17527 4.58792 6.249 4.55408 6.33024C4.52023 6.41148 4.50281 6.49862 4.50281 6.58663C4.50281 6.67464 4.52023 6.76177 4.55408 6.84301C4.58792 6.92425 4.63752 6.99799 4.70001 7.05996L7.52667 9.88663C7.58865 9.94911 7.66238 9.99871 7.74362 10.0326C7.82486 10.0664 7.912 10.0838 8.00001 10.0838C8.08801 10.0838 8.17515 10.0664 8.25639 10.0326C8.33763 9.99871 8.41136 9.94911 8.47334 9.88663L11.3333 7.05996C11.3958 6.99799 11.4454 6.92425 11.4793 6.84301C11.5131 6.76177 11.5305 6.67464 11.5305 6.58663C11.5305 6.49862 11.5131 6.41148 11.4793 6.33024C11.4454 6.249 11.3958 6.17527 11.3333 6.1133Z" fill="#8896AB"></path>
+               </svg>
               <select class="bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-" name="debugind">
                <option{% if data.debug_ind=="-1" %} selected{% endif %} value="-1">None</option>
                {% for a in data.debug_options %}
@@ -541,7 +561,7 @@
                     <button name="abandon_bid" type="submit" value="Abandon Bid" onclick="return confirmPopup();" class="flex flex-wrap justify-center w-full px-4 py-2.5 font-medium text-sm text-white hover:text-red border border-red-500 hover:border-red-500 hover:bg-red-600 bg-red-500 rounded-md shadow-button focus:ring-0 focus:outline-none">Abandon Bid</button>
                    </div>
                    {% endif %}
-                     {% if data.was_received == 'True' and not edit_bid and data.can_accept_bid %}
+                     {% if data.was_received == 'True' and not edit_bid %}
                    <div class="w-full md:w-auto p-1.5">
                     <button name="accept_bid" value="Accept Bid" type="submit" onclick='return confirmPopup("Accept");' class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">Accept Bid</button>
                    </div>
@@ -569,4 +589,4 @@
 </div>
 {% include 'footer.html' %}
 </body>
-</html>
+</html>
--- a/basicswap/templates/bid_xmr.html
+++ b/basicswap/templates/bid_xmr.html
@@ -1,5 +1,5 @@
 {% include 'header.html' %}
-{% from 'style.html' import breadcrumb_line_svg, circular_arrows_svg, input_arrow_down_svg, small_arrow_white_right_svg %}
+{% from 'style.html' import input_arrow_down_svg %}

 <div class="container mx-auto">
 <section class="p-5 mt-5">
@@ -11,11 +11,19 @@
       <p>Home</p>
      </a>
     </li>
-      <li> {{ breadcrumb_line_svg | safe }} </li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
     <li>
      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="#">Bids</a>
     </li>
-      <li> {{ breadcrumb_line_svg | safe }} </li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
     <li>
      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="{{ bid_id }}">BID ID: {{ bid_id }}</a>
     </li>
@@ -32,17 +40,25 @@
    <div class="relative z-20 flex flex-wrap items-center -m-3">
     <div class="w-full md:w-1/2 p-3">
      <h2 class="mb-6 text-4xl font-bold text-white tracking-tighter">Bid {% if debug_mode == true %} (Debug: bid_xmr template) {% endif %}</h2>
-      <p class="font-normal text-coolGray-200 dark:text-white"><span class="bold">BID ID:</span> {{ bid_id }}</p>
+      <p class="font-normal text-coolGray-200 dark:text-white">Bid ID: {{ bid_id }}</p>
     </div>
-     <div class="w-full md:w-1/2 p-3 p-6 container flex flex-wrap items-center justify-end items-center mx-auto">
-      {% if refresh %}
-      <a id="refresh" href="/bid/{{ bid_id }}"  class="rounded-full flex flex-wrap justify-center px-5 py-3 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border dark:bg-gray-500 dark:hover:bg-gray-700 border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
-        {{ circular_arrows_svg | safe }}
+     <div class="w-full md:w-1/2 p-3 p-6 container flex flex-wrap items-center justify-end items-center mx-auto"> {% if refresh %} <a id="refresh" href="/bid/{{ bid_id }}" class="flex flex-wrap justify-center px-5 py-3 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border dark:bg-gray-500 dark:hover:bg-gray-700 border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+       <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+        <g fill="#ffffff">
+         <path fill="#ffffff" d="M12,3c1.989,0,3.873,0.65,5.43,1.833l-3.604,3.393l9.167,0.983L22.562,0l-3.655,3.442 C16.957,1.862,14.545,1,12,1C5.935,1,1,5.935,1,12h2C3,7.037,7.037,3,12,3z"></path>
+         <path data-color="color-2" d="M12,21c-1.989,0-3.873-0.65-5.43-1.833l3.604-3.393l-9.167-0.983L1.438,24l3.655-3.442 C7.043,22.138,9.455,23,12,23c6.065,0,11-4.935,11-11h-2C21,16.963,16.963,21,12,21z"></path>
+        </g>
+       </svg>
       <span>Refresh {{ refresh }} seconds</span>
      </a>
      {% else %}
-      <a id="refresh" href="/bid/{{ bid_id }}"  class="rounded-full flex flex-wrap justify-center px-5 py-3 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border dark:bg-gray-500 dark:hover:bg-gray-700 border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
-        {{ circular_arrows_svg | safe }}
+      <a id="refresh" href="/bid/{{ bid_id }}" class="flex flex-wrap justify-center px-5 py-3 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border dark:bg-gray-500 dark:hover:bg-gray-700 border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+       <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+        <g fill="#ffffff">
+         <path fill="#ffffff" d="M12,3c1.989,0,3.873,0.65,5.43,1.833l-3.604,3.393l9.167,0.983L22.562,0l-3.655,3.442 C16.957,1.862,14.545,1,12,1C5.935,1,1,5.935,1,12h2C3,7.037,7.037,3,12,3z"></path>
+         <path data-color="color-2" d="M12,21c-1.989,0-3.873-0.65-5.43-1.833l3.604-3.393l-9.167-0.983L1.438,24l3.655-3.442 C7.043,22.138,9.455,23,12,23c6.065,0,11-4.935,11-11h-2C21,16.963,16.963,21,12,21z"></path>
+        </g>
+       </svg>
       <span>Refresh</span>
      </a>
    {% endif %}
@@ -82,8 +98,10 @@
            <td class="py-3 px-6">
             <div class="content flex py-2">
              <span class="bold">{{ data.amt_to }} {{ data.ticker_to }}</span>
-                {{ small_arrow_white_right_svg | safe }}
-              <span class="bold">{{ data.amt_from }} {{ data.ticker_from }}</span>
+              <svg aria-hidden="true " class="w-5 h-5 ml-3 mr-3" fill="currentColor " viewBox="0 0 20 20 " xmlns="http://www.w3.org/2000/svg ">
+               <path fill-rule="evenodd " d="M12.293 5.293a1 1 0 011.414 0l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-2.293-2.293a1 1 0 010-1.414z " clip-rule="evenodd "></path>
+              </svg>
+              <span class="text-xs bold">{{ data.amt_from }} {{ data.ticker_from }}</span>
             </div>
            </td>
           </tr>
@@ -93,7 +111,9 @@
            <td class="py-3 px-6">
             <div class="content flex py-2">
              <span class="bold">{{ data.amt_from }} {{ data.ticker_from }}</span>
-                {{ small_arrow_white_right_svg | safe }}
+              <svg aria-hidden="true " class="w-5 h-5 ml-3 mr-3" fill="currentColor " viewBox="0 0 20 20 " xmlns="http://www.w3.org/2000/svg ">
+               <path fill-rule="evenodd " d="M12.293 5.293a1 1 0 011.414 0l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-2.293-2.293a1 1 0 010-1.414z " clip-rule="evenodd "></path>
+              </svg>
              <span class="bold">{{ data.amt_to }} {{ data.ticker_to }}</span>
             </div>
            </td>
@@ -378,13 +398,13 @@
            {% if data.xmr_b_half_privatekey %}
            <tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600">
             <td class="py-3 px-6 bold">Key Half (WARNING key data!):</td>
-             <td class="py-3 px-6 monospace" id="localkeyhalf">{{ data.xmr_b_half_privatekey }}</td>
+             <td class="py-3 px-6 monospace">{{ data.xmr_b_half_privatekey }}</td>
            </tr>
            {% endif %}
            {% if data.xmr_b_half_privatekey_remote %}
            <tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600">
             <td class="py-3 px-6 bold">Remote Key Half:</td>
-             <td class="py-3 px-6 monospace" id="remotekeyhalf">{{ data.xmr_b_half_privatekey_remote }}</td>
+             <td class="py-3 px-6 monospace">{{ data.xmr_b_half_privatekey_remote }}</td>
            </tr>
            {% endif %}
           </table>
@@ -485,8 +505,7 @@
            <tr class="opacity-100 text-gray-500 dark:text-gray-100">
             <td class="py-3 px-6 bold">View Transaction:</td>
             <td class="py-3 px-6 bold">
-              <div class="relative">
-                {{ input_arrow_down_svg | safe }}
+              <div class="relative">{{ input_arrow_down_svg | safe }}
               <select class="bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0" name="view_tx">
                {% if data.txns|length %} {% for tx in data.txns %}
                <option value="{{ tx.txid }}" {% if data.view_tx_ind==tx.txid %} selected{% endif %}>{{ tx.type }} {{ tx.txid }}</option>
@@ -703,8 +722,7 @@
            <tr class="opacity-100 text-gray-500 dark:text-gray-100">
             <td class="py-3 px-6 bold">Change Bid State:</td>
             <td class="py-3 px-6">
-              <div class="relative">
-                {{ input_arrow_down_svg | safe }}
+              <div class="relative">{{ input_arrow_down_svg | safe }}
               <select class="bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0" name="new_state">
                {% for s in data.bid_states %}
                <option value="{{ s[0] }}" {% if data.bid_state_ind==s[0] %} selected{% endif %}>{{ s[1] }}</option>
@@ -717,8 +735,7 @@
            <tr class="opacity-100 text-gray-500 dark:text-gray-100">
             <td class="py-3 px-6 bold">Add Bid Action:</td>
             <td class="py-3 px-6">
-              <div class="relative">
-                {{ input_arrow_down_svg | safe }}
+              <div class="relative">{{ input_arrow_down_svg | safe }}
               <select class="bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0" name="new_action">
                {% for a in data.bid_actions %}
                <option value="{{ a[0] }}">{{ a[1] }}</option>
@@ -730,8 +747,7 @@
            <tr class="opacity-100 text-gray-500 dark:text-gray-100">
             <td class="py-3 px-6 bold">Debug Option</td>
             <td class="py-3 px-6">
-              <div class="relative">
-                {{ input_arrow_down_svg | safe }}
+              <div class="relative">{{ input_arrow_down_svg | safe }}
               <select class="bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0" name="debugind">
                <option{% if data.debug_ind=="-1" %} selected{% endif %} value="-1">None</option>
                  {% for a in data.debug_options %}
@@ -817,7 +833,7 @@
                     <button name="abandon_bid" type="submit" value="Abandon Bid" onclick="return confirmPopup();" class="flex flex-wrap justify-center w-full px-4 py-2.5 font-medium text-sm text-white hover:text-red border border-red-500 hover:border-red-500 hover:bg-red-600 bg-red-500 rounded-md focus:ring-0 focus:outline-none">Abandon Bid</button>
                    </div>
                     {% endif %}
-                      {% if data.was_received == 'True' and not edit_bid and data.can_accept_bid %}
+                      {% if data.was_received == 'True' and not edit_bid %}
                      <div class="w-full md:w-auto p-1.5">
                     <button name="accept_bid" value="Accept Bid" type="submit" onclick='return confirmPopup("Accept");' class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md focus:ring-0 focus:outline-none">Accept Bid</button>
                    </div>
--- a/basicswap/templates/bids.html
+++ b/basicswap/templates/bids.html
@@ -1,219 +1,285 @@
 {% include 'header.html' %}
-{% from 'style.html' import breadcrumb_line_svg, page_back_svg, page_forwards_svg, filter_clear_svg, filter_apply_svg, circular_arrows_svg, input_arrow_down_svg %}
 <div class="container mx-auto">
-  <section class="p-5 mt-5">
-    <div class="flex flex-wrap items-center -m-2">
-      <div class="w-full md:w-1/2 p-2">
-        <ul class="flex flex-wrap items-center gap-x-3 mb-2">
-          <li>
-            <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/"><p>Home</p></a>
-          </li>
-          <li> {{ breadcrumb_line_svg | safe }} </li>
-          <li> <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="#">{{ page_type_available }} {{ page_type_received }} {{ page_type_sent }}</a> </li>
-          <li> {{ breadcrumb_line_svg | safe }} </li>
-        </ul>
-      </div>
-    </div>
-  </section>
-  <section class="py-4">
-    <div class="container px-4 mx-auto">
-      <div class="relative py-11 px-16 bg-coolGray-900 dark:bg-blue-500 rounded-md overflow-hidden">
-        <img class="absolute z-10 left-4 top-4" src="/static/images/elements/dots-red.svg" alt=""> <img class="absolute z-10 right-4 bottom-4" src="/static/images/elements/dots-red.svg" alt="">
-        <img class="absolute h-64 left-1/2 top-1/2 transform -translate-x-1/2 -translate-y-1/2 object-cover" src="/static/images/elements/wave.svg" alt="">
-        <div class="relative z-20 flex flex-wrap items-center -m-3">
-          <div class="w-full md:w-1/2 p-3">
-            <h2 class="mb-6 text-4xl font-bold text-white tracking-tighter">{{ page_type_available }} {{ page_type_received }} {{ page_type_sent }}</h2>
-            <p class="font-normal text-coolGray-200 dark:text-white">{{ page_type_available_description }} {{ page_type_received_description }} {{ page_type_sent_description }}</p>
-          </div>
-          <div class="w-full md:w-1/2 p-3 p-6 container flex flex-wrap items-center justify-end items-center mx-auto">
-            {% if refresh %}
-            <a id="refresh" href="/bid/{{ bid_id }}" class="rounded-full mr-5 flex flex-wrap justify-center px-5 py-3 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border dark:bg-gray-500 dark:hover:bg-gray-700 border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
-              {{ circular_arrows_svg | safe }}
-              <span>Refresh {{ refresh }} seconds</span>
-            </a>
-          {% endif %}
-        </div>
-        </div>
-      </div>
-    </div>
-  </section>
-  {% include 'inc_messages.html' %}
-  <div class="pl-6 pr-6 pt-0 pb-0 mt-5 h-full overflow-hidden">
-    <div class="pb-6 border-coolGray-100">
-      <div class="flex flex-wrap items-center justify-between -m-2">
-        <div class="w-full mx-auto pt-2">
-          <form method="post">
-            <div class="flex items-center justify-center pb-4 dark:text-white">
-              <div class="rounded-b-md">
-                <div class="w-full md:w-0/12">
-                  <div class="flex flex-wrap justify-center -m-1.5">
-                    <div class="w-full md:w-auto p-1.5">
-                      <div class="relative">
-                        {{ input_arrow_down_svg | safe }}
-                        <select name="sort_by" class="hover:border-blue-500 bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0">
-                          <option value="created_at" {% if filters.sort_by=='created_at' %} selected{% endif %}>Time At</option>
-                        </select>
-                      </div>
-                    </div>
-                    <div class="w-full md:w-auto p-1.5">
-                      <div class="relative">
-                        {{ input_arrow_down_svg | safe }}
-                        <select name="sort_dir" class="hover:border-blue-500 bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0">
-                          <option value="asc" {% if filters.sort_dir=='asc' %} selected{% endif %}>Ascending</option>
-                          <option value="desc" {% if filters.sort_dir=='desc' %} selected{% endif %}>Descending</option>
-                        </select>
-                      </div>
-                    </div>
-                    <div class="flex items-center">
-                      <div class="w-full md:w-auto p-1.5">
-                        <p class="text-sm font-heading bold">State:</p>
-                      </div>
-                    </div>
-                    <div class="w-full md:w-auto p-1.5">
-                      <div class="relative">
-                        {{ input_arrow_down_svg | safe }}
-                        <select name="state" class="hover:border-blue-500 bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0">
-                          <option value="-1" {% if filters.bid_state_ind==-1 %} selected{% endif %}>Any</option>
-                          {% for s in data.bid_states %}
-                          <option value="{{ s[0] }}" {% if filters.bid_state_ind==s[0] %} selected{% endif %}>{{ s[1] }}</option>
-                          {% endfor %}
-                        </select>
-                      </div>
-                    </div>
-                    <div class="flex items-center">
-                      <div class="w-full md:w-auto p-1.5">
-                        <p class="text-sm font-heading bold">Include Expired:</p>
-                      </div>
-                    </div>
-                    <div class="w-full md:w-auto p-1.5">
-                      <div class="relative">
-                        {{ input_arrow_down_svg | safe }}
-                        <select name="with_expired" class="hover:border-blue-500 bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0">
-                          <option value="true" {% if filters.with_expired==true %} selected{% endif %}>Include</option>
-                          <option value="false" {% if filters.with_expired==false %} selected{% endif %}>Exclude</option>
-                        </select> </div>
-                    </div>
-                    <div class="w-full md:w-auto p-1.5">
-                      <div class="relative">
-                        <button type="submit" name='clearfilters' value="Clear Filters" class="flex flex-wrap justify-center w-full px-4 py-2.5 font-medium text-sm hover:text-white dark:text-white dark:bg-gray-500 bg-coolGray-200 hover:bg-green-600 hover:border-green-600 rounded-lg transition duration-200 border border-coolGray-200 dark:border-gray-400 rounded-md shadow-button focus:ring-0 focus:outline-none">
-                          <span>Clear Filters</span>
-                        </button>
-                      </div>
-                    </div>
-                    <div class="w-full md:w-auto p-1.5">
-                      <div class="relative"> <button type="submit" name='applyfilters' value="Apply Filters" class="flex flex-wrap justify-center w-full px-4 py-2.5 font-medium text-sm text-white bg-blue-600 hover:bg-green-600 hover:border-green-600 rounded-lg transition duration-200 border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
-                        {{ filter_apply_svg | safe }}
-                        <span>Apply Filters</span>
-                      </button>
-                    </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div class="container mt-5 mx-auto">
-              <div class="pt-6 pb-6 bg-coolGray-100 dark:bg-gray-500 rounded-xl">
-                <div class="px-6">
-                  <div class="w-full mt-6 pb-6 overflow-x-auto">
-                    <table class="w-full min-w-max">
-                      <thead class="uppercase">
-                        <tr class="text-left">
-                          <th class="p-0">
-                            <div class="py-3 px-6 rounded-tl-xl bg-coolGray-200 dark:bg-gray-600"> <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Date/Time at</span>
-                            </div>
-                          </th>
-                          <th class="p-0">
-                            <div class="py-3 px-6 bg-coolGray-200 dark:bg-gray-600"> <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Bid ID</span>
-                            </div>
-                          </th>
-                          <th class="p-0">
-                            <div class="py-3 px-6 bg-coolGray-200 dark:bg-gray-600"> <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Offer ID</span>
-                            </div>
-                          </th>
-                          <th class="p-0">
-                            <div class="py-3 px-6 bg-coolGray-200 dark:bg-gray-600"> <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Bid From</span>
-                            </div>
-                          </th>
-                          <th class="p-0">
-                            <div class="py-3 px-6 bg-coolGray-200 dark:bg-gray-600"> <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Bid Status</span>
-                            </div>
-                          </th>
-                          <th class="p-0">
-                            <div class="py-3 px-6 bg-coolGray-200 dark:bg-gray-600"> <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">ITX Status</span>
-                            </div>
-                          </th>
-                          <th class="p-0">
-                            <div class="py-3 px-6 bg-coolGray-200 dark:bg-gray-600"> <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">PTX Status</span>
-                            </div>
-                          </th>
-                          <th class="p-0">
-                            <div class="py-3 px-6 rounded-tr-xl bg-coolGray-200 dark:bg-gray-600"> <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Details</span>
-                            </div>
-                          </th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        {% for b in bids %}
-                        <tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600">
-                          <th scope="row" class="flex items-center py-7 px-46 text-gray-900 whitespace-nowrap"> <svg class="w-5 h-5 rounded-full ml-5" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
-                              <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
-                                <circle cx="12" cy="12" r="11"></circle>
-                                <polyline points=" 12,6 12,12 18,12 " stroke="#6b7280"></polyline>
-                              </g>
-                            </svg>
-                            <div class="pl-3">
-                              <div class="font-semibold text-xs dark:text-white">{{ b[0] }}</div>
-                            </div>
-                          </th>
-                          <td class="py-3 px-6 text-xs monospace"> <a href=/bid/{{ b[1] }}>{{ b[1]|truncate(20, True) }}</a> </td>
-                          <td class="py-3 px-6 text-xs monospace"> <a href=/offer/{{ b[2] }}>{{ b[2]|truncate(20, True) }}</a> </td>
-                          <td class="py-3 px-6 text-xs monospace"> <a href=/identity/{{ b[6] }}>{{ b[6] }}</a> </td>
-                          <td class="py-3 px-6 text-xs">{{ b[3] }}</td>
-                          <td class="py-3 px-6 text-xs">{{ b[4] }}</td>
-                          <td class="py-3 px-6 text-xs">{{ b[5] }}</td>
-                          {% if page_type_received or page_type_sent %}
-                          <td class="py-3 px-6 text-xs"> <a class="inline-block w-20 py-1 px-2 font-medium text-center text-sm rounded-md bg-blue-500 text-white border border-blue-500 hover:bg-blue-600 transition duration-200 bg-blue-500 text-white hover:bg-blue-600 transition duration-200" href="/bid/{{ b[1] }}">Details</a>
-                          </td> {% elif page_type_available %}
-                          <td class="py-3 px-6 text-xs"> <a class="inline-block w-20 py-1 px-2 font-medium text-center text-sm rounded-md bg-blue-500 text-white border border-blue-500 hover:bg-blue-600 transition duration-200 bg-blue-500 text-white hover:bg-blue-600 transition duration-200" href="/bid/{{ b[1] }}">Accept</a>
-                          </td>
-                          {% endif %}
-                        </tr>
-                      </tbody>
-                      {% endfor %}
-                    </table> <input type="hidden" name="formid" value="{{ form_id }}"> <input type="hidden" name="pageno" value="{{ filters.page_no }}">
-                  </div>
-                </div>
-                <div class="rounded-b-md">
-                  <div class="w-full md:w-0/12">
-                    <div class="flex flex-wrap justify-end pt-6 pr-6 border-t border-gray-100 dark:border-gray-400">
-                      {% if filters.page_no > 1 %} <div class="w-full md:w-auto p-1.5">
-                        <button type="submit" name='pageback' value="Previous" class="inline-flex items-center h-9 py-1 px-4 text-xs text-blue-50 font-semibold bg-blue-500 hover:bg-blue-600 rounded-lg transition duration-200 focus:ring-0 focus:outline-none">
-                          {{ page_back_svg | safe }}
-                          <span>Previous</span>
-                        </button>
-                      </div>
-                      {% endif %}
-                      <div class="flex items-center">
-                        <div class="w-full md:w-auto p-1.5">
-                          <p class="text-sm font-heading dark:text-white">Page: {{ filters.page_no }}</p>
-                        </div>
-                      </div>
-                      {% if bids_count > 20 %}
-                      <div class="w-full md:w-auto p-1.5"> <button type="submit" name='pageforwards' value="Next" class="inline-flex items-center h-9 py-1 px-4 text-xs text-blue-50 font-semibold bg-blue-500 hover:bg-blue-600 rounded-lg transition duration-200 focus:ring-0 focus:outline-none">
-                        <span>Next</span>
-                      {{ page_forwards_svg | safe }}
-                    </button>
-                  </div>
-                {% endif %}
-              </div>
-                  </div>
-                </div>
-          </form>
-        </div>
-      </div>
-    </div>
+ <section class="p-5 mt-5">
+  <div class="flex flex-wrap items-center -m-2">
+   <div class="w-full md:w-1/2 p-2">
+    <ul class="flex flex-wrap items-center gap-x-3 mb-2">
+     <li>
+      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/">
+       <p>Home</p>
+      </a>
+     </li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
+     <li>
+      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="#">{{ page_type_available }} {{ page_type_received }} {{ page_type_sent }}</a>
+     </li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
+    </ul>
+   </div>
  </div>
-  </section>
+ </section>
+ <section class="py-4">
+  <div class="container px-4 mx-auto">
+   <div class="relative py-11 px-16 bg-coolGray-900 dark:bg-blue-500 rounded-md overflow-hidden">
+    <img class="absolute z-10 left-4 top-4" src="/static/images/elements/dots-red.svg" alt="">
+    <img class="absolute z-10 right-4 bottom-4" src="/static/images/elements/dots-red.svg" alt="">
+    <img class="absolute h-64 left-1/2 top-1/2 transform -translate-x-1/2 -translate-y-1/2 object-cover" src="/static/images/elements/wave.svg" alt="">
+    <div class="relative z-20 flex flex-wrap items-center -m-3">
+     <div class="w-full md:w-1/2 p-3">
+      <h2 class="mb-6 text-4xl font-bold text-white tracking-tighter">{{ page_type_available }} {{ page_type_received }} {{ page_type_sent }}</h2>
+      <p class="font-normal text-coolGray-200 dark:text-white">{{ page_type_available_description }} {{ page_type_received_description }} {{ page_type_sent_description }}</p>
+     </div>
+     <div class="w-full md:w-1/2 p-3 p-6 container flex flex-wrap items-center justify-end items-center mx-auto"> {% if refresh %} <a id="refresh" href="/bid/{{ bid_id }}" class="flex flex-wrap justify-center px-5 py-4 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+       <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+        <g fill="#ffffff">
+         <path fill="#ffffff" d="M12,3c1.989,0,3.873,0.65,5.43,1.833l-3.604,3.393l9.167,0.983L22.562,0l-3.655,3.442 C16.957,1.862,14.545,1,12,1C5.935,1,1,5.935,1,12h2C3,7.037,7.037,3,12,3z"></path>
+         <path data-color="color-2" d="M12,21c-1.989,0-3.873-0.65-5.43-1.833l3.604-3.393l-9.167-0.983L1.438,24l3.655-3.442 C7.043,22.138,9.455,23,12,23c6.065,0,11-4.935,11-11h-2C21,16.963,16.963,21,12,21z"></path>
+        </g>
+       </svg>
+       <span>Refresh {{ refresh }} seconds</span>
+      </a>
+    {% endif %}
+      </div>
+    </div>
+   </div>
+  </div>
+ </section>
+ {% include 'inc_messages.html' %}
+ <div class="pl-6 pr-6 pt-0 pb-0 mt-5 h-full overflow-hidden">
+  <div class="pb-6 border-coolGray-100">
+   <div class="flex flex-wrap items-center justify-between -m-2">
+    <div class="w-full pt-2">
+     <form method="post">
+      <div class="flex justify-between items-center pb-4 dark:text-white">
+       <div class="rounded-b-md">
+        <div class="w-full md:w-0/12">
+         <div class="flex flex-wrap justify-end -m-1.5">
+          <div class="w-full md:w-auto p-1.5">
+           <div class="relative">
+            <svg class="absolute right-4 top-1/2 transform -translate-y-1/2" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+             <path d="M11.3333 6.1133C11.2084 5.98913 11.0395 5.91943 10.8633 5.91943C10.6872 5.91943 10.5182 5.98913 10.3933 6.1133L8.00001 8.47329L5.64001 6.1133C5.5151 5.98913 5.34613 5.91943 5.17001 5.91943C4.99388 5.91943 4.82491 5.98913 4.70001 6.1133C4.63752 6.17527 4.58792 6.249 4.55408 6.33024C4.52023 6.41148 4.50281 6.49862 4.50281 6.58663C4.50281 6.67464 4.52023 6.76177 4.55408 6.84301C4.58792 6.92425 4.63752 6.99799 4.70001 7.05996L7.52667 9.88663C7.58865 9.94911 7.66238 9.99871 7.74362 10.0326C7.82486 10.0664 7.912 10.0838 8.00001 10.0838C8.08801 10.0838 8.17515 10.0664 8.25639 10.0326C8.33763 9.99871 8.41136 9.94911 8.47334 9.88663L11.3333 7.05996C11.3958 6.99799 11.4454 6.92425 11.4793 6.84301C11.5131 6.76177 11.5305 6.67464 11.5305 6.58663C11.5305 6.49862 11.5131 6.41148 11.4793 6.33024C11.4454 6.249 11.3958 6.17527 11.3333 6.1133Z" fill="#8896AB"></path>
+            </svg>
+            <select name="sort_by" class="hover:border-blue-500 bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0">
+             <option value="created_at" {% if filters.sort_by=='created_at' %} selected{% endif %}>Time At</option>
+            </select>
+           </div>
+          </div>
+          <div class="w-full md:w-auto p-1.5">
+           <div class="relative">
+            <svg class="absolute right-4 top-1/2 transform -translate-y-1/2" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+             <path d="M11.3333 6.1133C11.2084 5.98913 11.0395 5.91943 10.8633 5.91943C10.6872 5.91943 10.5182 5.98913 10.3933 6.1133L8.00001 8.47329L5.64001 6.1133C5.5151 5.98913 5.34613 5.91943 5.17001 5.91943C4.99388 5.91943 4.82491 5.98913 4.70001 6.1133C4.63752 6.17527 4.58792 6.249 4.55408 6.33024C4.52023 6.41148 4.50281 6.49862 4.50281 6.58663C4.50281 6.67464 4.52023 6.76177 4.55408 6.84301C4.58792 6.92425 4.63752 6.99799 4.70001 7.05996L7.52667 9.88663C7.58865 9.94911 7.66238 9.99871 7.74362 10.0326C7.82486 10.0664 7.912 10.0838 8.00001 10.0838C8.08801 10.0838 8.17515 10.0664 8.25639 10.0326C8.33763 9.99871 8.41136 9.94911 8.47334 9.88663L11.3333 7.05996C11.3958 6.99799 11.4454 6.92425 11.4793 6.84301C11.5131 6.76177 11.5305 6.67464 11.5305 6.58663C11.5305 6.49862 11.5131 6.41148 11.4793 6.33024C11.4454 6.249 11.3958 6.17527 11.3333 6.1133Z" fill="#8896AB"></path>
+            </svg>
+            <select name="sort_dir" class="hover:border-blue-500 bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0">
+             <option value="asc" {% if filters.sort_dir=='asc' %} selected{% endif %}>Ascending</option>
+             <option value="desc" {% if filters.sort_dir=='desc' %} selected{% endif %}>Descending</option>
+            </select>
+           </div>
+          </div>
+          <div class="flex items-center">
+           <div class="w-full md:w-auto p-1.5">
+            <p class="text-sm font-heading bold">State:</p>
+           </div>
+          </div>
+          <div class="w-full md:w-auto p-1.5">
+           <div class="relative">
+            <svg class="absolute right-4 top-1/2 transform -translate-y-1/2" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+             <path d="M11.3333 6.1133C11.2084 5.98913 11.0395 5.91943 10.8633 5.91943C10.6872 5.91943 10.5182 5.98913 10.3933 6.1133L8.00001 8.47329L5.64001 6.1133C5.5151 5.98913 5.34613 5.91943 5.17001 5.91943C4.99388 5.91943 4.82491 5.98913 4.70001 6.1133C4.63752 6.17527 4.58792 6.249 4.55408 6.33024C4.52023 6.41148 4.50281 6.49862 4.50281 6.58663C4.50281 6.67464 4.52023 6.76177 4.55408 6.84301C4.58792 6.92425 4.63752 6.99799 4.70001 7.05996L7.52667 9.88663C7.58865 9.94911 7.66238 9.99871 7.74362 10.0326C7.82486 10.0664 7.912 10.0838 8.00001 10.0838C8.08801 10.0838 8.17515 10.0664 8.25639 10.0326C8.33763 9.99871 8.41136 9.94911 8.47334 9.88663L11.3333 7.05996C11.3958 6.99799 11.4454 6.92425 11.4793 6.84301C11.5131 6.76177 11.5305 6.67464 11.5305 6.58663C11.5305 6.49862 11.5131 6.41148 11.4793 6.33024C11.4454 6.249 11.3958 6.17527 11.3333 6.1133Z" fill="#8896AB"></path>
+            </svg>
+            <select name="state" class="hover:border-blue-500 bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0">
+             <option value="-1" {% if filters.bid_state_ind==-1 %} selected{% endif %}>Any</option>
+             {% for s in data.bid_states %}
+             <option value="{{ s[0] }}" {% if filters.bid_state_ind==s[0] %} selected{% endif %}>{{ s[1] }}</option>
+             {% endfor %}
+            </select>
+           </div>
+          </div>
+          <div class="flex items-center">
+           <div class="w-full md:w-auto p-1.5">
+            <p class="text-sm font-heading bold">Include Expired:</p>
+           </div>
+          </div>
+          <div class="w-full md:w-auto p-1.5">
+           <div class="relative">
+            <svg class="absolute right-4 top-1/2 transform -translate-y-1/2" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+             <path d="M11.3333 6.1133C11.2084 5.98913 11.0395 5.91943 10.8633 5.91943C10.6872 5.91943 10.5182 5.98913 10.3933 6.1133L8.00001 8.47329L5.64001 6.1133C5.5151 5.98913 5.34613 5.91943 5.17001 5.91943C4.99388 5.91943 4.82491 5.98913 4.70001 6.1133C4.63752 6.17527 4.58792 6.249 4.55408 6.33024C4.52023 6.41148 4.50281 6.49862 4.50281 6.58663C4.50281 6.67464 4.52023 6.76177 4.55408 6.84301C4.58792 6.92425 4.63752 6.99799 4.70001 7.05996L7.52667 9.88663C7.58865 9.94911 7.66238 9.99871 7.74362 10.0326C7.82486 10.0664 7.912 10.0838 8.00001 10.0838C8.08801 10.0838 8.17515 10.0664 8.25639 10.0326C8.33763 9.99871 8.41136 9.94911 8.47334 9.88663L11.3333 7.05996C11.3958 6.99799 11.4454 6.92425 11.4793 6.84301C11.5131 6.76177 11.5305 6.67464 11.5305 6.58663C11.5305 6.49862 11.5131 6.41148 11.4793 6.33024C11.4454 6.249 11.3958 6.17527 11.3333 6.1133Z" fill="#8896AB"></path>
+            </svg>
+            <select name="with_expired" class="hover:border-blue-500 bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0">
+             <option value="true" {% if filters.with_expired==true %} selected{% endif %}>Include</option>
+             <option value="false" {% if filters.with_expired==false %} selected{% endif %}>Exclude</option>
+            </select>
+           </div>
+          </div>
+          <div class="w-full md:w-auto p-1.5">
+           <div class="relative">
+            <button type="submit" name='clearfilters' value="Clear Filters" class="flex flex-wrap justify-center w-full px-4 py-2.5 font-medium text-sm text-white bg-blue-500 hover:bg-blue-600 rounded-lg transition duration-200 border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+             <svg class="mr-2 w-5 h-5" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+              <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#fff" stroke-linejoin="round">
+               <line x1="20" y1="2" x2="12.329" y2="11.506"></line>
+               <path d="M11,11a2,2,0,0,1,2,2,3.659,3.659,0,0,1-.2.891A9.958,9.958,0,0,0,13.258,23H1C1,16.373,4.373,11,11,11Z"></path>
+               <line x1="18" y1="15" x2="23" y2="15" stroke="#fff"></line>
+               <line x1="17" y1="19" x2="23" y2="19" stroke="#fff"></line>
+               <line x1="19" y1="23" x2="23" y2="23" stroke="#fff"></line>
+               <path d="M8.059,11.415A3.9,3.9,0,0,0,12,16c.041,0,.079-.011.12-.012" data-cap="butt"></path>
+               <path d="M5,23a13.279,13.279,0,0,1,.208-3.4" data-cap="butt"></path>
+               <path d="M9.042,23c-.688-1.083-.313-3.4-.313-3.4" data-cap="butt"></path>
+              </g>
+             </svg>
+             <span>Clear</span>
+            </button>
+           </div>
+          </div>
+          <div class="w-full md:w-auto p-1.5">
+           <div class="relative">
+            <button type="submit" name='applyfilters' value="Apply Filters" class="flex flex-wrap justify-center w-full px-4 py-2.5 font-medium text-sm text-white bg-blue-500 hover:bg-blue-600 rounded-lg transition duration-200 border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+             <svg class="mr-2 w-5 h-5" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+              <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#fff" stroke-linejoin="round">
+               <rect x="2" y="2" width="7" height="7"></rect>
+               <rect x="15" y="15" width="7" height="7"></rect>
+               <rect x="2" y="15" width="7" height="7"></rect>
+               <polyline points="15 6 17 8 22 3" stroke="#fff"></polyline>
+              </g>
+             </svg>
+             <span>Apply Filters</span>
+            </button>
+           </div>
+          </div>
+         </div>
+        </div>
+       </div>
+      </div>
+      <div class="container mt-5 mx-auto">
+       <div class="pt-6 pb-6 bg-coolGray-100 dark:bg-gray-500 rounded-xl">
+        <div class="px-6">
+         <div class="w-full mt-6 pb-6 overflow-x-auto">
+          <table class="w-full min-w-max">
+           <thead class="uppercase">
+            <tr class="text-left">
+             <th class="p-0">
+              <div class="py-3 px-6 rounded-tl-xl bg-coolGray-200 dark:bg-gray-600">
+               <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Date/Time at</span>
+              </div>
+             </th>
+             <th class="p-0">
+              <div class="py-3 px-6 bg-coolGray-200 dark:bg-gray-600">
+               <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Bid ID</span>
+              </div>
+             </th>
+             <th class="p-0">
+              <div class="py-3 px-6 bg-coolGray-200 dark:bg-gray-600">
+               <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Offer ID</span>
+              </div>
+             </th>
+             <th class="p-0">
+              <div class="py-3 px-6 bg-coolGray-200 dark:bg-gray-600">
+               <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Bid From</span>
+              </div>
+             </th>
+             <th class="p-0">
+              <div class="py-3 px-6 bg-coolGray-200 dark:bg-gray-600">
+               <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Bid Status</span>
+              </div>
+             </th>
+             <th class="p-0">
+              <div class="py-3 px-6 bg-coolGray-200 dark:bg-gray-600">
+               <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">ITX Status</span>
+              </div>
+             </th>
+             <th class="p-0">
+              <div class="py-3 px-6 bg-coolGray-200 dark:bg-gray-600">
+               <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">PTX Status</span>
+              </div>
+             </th>
+            <th class="p-0">
+              <div class="py-3 px-6 rounded-tr-xl bg-coolGray-200 dark:bg-gray-600">
+               <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Details</span>
+              </div>
+             </th>           
+            </tr>
+           </thead>
+           <tbody>
+            {% for b in bids %}
+            <tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600">
+             <th scope="row" class="flex items-center py-7 px-46 text-gray-900 whitespace-nowrap">
+              <svg class="w-5 h-5 rounded-full ml-5" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+               <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                <circle cx="12" cy="12" r="11"></circle>
+                <polyline points=" 12,6 12,12 18,12 " stroke="#6b7280"></polyline>
+               </g>
+              </svg>
+              <div class="pl-3">
+               <div class="font-semibold text-xs dark:text-white">{{ b[0] }}</div>
+              </div>
+             </th>
+             <td class="py-3 px-6 text-xs monospace">
+              <a href=/bid/{{ b[1] }}>{{ b[1]|truncate(20, True) }}</a>
+             </td>
+             <td class="py-3 px-6 text-xs monospace">
+              <a href=/offer/{{ b[2] }}>{{ b[2]|truncate(20, True) }}</a>
+             </td>
+             <td class="py-3 px-6 text-xs monospace">
+              <a href=/identity/{{ b[6] }}>{{ b[6] }}</a>
+             </td>
+             <td class="py-3 px-6 text-xs">{{ b[3] }}</td>
+             <td class="py-3 px-6 text-xs">{{ b[4] }}</td>
+             <td class="py-3 px-6 text-xs">{{ b[5] }}</td>
+             {% if page_type_received or page_type_sent %}
+              <td class="py-3 px-6 text-xs">
+               <a class="inline-block w-20 py-1 px-2 font-medium text-center text-sm rounded-md bg-blue-500 text-white border border-blue-500 hover:bg-blue-600 transition duration-200 bg-blue-500 text-white hover:bg-blue-600 transition duration-200" href="/bid/{{ b[1] }}">Details</a>
+              </td>
+             {% elif page_type_available %}
+              <td class="py-3 px-6 text-xs">
+               <a class="inline-block w-20 py-1 px-2 font-medium text-center text-sm rounded-md bg-blue-500 text-white border border-blue-500 hover:bg-blue-600 transition duration-200 bg-blue-500 text-white hover:bg-blue-600 transition duration-200" href="/bid/{{ b[1] }}">Accept</a>
+              </td>
+             {% endif %} 
+            </tr>
+           </tbody>
+           {% endfor %}
+          </table>
+          <input type="hidden" name="formid" value="{{ form_id }}">
+          <input type="hidden" name="pageno" value="{{ filters.page_no }}">
+         </div>
+        </div>
+        <div class="rounded-b-md">
+         <div class="w-full md:w-0/12">
+          <div class="flex flex-wrap justify-end pt-6 pr-6 border-t border-gray-100 dark:border-gray-400">
+           <div class="w-full md:w-auto p-1.5">
+            <button type="submit" name='pageback' value="Page Back" class="inline-flex items-center h-9 py-1 px-4 text-xs text-blue-50 font-semibold bg-blue-500 hover:bg-blue-600 rounded-lg transition duration-200 focus:ring-0 focus:outline-none">
+             <svg aria-hidden="true" class="mr-2 w-5 h-5" fill="#fff" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+              <path fill-rule="evenodd" d="M7.707 14.707a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 1.414L5.414 9H17a1 1 0 110 2H5.414l2.293 2.293a1 1 0 010 1.414z" clip-rule="evenodd"></path>
+             </svg>
+             <span>Page Back</span>
+            </button>
+           </div>
+           <div class="flex items-center">
+            <div class="w-full md:w-auto p-1.5">
+             <p class="text-sm font-heading dark:text-white">Page: {{ filters.page_no }}</p>
+            </div>
+           </div>
+           <div class="w-full md:w-auto p-1.5">
+            <button type="submit" name='pageforwards' value="Page Forwards" class="inline-flex items-center h-9 py-1 px-4 text-xs text-blue-50 font-semibold bg-blue-500 hover:bg-blue-600 rounded-lg transition duration-200 focus:ring-0 focus:outline-none">
+             <span>Page Forwards</span>
+             <svg aria-hidden="true" class="ml-2 w-5 h-5" fill="#fff" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+              <path fill-rule="evenodd" d="M12.293 5.293a1 1 0 011.414 0l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-2.293-2.293a1 1 0 010-1.414z" clip-rule="evenodd"></path>
+             </svg>
+            </button>
+           </div>
+          </div>
+         </div>
+        </div>
+     </form>
+    </div>
+   </div>
+  </div>
+ </div>
+ </section>
 </div>
 {% include 'footer.html' %}
 </body>
--- a/basicswap/templates/changepassword.html
+++ b/basicswap/templates/changepassword.html
@@ -1,17 +1,29 @@
 {% include 'header.html' %}
-{% from 'style.html' import breadcrumb_line_svg %} 
 <div class="container mx-auto">
 <section class="p-5 mt-5">
  <div class="flex flex-wrap items-center -m-2">
   <div class="w-full md:w-1/2 p-2">
    <ul class="flex flex-wrap items-center gap-x-3 mb-2">
-    <li>{{ breadcrumb_line_svg | safe }}</li>
     <li>
      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/">
       <p>Home</p>
      </a>
     </li>
-    <li>{{ breadcrumb_line_svg | safe }}</li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
+     <li>
+      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/wallets">
+       <p>Home</p>
+      </a>
+     </li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
     <li>
      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/changepassword">Change Password</a>
     </li>
@@ -32,8 +44,8 @@
    <img class="absolute h-64 left-1/2 top-1/2 transform -translate-x-1/2 -translate-y-1/2 object-cover" src="/static/images/elements/wave.svg" alt="">
    <div class="relative z-20 flex flex-wrap items-center -m-3">
     <div class="w-full md:w-1/2 p-3">
-      <h2 class="mb-6 text-4xl font-bold text-white tracking-tighter">Change/Set your Password</h2>
-      <p class="font-normal text-coolGray-200 dark:text-white">Change or Set your BasicSwap / Wallets password.</p>
+      <h2 class="mb-6 text-4xl font-bold text-white tracking-tighter">Change Password</h2>
+      <p class="font-normal text-coolGray-200 dark:text-white">Update your BasicSwap / Wallets password.</p>
     </div>
    </div>
   </div>
@@ -139,7 +151,13 @@
        <div class="px-6">
         <div class="flex flex-wrap justify-end">
          <div class="w-full md:w-auto p-1.5 ml-2">
-           <button type="submit" name="unlock" value="Unlock" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">Apply</button>
+           <button type="submit" name="unlock" value="Unlock" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+            <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+             <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="round">
+              <polyline points=" 6,12 10,16 18,8 " stroke="#ffffff"></polyline>
+              <circle cx="12" cy="12" r="11"></circle>
+             </g>
+            </svg>Apply </button>
          </div>
         </div>
        </div>
@@ -182,4 +200,4 @@ toggles.forEach(function (toggle_id, index) {
 });
 </script>
 </body>
-</html>
+</html>
--- a/basicswap/templates/debug.html
+++ b/basicswap/templates/debug.html
@@ -1,5 +1,4 @@
 {% include 'header.html' %}
-{% from 'style.html' import breadcrumb_line_svg, start_process_svg %} 
 <div class="container mx-auto">
 <section class="p-5 mt-5">
  <div class="flex flex-wrap items-center -m-2">
@@ -10,11 +9,19 @@
       <p>Home</p>
      </a>
     </li>
-      <li> {{ breadcrumb_line_svg | safe }} </li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
     <li>
      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/debug">Debug</a>
     </li>
-      <li> {{ breadcrumb_line_svg | safe }} </li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
    </ul>
   </div>
  </div>
@@ -28,7 +35,7 @@
    <div class="relative z-20 flex flex-wrap items-center -m-3">
     <div class="w-full md:w-1/2 p-3">
      <h2 class="mb-6 text-4xl font-bold text-white tracking-tighter">Debug</h2>
-      <p class="font-normal text-coolGray-200 dark:text-white">Expert debug options</p>
+      <p class="font-normal text-coolGray-200 dark:text-white">Debug options & Easter eggs.</p>
     </div>
    </div>
   </div>
@@ -63,15 +70,24 @@
            <tr class="opacity-100 text-gray-500 dark:text-gray-100">
             <td class="py-3 px-6 bold">Remove expired offers and bids</td>
             <td td class="py-3 px-6 ">
-              <button name="remove_expired" type="submit" value="Yes" class="w-60 flex flex-wrap justify-center py-2 px-4 bg-red-500 hover:bg-red-600 font-medium text-sm text-white border border-red-500 rounded-md shadow-button focus:ring-0 focus:outline-none" onclick="return confirmRemoveExpired();">
-              Remove Data</button>
+              <button name="remove_expired" type="submit" value="Yes" class="flex flex-wrap justify-center py-2 px-4 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none" onclick="return confirmRemoveExpired();">
+              Yes - Remove Data</button>
             </td>
            </tr>
            <tr class="opacity-100 text-gray-500 dark:text-gray-100">
             <td class="py-3 px-6 bold">Reinitialise XMR wallet</td>
             <td td class="py-3 px-6 ">
-              <button name="reinit_xmr" type="submit" value="Yes" class="w-60 flex flex-wrap justify-center py-2 px-4 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
-              {{ start_process_svg| safe }} Start Process</button>
+              <button name="reinit_xmr" type="submit" value="Yes" class="flex flex-wrap justify-center py-2 px-4 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+               <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+                <g stroke-linecap="square" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="miter" class="nc-icon-wrapper" stroke-miterlimit="10">
+                 <polyline points="2.966 1.13 2.237 6.927 7.929 5.341"></polyline>
+                 <path d="M2.921,18.2a11.006,11.006,0,0,1-1.041-1.9" stroke="#ffffff"></path>
+                 <path d="M8.461,22.412a11.07,11.07,0,0,1-1.529-.654q-.2-.1-.392-.214" stroke="#ffffff"></path>
+                 <path d="M15.539,22.41a11.062,11.062,0,0,1-2.06.486" stroke="#ffffff"></path>
+                 <path d="M21.08,18.206a10.984,10.984,0,0,1-1.438,1.705" stroke="#ffffff"></path>
+                 <path d="M2.759,6.027A11,11,0,0,1,22.9,13.464"></path>
+                </g>
+               </svg>Yes - Start Process</button>
             </td>
            </tr>
            <input type="hidden" name="formid" value="{{ form_id }}">
--- a/basicswap/templates/error.html
+++ b/basicswap/templates/error.html
@@ -1,123 +1,13 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8">
-    <link type="text/css" media="all" href="/static/css/libs/flowbite.min.css" rel="stylesheet" />
-    <link type="text/css" media="all" href="/static/css/libs/tailwind.min.css" rel="stylesheet">
-    <link type="text/css" media="all" href="/static/css/style.css" rel="stylesheet">
-    <script src="/static/js/main.js"></script>
-    <script src="/static/js/libs/flowbite.js"></script>
-    <script>
-      const isDarkMode =
-        localStorage.getItem('color-theme') === 'dark' ||
-        (!localStorage.getItem('color-theme') &&
-          window.matchMedia('(prefers-color-scheme: dark)').matches);
-
-      if (!localStorage.getItem('color-theme')) {
-        localStorage.setItem('color-theme', isDarkMode ? 'dark' : 'light');
-      }
-
-      document.documentElement.classList.toggle('dark', isDarkMode);
-    </script>
-    <link rel=icon sizes="32x32" type="image/png" href="/static/images/favicon/favicon-32.png">
-    <title>(BSX) BasicSwap - Info</title>
-    <style>
-      body {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        min-height: 100vh;
-        margin: 0;
-      }
-      .container {
-        width: 100%;
-        max-width: 600px;
-      }
-    </style>
-  </head>
-  <body class="dark:bg-gray-700">
-    <div class="container px-4 mx-auto">
-      <div class="text-center">
-        <a class="inline-block mb-6" href="#">
-          <img src="/static/images/logos/basicswap-logo.svg" class="h-20 imageshow dark-image">
-          <img src="/static/images/logos/basicswap-logo-dark.svg" class="h-20 imageshow light-image">
-        </a>
-        
-        <div class="p-6 bg-coolGray-100 dark:bg-gray-800 rounded-lg shadow-md">
-          <h2 class="text-xl font-bold mb-4 text-coolGray-900 dark:text-white">ERROR:</h2>
-          <p class="text-lg text-coolGray-500 dark:text-white mb-6">{{ message_str }}</p>
-          <a href="/" class="inline-block py-2 px-4 bg-blue-500 hover:bg-blue-600 text-white rounded-md transition duration-300">Home</a>
-        </div>
-        <p class="mt-10">
-          <span class="text-xs font-medium dark:text-white">Need help?</span>
-          <a class="inline-block text-xs font-medium text-blue-500 hover:text-blue-600 hover:underline" href="https://academy.particl.io/en/latest/faq/get_support.html" target="_blank">Help / Tutorials</a>
-        </p>
-        <p>
-          <span class="text-xs font-medium text-coolGray-500 dark:text-gray-500">{{ title }}</span>
-        </p>
-      </div>
-    </div>
-    <script>
-    document.addEventListener('DOMContentLoaded', () => {
-      // Image toggling function
-      function toggleImages() {
-        const html = document.querySelector('html');
-        const darkImages = document.querySelectorAll('.dark-image');
-        const lightImages = document.querySelectorAll('.light-image');
-
-        if (html && html.classList.contains('dark')) {
-          toggleImageDisplay(darkImages, 'block');
-          toggleImageDisplay(lightImages, 'none');
-        } else {
-          toggleImageDisplay(darkImages, 'none');
-          toggleImageDisplay(lightImages, 'block');
-        }
-      }
-
-      function toggleImageDisplay(images, display) {
-        images.forEach(img => {
-          img.style.display = display;
-        });
-      }
-
-      // Theme toggle functionality
-      function setTheme(theme) {
-        if (theme === 'light') {
-          document.documentElement.classList.remove('dark');
-          localStorage.setItem('color-theme', 'light');
-        } else {
-          document.documentElement.classList.add('dark');
-          localStorage.setItem('color-theme', 'dark');
-        }
-      }
-
-      // Initialize theme
-      const themeToggle = document.getElementById('theme-toggle');
-      const themeToggleDarkIcon = document.getElementById('theme-toggle-dark-icon');
-      const themeToggleLightIcon = document.getElementById('theme-toggle-light-icon');
-
-      if (themeToggle && themeToggleDarkIcon && themeToggleLightIcon) {
-        if (localStorage.getItem('color-theme') === 'dark' || (!('color-theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
-          themeToggleLightIcon.classList.remove('hidden');
-        } else {
-          themeToggleDarkIcon.classList.remove('hidden');
-        }
-
-        themeToggle.addEventListener('click', () => {
-          if (localStorage.getItem('color-theme') === 'dark') {
-            setTheme('light');
-          } else {
-            setTheme('dark');
-          }
-          themeToggleDarkIcon.classList.toggle('hidden');
-          themeToggleLightIcon.classList.toggle('hidden');
-          toggleImages();
-        });
-      }
-
-      // Call toggleImages on load
-      toggleImages();
-    });
-    </script>
-  </body>
-</html>
+<head>
+  <meta charset="UTF-8">
+  <link rel=icon sizes="32x32" type="image/png" href="/static/images/favicon-32.png">
+  <title>(BSX) BasicSwap - v{{ version }}</title>
+</head>
+<body>
+  <h2>{{ title_str }}</h2>
+  <p>Info: {{ message_str }}</p>
+  <p><a href="/">home</a></p>
+</body>
+</html>
--- a/basicswap/templates/explorers.html
+++ b/basicswap/templates/explorers.html
@@ -1,5 +1,4 @@
 {% include 'header.html' %}
-{% from 'style.html' import breadcrumb_line_svg, input_arrow_down_svg %} 
 <div class="container mx-auto">
 <section class="p-5 mt-5">
  <div class="flex flex-wrap items-center -m-2">
@@ -10,11 +9,19 @@
       <p>Home</p>
      </a>
     </li>
-    <li> {{ breadcrumb_line_svg | safe }} </li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
     <li>
      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/explores">Explorers</a>
     </li>
-    <li> {{ breadcrumb_line_svg | safe }} </li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
    </ul>
   </div>
  </div>
@@ -55,7 +62,7 @@
              </th>
              <th class="p-0">
               <div class="py-3 px-6 rounded-tr-xl bg-coolGray-200 dark:bg-gray-600">
-                <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold">Action</span>
+                <span class="text-xs text-gray-600 dark:text-gray-300 font-semibold py-3 px-6">Action</span>
               </div>
              </th>
             </tr>
@@ -63,7 +70,9 @@
            <tr class="opacity-100 text-gray-500 dark:text-gray-100">
             <td class="py-3 px-6">
              <div class="relative">
-                {{ input_arrow_down_svg| safe }} 
+               <svg class="absolute right-4 top-1/2 transform -translate-y-1/2" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M11.3333 6.1133C11.2084 5.98913 11.0395 5.91943 10.8633 5.91943C10.6872 5.91943 10.5182 5.98913 10.3933 6.1133L8.00001 8.47329L5.64001 6.1133C5.5151 5.98913 5.34613 5.91943 5.17001 5.91943C4.99388 5.91943 4.82491 5.98913 4.70001 6.1133C4.63752 6.17527 4.58792 6.249 4.55408 6.33024C4.52023 6.41148 4.50281 6.49862 4.50281 6.58663C4.50281 6.67464 4.52023 6.76177 4.55408 6.84301C4.58792 6.92425 4.63752 6.99799 4.70001 7.05996L7.52667 9.88663C7.58865 9.94911 7.66238 9.99871 7.74362 10.0326C7.82486 10.0664 7.912 10.0838 8.00001 10.0838C8.08801 10.0838 8.17515 10.0664 8.25639 10.0326C8.33763 9.99871 8.41136 9.94911 8.47334 9.88663L11.3333 7.05996C11.3958 6.99799 11.4454 6.92425 11.4793 6.84301C11.5131 6.76177 11.5305 6.67464 11.5305 6.58663C11.5305 6.49862 11.5131 6.41148 11.4793 6.33024C11.4454 6.249 11.3958 6.17527 11.3333 6.1133Z" fill="#8896AB"></path>
+               </svg>
               <select class="hover:border-blue-500 bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0" name="explorer">
                <!-- <option value="-1" {% if explorer==-1 %} selected{% endif %}>Select Explorer</option> -->
                {% for e in explorers %}
@@ -73,14 +82,11 @@
              </div>
             </td>
             <td class="py-3 px-6">
-              <div class="relative">
-                {{ input_arrow_down_svg| safe }}              
              <select class="hover:border-blue-500 bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0" name="action">
               <option value="-1" {% if action==-1 %} selected{% endif %}>Select Action</option>
               {% for a in actions %} <option value="{{ a[0] }}" {% if action==a[0] %} selected{% endif %}>{{ a[1] }}</option>
               {% endfor %}
              </select>
-            </div>
             </td>
            </tr>
            <tr class="opacity-100 text-gray-500 dark:text-gray-100">
@@ -109,7 +115,13 @@
        <div class="px-6">
         <div class="flex flex-wrap justify-end">
          <div class="w-full md:w-auto p-1.5 ml-2">
-           <button type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">Apply</button>
+           <button type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+            <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+             <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="round">
+              <polyline points=" 6,12 10,16 18,8 " stroke="#ffffff"></polyline>
+              <circle cx="12" cy="12" r="11"></circle>
+             </g>
+            </svg>Apply</button>
          </div>
         </div>
        </div>
@@ -121,13 +133,13 @@
 </section>
 <input type="hidden" name="formid" value="{{ form_id }}">
 {% if result %}
-<section class="rounded-xl">
+ <section>
  <div class="pl-6 pr-6 pt-0 pb-0 h-full overflow-hidden">
   <div class="border-coolGray-100">
    <div class="flex flex-wrap items-center justify-between -m-2">
     <div class="w-full pt-2">
      <div class="container mt-5 mx-auto">
-       <div class="pt-6 bg-coolGray-100 dark:bg-gray-500 rounded-xl rounded-bl-none rounded-br-none">
+       <div class="pt-6 pb-6 bg-coolGray-100 dark:bg-gray-500 rounded-xl">
        <div class="px-6">
         <div class="w-full mt-6 pb-6 overflow-x-auto">
          <table class="w-full min-w-max text-sm">
@@ -142,37 +154,21 @@
           </thead>
           <tr class="opacity-100 text-gray-500 dark:text-gray-100">
            <td class="py-3 px-6">
-             <textarea name="result" class="hover:border-blue-500 bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0" rows="20">{{ result }}</textarea>
+             <textarea class="hover:border-blue-500 bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0" rows="20">{{ result }}</textarea>
            </td>
           </tr>
          </table>
         </div>
-        </div>  
+        </div>
+        {% endif %}
        </form>
       </div>
      </div>
     </div>
    </div>
 </section>
-  <section>
-  <div class="pl-6 pr-6 pt-0 pb-0 h-full overflow-hidden ">
-   <div class="pb-6 ">
-    <div class="flex flex-wrap items-center justify-between -m-2">
-     <div class="w-full pt-2">
-      <div class="container mx-auto">
-       <div class="pt-6 pb-6 bg-coolGray-100 dark:border-gray-400 dark:bg-gray-500 rounded-bl-xl rounded-br-xl">
-        <div class="px-6">
-         <div class="flex flex-wrap justify-end">
-         </div>
-        </div>
-       </div>
-      </div>
-     </div>
-    </div>
-   </div>
- </section>
-{% endif %}
 </div>
 {% include 'footer.html' %}
 </body>
-</html>
+</html>
+<!-- todo round corners -->
--- a/basicswap/templates/footer.html
+++ b/basicswap/templates/footer.html
@@ -1,4 +1,3 @@
-{% from 'style.html' import love_svg, github_svg %}
 <section class="overflow-hidden">
  <div class="container px-4 mx-auto">
    <div class="flex flex-wrap lg:items-center pt-24 pb-12 -mx-4">
@@ -11,13 +10,12 @@
          <div class="w-full md:w-auto p-3 md:py-0 md:px-6"><a class="inline-block text-coolGray-500 dark:text-gray-300 font-medium" href="https://academy.particl.io/en/latest/basicswap-dex/basicswap_explained.html" target="_blank">BasicSwap Explained</a></div>
          <div class="w-full md:w-auto p-3 md:py-0 md:px-6"><a class="inline-block text-coolGray-500 dark:text-gray-300 font-medium" href="https://academy.particl.io/en/latest/basicswap-guides/basicswapguides_installation.html" target="_blank">Tutorials and Guides</a></div>
          <div class="w-full md:w-auto p-3 md:py-0 md:px-6"><a class="inline-block text-coolGray-500 dark:text-gray-300 font-medium" href="https://academy.particl.io/en/latest/faq/get_support.html" target="_blank">Get Support</a></div>
-          <div class="w-full md:w-auto p-3 md:py-0 md:px-6"><a class="inline-block text-coolGray-500 dark:text-gray-300 font-medium" href="https://basicswapdex.com/terms" target="_blank">Terms and Conditions</a></div>
        </div>
      </div>
      <div class="w-full md:w-1/4 px-4"> </div>
    </div>
  </div>
-  <div class="border-b border-gray-100 dark:border-gray-500 dark:bg-body dark:border-b-2"></div>
+  <div class="border-b border-gray-100 dark:border-gray-500 dark:bg-body dark:border-b-2"></div> 
  <div class="container px-4 mx-auto">
    <div class="flex flex-wrap items-center py-12 md:pb-32">
      <div class="w-full md:w-1/2 mb-6 md:mb-0">
@@ -25,17 +23,27 @@
          <div class="flex items-center">
            <p class="text-sm text-gray-90 dark:text-white font-medium">© 2024~ (BSX) BasicSwap</p> <span class="w-1 h-1 mx-1.5 bg-gray-500 dark:bg-white rounded-full"></span>
            <p class="text-sm text-coolGray-400  font-medium">BSX: v{{ version }}</p> <span class="w-1 h-1 mx-1.5 bg-gray-500 dark:bg-white rounded-full"></span>
-            <p class="text-sm text-coolGray-400  font-medium">GUI: v3.1.0</p> <span class="w-1 h-1 mx-1.5 bg-gray-500 dark:bg-white rounded-full"></span>
+            <p class="text-sm text-coolGray-400  font-medium">GUI: v2.0.3</p> <span class="w-1 h-1 mx-1.5 bg-gray-500 dark:bg-white rounded-full"></span>
            <p class="mr-2 text-sm font-bold dark:text-white text-gray-90 ">Made with </p>
-            {{ love_svg | safe }}
-            </div>
+            <svg xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+              <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#f80b0b" stroke-linejoin="round">
+                <path d="M21.243,3.757 c-2.343-2.343-6.142-2.343-8.485,0c-0.289,0.289-0.54,0.6-0.757,0.927c-0.217-0.327-0.469-0.639-0.757-0.927 c-2.343-2.343-6.142-2.343-8.485,0c-2.343,2.343-2.343,6.142,0,8.485L12,21.485l9.243-9.243C23.586,9.899,23.586,6.1,21.243,3.757z"></path>
+              </g>
+            </svg> <span class="ml-2 text-sm font-bold dark:text-white text-gray-90 ">by TV and CRZ</span></div>
        </div>
      </div>
      <div class="w-full md:w-1/2">
        <div class="flex flex-wrap md:justify-end -mx-5">
          <div class="px-5">
-            <a class="inline-block text-coolGray-300 hover:text-coolGray-400" href="https://github.com/basicswap/basicswap" target="_blank">
-            {{ github_svg | safe }}
+            <a class="inline-block text-coolGray-300 hover:text-coolGray-400" href="https://github.com/tecnovert/basicswap" target="_blank">
+              <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M9 0C4.0275 0 0 4.13211 0 9.22838C0 13.3065 2.5785 16.7648 6.15375 17.9841C6.60375 18.0709 6.76875 17.7853 6.76875 17.5403C6.76875 17.3212 6.76125 16.7405 6.7575 15.9712C4.254 16.5277 3.726 14.7332 3.726 14.7332C3.3165 13.6681 2.72475 13.3832 2.72475 13.3832C1.9095 12.8111 2.78775 12.8229 2.78775 12.8229C3.6915 12.887 4.16625 13.7737 4.16625 13.7737C4.96875 15.1847 6.273 14.777 6.7875 14.5414C6.8685 13.9443 7.10025 13.5381 7.3575 13.3073C5.35875 13.0764 3.258 12.2829 3.258 8.74709C3.258 7.73988 3.60675 6.91659 4.18425 6.27095C4.083 6.03774 3.77925 5.0994 4.263 3.82846C4.263 3.82846 5.01675 3.58116 6.738 4.77462C7.458 4.56958 8.223 4.46785 8.988 4.46315C9.753 4.46785 10.518 4.56958 11.238 4.77462C12.948 3.58116 13.7017 3.82846 13.7017 3.82846C14.1855 5.0994 13.8818 6.03774 13.7917 6.27095C14.3655 6.91659 14.7142 7.73988 14.7142 8.74709C14.7142 12.2923 12.6105 13.0725 10.608 13.2995C10.923 13.5765 11.2155 14.1423 11.2155 15.0071C11.2155 16.242 11.2043 17.2344 11.2043 17.5341C11.2043 17.7759 11.3617 18.0647 11.823 17.9723C15.4237 16.7609 18 13.3002 18 9.22838C18 4.13211 13.9703 0 9 0Z" fill="currentColor"></path>
+              </svg>
+            </a>
+          </div>
+          <div class="px-5">
+            <a class="inline-block text-coolGray-300 hover:text-coolGray-400" href="#">
+              <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg"></svg>
            </a>
          </div>
        </div>
@@ -43,68 +51,74 @@
    </div>
  </div>
 </section>
+
 <script>
-  var toggleImages = function() {
-    var html = document.querySelector('html');
-    var darkImages = document.querySelectorAll('.dark-image');
-    var lightImages = document.querySelectorAll('.light-image');
+  (function() {
+    var toggleImages = function() {
+      var html = document.querySelector('html');
+      var darkImages = document.querySelectorAll('.dark-image');
+      var lightImages = document.querySelectorAll('.light-image');

-    if (html && html.classList.contains('dark')) {
-      toggleImageDisplay(darkImages, 'block');
-      toggleImageDisplay(lightImages, 'none');
-    } else {
-      toggleImageDisplay(darkImages, 'none');
-      toggleImageDisplay(lightImages, 'block');
+      if (html && html.classList.contains('dark')) {
+        toggleImageDisplay(darkImages, 'block');
+        toggleImageDisplay(lightImages, 'none');
+      } else {
+        toggleImageDisplay(darkImages, 'none');
+        toggleImageDisplay(lightImages, 'block');
+      }
    }
-  };

-  var toggleImageDisplay = function(images, display) {
-    images.forEach(function(img) {
-      img.style.display = display;
-    });
-  };
-
-  document.addEventListener('DOMContentLoaded', function() {
-    var themeToggle = document.getElementById('theme-toggle');
-
-    if (themeToggle) {
-      themeToggle.addEventListener('click', function() {
-        toggleImages();
+    var toggleImageDisplay = function(images, display) {
+      images.forEach(function(img) {
+        img.style.display = display;
      });
    }

-    toggleImages();
-  });
+    document.addEventListener('DOMContentLoaded', function() {
+      var themeToggle = document.getElementById('theme-toggle');
+
+      if (themeToggle) {
+        themeToggle.addEventListener('click', function() {
+          toggleImages();
+        });
+      }
+
+      toggleImages();
+    });
+  })();
 </script>
+
+
+
 <script>
-  var themeToggleDarkIcon = document.getElementById('theme-toggle-dark-icon');
-  var themeToggleLightIcon = document.getElementById('theme-toggle-light-icon');
+      var themeToggleDarkIcon = document.getElementById('theme-toggle-dark-icon');
+      var themeToggleLightIcon = document.getElementById('theme-toggle-light-icon');

-  if (localStorage.getItem('color-theme') === 'dark' || (!('color-theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
-    themeToggleLightIcon.classList.remove('hidden');
-  } else {
-    themeToggleDarkIcon.classList.remove('hidden');
-  }
+      if (localStorage.getItem('color-theme') === 'dark' || (!('color-theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
+          themeToggleLightIcon.classList.remove('hidden');
+      } else {
+          themeToggleDarkIcon.classList.remove('hidden');
+      }

-  function setTheme(theme) {
-    if (theme === 'light') {
-      document.documentElement.classList.remove('dark');
-      localStorage.setItem('color-theme', 'light');
-    } else {
-      document.documentElement.classList.add('dark');
-      localStorage.setItem('color-theme', 'dark');
-    }
-  }
+      function setTheme(theme) {
+        if (theme === 'light') {
+          document.documentElement.classList.remove('dark');
+          localStorage.setItem('color-theme', 'light');
+        } else {
+          document.documentElement.classList.add('dark');
+          localStorage.setItem('color-theme', 'dark');
+        }
+      }

-  document.getElementById('theme-toggle').addEventListener('click', () => {
-    if (localStorage.getItem('color-theme') === 'dark') {
-      setTheme('light');
-    } else {
-      setTheme('dark');
-    }
-    themeToggleDarkIcon.classList.toggle('hidden');
-    themeToggleLightIcon.classList.toggle('hidden');
-    toggleImages();
-  });
+      document.getElementById('theme-toggle').addEventListener('click', () => {
+        if (localStorage.getItem('color-theme') === 'dark') {
+          setTheme('light');
+        } else {
+          setTheme('dark');
+        }
+        themeToggleDarkIcon.classList.toggle('hidden');
+        themeToggleLightIcon.classList.toggle('hidden');
+        toggleImages();
+      });

-</script>
+</script>
--- a/basicswap/templates/header.html
+++ b/basicswap/templates/header.html
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-{% from 'style.html' import change_password_svg, notifications_network_offer_svg, notifications_bid_accepted_svg, notifications_unknow_event_svg, notifications_new_bid_on_offer_svg, notifications_close_svg, swap_in_progress_mobile_svg, wallet_svg, page_back_svg, order_book_svg, new_offer_svg, settings_svg, asettings_svg, cog_svg, rpc_svg, debug_svg, explorer_svg, tor_svg, smsg_svg, outputs_svg, automation_svg, shutdown_svg, notifications_svg, debug_nerd_svg, wallet_locked_svg, mobile_menu_svg, wallet_unlocked_svg, tor_purple_svg, sun_svg, moon_svg, swap_in_progress_svg, swap_in_progress_green_svg, available_bids_svg, your_offers_svg, bids_received_svg, bids_sent_svg, header_arrow_down_svg, love_svg %}
 <html lang="en">
 <head>
  <meta charset="UTF-8">
@@ -7,13 +6,11 @@
  <meta http-equiv="refresh" content="{{ refresh }}">
  {% endif %}
  <script src="/static/js/libs/chart.js"></script>
-  <script src="/static/js/libs/chartjs-adapter-date-fns.bundle.min.js"></script>
  <link type="text/css" media="all" href="/static/css/libs/flowbite.min.css" rel="stylesheet" />
  <link type="text/css" media="all" href="/static/css/libs/tailwind.min.css" rel="stylesheet">
  <link type="text/css" media="all" href="/static/css/style.css" rel="stylesheet">
  <script src="/static/js/main.js"></script>
  <script src="/static/js/libs/flowbite.js"></script>
-
 <script>
  const isDarkMode =
    localStorage.getItem('color-theme') === 'dark' ||
@@ -21,7 +18,7 @@
      window.matchMedia('(prefers-color-scheme: dark)').matches);

  if (!localStorage.getItem('color-theme')) {
-    localStorage.setItem('color-theme', 'dark');
+    localStorage.setItem('color-theme', isDarkMode ? 'dark' : 'light');
  }

  document.documentElement.classList.toggle('dark', isDarkMode);
@@ -86,107 +83,65 @@
    }
  },
 }
+
 </script>
-<script>
-document.addEventListener('DOMContentLoaded', function() {
-    const shutdownButtons = document.querySelectorAll('.shutdown-button');
-    const shutdownModal = document.getElementById('shutdownModal');
-    const closeModalButton = document.getElementById('closeShutdownModal');
-    const confirmShutdownButton = document.getElementById('confirmShutdown');
-    const shutdownWarning = document.getElementById('shutdownWarning');
-
-    function updateShutdownButtons() {
-        const activeSwaps = parseInt(shutdownButtons[0].getAttribute('data-active-swaps') || '0');
-
-        shutdownButtons.forEach(button => {
-            if (activeSwaps > 0) {
-                button.classList.add('shutdown-disabled');
-                button.setAttribute('data-disabled', 'true');
-                button.setAttribute('title', 'Caution: Swaps in progress');
-            } else {
-                button.classList.remove('shutdown-disabled');
-                button.removeAttribute('data-disabled');
-                button.removeAttribute('title');
-            }
-        });
-    }
-
-    function showShutdownModal() {
-        const activeSwaps = parseInt(shutdownButtons[0].getAttribute('data-active-swaps') || '0');
-        if (activeSwaps > 0) {
-            shutdownWarning.classList.remove('hidden');
-            confirmShutdownButton.textContent = 'Yes, Shut Down Anyway';
-        } else {
-            shutdownWarning.classList.add('hidden');
-            confirmShutdownButton.textContent = 'Yes, Shut Down';
-        }
-        shutdownModal.classList.remove('hidden');
-        document.body.style.overflow = 'hidden';
-    }
-
-    function hideShutdownModal() {
-        shutdownModal.classList.add('hidden');
-        document.body.style.overflow = '';
-    }
-
-    shutdownButtons.forEach(button => {
-        button.addEventListener('click', function(e) {
-            e.preventDefault();
-            showShutdownModal();
-        });
-    });
-
-    closeModalButton.addEventListener('click', hideShutdownModal);
-
-    confirmShutdownButton.addEventListener('click', function() {
-        const shutdownToken = document.querySelector('.shutdown-button').getAttribute('href').split('/').pop();
-        window.location.href = '/shutdown/' + shutdownToken;
-    });
-
-    shutdownModal.addEventListener('click', function(e) {
-        if (e.target === this) {
-            hideShutdownModal();
-        }
-    });
-
-    updateShutdownButtons();
-});
-</script>
-
  <link rel=icon sizes="32x32" type="image/png" href="/static/images/favicon/favicon-32.png">
  <title>(BSX) BasicSwap - v{{ version }}</title>
 </head>
 <body class="dark:bg-gray-700">
  <section>
    <nav class="relative bg-gray-700">
-
      <div class="p-6 container flex flex-wrap items-center justify-between items-center mx-auto">
        <a class="flex-shrink-0 mr-12 text-2xl text-white font-semibold" href="/"> <img class="h-10" src="/static/images/logos/basicswap-logo.svg" alt="" width="auto"></a>
        <ul class="hidden xl:flex">
          <li>
            <a class="flex mr-10 items-center py-3 text-gray-50 hover:text-gray-100 text-sm" href="/wallets">
-              {{ wallet_svg | safe }}
-               <span>Wallets</span>
-             </a>
+              <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24">
+                <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                  <path d="M6,3H3C1.895,3,1,3.895,1,5 v0c0,1.105,0.895,2,2,2"></path>
+                  <polyline points=" 6,7 6,1 20,1 20,7 " stroke="#6b7280"></polyline>
+                  <path d="M23,7H3 C1.895,7,1,6.105,1,5v15c0,1.657,1.343,3,3,3h19V7z"></path>
+                  <circle cx="17" cy="15" r="2"></circle>
+                </g>
+              </svg> <span>Wallets</span></a>
          </li>
-
          <li>
            <a class="flex mr-10 items-center py-2.5 text-gray-50 hover:text-gray-100 text-sm" href="/offers">
-              {{ order_book_svg | safe }}<span>Show Order Book</span>
-              <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_network_offers }}</span>
-            </a>
+              <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24">
+                <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                  <rect x="3" y="1" width="18" height="22"></rect>
+                  <line x1="12" y1="8" x2="12" y2="16" stroke="#6b7280"></line>
+                  <line x1="8" y1="14" x2="8" y2="16" stroke="#6b7280"></line>
+                  <line x1="16" y1="11" x2="16" y2="16" stroke="#6b7280"> </line>
+                </g>
+              </svg> <span>Show Order Book</span> <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_network_offers }}</span></a>
          </li>
          <li>
-            <a class="flex rounded-full flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-green-600 hover:border-green-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none" href="/newoffer">
-              {{ new_offer_svg | safe }}
-              <span>Place new Offer</span>
-            </a>
+            <a class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none" href="/newoffer">
+              <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24">
+                <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="round">
+                  <circle cx="5" cy="5" r="4"></circle>
+                  <circle cx="19" cy="19" r="4"></circle>
+                  <polyline data-cap="butt" points="13,5 21,5 21,11 " stroke="#ffffff"></polyline>
+                  <polyline data-cap="butt" points="11,19 3,19 3,13 " stroke="#ffffff"></polyline>
+                  <polyline points=" 16,2 13,5 16,8 " stroke="#ffffff"></polyline>
+                  <polyline points=" 8,16 11,19 8,22 " stroke="#ffffff"></polyline>
+                </g>
+              </svg> <span>Place new Offer</span></a>
          </li>
        </ul>
        <ul class="mr-10 hidden xl:flex lg:justify-end lg:items-center lg:space-x-6 ml-auto">
          <div id="dropdownNavbarLink" data-dropdown-toggle="dropdownNavbar" class="flex justify-between items-center py-2 pr-4 pl-3 w-full text-gray-50 text-sm  md:border-0 md:p-0 md:w-auto text-gray-50 hover:text-gray-100">
-            {{ settings_svg | safe }} Settings & Tools
-            {{ header_arrow_down_svg| safe }}
+            <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+              <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                <path d="M14,19l2.95,2.95A3.5,3.5,0,0,0,21.9,22l.051-.051h0A3.5,3.5,0,0,0,22,17l-.051-.051L20,15" stroke="#6b7280"></path>
+                <polyline data-cap="butt" points="11.491 8.866 4.203 1.578 1.661 4.12 8.779 11.238" stroke="#6b7280"></polyline>
+                <path d="M22.678,4.922,19.6,7.987l-3.6-3.576,3.08-3.066a4.214,4.214,0,0,0-2.259-.307,5.615,5.615,0,0,0-5.133,5.723A4.223,4.223,0,0,0,12,8.4L2.145,17.083a3.419,3.419,0,0,0-.276,4.827c.023.027.047.052.071.078h0a3.286,3.286,0,0,0,4.647.1,3.232,3.232,0,0,0,.281-.3l8.726-9.81a6.717,6.717,0,0,0,2.875.2A5.687,5.687,0,0,0,22.78,8.192,5.088,5.088,0,0,0,22.678,4.922Z"></path>
+              </g>
+            </svg> Settings & Tools
+            <svg class="text-gray-400 ml-4" width="10" height="6" viewBox="0 0 10 6" fill="none" xmlns="http://www.w3.org/2000/svg">
+              <path d="M9.08335 0.666657C8.75002 0.333323 8.25002 0.333323 7.91669 0.666657L5.00002 3.58332L2.08335 0.666657C1.75002 0.333323 1.25002 0.333323 0.916687 0.666657C0.583354 0.99999 0.583354 1.49999 0.916687 1.83332L4.41669 5.33332C4.58335 5.49999 4.75002 5.58332 5.00002 5.58332C5.25002 5.58332 5.41669 5.49999 5.58335 5.33332L9.08335 1.83332C9.41669 1.49999 9.41669 0.99999 9.08335 0.666657Z" fill="#6b7280"></path>
+            </svg>
          </div>
        </ul>
        <!-- dropdown settings & tools -->
@@ -194,106 +149,138 @@ document.addEventListener('DOMContentLoaded', function() {
          <ul class="py-0 text-sm text-gray-700" aria-labelledby="dropdownLargeButton">
            <li>
              <a href="/settings" class="flex items-center block py-4 px-4 hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"> <span class="sr-only">Settings</span>
-            {{ cog_svg | safe }} Settings</a>
-            </li>
-              <li>
-              <a href="/changepassword" class="flex items-center block py-4 px-4 hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"> <span class="sr-only">Change/Set Password</span>
-            {{ change_password_svg | safe }} Change/Set Password</a>
+                <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <circle cx="12" cy="12" r="3" stroke="#6b7280"></circle>
+                    <path d="M20,12a8.049,8.049,0,0,0-.188-1.713l2.714-2.055-2-3.464L17.383,6.094a7.987,7.987,0,0,0-2.961-1.719L14,1H10L9.578,4.375A7.987,7.987,0,0,0,6.617,6.094L3.474,4.768l-2,3.464,2.714,2.055a7.9,7.9,0,0,0,0,3.426L1.474,15.768l2,3.464,3.143-1.326a7.987,7.987,0,0,0,2.961,1.719L10,23h4l.422-3.375a7.987,7.987,0,0,0,2.961-1.719l3.143,1.326,2-3.464-2.714-2.055A8.049,8.049,0,0,0,20,12Z"></path>
+                  </g>
+                </svg> Settings</a>
            </li>
            {% if debug_mode == true %}
            <li>
              <a href="/rpc" class="flex items-center block py-4 px-4 hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"> <span class="sr-only">RPC</span>
-                {{ rpc_svg | safe }} RPC Console </a>
+                <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <rect x="1" y="2" width="22" height="20"></rect>
+                    <line x1="1" y1="6" x2="23" y2="6"></line>
+                    <polyline points=" 5,11 7,13 5,15 " stroke="#6b7280"></polyline>
+                    <line x1="10" y1="15" x2="14" y2="15" stroke="#6b7280"></line>
+                    <line x1="6" y1="2" x2="6" y2="6"></line>
+                  </g>
+                </svg> RPC Console </a>
            </li>
            {% endif %}
            {% if debug_mode == true %}
            <li>
-            <a href="/debug" class="flex items-center block py-4 px-4 hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"> <span class="sr-only">Debug</span>
-            {{ debug_svg | safe }}  Debug</a>
+              <a href="/debug" class="flex items-center block py-4 px-4 hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"> <span class="sr-only">Debug</span>
+                <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <path data-cap="butt" d="M5.29,10H4A3,3,0,0,1,1,7V6" stroke="#6b7280"></path>
+                    <path data-cap="butt" d="M5.29,18H4a3,3,0,0,0-3,3v1" stroke="#6b7280"></path>
+                    <path data-cap="butt" d="M8,6.255V5a4,4,0,0,1,4-4h0a4,4,0,0,1,4,4V6.255" stroke="#6b7280"></path>
+                    <line x1="5" y1="14" x2="1" y2="14" stroke="#6b7280"></line>
+                    <path data-cap="butt" d="M18.71,10H20a3,3,0,0,0,3-3V6" stroke="#6b7280"></path>
+                    <path data-cap="butt" d="M18.71,18H20a3,3,0,0,1,3,3v1" stroke="#6b7280"></path>
+                    <line x1="19" y1="14" x2="23" y2="14" stroke="#6b7280"></line>
+                    <path d="M19,16A7,7,0,0,1,5,16V12a7,7,0,0,1,14,0Z"></path>
+                  </g>
+                </svg> Debug</a>
            </li>
            {% endif %}
            {% if debug_mode == true %}
            <li>
              <a href="/explorers" class="flex items-center block py-4 px-4 hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"> <span class="sr-only">Explorers</span>
-            {{ explorer_svg | safe }}  Explorers </a>
+                <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <line x1="22" y1="22" x2="15.656" y2="15.656" stroke="#6b7280"></line>
+                    <circle cx="10" cy="10" r="8"></circle>
+                  </g>
+                </svg> Explorers </a>
            </li>
            {% endif %}
            {% if use_tor_proxy == true %}
            <li>
-              <a href="/tor" class="flex items-center block py-4 px-4 hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"> <span class="sr-only">Tor</span>
-            {{ tor_svg | safe }} Tor </a>
+              <a href="/tor" class="flex items-center block py-4 px-4 hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"> <span class="sr-only">Debug</span>
+                <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+                          <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                            <path d="M9,18.8A6.455,6.455,0,0,1,7,14,6.455,6.455,0,0,1,9,9.2" stroke="#6b7280"></path>
+                            <path d="M15,18.8A6.455,6.455,0,0,0,17,14a6.455,6.455,0,0,0-2-4.8" stroke="#6b7280"></path>
+                            <path d="M14,2.256V1H10V2.256A3.949,3.949,0,0,1,7.658,5.891,8.979,8.979,0,0,0,2,14c0,4.971,4.477,9,10,9s10-4.029,10-9a8.978,8.978,0,0,0-5.658-8.109A3.95,3.95,0,0,1,14,2.256Z"></path>
+                          </g>
+                        </svg>
+                </svg> Tor </a>
            </li>
            {% endif %}
            <li>
              <a href="/smsgaddresses" class="flex items-center block py-4 px-4 hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"> <span class="sr-only">Settings</span>
-            {{ smsg_svg | safe }}  SMSG Addresses</a>
+                <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <path data-cap="butt" d="M11.992,11.737,14.2,13.4A2,2,0,0,1,15,15v1H7V15a2,2,0,0,1,.8-1.6l2.208-1.663" stroke="#6b7280"></path>
+                    <rect x="9" y="7" width="4" height="5" rx="2" ry="2" stroke="#6b7280"></rect>
+                    <path d="M2,1H18a2,2,0,0,1,2,2V21a2,2,0,0,1-2,2H2Z"></path>
+                    <line x1="23" y1="5" x2="23" y2="9" stroke="#6b7280"></line>
+                  </g>
+                </svg> SMSG Addresses</a>
            </li>
            <li>
-            <a href="/watched" class="flex items-center block py-4 px-4 hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"> <span class="sr-only">Automation Strategies</span>
-            {{ outputs_svg | safe }}  Watch Outputs
-            <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_watched_outputs }}</span>
-            </a>
+              <a href="/watched" class="flex items-center block py-4 px-4 hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"> <span class="sr-only">Automation Strategies</span>
+                <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <path d="M1.373,13.183a2.064,2.064,0,0,1,0-2.366C2.946,8.59,6.819,4,12,4s9.054,4.59,10.627,6.817a2.064,2.064,0,0,1,0,2.366C21.054,15.41,17.181,20,12,20S2.946,15.41,1.373,13.183Z"></path>
+                    <circle cx="12" cy="12" r="4" stroke="#6b7280"></circle>
+                  </g>
+                </svg> Watch Outputs <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_watched_outputs }}</span> </a>
            </li>
            {% if debug_mode == true %}
            <li>
-              <a href="/automation" class="flex items-center block py-4 px-4 hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"> <span class="sr-only">Automation Strategies</span>
-            {{ automation_svg | safe }} Automation Strategies</a>
+              <a href="/automation" class="flex items-center block py-4 px-4 hover:bg-gray-10 dark:hover:bg-gray-700 dark:text-white"> <span class="sr-only">Automation Strategies</span>
+                <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <line data-cap="butt" x1="5" y1="1" x2="5" y2="6" stroke="#6b7280"></line>
+                    <line x1="3" y1="1" x2="7" y2="1" stroke="#6b7280"> </line>
+                    <line data-cap="butt" x1="19" y1="1" x2="19" y2="6" stroke="#6b7280"></line>
+                    <line x1="17" y1="1" x2="21" y2="1" stroke="#6b7280"></line>
+                    <rect x="6" y="15" width="12" height="4" stroke="#6b7280"></rect>
+                    <line data-cap="butt" x1="10" y1="19" x2="10" y2="15" stroke="#6b7280"></line>
+                    <line data-cap="butt" x1="14" y1="19" x2="14" y2="15" stroke="#6b7280"></line>
+                    <line x1="6" y1="11" x2="8" y2="11" stroke="#6b7280"></line>
+                    <line x1="16" y1="11" x2="18" y2="11" stroke="#6b7280"> </line>
+                    <polygon points="23 6 5 6 1 6 1 23 23 23 23 6"></polygon>
+                  </g>
+                </svg> Automation Strategies</a>
            </li>
          {% endif %}
        </ul>
-<div class="text-sm text-gray-700">
-<a href="/shutdown/{{ shutdown_token }}"
-   class="shutdown-button flex items-center block py-4 px-4 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white"
-   data-active-swaps="{{ summary.num_swapping }}">
-    {{ shutdown_svg | safe }}
-    <span class="ml-2">Shutdown</span>
-</a>
-</div>
-</div>
-
-<div id="shutdownModal" tabindex="-1" class="hidden fixed inset-0 z-50 overflow-y-auto overflow-x-hidden">
-    <div class="fixed inset-0 bg-black bg-opacity-60 transition-opacity"></div>
-    <div class="flex items-center justify-center min-h-screen p-4 relative z-10">
-        <div class="bg-white dark:bg-gray-500 rounded-lg shadow-xl max-w-md w-full">
-            <div class="p-6 text-center">
-                <svg class="mx-auto mb-4 text-gray-400 w-12 h-12 dark:text-gray-200" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20">
-                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 11V6m0 8h.01M19 10a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"/>
-                </svg>
-                <h3 class="mb-5 text-lg font-normal text-gray-700 dark:text-gray-300">Are you sure you want to shut down?</h3>
-                <p id="shutdownWarning" class="mb-5 text-sm text-red-500 font-bold hidden">Warning: Swaps are in progress. Please wait for swaps to complete before shutting down.</p>
-                <p class="mb-5 text-sm text-gray-500 dark:text-gray-300">This action will shut down the application. Are you sure you want to proceed?</p>
-                <button id="confirmShutdown" type="button" class="text-white bg-red-600 hover:bg-red-800 focus:ring-0 focus:outline-none focus:ring-red-300 dark:focus:ring-red-800 font-medium rounded-lg text-sm inline-flex items-center px-5 py-2.5 text-center mr-2">
-                    Yes, Shut Down
-                </button>
-                <button id="closeShutdownModal" type="button" class="text-gray-500 bg-white hover:bg-gray-100 focus:ring-0 focus:outline-none focus:ring-gray-200 rounded-lg border border-gray-200 text-sm font-medium px-5 py-2.5 hover:text-gray-900 focus:z-10 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-500 dark:hover:text-white dark:hover:bg-gray-600 dark:focus:ring-gray-600">
-                    Cancel
-                </button>
-            </div>
+          <div class="text-sm text-gray-700">
+            <a href="/shutdown/{{ shutdown_token }}" class="flex items-center block py-4 px-4 hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"> <span class="sr-only">Shutdown</span>
+              <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                  <line data-cap="butt" x1="11" y1="10" x2="22" y2="10" stroke="#6b7280"></line>
+                  <polyline points="18 6 22 10 18 14" stroke="#6b7280"></polyline>
+                  <polyline data-cap="butt" points="13 13 13 17 8 17"></polyline>
+                  <polyline data-cap="butt" points="1 2 8 7.016 8 22 1 17 1 2 13 2 13 7"></polyline>
+                </g>
+              </svg> Shutdown </a>
+          </div>
        </div>
-    </div>
-</div>
        <!-- dropdown settings & tools -->
-
        <!-- notifications -->
        <button id="dropdownNotificationButton" data-dropdown-toggle="dropdownNotification" class="inline-flex items-center text-sm font-medium text-center text-gray-500 focus:outline-none " type="button">
-          {{ notifications_svg | safe }}
+          <svg class="h-5 w-5" viewBox="0 0 16 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M14 11.18V8C13.9986 6.58312 13.4958 5.21247 12.5806 4.13077C11.6655 3.04908 10.3971 2.32615 9 2.09V1C9 0.734784 8.89464 0.48043 8.70711 0.292893C8.51957 0.105357 8.26522 0 8 0C7.73478 0 7.48043 0.105357 7.29289 0.292893C7.10536 0.48043 7 0.734784 7 1V2.09C5.60294 2.32615 4.33452 3.04908 3.41939 4.13077C2.50425 5.21247 2.00144 6.58312 2 8V11.18C1.41645 11.3863 0.910998 11.7681 0.552938 12.2729C0.194879 12.7778 0.00173951 13.3811 0 14V16C0 16.2652 0.105357 16.5196 0.292893 16.7071C0.48043 16.8946 0.734784 17 1 17H4.14C4.37028 17.8474 4.873 18.5954 5.5706 19.1287C6.26819 19.6621 7.1219 19.951 8 19.951C8.8781 19.951 9.73181 19.6621 10.4294 19.1287C11.127 18.5954 11.6297 17.8474 11.86 17H15C15.2652 17 15.5196 16.8946 15.7071 16.7071C15.8946 16.5196 16 16.2652 16 16V14C15.9983 13.3811 15.8051 12.7778 15.4471 12.2729C15.089 11.7681 14.5835 11.3863 14 11.18ZM4 8C4 6.93913 4.42143 5.92172 5.17157 5.17157C5.92172 4.42143 6.93913 4 8 4C9.06087 4 10.0783 4.42143 10.8284 5.17157C11.5786 5.92172 12 6.93913 12 8V11H4V8ZM8 18C7.65097 17.9979 7.30857 17.9045 7.00683 17.7291C6.70509 17.5536 6.45451 17.3023 6.28 17H9.72C9.54549 17.3023 9.29491 17.5536 8.99317 17.7291C8.69143 17.9045 8.34903 17.9979 8 18ZM14 15H2V14C2 13.7348 2.10536 13.4804 2.29289 13.2929C2.48043 13.1054 2.73478 13 3 13H13C13.2652 13 13.5196 13.1054 13.7071 13.2929C13.8946 13.4804 14 13.7348 14 14V15Z" fill="#6b7280"></path>
+          </svg>
          <div class="flex relative">
            <!-- Todo -->
            <!-- <div class="inline-flex relative -top-2 right-2 w-3 h-3 bg-green-500 rounded-full border-2 border-gray-800"></div> -->
-            <!-- Red <div class="inline-flex relative -top-2 right-3 w-3 h-3 bg-red-500 rounded-full border-2 border-white"></div>  -->
-            <!-- Todo -->
-          </div>
+            <!-- Red <div class="inline-flex relative -top-2 right-3 w-3 h-3 bg-red-500 rounded-full border-2 border-white"></div>  --></div>
        </button>
-
        <!-- Dropdown menu -->
        <div id="dropdownNotification" class="hidden z-50 w-full max-w-sm bg-white shadow rounded divide-y divide-gray-100 drop-shadow dark:bg-gray-500 dark:divide-gray-400 dark:text-white" aria-labelledby="dropdownNotificationButton">
          <div class="block py-2 px-4 font-semibold text-center text-gray-700 bg-gray-50 drop-shadow dark:text-white dark:bg-gray-500">Notifications History</div>
          <div class="divide-y divide-gray-100 dark:divide-gray-400">
            {% for entry in notifications %} {% if entry[1] == 1 %}
            <div class="flex py-3 px-4 hover:bg-gray-100 dark:hover:bg-gray-700">
-              <div class="inline-flex flex-shrink-0 justify-center items-center w-8 h-8 bg-blue-500 rounded-lg">
-                {{ notifications_network_offer_svg | safe }}
-              </div>
+              <div class="inline-flex flex-shrink-0 justify-center items-center w-8 h-8 bg-blue-500 rounded-lg"><svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24"><g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="round"><circle cx="5" cy="5" r="4"></circle> <circle cx="19" cy="19" r="4"></circle> <polyline data-cap="butt" points="13,5 21,5 21,11 " stroke="#ffffff"></polyline> <polyline data-cap="butt" points="11,19 3,19 3,13 " stroke="#ffffff"></polyline> <polyline points=" 16,2 13,5 16,8 " stroke="#ffffff"></polyline> <polyline points=" 8,16 11,19 8,22 " stroke="#ffffff"></polyline></g></svg></div>
              <div class="pl-3 w-full">
                <div class="text-gray-500 text-sm mb-1.5"> <span class="font-semibold text-gray-900 dark:text-white">
                    NEW NETWORK <a class="underline text-blue-500" href="/offer/{{ entry[2].offer_id }}">OFFER</a></span>
@@ -305,9 +292,7 @@ document.addEventListener('DOMContentLoaded', function() {
            </div>
            {% elif entry[1] == 2 %}
            <div class="flex py-3 px-4 hover:bg-gray-100 dark:hover:bg-gray-700">
-              <div class="inline-flex flex-shrink-0 justify-center items-center w-8 h-8 bg-blue-500 rounded-lg">
-                {{ notifications_new_bid_on_offer_svg | safe }}
-              </div>
+              <div class="inline-flex flex-shrink-0 justify-center items-center w-8 h-8 bg-blue-500 rounded-lg"><svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24"><g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="round"><rect x="9.843" y="5.379" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -0.7635 13.1569)" width="11.314" height="4.243"></rect> <polyline points="3,23 3,19 15,19 15,23 "></polyline> <line x1="4" y1="15" x2="1" y2="15" stroke="#ffffff"></line> <line x1="5.757" y1="10.757" x2="3.636" y2="8.636" stroke="#ffffff"></line> <line x1="1" y1="23" x2="17" y2="23"></line> <line x1="17" y1="9" x2="23" y2="15"></line></g></svg></div>
              <div class="pl-3 w-full">
                <div class="text-gray-500 dark:text-white text-sm mb-1.5"> <span class="font-semibold text-gray-900 dark:text-white">
                    <a class="underline text-blue-500" href="/bid/{{ entry[2].bid_id }}">NEW BID</a> ON <a class="underline text-blue-500" href="/offer/{{ entry[2].offer_id }}">OFFER</a></span>
@@ -319,9 +304,7 @@ document.addEventListener('DOMContentLoaded', function() {
            </div>
            {% elif entry[1] == 3 %}
            <div class="flex py-3 px-4 hover:bg-gray-100 dark:hover:bg-gray-700">
-              <div class="inline-flex flex-shrink-0 justify-center items-center w-8 h-8 bg-violet-500 rounded-lg">
-                {{ notifications_bid_accepted_svg | safe }}
-              </div>
+              <div class="inline-flex flex-shrink-0 justify-center items-center w-8 h-8 bg-violet-500 rounded-lg"><svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24"><g fill="#ffffff"><path d="M8.5,20a1.5,1.5,0,0,1-1.061-.439L.379,12.5,2.5,10.379l6,6,13-13L23.621,5.5,9.561,19.561A1.5,1.5,0,0,1,8.5,20Z" fill="#ffffff"></path></g></svg></div>
              <div class="pl-3 w-full">
                <div class="text-gray-500 text-sm mb-1.5 dark:text-white"> <span class="font-semibold text-gray-900 dark:text-white">
                    <a class="underline text-blue-500" href="/bid/{{ entry[2].bid_id }}">BID</a> ACCEPTED</span>
@@ -333,9 +316,7 @@ document.addEventListener('DOMContentLoaded', function() {
            </div>
            {% else %}
            <div class="flex py-3 px-4 hover:bg-gray-100 dark:hover:bg-gray-700">
-              <div class="inline-flex flex-shrink-0 justify-center items-center w-8 h-8 bg-blue-500 rounded-lg">
-                {{ notifications_unknow_event_svg | safe }}
-              </div>
+              <div class="inline-flex flex-shrink-0 justify-center items-center w-8 h-8 bg-blue-500 rounded-lg"><svg class="w-4 h-4" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24"><g fill="#ffffff"><path d="M8.5,20a1.5,1.5,0,0,1-1.061-.439L.379,12.5,2.5,10.379l6,6,13-13L23.621,5.5,9.561,19.561A1.5,1.5,0,0,1,8.5,20Z" fill="#ffffff"></path></g></svg></div>
              <div class="pl-3 w-full">
                <div class="text-gray-500 text-sm mb-1.5 dark:text-white"> <span class="font-semibold text-gray-900 dark:text-white">
                    UNKNOWN EVENT</span>
@@ -347,9 +328,19 @@ document.addEventListener('DOMContentLoaded', function() {
               {% endif %}
               {% endfor %}
            </div>
+           <!-- todo <a href="#" class="block py-2 text-sm font-medium text-center text-gray-900 bg-gray-50 hover:bg-gray-100">
+             <div class="inline-flex items-center ">
+                <svg class="mr-2 w-4 h-4 text-gray-500" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <path d="M1.373,13.183a2.064,2.064,0,0,1,0-2.366C2.946,8.59,6.819,4,12,4s9.054,4.59,10.627,6.817a2.064,2.064,0,0,1,0,2.366C21.054,15.41,17.181,20,12,20S2.946,15.41,1.373,13.183Z"></path>
+                    <circle cx="12" cy="12" r="4" stroke="#6b7280"></circle>
+                  </g>
+                </svg> View all
+              </div>
+            </a>-->
          </div>
 <!-- notifications -->
-
+<!-- todo - fix line -->
 <div class="flex mr-2 items-center text-gray-50 hover:text-gray-100 text-sm ml-5">
  <div class="flex-shrink-0 w-px h-10 bg-gray-400 dark:bg-gray-400 ml-4 mr-5"></div>
              {% if debug_mode == true %}
@@ -357,8 +348,15 @@ document.addEventListener('DOMContentLoaded', function() {
              <ul class="xl:flex">
              <li>
                <div data-tooltip-target="tooltip-DEV" class="ml-5 flex items-center text-gray-50 hover:text-gray-100 text-sm">
-                  {{ debug_nerd_svg | safe }}
-                 </div>
+                    <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24">
+                    <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#2ad167" stroke-linejoin="round">
+                      <circle cx="12" cy="12" r="11"></circle>
+                      <path data-cap="butt" d="M9,16a3,3,0,0,0,6,0" stroke="#2ad167"></path>
+                      <circle cx="17" cy="10" r="3" stroke="#2ad167"></circle>
+                      <circle cx="7" cy="10" r="3" stroke="#2ad167"></circle>
+                      <path data-cap="butt" d="M10,10a2,2,0,0,1,4,0" stroke="#2ad167"></path></g>
+                  </svg>
+                  <span data-tooltip-target="tooltip-DEV" ></span> </div>
                <div id="tooltip-DEV" role="tooltip" class="inline-block absolute invisible z-10 py-2 px-3 text-sm font-medium text-white bg-blue-500 rounded-lg shadow-sm opacity-0 transition-opacity duration-300 tooltip">
                  <p><b>Debug mode:</b> Active</p>
                  {% if debug_ui_mode == true %}
@@ -374,15 +372,17 @@ document.addEventListener('DOMContentLoaded', function() {
                <ul class="xl:flex"><li>
                {% if locked == true %}
                <div data-tooltip-target="tooltip-locked-wallets" class="ml-5 flex items-center text-gray-50 hover:text-gray-100 text-sm">
-                  {{ wallet_locked_svg | safe }}</div>
+                   <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24"><g stroke-linecap="round" stroke-width="2" fill="none" stroke="#2ad167" stroke-linejoin="round"><rect x="3" y="11" width="18" height="12" rx="2"></rect><circle cx="12" cy="17" r="2" stroke="#2ad167"></circle><path d="M17,7V6a4.951,4.951,0,0,0-4.9-5H12A4.951,4.951,0,0,0,7,5.9V7" stroke="#2ad167"></path></g></svg>
+                  <span data-tooltip-target="tooltip-locked-wallets" ></span> </div>
                <div id="tooltip-locked-wallets" role="tooltip" class="inline-block absolute invisible z-10 py-2 px-3 text-sm font-medium text-white bg-blue-500 rounded-lg shadow-sm opacity-0 transition-opacity duration-300 tooltip">
                  <p><b>Wallets:</b> Locked </p>
                </div>
                {% else %}
                <a href='/lock'>
                <div data-tooltip-target="tooltip-unlocked-wallets" class="ml-5 flex items-center text-gray-50 hover:text-gray-100 text-sm">
-                {{ wallet_unlocked_svg | safe }}
-                 </div>
+                   <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24"><g stroke-linecap="round" stroke-width="2" fill="none" stroke="#f80b0b" stroke-linejoin="round"><rect x="3" y="11" width="18" height="12"></rect><circle cx="12" cy="17" r="2" stroke="#f80b0b"></circle><path data-cap="butt" d="M17,6a4.951,4.951,0,0,0-4.9-5H12A4.951,4.951,0,0,0,7,5.9V11"></path></g></svg>
+                  <span data-tooltip-target="tooltip-unlocked-wallets" ></span> </div>
+                <div class="tooltip-arrow" data-popper-arrow></div>
                <div id="tooltip-unlocked-wallets" role="tooltip" class="inline-block absolute invisible z-10 py-2 px-3 text-sm font-medium text-white bg-blue-500 rounded-lg shadow-sm opacity-0 transition-opacity duration-300 tooltip">
                  <p><b>Wallets:</b> Unlocked </p>
                </div>
@@ -395,59 +395,68 @@ document.addEventListener('DOMContentLoaded', function() {
                <ul class="xl:flex ml-5">
                  <li>
                    <a href="/tor">
-                      <div data-tooltip-target="tooltip-tor" class="flex items-center text-gray-50 hover:text-gray-100 text-sm">
-                        {{ tor_purple_svg | safe }}
-                    </a></div>
-                    <div id="tooltip-tor" role="tooltip" class="inline-block absolute invisible z-10 py-2 px-3 text-sm font-medium text-white bg-blue-500 rounded-lg shadow-sm opacity-0 transition-opacity duration-300 tooltip"><b>Tor mode:</b> Active
-                      {% if tor_established == true %}
-                      <br><b>Tor:</b> Connected
-                      {% endif %}
-                    </div>
+                      <div data-tooltip-target="tooltip-TOR" class="flex items-center text-gray-50 hover:text-gray-100 text-sm">
+                        <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                          <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#AA70E4" stroke-linejoin="round">
+                            <path d="M9,18.8A6.455,6.455,0,0,1,7,14,6.455,6.455,0,0,1,9,9.2" stroke="#AA70E4"></path>
+                            <path d="M15,18.8A6.455,6.455,0,0,0,17,14a6.455,6.455,0,0,0-2-4.8" stroke="#AA70E4"></path>
+                            <path d="M14,2.256V1H10V2.256A3.949,3.949,0,0,1,7.658,5.891,8.979,8.979,0,0,0,2,14c0,4.971,4.477,9,10,9s10-4.029,10-9a8.978,8.978,0,0,0-5.658-8.109A3.95,3.95,0,0,1,14,2.256Z"></path>
+                          </g>
+                        </svg>
+                    </a> <span data-tooltip-target="tooltip-TOR"></span></div>
+                    <div id="tooltip-TOR" role="tooltip" class="inline-block absolute invisible z-10 py-2 px-3 text-sm font-medium text-white bg-blue-500 rounded-lg shadow-sm opacity-0 transition-opacity duration-300 tooltip"><b>Tor mode:</b> Active {% if tor_established == true %}
+                      <br><b>Tor:</b> Connected{% endif %}</div>
                  </li>
                </ul>
                <!-- tor -->
              {% endif %}
              <button data-tooltip-target="tooltip-darkmode" id="theme-toggle" type="button" class="text-gray-500 dark:text-gray-400 focus:outline-none rounded-lg text-sm ml-5">
-                {{ sun_svg | safe }}
-                {{ moon_svg | safe }}
+               <svg id="theme-toggle-dark-icon" class="hidden w-5 h-5" fill="#F59E0B" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M17.293 13.293A8 8 0 016.707 2.707a8.001 8.001 0 1010.586 10.586z"></path></svg>
+               <svg id="theme-toggle-light-icon" class="hidden w-5 h-5" fill="#F59E0B" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z" fill-rule="evenodd" clip-rule="evenodd"></path></svg>
+               <span data-tooltip-target="tooltip-darkmode"></span>
                  <div id="tooltip-darkmode" role="tooltip" class="inline-block absolute invisible z-10 py-2 px-3 text-sm font-medium text-white bg-blue-500 rounded-lg shadow-sm opacity-0 transition-opacity duration-300 tooltip">Dark mode</div>
              </button>
            </div>
-
              <div class="hidden xl:block"></div>
-
              <!-- mobile menu -->
              <div class="ml-auto flex xl:hidden">
                <button class="navbar-burger flex items-center rounded focus:outline-none">
-                  {{ mobile_menu_svg | safe }}
+                  <svg class="text-white bg-blue-500 hover:bg-blue-600 block h-8 w-8 p-2 rounded" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill="currentColor">
+                    <title>Mobile Menu</title>
+                    <path d="M0 3h20v2H0V3zm0 6h20v2H0V9zm0 6h20v2H0v-2z"></path>
+                  </svg>
                </button>
              </div>
-
+              <!-- mobile menu -->
            </div>
            <div class="hidden xl:block py-5 px-6 bg-coolGray-100 border-gray-100 dark:border-gray-500 dark:bg-body border-b dark:border-b-2">
              <div class="flex items-center container flex flex-wrap items-center justify-between items-center mx-auto">
                <ul class="flex items-center">
-
                  <li>
                    <a class="flex mr-5 items-center text-sm text-gray-400 hover:text-gray-600 dark:text-gray-100 dark:hover:text-gray-100" href="/active">
-                      <div id="swapContainer" class="inline-flex center-spin ml-7 mr-2" {% if summary.num_swapping != 0 %}style="animation: spin 2s linear infinite;"{% endif %}>
-                        {% if summary.num_swapping != 0 %}
-                        {{ swap_in_progress_green_svg | safe }}
-                        {% else %}
-                        {{ swap_in_progress_svg | safe }}
-                        {% endif %}
-                      </div>
-                      <span>Swaps in Progress</span>
-                      <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full num-swap">{{ summary.num_swapping }}</span>
-                    </a>
+                      <svg class="text-gray-100 w-5 h-5 ml-7 mr-2" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                        <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                          <circle data-cap="butt" cx="12" cy="12" r="3" stroke="#6b7280"></circle>
+                          <polyline points="16.071 5.341 21.763 6.927 21.034 1.13"></polyline>
+                          <path data-cap="butt" d="M1,12A11,11,0,0,1,21.763,6.927"></path>
+                          <polyline points="7.929 18.659 2.237 17.073 2.966 22.87"></polyline>
+                          <path data-cap="butt" d="M23,12A11,11,0,0,1,2.237,17.073"></path>
+                        </g>
+                      </svg><span>Swaps in Progress </span> <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_swapping }}</span></a>
                  </li>
-
                  <div class="flex-shrink-0 w-px h-10 bg-gray-200 dark:bg-gray-400 mr-10"></div>
-
                  <li>
                    <a data-tooltip-target="tooltip-your-offers" class="flex mr-5 items-center text-sm text-gray-400 hover:text-gray-600 dark:text-gray-100 dark:hover:text-gray-100" href="/sentoffers">
-                      {{ your_offers_svg | safe }}
-                      <span>Your Offers</span> <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_sent_active_offers }}</span></a>
+                      <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24">
+                        <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                          <circle cx="5" cy="5" r="4"></circle>
+                          <circle cx="19" cy="19" r="4"></circle>
+                          <polyline data-cap="butt" points="13,5 21,5 21,11 " stroke="#6b7280"></polyline>
+                          <polyline data-cap="butt" points="11,19 3,19 3,13 " stroke="#6b7280"></polyline>
+                          <polyline points=" 16,2 13,5 16,8 " stroke="#6b7280"></polyline>
+                          <polyline points=" 8,16 11,19 8,22 " stroke="#6b7280"></polyline>
+                        </g>
+                      </svg><span>Your Offers</span> <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_sent_active_offers }}</span></a>

                <div id="tooltip-your-offers" role="tooltip" class="inline-block absolute invisible z-10 py-2 px-3 text-sm font-medium text-white bg-blue-500 rounded-lg shadow-sm opacity-0 transition-opacity duration-300 tooltip">
                  <p><b>Total:</b> {{ summary.num_sent_offers }}</p>
@@ -457,13 +466,23 @@ document.addEventListener('DOMContentLoaded', function() {
                  </li>
                  <div class="flex-shrink-0 w-px h-10 bg-gray-200 dark:bg-gray-400 mr-10"></div>
                  <li>
-                    <a class="flex mr-10 items-center text-sm text-gray-400 hover:text-gray-600 dark:text-gray-100 dark:hover:text-gray-100" href="/availablebids">{{ available_bids_svg | safe }}
-                      <span>Available Bids</span> <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_available_bids }}</span></a>
+                    <a class="flex mr-10 items-center text-sm text-gray-400 hover:text-gray-600 dark:text-gray-100 dark:hover:text-gray-100" href="/availablebids">
+                      <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                        <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                          <circle cx="12" cy="12" r="11"></circle>
+                          <polyline points=" 12,6 12,12 18,12 " stroke="#6b7280"></polyline>
+                        </g>
+                      </svg><span>Available Bids</span> <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_available_bids }}</span></a>
                  </li>
                  <li>
                    <a data-tooltip-target="tooltip-bids-received" class="flex mr-10 items-center text-sm text-gray-400 hover:text-gray-600 dark:text-gray-100 dark:hover:text-gray-100" href="/receivedbids">
-                      {{ bids_received_svg | safe }}
-                      <span>Bids Received</span> <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_recv_active_bids }}</span></a>
+                      <svg class="text-gray-100 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                        <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                          <path d="M2,16v4a2,2,0,0,0,2,2H20a2,2,0,0,0,2-2V16"> </path>
+                          <line data-cap="butt" x1="12" y1="1" x2="12" y2="16" stroke="#6b7280"></line>
+                          <polyline points="7 11 12 16 17 11" stroke="#6b7280"></polyline>
+                        </g>
+                      </svg><span>Bids Received</span> <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_recv_active_bids }}</span></a>
                  </li>

                <div id="tooltip-bids-received" role="tooltip" class="inline-block absolute invisible z-10 py-2 px-3 text-sm font-medium text-white bg-blue-500 rounded-lg shadow-sm opacity-0 transition-opacity duration-300 tooltip">
@@ -472,8 +491,13 @@ document.addEventListener('DOMContentLoaded', function() {
                </div>
                  <li>
                    <a data-tooltip-target="tooltip-bids-sent" class="flex mr-10 items-center text-sm text-gray-400 hover:text-gray-600 dark:text-gray-100 dark:hover:text-gray-100" href="/sentbids">
-                      {{ bids_sent_svg| safe }}
-                      <span>Bids Sent</span><span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_sent_active_bids }}</span></a>
+                      <svg class="text-gray-100 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                        <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                          <path d="M2,16v4a2,2,0,0,0,2,2H20a2,2,0,0,0,2-2V16"></path>
+                          <line data-cap="butt" x1="12" y1="17" x2="12" y2="2" stroke="#6b7280"></line>
+                          <polyline points="17 7 12 2 7 7" stroke="#6b7280"></polyline>
+                        </g>
+                      </svg><span>Bids Sent</span><span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_sent_active_bids }}</span></a>
                <div id="tooltip-bids-sent" role="tooltip" class="inline-block absolute invisible z-10 py-2 px-3 text-sm font-medium text-white bg-blue-500 rounded-lg shadow-sm opacity-0 transition-opacity duration-300 tooltip">
                  <p><b>Total:</b>  {{ summary.num_sent_bids }}</p>
                <div class="tooltip-arrow" data-popper-arrow></div>
@@ -496,46 +520,103 @@ document.addEventListener('DOMContentLoaded', function() {
          <ul class="mb-8 text-sm font-medium">
            <li>
              <a class="flex items-center pl-3 py-3 pr-4 text-gray-50 hover:bg-gray-900 rounded" href="/wallets"> <span class="inline-block mr-3">
-                {{ wallet_svg | safe }}
-                </span><span>Wallets</span>
-                <span class="inline-block ml-auto"></span></a>
+                <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <path d="M6,3H3C1.895,3,1,3.895,1,5 v0c0,1.105,0.895,2,2,2"></path>
+                    <polyline points=" 6,7 6,1 20,1 20,7 " stroke="#6b7280"></polyline>
+                    <path d="M23,7H3 C1.895,7,1,6.105,1,5v15c0,1.657,1.343,3,3,3h19V7z"></path>
+                    <circle cx="17" cy="15" r="2"></circle>
+                  </g>
+                </svg>
+                </span><span>Wallets</span> <span class="inline-block ml-auto">
+                </span></a>
            </li>
          </ul>
          <h3 class="mb-2 text-xs uppercase text-gray-300 font-medium dark:text-gray-300">Exchange</h3>
          <ul class="text-sm font-medium">
            <li>
              <a class="flex items-center pl-3 py-3 pr-2 text-gray-50 hover:bg-gray-900 rounded" href="/newoffer"> <span class="inline-block mr-3">
-                {{ new_offer_svg | safe }}
+                <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <circle cx="5" cy="5" r="4"></circle>
+                    <circle cx="19" cy="19" r="4"></circle>
+                    <polyline data-cap="butt" points="13,5 21,5 21,11 " stroke="#6b7280"></polyline>
+                    <polyline data-cap="butt" points="11,19 3,19 3,13 " stroke="#6b7280"></polyline>
+                    <polyline points=" 16,2 13,5 16,8 " stroke="#6b7280"></polyline>
+                    <polyline points=" 8,16 11,19 8,22 " stroke="#6b7280"></polyline>
+                  </g>
+                </svg>
                </span><span>Place new Offer</span></a>
            </li>
            <li>
              <a class="flex items-center pl-3 py-3 pr-4 text-gray-50 hover:bg-gray-900 rounded" href="/active"> <span class="inline-block mr-3">
-                {{ swap_in_progress_mobile_svg | safe }}
-              </span><span>Swaps in Progress</span> <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_swapping }}</span></a>
+                <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <circle data-cap="butt" cx="12" cy="12" r="3" stroke="#6b7280"></circle>
+                    <polyline points="16.071 5.341 21.763 6.927 21.034 1.13"></polyline>
+                    <path data-cap="butt" d="M1,12A11,11,0,0,1,21.763,6.927"></path>
+                    <polyline points="7.929 18.659 2.237 17.073 2.966 22.87"></polyline>
+                    <path data-cap="butt" d="M23,12A11,11,0,0,1,2.237,17.073"></path>
+                  </g>
+                </svg>
+                </span><span>Swaps in Progress</span> <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_swapping }}</span></a>
            </li>
            <li>
              <a class="flex items-center pl-3 py-3 pr-4 text-gray-50 hover:bg-gray-900 rounded" href="/offers"> <span class="inline-block mr-3">
-                {{ order_book_svg | safe }}
+                <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <rect x="3" y="1" width="18" height="22"></rect>
+                    <line x1="12" y1="8" x2="12" y2="16" stroke="#6b7280"></line>
+                    <line x1="8" y1="14" x2="8" y2="16" stroke="#6b7280"></line>
+                    <line x1="16" y1="11" x2="16" y2="16" stroke="#6b7280"> </line>
+                  </g>
+                </svg>
                </span><span>Show Order Book</span> <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_network_offers }}</span></a>
            </li>
            <li>
              <a class="flex items-center pl-3 py-3 pr-4 text-gray-50 hover:bg-gray-900 rounded" href="sentoffers"> <span class="inline-block mr-3">
-                {{ your_offers_svg | safe }}
+                <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <circle cx="5" cy="5" r="4"></circle>
+                    <circle cx="19" cy="19" r="4"></circle>
+                    <polyline data-cap="butt" points="13,5 21,5 21,11 " stroke="#6b7280"></polyline>
+                    <polyline data-cap="butt" points="11,19 3,19 3,13 " stroke="#6b7280"></polyline>
+                    <polyline points=" 16,2 13,5 16,8 " stroke="#6b7280"></polyline>
+                    <polyline points=" 8,16 11,19 8,22 " stroke="#6b7280"></polyline>
+                  </g>
+                </svg>
              </span><span>Your Offers</span> <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_sent_offers }}</span></a>
            </li>
            <li>
              <a class="flex items-center pl-3 py-3 pr-4 text-gray-50 hover:bg-gray-900 rounded" href="/availablebids"> <span class="inline-block mr-3">
-                {{ available_bids_svg | safe }}
+                <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <circle cx="12" cy="12" r="11"></circle>
+                    <polyline points=" 12,6 12,12 18,12 " stroke="#6b7280"></polyline>
+                  </g>
+                </svg>
                </span><span>Available Bids</span> <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_available_bids }}</span></a>
            </li>
            <li>
              <a class="flex items-center pl-3 py-3 pr-4 text-gray-50 hover:bg-gray-900 rounded" href="/receivedbids"> <span class="inline-block mr-3">
-                {{ bids_received_svg | safe }}
+                <svg class="text-gray-100 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <path d="M2,16v4a2,2,0,0,0,2,2H20a2,2,0,0,0,2-2V16"> </path>
+                    <line data-cap="butt" x1="12" y1="1" x2="12" y2="16" stroke="#6b7280"></line>
+                    <polyline points="7 11 12 16 17 11" stroke="#6b7280"></polyline>
+                  </g>
+                </svg>
                </span><span>Bids Received</span> <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_recv_bids }}</span></a>
            </li>
            <li>
              <a class="flex items-center pl-3 py-3 pr-4 text-gray-50 hover:bg-gray-900 rounded" href="/sentbids"> <span class="inline-block mr-3">
-                {{ bids_sent_svg | safe }}
+                <svg class="text-gray-100 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <path d="M2,16v4a2,2,0,0,0,2,2H20a2,2,0,0,0,2-2V16"></path>
+                    <line data-cap="butt" x1="12" y1="17" x2="12" y2="2" stroke="#6b7280"></line>
+                    <polyline points="17 7 12 2 7 7" stroke="#6b7280"></polyline>
+                  </g>
+                </svg>
                </span><span>Bids Sent</span> <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_sent_bids }}</span></a>
            </li>
          </ul>
@@ -543,125 +624,162 @@ document.addEventListener('DOMContentLoaded', function() {
          <ul class="text-sm font-medium">
            <li>
              <a class="flex items-center pl-3 py-3 pr-2 text-gray-50 hover:bg-gray-900 rounded" href="/settings"> <span class="inline-block mr-3">
-                  {{ settings_svg | safe }}
+                  <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24">
+                    <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                      <circle cx="12" cy="12" r="3" stroke="#6b7280"></circle>
+                      <path d="M20,12a8.049,8.049,0,0,0-.188-1.713l2.714-2.055-2-3.464L17.383,6.094a7.987,7.987,0,0,0-2.961-1.719L14,1H10L9.578,4.375A7.987,7.987,0,0,0,6.617,6.094L3.474,4.768l-2,3.464,2.714,2.055a7.9,7.9,0,0,0,0,3.426L1.474,15.768l2,3.464,3.143-1.326a7.987,7.987,0,0,0,2.961,1.719L10,23h4l.422-3.375a7.987,7.987,0,0,0,2.961-1.719l3.143,1.326,2-3.464-2.714-2.055A8.049,8.049,0,0,0,20,12Z"></path>
+                    </g>
+                  </svg>
                  </span><span>Settings</span></a>
            </li>
-           <li>
-              <a class="flex items-center pl-3 py-3 pr-2 text-gray-50 hover:bg-gray-900 rounded" href="/changepassword"> <span class="inline-block mr-3">
-                  {{ change_password_svg | safe }}
-                  </span><span>Change/Set Password</span></a>
-            </li>
            {% if debug_mode == true %}
            <li>
              <a class="flex items-center pl-3 py-3 pr-4 text-gray-50 hover:bg-gray-900 rounded" href="/rpc"> <span class="inline-block mr-3">
-                {{ rpc_svg | safe }}
+                <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <rect x="1" y="2" width="22" height="20"></rect>
+                    <line x1="1" y1="6" x2="23" y2="6"></line>
+                    <polyline points=" 5,11 7,13 5,15 " stroke="#6b7280"></polyline>
+                    <line x1="10" y1="15" x2="14" y2="15" stroke="#6b7280"></line>
+                    <line x1="6" y1="2" x2="6" y2="6"></line>
+                  </g>
+                </svg>
                </span><span>RPC Console</span></a>
            </li>
            {% endif %}
            {% if debug_mode == true %}
            <li>
              <a class="flex items-center pl-3 py-3 pr-4 text-gray-50 hover:bg-gray-900 rounded" href="/debug"> <span class="inline-block mr-3">
-              {{ debug_svg | safe }}
+              <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+              <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+              <path data-cap="butt" d="M5.29,10H4A3,3,0,0,1,1,7V6" stroke="#6b7280"></path>
+              <path data-cap="butt" d="M5.29,18H4a3,3,0,0,0-3,3v1" stroke="#6b7280"></path>
+              <path data-cap="butt" d="M8,6.255V5a4,4,0,0,1,4-4h0a4,4,0,0,1,4,4V6.255" stroke="#6b7280"></path>
+              <line x1="5" y1="14" x2="1" y2="14" stroke="#6b7280"></line> <path data-cap="butt" d="M18.71,10H20a3,3,0,0,0,3-3V6" stroke="#6b7280"></path>
+              <path data-cap="butt" d="M18.71,18H20a3,3,0,0,1,3,3v1" stroke="#6b7280"></path> <line x1="19" y1="14" x2="23" y2="14" stroke="#6b7280"></line>
+              <path d="M19,16A7,7,0,0,1,5,16V12a7,7,0,0,1,14,0Z"></path></g></svg>
            </span> <span>Debug</span> </a>
            </li>
            {% endif %}
            {% if debug_mode == true %}
            <li>
              <a class="flex items-center pl-3 py-3 pr-4 text-gray-50 hover:bg-gray-900 rounded" href="/explorers"> <span class="inline-block mr-3">
-            {{ explorer_svg | safe }}
+                <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <line x1="22" y1="22" x2="15.656" y2="15.656" stroke="#6b7280"></line>
+                    <circle cx="10" cy="10" r="8"></circle>
+                  </g>
+                </svg>
                </span><span>Explorers</span></a>
            </li>
            {% endif %}
            <li>
              <a class="flex items-center pl-3 py-3 pr-4 text-gray-50 hover:bg-gray-900 rounded" href="/smsgaddresses"> <span class="inline-block mr-3">
-              {{ smsg_svg | safe }}
+                <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <path data-cap="butt" d="M11.992,11.737,14.2,13.4A2,2,0,0,1,15,15v1H7V15a2,2,0,0,1,.8-1.6l2.208-1.663" stroke="#6b7280"></path>
+                    <rect x="9" y="7" width="4" height="5" rx="2" ry="2" stroke="#6b7280"></rect>
+                    <path d="M2,1H18a2,2,0,0,1,2,2V21a2,2,0,0,1-2,2H2Z"></path>
+                    <line x1="23" y1="5" x2="23" y2="9" stroke="#6b7280"></line>
+                  </g>
+                </svg>
                </span><span>SMSG Addresses</span></a>
            </li>
            <li>
              <a class="flex items-center pl-3 py-3 pr-4 text-gray-50 hover:bg-gray-900 rounded" href="/watched"> <span class="inline-block mr-3">
-                {{ outputs_svg| safe }}
+                <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <path d="M1.373,13.183a2.064,2.064,0,0,1,0-2.366C2.946,8.59,6.819,4,12,4s9.054,4.59,10.627,6.817a2.064,2.064,0,0,1,0,2.366C21.054,15.41,17.181,20,12,20S2.946,15.41,1.373,13.183Z"></path>
+                    <circle cx="12" cy="12" r="4" stroke="#6b7280"></circle>
+                  </g>
+                </svg>
                </span><span>Watched Outputs</span> <span class="inline-flex justify-center items-center text-xs font-semibold ml-3 mr-2 px-2.5 py-1 font-small text-white bg-blue-500 rounded-full">{{ summary.num_watched_outputs }}</span></a>
            </li>
            {% if debug_mode == true %}
            <li>
              <a class="flex items-center pl-3 py-3 pr-4 text-gray-50 hover:bg-gray-900 rounded" href="/automation"> <span class="inline-block mr-3">
-              {{ automation_svg | safe }}
+                <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                    <line data-cap="butt" x1="5" y1="1" x2="5" y2="6" stroke="#6b7280"></line>
+                    <line x1="3" y1="1" x2="7" y2="1" stroke="#6b7280"> </line>
+                    <line data-cap="butt" x1="19" y1="1" x2="19" y2="6" stroke="#6b7280"></line>
+                    <line x1="17" y1="1" x2="21" y2="1" stroke="#6b7280"></line>
+                    <rect x="6" y="15" width="12" height="4" stroke="#6b7280"></rect>
+                    <line data-cap="butt" x1="10" y1="19" x2="10" y2="15" stroke="#6b7280"></line>
+                    <line data-cap="butt" x1="14" y1="19" x2="14" y2="15" stroke="#6b7280"></line>
+                    <line x1="6" y1="11" x2="8" y2="11" stroke="#6b7280"></line>
+                    <line x1="16" y1="11" x2="18" y2="11" stroke="#6b7280"> </line>
+                    <polygon points="23 6 5 6 1 6 1 23 23 23 23 6"></polygon>
+                  </g>
+                </svg>
                </span><span>Automation Strategies</span></a>
            </li>
            {% endif %}
            {% if use_tor_proxy == true %}
            <li>
              <a class="flex items-center pl-3 py-3 pr-2 text-gray-50 hover:bg-gray-900 rounded" href="/tor"> <span class="inline-block mr-3">
-              {{ tor_svg | safe }} <!-- change color -->
+                <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                  <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#AA70E4" stroke-linejoin="round">
+                    <path d="M9,18.8A6.455,6.455,0,0,1,7,14,6.455,6.455,0,0,1,9,9.2" stroke="#AA70E4"></path>
+                    <path d="M15,18.8A6.455,6.455,0,0,0,17,14a6.455,6.455,0,0,0-2-4.8" stroke="#AA70E4"></path>
+                     <path d="M14,2.256V1H10V2.256A3.949,3.949,0,0,1,7.658,5.891,8.979,8.979,0,0,0,2,14c0,4.971,4.477,9,10,9s10-4.029,10-9a8.978,8.978,0,0,0-5.658-8.109A3.95,3.95,0,0,1,14,2.256Z"></path>
+                   </g>
+                 </svg>
              </span><span>Tor</span></a>
            </li>
          {% endif %}
        </ul>
          <div class="pt-8 text-sm font-medium">
-<a href="/shutdown/{{ shutdown_token }}"
-   class="shutdown-button flex items-center block py-4 px-4 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white"
-   data-active-swaps="{{ summary.num_swapping }}">
-    {{ shutdown_svg | safe }}
-    <span class="ml-2">Shutdown</span>
-</a>
+            <a class="flex items-center pl-3 py-3 pr-4 text-gray-50 hover:bg-gray-900 rounded" href="/shutdown/{{ shutdown_token }}"> <span class="inline-block mr-3">
+              <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#6b7280" stroke-linejoin="round">
+                  <line data-cap="butt" x1="11" y1="10" x2="22" y2="10" stroke="#6b7280"></line>
+                  <polyline points="18 6 22 10 18 14" stroke="#6b7280"></polyline>
+                  <polyline data-cap="butt" points="13 13 13 17 8 17"></polyline>
+                  <polyline data-cap="butt" points="1 2 8 7.016 8 22 1 17 1 2 13 2 13 7"></polyline>
+                </g>
+              </svg>
+              </span><span>Shutdown</span></a>
          </div>
        </div>
      </nav>
    </div>
-  <!-- mobile sidebar -->
-
+    <!-- mobile sidebar -->
  </section>
-  {% if ws_port %}
+  {% if ws_url %}
  <script>
-// Configuration object
-const notificationConfig = {
-    showNewOffers: false,
-    showNewBids: true,
-    showBidAccepted: true
-};
-
-var ws = new WebSocket("ws://" + window.location.hostname + ":{{ ws_port }}"),
+    var ws = new WebSocket("{{ ws_url }}"),
    floating_div = document.createElement('div');
-floating_div.classList.add('floatright');
-messages = document.createElement('ul');
-messages.setAttribute('id', 'ul_updates');
-
-floating_div.appendChild(messages);
-
-ws.onmessage = function(event) {
-    let json = JSON.parse(event.data);
-    let event_message = 'Unknown event';
-    let should_display = false;
-
-    if (json['event'] == 'new_offer' && notificationConfig.showNewOffers) {
+    floating_div.classList.add('floatright');
+    messages = document.createElement('ul');
+    messages.setAttribute('id', 'ul_updates');
+    ws.onmessage = function(event) {
+      let json = JSON.parse(event.data);
+      let event_message = 'Unknown event';
+      if (json['event'] == 'new_offer') {
        event_message = '<div id="hide"><div id="toast-success" class="flex items-center p-4 mb-4 w-full max-w-xs text-gray-500 bg-white rounded-lg shadow" role="alert"><div class="inline-flex flex-shrink-0 justify-center items-center w-10 h-10 bg-blue-500 rounded-lg"><svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24"><g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="round"><circle cx="5" cy="5" r="4"></circle> <circle cx="19" cy="19" r="4"></circle> <polyline data-cap="butt" points="13,5 21,5 21,11 " stroke="#ffffff"></polyline> <polyline data-cap="butt" points="11,19 3,19 3,13 " stroke="#ffffff"></polyline> <polyline points=" 16,2 13,5 16,8 " stroke="#ffffff"></polyline> <polyline points=" 8,16 11,19 8,22 " stroke="#ffffff"></polyline></g></svg></div><div class="uppercase w-40 ml-3 text-sm font-semibold text-gray-900">New network <a class="underline" href=/offer/' + json['offer_id'] + '>offer</a></div><button type="button" onclick="closeAlert(event)" class="ml-auto -mx-1.5 -my-1.5 bg-white text-gray-400 hover:text-gray-900 rounded-lg focus:ring-0 focus:outline-none focus:ring-gray-300 p-1.5 hover:bg-gray-100 inline-flex h-8 w-8" data-dismiss="#toast-success" aria-label="Close"><span class="sr-only">Close</span><svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg></button></div></div>';
-        should_display = true;
-    }
-    else if (json['event'] == 'new_bid' && notificationConfig.showNewBids) {
+      }
+      else
+      if (json['event'] == 'new_bid') {
        event_message = '<div id="hide"><div id="toast-success" class="flex items-center p-4 mb-4 w-full max-w-xs text-gray-500 bg-white rounded-lg shadow" role="alert"><div class="inline-flex flex-shrink-0 justify-center items-center w-10 h-10 bg-violet-500 rounded-lg"><svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24"><g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="round"><rect x="9.843" y="5.379" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -0.7635 13.1569)" width="11.314" height="4.243"></rect> <polyline points="3,23 3,19 15,19 15,23 "></polyline> <line x1="4" y1="15" x2="1" y2="15" stroke="#ffffff"></line> <line x1="5.757" y1="10.757" x2="3.636" y2="8.636" stroke="#ffffff"></line> <line x1="1" y1="23" x2="17" y2="23"></line> <line x1="17" y1="9" x2="23" y2="15"></line></g></svg></div><div class="uppercase w-40 ml-3 text-sm font-normal"><span class="mb-1 text-sm font-semibold text-gray-900"><a class="underline" href=/bid/' + json['bid_id'] + '>New bid</a> on <a class="underline" href=/offer/' + json['offer_id'] + '>offer</a></span></div><button type="button" onclick="closeAlert(event)" class="ml-auto -mx-1.5 -my-1.5 bg-white text-gray-400 hover:text-gray-900 rounded-lg focus:ring-0 focus:outline-nonefocus:ring-gray-300 p-1.5 hover:bg-gray-100 inline-flex h-8 w-8" data-dismiss="#toast-success" aria-label="Close"><svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg></button></div></div>';
-        should_display = true;
-    }
-    else if (json['event'] == 'bid_accepted' && notificationConfig.showBidAccepted) {
+      }
+      else
+      if (json['event'] == 'bid_accepted') {
        event_message = '<div id="hide"><div id="toast-success" class="flex items-center p-4 mb-4 w-full max-w-xs text-gray-500 bg-white rounded-lg shadow" role="alert"><div class="inline-flex flex-shrink-0 justify-center items-center w-10 h-10 bg-violet-500 rounded-lg"><svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24"><g fill="#ffffff"><path d="M8.5,20a1.5,1.5,0,0,1-1.061-.439L.379,12.5,2.5,10.379l6,6,13-13L23.621,5.5,9.561,19.561A1.5,1.5,0,0,1,8.5,20Z" fill="#ffffff"></path></g></svg></div><div class="uppercase w-40 ml-3 text-sm font-semibold text-gray-900"><a class="underline" href=/bid/' + json['bid_id'] + '>Bid</a> accepted</div><button type="button" onclick="closeAlert(event)" class="ml-auto -mx-1.5 -my-1.5 bg-white text-gray-400 hover:text-gray-900 rounded-lg focus:ring-0 focus:outline-none focus:ring-gray-300 p-1.5 hover:bg-gray-100 inline-flex h-8 w-8" data-dismiss="#toast-success" aria-label="Close"><span class="sr-only">Close</span><svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg></button></div></div>';
-        should_display = true;
-    }
-
-    if (should_display) {
-        let messages = document.getElementById('ul_updates'),
-            message = document.createElement('li');
-        message.innerHTML = event_message;
-        messages.appendChild(message);
-    }
-};
-
-document.body.appendChild(floating_div);
-
-function closeAlert(event){
+      }
+      let messages = document.getElementById('ul_updates'),
+        message = document.createElement('li');
+      message.innerHTML = event_message;
+      messages.appendChild(message);
+    };
+    floating_div.appendChild(messages);
+    document.body.appendChild(floating_div);
+      function closeAlert(event){
    let element = event.target;
    while(element.nodeName !== "BUTTON"){
-        element = element.parentNode;
+      element = element.parentNode;
    }
    element.parentNode.parentNode.removeChild(element.parentNode);
-}
+  }
  </script>
  {% endif %}
--- a/basicswap/templates/identity.html
+++ b/basicswap/templates/identity.html
@@ -1,5 +1,4 @@
 {% include 'header.html' %}
-{% from 'style.html' import breadcrumb_line_svg, red_cross_close_svg %} 
 <div class="container mx-auto">
 <section class="p-5 mt-5">
  <div class="flex flex-wrap items-center -m-2">
@@ -10,13 +9,21 @@
       <p>Home</p>
      </a>
     </li>
-    <li>{{ breadcrumb_line_svg | safe }}</li>
+     <li>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
     <li>
      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/smsgaddresses">Identity</a>
     </li>
-    <li>{{ breadcrumb_line_svg | safe }}</li>
     <li>
-      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/identity/{{ data.identity_address }}">Address: {{ data.identity_address }}</a>
+      <svg width="6" height="15" viewBox="0 0 6 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+       <path d="M5.34 0.671999L2.076 14.1H0.732L3.984 0.671999H5.34Z" fill="#BBC3CF"></path>
+      </svg>
+     </li>
+     <li>
+      <a class="flex font-medium text-xs text-coolGray-500 dark:text-gray-300 hover:text-coolGray-700" href="/identity/{{ data.identity_address }}">ADDRESS: {{ data.identity_address }}</a>
     </li>
    </ul>
   </div>
@@ -31,7 +38,7 @@
    <div class="relative z-20 flex flex-wrap items-center -m-3">
     <div class="w-full md:w-1/2 p-3">
      <h2 class="mb-6 text-4xl font-bold text-white tracking-tighter">Identity</h2>
-      <p class="font-normal text-coolGray-200 dark:text-white"><span class="bold">Address:</span> {{ data.identity_address }}</p>
+      <p class="font-normal text-coolGray-200 dark:text-white">Address: {{ data.identity_address }}</p>
     </div>
    </div>
   </div>
@@ -146,14 +153,34 @@
         <div class="flex flex-wrap justify-end">
          {% if data.show_edit_form %}
          <div class="w-full md:w-auto p-1.5 ml-2">
-           <button name="apply" value="Apply" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">Apply</button>
+           <button name="apply" value="Apply" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+            <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+             <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="round">
+              <polyline points=" 6,12 10,16 18,8 " stroke="#ffffff"></polyline>
+              <circle cx="12" cy="12" r="11"></circle>
+             </g>
+            </svg>Apply </button>
          </div>
          <div class="w-full md:w-auto p-1.5 ml-2">
-           <button name="cancel" value="Cancel" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-red-500 hover:bg-red-600 font-medium text-sm text-white border border-red-500 rounded-md shadow-button focus:ring-0 focus:outline-none">Cancel</button>
+           <button name="cancel" value="Cancel" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-red-500 hover:bg-red-600 font-medium text-sm text-white border border-red-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+            <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+             <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="round">
+              <line x1="16" y1="8" x2="8" y2="16" stroke="#ffffff"></line>
+              <line x1="16" y1="16" x2="8" y2="8" stroke="#ffffff"></line>
+              <circle cx="12" cy="12" r="11"></circle>
+             </g>
+            </svg>Cancel </button>
          </div>
          {% else %}
          <div class="w-full md:w-auto p-1.5">
-           <button name="edit" value="edit" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">Edit</button>
+           <button name="edit" value="edit" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+            <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24">
+             <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="round">
+              <line x1="2" y1="23" x2="22" y2="23" stroke="#ffffff"></line>
+              <line data-cap="butt" x1="13" y1="5" x2="17" y2="9"></line>
+              <polygon points="8 18 3 19 4 14 16 2 20 6 8 18"></polygon>
+             </g>
+            </svg>Edit </button>
          </div>
          {% endif %}
         </div>
--- a/basicswap/templates/inc_messages.html
+++ b/basicswap/templates/inc_messages.html
@@ -1,24 +1,24 @@
-{% from 'style.html' import circular_info_messages_svg, green_cross_close_svg, red_cross_close_svg, circular_error_messages_svg %}
-
 {% for m in messages %}
 <section class="py-4" id="messages_{{ m[0] }}" role="alert">
  <div class="container px-4 mx-auto">
-    <div class="p-6 text-green-800 rounded-lg bg-green-50 border border-green-500 dark:bg-gray-500 dark:text-green-400 rounded-md">
+    <div class="p-6 bg-green-100 border border-green-200 rounded-md">
      <div class="flex flex-wrap justify-between items-center -m-2">
        <div class="flex-1 p-2">
          <div class="flex flex-wrap -m-1">
            <div class="w-auto p-1">
-            {{ circular_info_messages_svg | safe }}
+              <svg class="relative top-0.5" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M12.4732 4.80667C12.4112 4.74418 12.3375 4.69458 12.2563 4.66074C12.175 4.62689 12.0879 4.60947 11.9999 4.60947C11.9119 4.60947 11.8247 4.62689 11.7435 4.66074C11.6623 4.69458 11.5885 4.74418 11.5266 4.80667L6.55989 9.78L4.47322 7.68667C4.40887 7.62451 4.33291 7.57563 4.24967 7.54283C4.16644 7.51003 4.07755 7.49394 3.9881 7.49549C3.89865 7.49703 3.81037 7.51619 3.72832 7.55185C3.64627 7.58751 3.57204 7.63898 3.50989 7.70333C3.44773 7.76768 3.39885 7.84364 3.36605 7.92688C3.33324 8.01011 3.31716 8.099 3.31871 8.18845C3.32025 8.2779 3.3394 8.36618 3.37507 8.44823C3.41073 8.53028 3.4622 8.60451 3.52655 8.66667L6.08655 11.2267C6.14853 11.2892 6.22226 11.3387 6.3035 11.3726C6.38474 11.4064 6.47188 11.4239 6.55989 11.4239C6.64789 11.4239 6.73503 11.4064 6.81627 11.3726C6.89751 11.3387 6.97124 11.2892 7.03322 11.2267L12.4732 5.78667C12.5409 5.72424 12.5949 5.64847 12.6318 5.56414C12.6688 5.4798 12.6878 5.38873 12.6878 5.29667C12.6878 5.2046 12.6688 5.11353 12.6318 5.02919C12.5949 4.94486 12.5409 4.86909 12.4732 4.80667Z" fill="#2AD168"></path>
+              </svg>
            </div>
-        <ul class="ml-4 mt-1">
-            <li class="font-semibold text-sm text-green-500 error_msg"><span class="bold">INFO:</span></li>
-                <li class="font-medium text-sm text-green-500 infomsg">{{ m[1] }}</li>
-        </ul>
-           </div>             
+            <div class="flex-1 p-1">
+              <h3 class="infomsg font-medium text-sm text-green-900">{{ m[1] }}</h3></div>
+          </div>
        </div>
        <div class="w-auto p-2">
-          <button type="button" class="ms-auto bg-green-50 text-green-500 rounded-lg focus:ring-0 focus:ring-green-400 p-1.5 hover:bg-green-200 inline-flex items-center justify-center h-8 w-8 focus:outline-none dark:bg-gray-800 dark:text-green-400 dark:hover:bg-gray-700" data-dismiss-target="#messages_{{ m[0] }}" aria-label="Close"><span class="sr-only">Close</span>
-            {{ green_cross_close_svg | safe }}
+          <button type="button" class="ml-auto bg-green-100 text-green-500 rounded-lg focus:ring-0 focus:ring-green-400 p-1.5 hover:bg-green-200 inline-flex h-8 w-8 focus:outline-none" data-dismiss-target="#messages_{{ m[0] }}" aria-label="Close"><span class="sr-only">Close</span>
+            <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+              <path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path>
+            </svg>
          </button>
        </div>
      </div>
@@ -29,27 +29,27 @@
 {% if err_messages %}
 <section class="py-4" id="err_messages_{{ err_messages[0][0] }}" role="alert">
  <div class="container px-4 mx-auto">
-    <div class="p-6 text-green-800 rounded-lg bg-red-50 border border-red-400 dark:bg-gray-500 dark:text-red-400 rounded-md">
+    <div class="p-6 bg-red-100 border border-red-200 rounded-md">
      <div class="flex flex-wrap justify-between items-center -m-2">
        <div class="flex-1 p-2">
          <div class="flex flex-wrap -m-1">
            <div class="w-auto p-1">
-              {{ circular_error_messages_svg | safe }}
+              {% for m in err_messages %}
+              <div class="flex-1 p-1">
+                <h3 class="font-medium text-sm text-red-900 error_msg">
+                  <p class="error_msg">Error: {{ m[1] }}</p>
+                </h3>
+              </div>
+              {% endfor %}
            </div>
-    {% if err_messages %}
-        <ul class="ml-4 mt-1">
-            <li class="font-semibold text-sm text-red-500 error_msg"><span class="bold">ERROR:</span></li>
-            {% for m in err_messages %}
-                <li class="font-medium text-sm text-red-500 error_msg">{{ m[1] }}</li>
-            {% endfor %}
-        </ul>
-    {% endif %}
-      </div>
+          </div>
        </div>
        <div class="w-auto p-2">
-          <button type="button" class="ml-auto bg-red-100 text-red-500 rounded-lg focus:ring-0 focus:ring-red-400 p-1.5 hover:bg-red-200 inline-flex h-8 w-8 focus:outline-none inline-flex items-center justify-center h-8 w-8 dark:bg-gray-800 dark:text-red-400 dark:hover:bg-gray-700" data-dismiss-target="#err_messages_{{ err_messages[0][0] }}" aria-label="Close">
+          <button type="button" class="ml-auto bg-red-100 text-red-500 rounded-lg focus:ring-0 focus:ring-red-400 p-1.5 hover:bg-red-200 inline-flex h-8 w-8 focus:outline-none" data-dismiss-target="#err_messages_{{ err_messages[0][0] }}" aria-label="Close">
            <span class="sr-only">Close</span>
-            {{ red_cross_close_svg | safe }}
+            <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+              <path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path>
+            </svg>
          </button>
        </div>
      </div>
@@ -57,3 +57,4 @@
  </div>
 </section>
 {% endif %}
+<!-- todo messages colors better for darkmode -->
--- a/Show More
+++ b/Show More