diff --git a/.github/workflows/ci-build-upload-binaries.yml b/.github/workflows/ci-build-upload-binaries.yml
index 8ceb473118c..00c28191bdd 100644
--- a/.github/workflows/ci-build-upload-binaries.yml
+++ b/.github/workflows/ci-build-upload-binaries.yml
@@ -8,11 +8,6 @@ on:
         required: true
         default: false
         type: boolean
-      enable_wireguard:
-        description: "Add --features wireguard"
-        required: true
-        default: false
-        type: boolean
       enable_deb:
         description: "True to enable cargo-deb installation and .deb package building"
         required: false
@@ -42,7 +37,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-20.04]
+        platform: [ ubuntu-20.04 ]
 
     runs-on: ${{ matrix.platform }}
     env:
@@ -70,9 +65,6 @@ jobs:
       - name: Set CARGO_FEATURES
         run: |
           echo 'CARGO_FEATURES=--features wireguard' >> $GITHUB_ENV
-        if: >
-          github.event_name == 'schedule' ||
-          (github.event_name == 'workflow_dispatch' && inputs.enable_wireguard == true)
 
       - name: Install Rust stable
         uses: actions-rs/toolchain@v1
@@ -104,8 +96,6 @@ jobs:
           name: nym-binaries-artifacts
           path: |
             target/release/nym-client
-            target/release/nym-gateway
-            target/release/nym-mixnode
             target/release/nym-socks5-client
             target/release/nym-api
             target/release/nym-network-requester
@@ -123,8 +113,6 @@ jobs:
           OUTPUT_DIR: ci-builds/${{ github.ref_name }}
         run: |
           cp target/release/nym-client $OUTPUT_DIR
-          cp target/release/nym-gateway $OUTPUT_DIR
-          cp target/release/nym-mixnode $OUTPUT_DIR
           cp target/release/nym-socks5-client $OUTPUT_DIR
           cp target/release/nym-api $OUTPUT_DIR
           cp target/release/nym-network-requester $OUTPUT_DIR
diff --git a/.github/workflows/publish-nym-binaries.yml b/.github/workflows/publish-nym-binaries.yml
index 3d1e6fc5e9b..be70c514ba4 100644
--- a/.github/workflows/publish-nym-binaries.yml
+++ b/.github/workflows/publish-nym-binaries.yml
@@ -51,6 +51,10 @@ jobs:
           echo 'RUSTFLAGS="--cfg tokio_unstable"' >> $GITHUB_ENV
         if: github.event_name == 'workflow_dispatch' && inputs.add_tokio_unstable == true
 
+      - name: Set CARGO_FEATURES
+        run: |
+          echo 'CARGO_FEATURES=--features wireguard' >> $GITHUB_ENV
+
       - name: Install Rust stable
         uses: actions-rs/toolchain@v1
         with:
@@ -60,8 +64,8 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --workspace --release
-
+          args: --workspace --release ${{ env.CARGO_FEATURES }}
+  
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39bf7a2d79e..1a39429e556 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,20 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 
 ## [Unreleased]
 
+## [2024.9-topdeck] (2024-07-26)
+
+- chore: fix 1.80 lint issues ([#4731])
+- Handle clients with different versions in IPR ([#4723])
+- Add 1GB/day/user bandwidth cap ([#4717])
+- Feature/merge back ([#4710])
+- removed mixnode/gateway config migration code and disabled cli without explicit flag ([#4706])
+
+[#4731]: https://github.com/nymtech/nym/pull/4731
+[#4723]: https://github.com/nymtech/nym/pull/4723
+[#4717]: https://github.com/nymtech/nym/pull/4717
+[#4710]: https://github.com/nymtech/nym/pull/4710
+[#4706]: https://github.com/nymtech/nym/pull/4706
+
 ## [2024.8-wispa] (2024-07-10)
 
 - add event parsing to support cosmos_sdk > 0.50 ([#4697])
@@ -28,6 +42,38 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 [#4677]: https://github.com/nymtech/nym/pull/4677
 [#4667]: https://github.com/nymtech/nym/pull/4667
 
+## [2024.7-doubledecker] (2024-07-04)
+
+- Add an early return in `parse_raw_str_logs` for empty raw log strings. ([#4686])
+- Bump braces from 3.0.2 to 3.0.3 in /wasm/mix-fetch/internal-dev ([#4672])
+- add expiry returned on import ([#4670])
+- [bugfix] missing rustls feature ([#4666])
+- Bump ws from 8.13.0 to 8.17.1 in /wasm/client/internal-dev-node ([#4665])
+- Bump braces from 3.0.2 to 3.0.3 in /clients/native/examples/js-examples/websocket ([#4663])
+- Bump ws from 8.14.2 to 8.17.1 in /sdk/typescript/packages/nodejs-client ([#4662])
+- Update setup.md ([#4661])
+- New clippy lints ([#4660])
+- Bump braces from 3.0.2 to 3.0.3 in /nym-api/tests ([#4659])
+- Bump braces from 3.0.2 to 3.0.3 in /docker/typescript_client/upload_contract ([#4658])
+- Update vps-setup.md ([#4656])
+- Update configuration.md ([#4655])
+- Remove old PR template ([#4639])
+
+[#4686]: https://github.com/nymtech/nym/pull/4686
+[#4672]: https://github.com/nymtech/nym/pull/4672
+[#4670]: https://github.com/nymtech/nym/pull/4670
+[#4666]: https://github.com/nymtech/nym/pull/4666
+[#4665]: https://github.com/nymtech/nym/pull/4665
+[#4663]: https://github.com/nymtech/nym/pull/4663
+[#4662]: https://github.com/nymtech/nym/pull/4662
+[#4661]: https://github.com/nymtech/nym/pull/4661
+[#4660]: https://github.com/nymtech/nym/pull/4660
+[#4659]: https://github.com/nymtech/nym/pull/4659
+[#4658]: https://github.com/nymtech/nym/pull/4658
+[#4656]: https://github.com/nymtech/nym/pull/4656
+[#4655]: https://github.com/nymtech/nym/pull/4655
+[#4639]: https://github.com/nymtech/nym/pull/4639
+
 ## [2024.6-chomp] (2024-06-25)
 
 - Remove additional code as part of Ephemera Purge and SP and contracts ([#4650])
@@ -505,7 +551,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 [#3187]: https://github.com/nymtech/nym/issues/3187
 [#3203]: https://github.com/nymtech/nym/pull/3203
 [#3199]: https://github.com/nymtech/nym/pull/3199
->>>>>>> master
 
 ## [v1.1.13] (2023-03-15)
 
diff --git a/Cargo.lock b/Cargo.lock
index 6daa2d0713b..80c9660bccf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2093,7 +2093,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "explorer-api"
-version = "1.1.37"
+version = "1.1.38"
 dependencies = [
  "chrono",
  "clap 4.5.4",
@@ -3849,7 +3849,7 @@ dependencies = [
 
 [[package]]
 name = "nym-api"
-version = "1.1.41"
+version = "1.1.42"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -4057,7 +4057,7 @@ dependencies = [
 
 [[package]]
 name = "nym-cli"
-version = "1.1.39"
+version = "1.1.40"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
@@ -4136,7 +4136,7 @@ dependencies = [
 
 [[package]]
 name = "nym-client"
-version = "1.1.38"
+version = "1.1.39"
 dependencies = [
  "bs58 0.5.1",
  "clap 4.5.4",
@@ -4950,7 +4950,7 @@ dependencies = [
 
 [[package]]
 name = "nym-network-requester"
-version = "1.1.39"
+version = "1.1.40"
 dependencies = [
  "addr",
  "anyhow",
@@ -5001,7 +5001,7 @@ dependencies = [
 
 [[package]]
 name = "nym-node"
-version = "1.1.5"
+version = "1.1.6"
 dependencies = [
  "anyhow",
  "bip39",
@@ -5264,7 +5264,7 @@ dependencies = [
 
 [[package]]
 name = "nym-socks5-client"
-version = "1.1.38"
+version = "1.1.39"
 dependencies = [
  "bs58 0.5.1",
  "clap 4.5.4",
@@ -5742,6 +5742,7 @@ name = "nym-wireguard"
 version = "0.1.0"
 dependencies = [
  "base64 0.21.7",
+ "chrono",
  "dashmap",
  "defguard_wireguard_rs",
  "ip_network",
@@ -5750,6 +5751,7 @@ dependencies = [
  "nym-network-defaults",
  "nym-task",
  "nym-wireguard-types",
+ "thiserror",
  "tokio",
  "tokio-stream",
  "x25519-dalek",
@@ -5777,7 +5779,7 @@ dependencies = [
 
 [[package]]
 name = "nymvisor"
-version = "0.1.4"
+version = "0.1.5"
 dependencies = [
  "anyhow",
  "bytes",
@@ -9437,6 +9439,7 @@ dependencies = [
 name = "wasm-utils"
 version = "0.1.0"
 dependencies = [
+ "console_error_panic_hook",
  "futures",
  "getrandom 0.2.15",
  "gloo-net",
diff --git a/README.md b/README.md
index 63e9c81a228..8ebd3b590f8 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ References for developers:
 
 You can chat to us in two places:
 * The #dev channel on [Matrix](https://matrix.to/#/#dev:nymtech.chat)
-* The various developer channels on [Discord](https://discord.gg/FaTJb8q8)
+* The various developer channels on [Discord](https://nymtech.net/go/discord)
 
 ### Tokenomics & Rewards
 
diff --git a/clients/native/Cargo.toml b/clients/native/Cargo.toml
index 1cb349c872a..a9511628862 100644
--- a/clients/native/Cargo.toml
+++ b/clients/native/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.38"
+version = "1.1.39"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
diff --git a/clients/socks5/Cargo.toml b/clients/socks5/Cargo.toml
index 7788430c9c5..b7641e64967 100644
--- a/clients/socks5/Cargo.toml
+++ b/clients/socks5/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.38"
+version = "1.1.39"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
 edition = "2021"
diff --git a/common/authenticator-requests/src/v1/request.rs b/common/authenticator-requests/src/v1/request.rs
index 15389998281..f8490312180 100644
--- a/common/authenticator-requests/src/v1/request.rs
+++ b/common/authenticator-requests/src/v1/request.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use nym_sphinx::addressing::Recipient;
-use nym_wireguard_types::{GatewayClient, InitMessage};
+use nym_wireguard_types::{GatewayClient, InitMessage, PeerPublicKey};
 use serde::{Deserialize, Serialize};
 
 use crate::make_bincode_serializer;
@@ -57,6 +57,19 @@ impl AuthenticatorRequest {
         )
     }
 
+    pub fn new_query_request(peer_public_key: PeerPublicKey, reply_to: Recipient) -> (Self, u64) {
+        let request_id = generate_random();
+        (
+            Self {
+                version: VERSION,
+                data: AuthenticatorRequestData::QueryBandwidth(peer_public_key),
+                reply_to,
+                request_id,
+            },
+            request_id,
+        )
+    }
+
     pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
         use bincode::Options;
         make_bincode_serializer().serialize(self)
@@ -67,4 +80,5 @@ impl AuthenticatorRequest {
 pub enum AuthenticatorRequestData {
     Initial(InitMessage),
     Final(GatewayClient),
+    QueryBandwidth(PeerPublicKey),
 }
diff --git a/common/authenticator-requests/src/v1/response.rs b/common/authenticator-requests/src/v1/response.rs
index 925ece872e5..83c5a71d509 100644
--- a/common/authenticator-requests/src/v1/response.rs
+++ b/common/authenticator-requests/src/v1/response.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use nym_sphinx::addressing::Recipient;
-use nym_wireguard_types::registration::RegistrationData;
+use nym_wireguard_types::registration::{RegistrationData, RegistredData, RemainingBandwidthData};
 use serde::{Deserialize, Serialize};
 
 use crate::make_bincode_serializer;
@@ -33,10 +33,31 @@ impl AuthenticatorResponse {
         }
     }
 
-    pub fn new_registered(reply_to: Recipient, request_id: u64) -> Self {
+    pub fn new_registered(
+        registred_data: RegistredData,
+        reply_to: Recipient,
+        request_id: u64,
+    ) -> Self {
         Self {
             version: VERSION,
             data: AuthenticatorResponseData::Registered(RegisteredResponse {
+                reply: registred_data,
+                reply_to,
+                request_id,
+            }),
+            reply_to,
+        }
+    }
+
+    pub fn new_remaining_bandwidth(
+        remaining_bandwidth_data: Option<RemainingBandwidthData>,
+        reply_to: Recipient,
+        request_id: u64,
+    ) -> Self {
+        Self {
+            version: VERSION,
+            data: AuthenticatorResponseData::RemainingBandwidth(RemainingBandwidthResponse {
+                reply: remaining_bandwidth_data,
                 reply_to,
                 request_id,
             }),
@@ -64,6 +85,7 @@ impl AuthenticatorResponse {
         match &self.data {
             AuthenticatorResponseData::PendingRegistration(response) => Some(response.request_id),
             AuthenticatorResponseData::Registered(response) => Some(response.request_id),
+            AuthenticatorResponseData::RemainingBandwidth(response) => Some(response.request_id),
         }
     }
 }
@@ -72,6 +94,7 @@ impl AuthenticatorResponse {
 pub enum AuthenticatorResponseData {
     PendingRegistration(PendingRegistrationResponse),
     Registered(RegisteredResponse),
+    RemainingBandwidth(RemainingBandwidthResponse),
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
@@ -85,4 +108,12 @@ pub struct PendingRegistrationResponse {
 pub struct RegisteredResponse {
     pub request_id: u64,
     pub reply_to: Recipient,
+    pub reply: RegistredData,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct RemainingBandwidthResponse {
+    pub request_id: u64,
+    pub reply_to: Recipient,
+    pub reply: Option<RemainingBandwidthData>,
 }
diff --git a/common/client-libs/validator-client/src/nyxd/cosmwasm_client/mod.rs b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/mod.rs
index 98f2f8d07ca..544f6aaf0d4 100644
--- a/common/client-libs/validator-client/src/nyxd/cosmwasm_client/mod.rs
+++ b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/mod.rs
@@ -1,6 +1,11 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+// TEMPORARY WORKAROUND:
+// those features are expected as the below should only get activated whenever
+// the corresponding features in tendermint-rpc are enabled transitively
+#![allow(unexpected_cfgs)]
+
 use crate::nyxd::cosmwasm_client::client_traits::SigningCosmWasmClient;
 use crate::nyxd::error::NyxdError;
 use crate::nyxd::{Config, GasPrice, Hash, Height};
diff --git a/common/client-libs/validator-client/src/nyxd/mod.rs b/common/client-libs/validator-client/src/nyxd/mod.rs
index e396af40530..608fb2b2b0e 100644
--- a/common/client-libs/validator-client/src/nyxd/mod.rs
+++ b/common/client-libs/validator-client/src/nyxd/mod.rs
@@ -1,6 +1,11 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+// TEMPORARY WORKAROUND:
+// those features are expected as the below should only get activated whenever
+// the corresponding features in tendermint-rpc are enabled transitively
+#![allow(unexpected_cfgs)]
+
 use crate::nyxd::contract_traits::{NymContractsProvider, TypedNymContracts};
 use crate::nyxd::cosmwasm_client::types::{
     ChangeAdminResult, ContractCodeId, ExecuteResult, InstantiateOptions, InstantiateResult,
diff --git a/common/client-libs/validator-client/src/rpc/mod.rs b/common/client-libs/validator-client/src/rpc/mod.rs
index 78f5476b48c..bbab0cbc38c 100644
--- a/common/client-libs/validator-client/src/rpc/mod.rs
+++ b/common/client-libs/validator-client/src/rpc/mod.rs
@@ -1,6 +1,11 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+// TEMPORARY WORKAROUND:
+// those features are expected as the below should only get activated whenever
+// the corresponding features in tendermint-rpc are enabled transitively
+#![allow(unexpected_cfgs)]
+
 use async_trait::async_trait;
 use cosmrs::tendermint::{self, abci, block::Height, evidence::Evidence, Genesis, Hash};
 use serde::{de::DeserializeOwned, Serialize};
diff --git a/common/ip-packet-requests/src/v6/conversion.rs b/common/ip-packet-requests/src/v6/conversion.rs
new file mode 100644
index 00000000000..be2327b2e6b
--- /dev/null
+++ b/common/ip-packet-requests/src/v6/conversion.rs
@@ -0,0 +1,69 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{v6, v7};
+
+impl From<v7::response::StaticConnectFailureReason> for v6::response::StaticConnectFailureReason {
+    fn from(failure: v7::response::StaticConnectFailureReason) -> Self {
+        match failure {
+            v7::response::StaticConnectFailureReason::RequestedIpAlreadyInUse => {
+                v6::response::StaticConnectFailureReason::RequestedIpAlreadyInUse
+            }
+            v7::response::StaticConnectFailureReason::RequestedNymAddressAlreadyInUse => {
+                v6::response::StaticConnectFailureReason::RequestedNymAddressAlreadyInUse
+            }
+            v7::response::StaticConnectFailureReason::OutOfDateTimestamp => {
+                v6::response::StaticConnectFailureReason::Other("out of date timestamp".to_string())
+            }
+            v7::response::StaticConnectFailureReason::Other(reason) => {
+                v6::response::StaticConnectFailureReason::Other(reason)
+            }
+        }
+    }
+}
+
+impl From<v7::response::DynamicConnectFailureReason> for v6::response::DynamicConnectFailureReason {
+    fn from(failure: v7::response::DynamicConnectFailureReason) -> Self {
+        match failure {
+            v7::response::DynamicConnectFailureReason::RequestedNymAddressAlreadyInUse => {
+                v6::response::DynamicConnectFailureReason::RequestedNymAddressAlreadyInUse
+            }
+            v7::response::DynamicConnectFailureReason::NoAvailableIp => {
+                v6::response::DynamicConnectFailureReason::NoAvailableIp
+            }
+            v7::response::DynamicConnectFailureReason::Other(err) => {
+                v6::response::DynamicConnectFailureReason::Other(err)
+            }
+        }
+    }
+}
+
+impl From<v7::response::InfoResponseReply> for v6::response::InfoResponseReply {
+    fn from(reply: v7::response::InfoResponseReply) -> Self {
+        match reply {
+            v7::response::InfoResponseReply::Generic { msg } => {
+                v6::response::InfoResponseReply::Generic { msg }
+            }
+            v7::response::InfoResponseReply::VersionMismatch {
+                request_version,
+                response_version,
+            } => v6::response::InfoResponseReply::VersionMismatch {
+                request_version,
+                response_version,
+            },
+            v7::response::InfoResponseReply::ExitPolicyFilterCheckFailed { dst } => {
+                v6::response::InfoResponseReply::ExitPolicyFilterCheckFailed { dst }
+            }
+        }
+    }
+}
+
+impl From<v7::response::InfoLevel> for v6::response::InfoLevel {
+    fn from(level: v7::response::InfoLevel) -> Self {
+        match level {
+            v7::response::InfoLevel::Info => v6::response::InfoLevel::Info,
+            v7::response::InfoLevel::Warn => v6::response::InfoLevel::Warn,
+            v7::response::InfoLevel::Error => v6::response::InfoLevel::Error,
+        }
+    }
+}
diff --git a/common/ip-packet-requests/src/v6/mod.rs b/common/ip-packet-requests/src/v6/mod.rs
index 11a7aee8dcb..73ffb1815cd 100644
--- a/common/ip-packet-requests/src/v6/mod.rs
+++ b/common/ip-packet-requests/src/v6/mod.rs
@@ -1,3 +1,4 @@
+pub mod conversion;
 pub mod request;
 pub mod response;
 
diff --git a/common/ip-packet-requests/src/v7/request.rs b/common/ip-packet-requests/src/v7/request.rs
index 7f8c1b73983..24f9819c2a2 100644
--- a/common/ip-packet-requests/src/v7/request.rs
+++ b/common/ip-packet-requests/src/v7/request.rs
@@ -198,6 +198,17 @@ impl IpPacketRequestData {
             | IpPacketRequestData::Health(_) => None,
         }
     }
+
+    pub fn signable_request(&self) -> Option<Result<Vec<u8>, SignatureError>> {
+        match self {
+            IpPacketRequestData::StaticConnect(request) => Some(request.request()),
+            IpPacketRequestData::DynamicConnect(request) => Some(request.request()),
+            IpPacketRequestData::Disconnect(request) => Some(request.request()),
+            IpPacketRequestData::Data(_) => None,
+            IpPacketRequestData::Ping(_) => None,
+            IpPacketRequestData::Health(_) => None,
+        }
+    }
 }
 
 // A static connect request is when the client provides the internal IP address it will use on the
diff --git a/common/topology/src/error.rs b/common/topology/src/error.rs
index 4c8714c0d6b..68f169ccc7e 100644
--- a/common/topology/src/error.rs
+++ b/common/topology/src/error.rs
@@ -44,7 +44,6 @@ pub enum NymTopologyError {
     PayloadBuilder,
 
     #[error("Outfox: {0}")]
-    #[cfg(feature = "outfox")]
     Outfox(#[from] nym_sphinx_types::OutfoxError),
 
     #[error("{0}")]
diff --git a/common/topology/src/random_route_provider.rs b/common/topology/src/random_route_provider.rs
index 65d94521617..1771c83eb71 100644
--- a/common/topology/src/random_route_provider.rs
+++ b/common/topology/src/random_route_provider.rs
@@ -7,6 +7,7 @@ use nym_sphinx_routing::SphinxRouteMaker;
 use nym_sphinx_types::Node;
 use rand::{CryptoRng, Rng};
 
+#[allow(dead_code)]
 pub struct NymTopologyRouteProvider<R> {
     rng: R,
     inner: NymTopology,
diff --git a/common/wasm/utils/Cargo.toml b/common/wasm/utils/Cargo.toml
index 57d33b6602e..76ebe5f3dd3 100644
--- a/common/wasm/utils/Cargo.toml
+++ b/common/wasm/utils/Cargo.toml
@@ -17,6 +17,8 @@ gloo-utils = { workspace = true }
 gloo-net = { workspace = true, features = ["websocket"], optional = true }
 #gloo-net = { path = "../../../../gloo/crates/net", features = ["websocket"], optional = true }
 
+console_error_panic_hook = { workspace = true, optional = true }
+
 # we don't want entire tokio-tungstenite, tungstenite itself is just fine - we just want message and error enums
 [dependencies.tungstenite]
 workspace = true
@@ -28,7 +30,7 @@ workspace = true
 optional = true
 
 [features]
-default = ["sleep"]
+default = ["sleep", "console_error_panic_hook"]
 sleep = ["web-sys", "web-sys/Window"]
 websocket = [
     "getrandom",
diff --git a/common/wireguard-types/src/registration.rs b/common/wireguard-types/src/registration.rs
index 5645c4f5de7..ae5a758d905 100644
--- a/common/wireguard-types/src/registration.rs
+++ b/common/wireguard-types/src/registration.rs
@@ -27,12 +27,15 @@ pub type HmacSha256 = Hmac<Sha256>;
 pub type Nonce = u64;
 pub type Taken = Option<SystemTime>;
 
+pub const BANDWIDTH_CAP_PER_DAY: u64 = 1024 * 1024 * 1024; // 1 GB
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(tag = "type", rename_all = "camelCase")]
 #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]
 pub enum ClientMessage {
     Initial(InitMessage),
     Final(GatewayClient),
+    Query(PeerPublicKey),
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -60,6 +63,19 @@ pub struct RegistrationData {
     pub wg_port: u16,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct RegistredData {
+    pub pub_key: PeerPublicKey,
+    pub private_ip: IpAddr,
+    pub wg_port: u16,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct RemainingBandwidthData {
+    pub available_bandwidth: u64,
+    pub suspended: bool,
+}
+
 /// Client that wants to register sends its PublicKey bytes mac digest encrypted with a DH shared secret.
 /// Gateway/Nym node can then verify pub_key payload using the same process
 #[derive(Serialize, Deserialize, Debug, Clone)]
diff --git a/common/wireguard/Cargo.toml b/common/wireguard/Cargo.toml
index 0a5e615d4cb..51a0b115a1e 100644
--- a/common/wireguard/Cargo.toml
+++ b/common/wireguard/Cargo.toml
@@ -12,6 +12,7 @@ license.workspace = true
 
 [dependencies]
 base64 = { workspace = true }
+chrono = { workspace = true }
 dashmap = { workspace = true }
 defguard_wireguard_rs = { workspace = true }
 # The latest version on crates.io at the time of writing this (6.0.0) has a
@@ -24,5 +25,6 @@ nym-crypto = { path = "../crypto", features = ["asymmetric"] }
 nym-network-defaults = { path = "../network-defaults" }
 nym-task = { path = "../task" }
 nym-wireguard-types = { path = "../wireguard-types" }
+thiserror = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "net", "io-util"] }
 tokio-stream = { workspace = true }
diff --git a/common/wireguard/src/error.rs b/common/wireguard/src/error.rs
new file mode 100644
index 00000000000..da7452614fc
--- /dev/null
+++ b/common/wireguard/src/error.rs
@@ -0,0 +1,11 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+#[derive(Debug, thiserror::Error)]
+pub enum Error {
+    #[error("peers in wireguard don't match with in-memory ")]
+    PeerMismatch,
+
+    #[error("{0}")]
+    Defguard(#[from] defguard_wireguard_rs::error::WireguardInterfaceError),
+}
diff --git a/common/wireguard/src/lib.rs b/common/wireguard/src/lib.rs
index 3b1b0ea199d..6244320e540 100644
--- a/common/wireguard/src/lib.rs
+++ b/common/wireguard/src/lib.rs
@@ -1,3 +1,6 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
 #![cfg_attr(not(target_os = "linux"), allow(dead_code))]
 // #![warn(clippy::pedantic)]
 // #![warn(clippy::expect_used)]
@@ -6,13 +9,14 @@
 use dashmap::DashMap;
 use defguard_wireguard_rs::{host::Peer, key::Key, net::IpAddrMask, WGApi};
 use nym_crypto::asymmetric::encryption::KeyPair;
-use nym_wireguard_types::{Config, Error, GatewayClient, GatewayClientRegistry};
-use peer_controller::PeerControlMessage;
+use nym_wireguard_types::{Config, Error, GatewayClient, GatewayClientRegistry, PeerPublicKey};
+use peer_controller::PeerControlRequest;
 use std::sync::Arc;
-use tokio::sync::mpsc::{self, UnboundedReceiver};
+use tokio::sync::mpsc::{self, UnboundedReceiver, UnboundedSender};
 
 const WG_TUN_NAME: &str = "nymwg";
 
+pub(crate) mod error;
 pub mod peer_controller;
 
 pub struct WgApiWrapper {
@@ -39,14 +43,14 @@ pub struct WireguardGatewayData {
     config: Config,
     keypair: Arc<KeyPair>,
     client_registry: Arc<GatewayClientRegistry>,
-    peer_tx: mpsc::UnboundedSender<PeerControlMessage>,
+    peer_tx: UnboundedSender<PeerControlRequest>,
 }
 
 impl WireguardGatewayData {
     pub fn new(
         config: Config,
         keypair: Arc<KeyPair>,
-    ) -> (Self, mpsc::UnboundedReceiver<PeerControlMessage>) {
+    ) -> (Self, UnboundedReceiver<PeerControlRequest>) {
         let (peer_tx, peer_rx) = mpsc::unbounded_channel();
         (
             WireguardGatewayData {
@@ -75,20 +79,26 @@ impl WireguardGatewayData {
         let mut peer = Peer::new(Key::new(client.pub_key.to_bytes()));
         peer.allowed_ips
             .push(IpAddrMask::new(client.private_ip, 32));
-        let msg = PeerControlMessage::AddPeer(peer);
+        let msg = PeerControlRequest::AddPeer(peer);
         self.peer_tx.send(msg).map_err(|_| Error::PeerModifyStopped)
     }
 
     pub fn remove_peer(&self, client: &GatewayClient) -> Result<(), Error> {
         let key = Key::new(client.pub_key().to_bytes());
-        let msg = PeerControlMessage::RemovePeer(key);
+        let msg = PeerControlRequest::RemovePeer(key);
+        self.peer_tx.send(msg).map_err(|_| Error::PeerModifyStopped)
+    }
+
+    pub fn query_bandwidth(&self, peer_public_key: PeerPublicKey) -> Result<(), Error> {
+        let key = Key::new(peer_public_key.to_bytes());
+        let msg = PeerControlRequest::QueryBandwidth(key);
         self.peer_tx.send(msg).map_err(|_| Error::PeerModifyStopped)
     }
 }
 
 pub struct WireguardData {
     pub inner: WireguardGatewayData,
-    pub peer_rx: UnboundedReceiver<PeerControlMessage>,
+    pub peer_rx: UnboundedReceiver<PeerControlRequest>,
 }
 
 /// Start wireguard device
@@ -96,6 +106,7 @@ pub struct WireguardData {
 pub async fn start_wireguard(
     task_client: nym_task::TaskClient,
     wireguard_data: WireguardData,
+    control_tx: UnboundedSender<peer_controller::PeerControlResponse>,
 ) -> Result<std::sync::Arc<WgApiWrapper>, Box<dyn std::error::Error + Send + Sync + 'static>> {
     use base64::{prelude::BASE64_STANDARD, Engine};
     use defguard_wireguard_rs::{InterfaceConfiguration, WireguardInterfaceApi};
@@ -135,13 +146,13 @@ pub async fn start_wireguard(
     wg_api.configure_peer_routing(&[catch_all_peer])?;
 
     let wg_api = std::sync::Arc::new(WgApiWrapper::new(wg_api));
-    let mut controller = PeerController::new(wg_api.clone(), wireguard_data.peer_rx);
+    let mut controller = PeerController::new(
+        wg_api.clone(),
+        interface_config.peers,
+        wireguard_data.peer_rx,
+        control_tx,
+    );
     tokio::spawn(async move { controller.run(task_client).await });
 
     Ok(wg_api)
 }
-
-#[cfg(not(target_os = "linux"))]
-pub async fn start_wireguard() {
-    todo!("WireGuard is currently only supported on Linux");
-}
diff --git a/common/wireguard/src/peer_controller.rs b/common/wireguard/src/peer_controller.rs
index a325cf29dbe..fa11aa8a71d 100644
--- a/common/wireguard/src/peer_controller.rs
+++ b/common/wireguard/src/peer_controller.rs
@@ -1,91 +1,182 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use std::{
-    sync::Arc,
-    time::{Duration, SystemTime},
-};
-
-use defguard_wireguard_rs::{
-    host::{Host, Peer},
-    key::Key,
-    WGApi, WireguardInterfaceApi,
-};
+use chrono::{Timelike, Utc};
+use defguard_wireguard_rs::{host::Peer, key::Key, WireguardInterfaceApi};
+use nym_wireguard_types::registration::{RemainingBandwidthData, BANDWIDTH_CAP_PER_DAY};
+use std::time::SystemTime;
+use std::{collections::HashMap, sync::Arc, time::Duration};
 use tokio::sync::mpsc;
 use tokio_stream::{wrappers::IntervalStream, StreamExt};
 
+use crate::error::Error;
 use crate::WgApiWrapper;
 
-const DEFAULT_PEER_TIMEOUT: Duration = Duration::from_secs(60 * 60); // 1 hour
+// To avoid any problems, keep this stale check time bigger (>2x) then the bandwidth cap
+// reset time (currently that one is 24h, at UTC midnight)
+const DEFAULT_PEER_TIMEOUT: Duration = Duration::from_secs(60 * 60 * 24 * 3); // 3 days
 const DEFAULT_PEER_TIMEOUT_CHECK: Duration = Duration::from_secs(60); // 1 minute
 
-pub enum PeerControlMessage {
+pub enum PeerControlRequest {
     AddPeer(Peer),
     RemovePeer(Key),
+    QueryBandwidth(Key),
+}
+
+pub enum PeerControlResponse {
+    AddPeer {
+        success: bool,
+    },
+    RemovePeer {
+        success: bool,
+    },
+    QueryBandwidth {
+        bandwidth_data: Option<RemainingBandwidthData>,
+    },
 }
 
 pub struct PeerController {
-    peer_rx: mpsc::UnboundedReceiver<PeerControlMessage>,
+    request_rx: mpsc::UnboundedReceiver<PeerControlRequest>,
+    response_tx: mpsc::UnboundedSender<PeerControlResponse>,
     wg_api: Arc<WgApiWrapper>,
     timeout_check_interval: IntervalStream,
+    active_peers: HashMap<Key, Peer>,
+    suspended_peers: HashMap<Key, Peer>,
+    last_seen_bandwidth: HashMap<Key, u64>,
 }
 
 impl PeerController {
     pub fn new(
         wg_api: Arc<WgApiWrapper>,
-        peer_rx: mpsc::UnboundedReceiver<PeerControlMessage>,
+        peers: Vec<Peer>,
+        request_rx: mpsc::UnboundedReceiver<PeerControlRequest>,
+        response_tx: mpsc::UnboundedSender<PeerControlResponse>,
     ) -> Self {
         let timeout_check_interval = tokio_stream::wrappers::IntervalStream::new(
             tokio::time::interval(DEFAULT_PEER_TIMEOUT_CHECK),
         );
+        let active_peers = peers
+            .into_iter()
+            .map(|peer| (peer.public_key.clone(), peer))
+            .collect();
+
         PeerController {
             wg_api,
-            peer_rx,
+            request_rx,
+            response_tx,
             timeout_check_interval,
+            active_peers,
+            suspended_peers: HashMap::new(),
+            last_seen_bandwidth: HashMap::new(),
         }
     }
 
-    fn remove_stale_peers(wg_api: &WGApi, host: Host) {
-        let current_timestamp = SystemTime::now();
-        for (key, peer) in host.peers.iter() {
-            if let Some(timestamp) = peer.last_handshake {
-                if let Ok(duration_since_handshake) = current_timestamp.duration_since(timestamp) {
-                    if duration_since_handshake > DEFAULT_PEER_TIMEOUT {
-                        if let Err(e) = wg_api.remove_peer(key) {
-                            log::error!("Could not remove stale peer: {:?}", e);
-                        } else {
-                            log::debug!("Removed stale peer {:?}", key);
-                        }
-                    }
+    fn check_stale_peer(&self, peer: &Peer, current_timestamp: SystemTime) -> Result<bool, Error> {
+        if let Some(timestamp) = peer.last_handshake {
+            if let Ok(duration_since_handshake) = current_timestamp.duration_since(timestamp) {
+                if duration_since_handshake > DEFAULT_PEER_TIMEOUT {
+                    self.wg_api.inner.remove_peer(&peer.public_key)?;
+                    return Ok(true);
                 }
             }
         }
+
+        Ok(false)
+    }
+
+    fn check_suspend_peer(&mut self, peer: &Peer) -> Result<(), Error> {
+        let prev_peer = self
+            .active_peers
+            .get(&peer.public_key)
+            .ok_or(Error::PeerMismatch)?;
+        let data_usage =
+            (peer.rx_bytes + peer.tx_bytes).saturating_sub(prev_peer.rx_bytes + prev_peer.tx_bytes);
+        if data_usage > BANDWIDTH_CAP_PER_DAY {
+            self.wg_api.inner.remove_peer(&peer.public_key)?;
+            let (moved_key, moved_peer) = self
+                .active_peers
+                .remove_entry(&peer.public_key)
+                .ok_or(Error::PeerMismatch)?;
+            self.suspended_peers.insert(moved_key, moved_peer);
+        }
+        Ok(())
+    }
+
+    fn check_peers(&mut self) -> Result<(), Error> {
+        // Add 10 seconds to cover edge cases. At worst, we give ten free seconds worth of bandwidth
+        // by resetting the bandwidth twice
+        let reset = Utc::now().num_seconds_from_midnight() as u64
+            <= DEFAULT_PEER_TIMEOUT_CHECK.as_secs() + 10;
+
+        if reset {
+            for (_, peer) in self.suspended_peers.drain() {
+                self.wg_api.inner.configure_peer(&peer)?;
+            }
+        }
+        let host = self.wg_api.inner.read_interface_data()?;
+        self.last_seen_bandwidth = host
+            .peers
+            .iter()
+            .map(|(key, peer)| (key.clone(), peer.rx_bytes + peer.tx_bytes))
+            .collect();
+        if reset {
+            self.active_peers = host.peers;
+        } else {
+            let current_timestamp = SystemTime::now();
+            for peer in host.peers.values() {
+                if !self.check_stale_peer(peer, current_timestamp)? {
+                    self.check_suspend_peer(peer)?;
+                }
+            }
+        }
+
+        Ok(())
     }
 
     pub async fn run(&mut self, mut task_client: nym_task::TaskClient) {
         loop {
             tokio::select! {
                 _ = self.timeout_check_interval.next() => {
-                    match self.wg_api.inner.read_interface_data() {
-                        Ok(host) => Self::remove_stale_peers(&self.wg_api.inner, host),
-                        Err(e) => { log::error!("Could not read peer data: {:?}", e); },
+                    if let Err(e) = self.check_peers() {
+                        log::error!("Error while periodically checking peers: {:?}", e);
                     }
                 }
                 _ = task_client.recv() => {
                     log::trace!("PeerController handler: Received shutdown");
                     break;
                 }
-                msg = self.peer_rx.recv() => {
+                msg = self.request_rx.recv() => {
                     match msg {
-                        Some(PeerControlMessage::AddPeer(peer)) => {
-                            if let Err(e) = self.wg_api.inner.configure_peer(&peer) {
+                        Some(PeerControlRequest::AddPeer(peer)) => {
+                            let success = if let Err(e) = self.wg_api.inner.configure_peer(&peer) {
                                 log::error!("Could not configure peer: {:?}", e);
-                            }
+                                false
+                            } else {
+                                self.active_peers.insert(peer.public_key.clone(), peer);
+                                true
+                            };
+                            self.response_tx.send(PeerControlResponse::AddPeer { success }).ok();
                         }
-                        Some(PeerControlMessage::RemovePeer(peer_pubkey)) => {
-                            if let Err(e) = self.wg_api.inner.remove_peer(&peer_pubkey) {
+                        Some(PeerControlRequest::RemovePeer(peer_pubkey)) => {
+                            let success = if let Err(e) = self.wg_api.inner.remove_peer(&peer_pubkey) {
                                 log::error!("Could not remove peer: {:?}", e);
-                            }
+                                false
+                            } else {
+                                self.active_peers.remove(&peer_pubkey);
+                                self.suspended_peers.remove(&peer_pubkey);
+                                true
+                            };
+                            self.response_tx.send(PeerControlResponse::RemovePeer { success }).ok();
+                        }
+                        Some(PeerControlRequest::QueryBandwidth(peer_pubkey)) => {
+                            let msg = if self.suspended_peers.contains_key(&peer_pubkey) {
+                                PeerControlResponse::QueryBandwidth { bandwidth_data: Some(RemainingBandwidthData{ available_bandwidth: 0, suspended: true }) }
+                            } else if let Some(&consumed_bandwidth) = self.last_seen_bandwidth.get(&peer_pubkey) {
+                                PeerControlResponse::QueryBandwidth { bandwidth_data: Some(RemainingBandwidthData{ available_bandwidth: BANDWIDTH_CAP_PER_DAY - consumed_bandwidth, suspended: false })}
+                            } else {
+                                PeerControlResponse::QueryBandwidth { bandwidth_data: None }
+                            };
+                            self.response_tx.send(msg).ok();
                         }
                         None => {
                             log::trace!("PeerController [main loop]: stopping since channel closed");
diff --git a/documentation/dev-portal/src/SUMMARY.md b/documentation/dev-portal/src/SUMMARY.md
index 71560ee516c..948235c69fe 100644
--- a/documentation/dev-portal/src/SUMMARY.md
+++ b/documentation/dev-portal/src/SUMMARY.md
@@ -1,94 +1,59 @@
 #
-# Summary
-
 - [Introduction](introduction.md)
+- [Clients Overview - Start Here!](clients-overview.md)
+
+# SDKs 
+- [Rust SDK](sdk/rust/rust.md)
+	- [Message Types](sdk/rust/message-types.md)
+	- [Message Helpers](sdk/rust/message-helpers.md)
+	- [Troubleshooting](sdk/rust/troubleshooting.md)
+	- [Examples](sdk/rust/examples.md)
+		- [Simple Send](sdk/rust/examples/simple.md)
+		- [Create and Store Keys](sdk/rust/examples/keys.md)
+		- [Manual Storage](sdk/rust/examples/storage.md)
+		- [Anonymous Replies](sdk/rust/examples/surbs.md)
+		- [Use Custom Network Topology](sdk/rust/examples/custom-network.md)
+		- [Socks Proxy](sdk/rust/examples/socks.md)
+		- [Split Send and Receive](sdk/rust/examples/split-send.md)
+		- [Testnet Bandwidth Cred](sdk/rust/examples/credential.md)
+		- [Example Cargo file](sdk/rust/examples/cargo.md)
+- [Typescript SDK](sdk/typescript.md)
+
+# Binaries
+- [Pre-built Binaries](binaries/pre-built-binaries.md)
+- [Building from Source](binaries/building-nym.md)
+
+# Standalone Clients
+- [Websocket Client](clients/websocket-client.md)
+	- [Setup & Run](clients/websocket/setup.md)
+	- [Configuration](clients/websocket/config.md)
+	- [Using Your Client](clients/websocket/usage.md)
+	- [Examples](clients/websocket/examples.md)
+- [Socks5 Client](clients/socks5-client.md)
+  - [Setup & Run](clients/socks5/setup.md) 
+  - [Using Your Client](clients/socks5/usage.md)
+- [Webassembly Client](clients/webassembly-client.md)
 
-# Infrastructure
-
-- [What is Nym?](infrastructure/nym.md)
-- [Nym vs Other Systems](infrastructure/nym-vs-others.md)
-- [Node Types](infrastructure/node-types.md)
-
-# Quickstart
-
-- [Overview](quickstart/overview.md)
-- [Chat demo (webapp)](quickstart/chat-demo.md)
-- [Coconut Credential Playground (webapp)](quickstart/cred-playground.md)
-- [SOCKS Proxy (CLI)](quickstart/socks-proxy.md)
-
-# User Manuals
-
-- [NymVPN alpha](nymvpn/intro.md)
-    - [CLI](nymvpn/cli.md)
-
-<!-- OUTDATED STUFF:
-- [NymConnect X Monero](tutorials/monero.md)
-- [NymConnect X Matrix](tutorials/matrix.md)
-- [NymConnect X Telegram](tutorials/telegram.md)
-- [NymConnect X Electrum](tutorials/electrum.md)
-- [NymConnect X Firo wallet](tutorials/firo.md)
--->
+# Tutorials
+- [Stub: Updates Coming Soon!](./tutorials/coming-soon.md)
 
 # Code Examples
-
 - [Custom Service Providers](examples/custom-services.md)
 - [Apps Using Network Requesters](examples/using-nrs.md)
 - [Browser only](examples/browser-only.md)
 - [Monorepo examples](examples/monorepo-examples.md)
 
 # Integrations
-
 - [Integration Options](integrations/integration-options.md)
 [//]: # (- [Mixnet Integration]&#40;integrations/mixnet-integration.md&#41;)
 - [Payment Integration](integrations/payment-integration.md)
 
-# Tutorials
-
-- [Rust SDK](tutorials/rust-sdk.md)
-	- [Blockchain Service pt1](tutorials/cosmos-service/intro.md)
-		- [Tutorial Overview](tutorials/cosmos-service/overview.md)
-		- [Preparing Your Environment](tutorials/cosmos-service/preparing-env.md)
-		- [Preparing Your Lib](tutorials/cosmos-service/lib.md)
-		- [Preparing Your Client](tutorials/cosmos-service/client.md)
-		- [Preparing Your Client pt2](tutorials/cosmos-service/client-src.md)
-		- [Preparing Your Service](tutorials/cosmos-service/service.md)
-		- [Preparing Your Service pt2](tutorials/cosmos-service/service-src.md)
-		- [Querying the Chain](tutorials/cosmos-service/querying.md)
-
-- [Typescript](tutorials/typescript.md)
-    - [Simple Service Provider](tutorials/simple-service-provider/simple-service-provider.md)
-      	- [Tutorial Overview](tutorials/simple-service-provider/overview.md)
-      	- [Preparing Your User Client Environment](tutorials/simple-service-provider/preparating-env.md)
-      	- [Building Your User Client](tutorials/simple-service-provider/user-client.md)
-      	- [Preparing Your Service Provider Environment](tutorials/simple-service-provider/preparating-env2.md)
-      	- [Building Your Service Provider](tutorials/simple-service-provider/service-provider.md)
-      	- [Sending a Message Through the Mixnet](tutorials/simple-service-provider/sending-message.md)
-
-[//]: # (TODO make generic )
-[//]: # (# Shipyard Builders Hackathon 2023 )
-[//]: # (- [General Info & Resources]&#40;shipyard/general.md&#41;)
-[//]: # (- [Hackathon Challenges]&#40;shipyard/challenges-overview.md&#41;)
-[//]: # (- [A Note on Infrastructure]&#40;shipyard/infra.md&#41;)
-[//]: # (- [Submission Guidelines]&#40;shipyard/guidelines.md&#41;)
-
-<!-- Commenting out as a lot of the stuff is deprecated, can be purged as a part of the large overhaul
-# Events
-
-- [Web3Privacy Now](./events/web3-privacy.md)
-- [HCPP23-serinko](./events/hcpp23-serinko.md)
-- [HCPP23-max](./events/hcpp23-max.md)
--->
-
 # FAQ
-- [General](faq/general-faq.md)
 - [Integrations](faq/integrations-faq.md)
-- [Rewards & Token](faq/rewards-faq.md)
-
-# Community Resources
 
-- [Nym DevRel AMAs](community-resources/ama.md)
-- [Community Applications and Guides](community-resources/community-applications-and-guides.md)
-- [Change Service Grantee Information](info-request.md)
+# User Manuals
+- [NymVPN alpha](nymvpn/intro.md)
+    - [CLI](nymvpn/cli.md)
 
 ---
 # Misc.
diff --git a/documentation/dev-portal/src/binaries/building-nym.md b/documentation/dev-portal/src/binaries/building-nym.md
new file mode 100644
index 00000000000..47fb637c61e
--- /dev/null
+++ b/documentation/dev-portal/src/binaries/building-nym.md
@@ -0,0 +1,61 @@
+# Building from Source
+
+> Nym runs on Mac OS X, Linux, and Windows. All nodes **except the Desktop Wallet and NymConnect** on Windows should be considered experimental - it works fine if you're an app developer but isn't recommended for running nodes.
+
+## Building Nym
+Nym has two main codebases:
+
+- the [Nym platform](https://github.com/nymtech/nym), written in Rust. This contains all of our code _except_ for the validators.
+- the [Nym validators](https://github.com/nymtech/nyxd), written in Go.
+
+> This page details how to build the main Nym platform code.
+
+## Prerequisites
+- Debian/Ubuntu: `pkg-config`, `build-essential`, `libssl-dev`, `curl`, `jq`, `git`
+
+```
+apt install pkg-config build-essential libssl-dev curl jq git
+```
+
+- Arch/Manjaro: `base-devel`
+
+```
+pacman -S base-devel
+```
+
+- Mac OS X: `pkg-config` , `brew`, `openss1`, `protobuf`, `curl`, `git`
+Running the following the script installs Homebrew and the above dependencies:
+
+```
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+```
+
+- `Rust & cargo >= {{minimum_rust_version}}`
+
+We recommend using the [Rust shell script installer](https://www.rust-lang.org/tools/install). Installing cargo from your package manager (e.g. `apt`) is not recommended as the packaged versions are usually too old.
+
+If you really don't want to use the shell script installer, the [Rust installation docs](https://forge.rust-lang.org/infra/other-installation-methods.html) contain instructions for many platforms.
+
+## Download and build Nym binaries
+The following commands will compile binaries into the `nym/target/release` directory:
+
+```sh
+rustup update
+git clone https://github.com/nymtech/nym.git
+cd nym
+
+git reset --hard # in case you made any changes on your branch
+git pull # in case you've checked it out before
+
+git checkout master # master branch has the latest release version: `develop` will most likely be incompatible with deployed public networks
+
+cargo build --release # build your binaries with **mainnet** configuration
+```
+
+Quite a bit of stuff gets built. The key working parts for devs are the Client binaries and the CLI tool: 
+
+* [websocket client](../clients/websocket-client.md): `nym-client`
+* [socks5 client](../clients/socks5-client.md): `nym-socks5-client`
+* [nym-cli tool](https://nymtech.net/docs/tools/nym-cli.md): `nym-cli`
+
+> You cannot build from GitHub's .zip or .tar.gz archive files on the releases page - the Nym build scripts automatically include the current git commit hash in the built binary during compilation, so the build will fail if you use the archive code (which isn't a Git repository). Check the code out from github using `git clone` instead.
diff --git a/documentation/dev-portal/src/binaries/pre-built-binaries.md b/documentation/dev-portal/src/binaries/pre-built-binaries.md
new file mode 100644
index 00000000000..269c26276c5
--- /dev/null
+++ b/documentation/dev-portal/src/binaries/pre-built-binaries.md
@@ -0,0 +1,6 @@
+# Pre-built Binaries
+
+The [Github releases page](https://github.com/nymtech/nym/releases) has pre-built binaries which should work on Ubuntu 20.04 and other Debian-based systems, but at this stage cannot be guaranteed to work everywhere.
+
+If the pre-built binaries don't work or are unavailable for your system, you will need to build the platform yourself.
+
diff --git a/documentation/dev-portal/src/clients-overview.md b/documentation/dev-portal/src/clients-overview.md
new file mode 100644
index 00000000000..616ddc797e4
--- /dev/null
+++ b/documentation/dev-portal/src/clients-overview.md
@@ -0,0 +1,49 @@
+# Clients Overview 
+
+A large proportion of the Nym mixnet's functionality is implemented client-side. 
+
+Clients perform the following actions on behalf of users: 
+
+* determine network topology - what mixnodes exist, what their keys are, etc.
+* register with a gateway
+* authenticate with a gateway
+* receive and decrypt messages from the gateway
+* create layer-encrypted Sphinx packets
+* send Sphinx packets with real messages
+* send Sphinx packet _cover traffic_ when no real messages are being sent
+* retransmit un-acknowledged packet sends - if a client sends 100 packets to a gateway, but only receives an acknowledgement ('ack') for 95 of them, it will resend those 5 packets to the gateway again, to make sure that all packets are received.  
+
+> As a developer, you'll want to use a Nym client to send your application network traffic through the mixnet; whether that is an RPC call, a TCP connection request, or treating it like a UDP pipe, you need to send whatever bytes your app needs to send through it. However, unlike (e.g.) a TCP Socket, Nym client communication is message-based, so you cannot (yet) simply plug-and-play using the mixnet as a seamless drop-in replacement. We are currently working on stream-like abstractions for ease of integration with the Rust SDK. 
+
+## Types of Nym clients
+At present, there are three Nym clients:
+
+- the websocket (native) client
+- the SOCKS5 client
+- the wasm (webassembly) client
+
+You need to choose which one you want incorporate into your app. Which one you use will depend largely on your preferred programming style and the purpose of your app.
+
+### The websocket client
+Your first option is the native websocket client (`nym-client`). This is a compiled program that can run on Linux, Mac OS X, and Windows machines. It can be run as a persistent process on a desktop or server machine. You can connect to it with **any language that supports websockets**. 
+
+> Rust developers can import websocket client functionality into their code via the [Rust SDK](sdk/rust/rust.md). 
+
+### The webassembly client
+If you're working in JavaScript or Typescript in the browser, or building an [edge computing](https://en.wikipedia.org/wiki/Edge_computing) app, you'll likely want to choose the webassembly client. 
+
+It's packaged and [available on the npm registry](https://www.npmjs.com/package/@nymproject/nym-client-wasm), so you can `npm install` it into your JavaScript or TypeScript application. 
+
+> The webassembly client is most easily used via the [Typescript SDK](sdk/typescript.md). Typescript developers who wish to send API requests through the mixnet can can also check the [`mixfetch`]() package.
+
+### The SOCKS5 client
+The `nym-socks5-client` is useful for allowing existing applications to use the Nym mixnet without any code changes. All that's necessary is that they can use one of the SOCKS5, SOCKS4a, or SOCKS4 proxy protocols (which many applications can - crypto wallets, browsers, chat applications etc). 
+
+When used as a standalone client, it's less flexible as a way of writing custom applications than the other clients, but able to be used to proxy application traffic through the mixnet without having to make any code changes. 
+
+> Rust developers can import socks client functionality into their code via the [Rust SDK](sdk/rust/rust.md). 
+
+## Commonalities between clients
+All Nym client packages present basically the same capabilities to the privacy application developer. They need to run as a persistent process in order to stay connected and ready to receive any incoming messages from their gateway nodes. They register and authenticate to gateways, and encrypt Sphinx packets.
+
+
diff --git a/documentation/docs/src/clients/overview.md b/documentation/dev-portal/src/clients/overview.md
similarity index 89%
rename from documentation/docs/src/clients/overview.md
rename to documentation/dev-portal/src/clients/overview.md
index b9b5686dbd0..fcce9eb8bb6 100644
--- a/documentation/docs/src/clients/overview.md
+++ b/documentation/dev-portal/src/clients/overview.md
@@ -25,14 +25,14 @@ You need to choose which one you want incorporate into your app. Which one you u
 ### The websocket client
 Your first option is the native websocket client (`nym-client`). This is a compiled program that can run on Linux, Mac OS X, and Windows machines. It can be run as a persistent process on a desktop or server machine. You can connect to it with **any language that supports websockets**. 
 
-_Rust developers can import websocket client functionality into their code via the [Rust SDK](../sdk/rust/rust.md)_. 
+> Rust developers can import websocket client functionality into their code via the [Rust SDK](../sdk/rust/rust.md). 
 
 ### The webassembly client
 If you're working in JavaScript or Typescript in the browser, or building an [edge computing](https://en.wikipedia.org/wiki/Edge_computing) app, you'll likely want to choose the webassembly client. 
 
 It's packaged and [available on the npm registry](https://www.npmjs.com/package/@nymproject/nym-client-wasm), so you can `npm install` it into your JavaScript or TypeScript application. 
 
-_The webassembly client is most easily used via the [Typescript SDK](../sdk/typescript.md)_. 
+> The webassembly client is most easily used via the [Typescript SDK](../sdk/typescript.md). Typescript developers who wish to send API requests through the mixnet can can also check the [`mixfetch`]() package.
 
 ### The SOCKS5 client
 The `nym-socks5-client` is useful for allowing existing applications to use the Nym mixnet without any code changes. All that's necessary is that they can use one of the SOCKS5, SOCKS4a, or SOCKS4 proxy protocols (which many applications can - crypto wallets, browsers, chat applications etc). 
diff --git a/documentation/docs/src/clients/socks5-client.md b/documentation/dev-portal/src/clients/socks5-client.md
similarity index 90%
rename from documentation/docs/src/clients/socks5-client.md
rename to documentation/dev-portal/src/clients/socks5-client.md
index f34928e1a53..6fc1e6159fd 100644
--- a/documentation/docs/src/clients/socks5-client.md
+++ b/documentation/dev-portal/src/clients/socks5-client.md
@@ -1,6 +1,6 @@
 # Socks5 Client
 
-> The Nym socks5 client was built in the [building nym](../binaries/building-nym.md) section. If you haven't yet built Nym and want to run the code on this page, go there first.
+> The Nym Socks5 Client was built in the [building nym](../binaries/building-nym.md) section. If you haven't yet built Nym and want to run the code on this page, go there first.
 
 ## Current version
 ```
@@ -60,7 +60,7 @@ There are 2 pieces of software that work together to send SOCKS traffic through
 The `nym-socks5-client` allows you to do the following from your local machine:
 * Take a TCP data stream from a application that can send traffic via SOCKS5.
 * Chop up the TCP stream into multiple Sphinx packets, assigning sequence numbers to them, while leaving the TCP connection open for more data
-* Send the Sphinx packets through the mixnet to a [network requester](../nodes/network-requester.md). Packets are shuffled and mixed as they transit the mixnet.
+* Send the Sphinx packets through the mixnet to a [network requester](https://nymtech.net/operators/nodes/network-requester.md). Packets are shuffled and mixed as they transit the mixnet.
 
 The `nym-network-requester` then reassembles the original TCP stream using the packets' sequence numbers, and make the intended request. It will then chop up the response into Sphinx packets and send them back through the mixnet to your  `nym-socks5-client`. The application will then receive its data, without even noticing that it wasn't talking to a "normal" SOCKS5 proxy!
 
@@ -100,11 +100,11 @@ Before you can use the client, you need to initalise a new instance of it, which
 
 The `--id` in the example above is a local identifier so that you can name your clients and keep track of them on your local system; it is **never** transmitted over the network.
 
-The `--use-reply-surbs` field denotes whether you wish to send [SURBs](../architecture/traffic-flow.md#private-replies-using-surbs) along with your request. It defaults to `false`, we are explicitly setting it as `true`. It defaults to `false` for compatibility with older versions of the [Network Requester](../nodes/network-requester.md).
+The `--use-reply-surbs` field denotes whether you wish to send [SURBs](https://nymtech.net/docs/architecture/traffic-flow.md#private-replies-using-surbs) along with your request. It defaults to `false`, we are explicitly setting it as `true`. It defaults to `false` for compatibility with older versions of the [Network Requester](https://nymtech.net/nodes/network-requester.md).
 
-The `--provider` field needs to be filled with the Nym address of a Network Requester that can make network requests on your behalf. If you don't want to [run your own](../nodes/network-requester.md) you can select one from the [mixnet explorer](https://explorer.nymtech.net/network-components/service-providers) by copying its `Client ID` and using this as the value of the `--provider` flag. Alternatively, you could use [this list](https://harbourmaster.nymtech.net/).
+The `--provider` field needs to be filled with the Nym address of a Network Requester that can make network requests on your behalf. If you don't want to [run your own](https://nymtech.net/operators/nodes/network-requester.md) you can select one from the [mixnet explorer](https://explorer.nymtech.net/network-components/service-providers) by copying its `Client ID` and using this as the value of the `--provider` flag. Alternatively, you could use [this list](https://harbourmaster.nymtech.net/).
 
-Since the nodes on this list are the infrastructure for [Nymconnect](https://nymtech.net/developers/quickstart/nymconnect-gui.html) they will support all apps on the [default whitelist](../nodes/network-requester.md#network-requester-whitelist): Keybase, Telegram, Electrum, Blockstream Green, and Helios.
+Since the nodes on this list are the infrastructure for [Nymconnect](https://nymtech.net/developers/quickstart/nymconnect-gui.html) they will support all apps on the [default whitelist](https://nymtech.net/operators/nodes/network-requester.md#network-requester-whitelist): Keybase, Telegram, Electrum, Blockstream Green, and Helios.
 
 #### Choosing a Gateway
 By default - as in the example above - your client will choose a random gateway to connect to.
diff --git a/documentation/dev-portal/src/quickstart/socks-proxy.md b/documentation/dev-portal/src/clients/socks5/setup.md
similarity index 59%
rename from documentation/dev-portal/src/quickstart/socks-proxy.md
rename to documentation/dev-portal/src/clients/socks5/setup.md
index 9a067f694e1..55428dae754 100644
--- a/documentation/dev-portal/src/quickstart/socks-proxy.md
+++ b/documentation/dev-portal/src/clients/socks5/setup.md
@@ -1,4 +1,4 @@
-# SOCKS Proxy (CLI)
+# Setup 
 
 > `nym-socks5-client` now also supports SOCKS4 and SOCKS4A protocols as well as SOCKS5.
 
@@ -39,33 +39,4 @@ Now your client is initialised, start it with the following:
 ./nym-socks5-client run --id <ID>
 ```
 
-## Proxying traffic
-After completing the steps above, your local `nym-socks5-client` will be listening on `localhost:1080` ready to proxy traffic to the Network Requester set as the `--provider` when initialising.
 
-When trying to connect your app, generally the proxy settings are found in `settings->advanced` or `settings->connection`.
-
-Here is an example of setting the proxy connecting in Blockstream Green:
-
-![Blockstream Green settings](../images/blockstream-green.gif)
-
-Most wallets and other applications will work basically the same way: find the network proxy settings, enter the proxy url (host: **localhost**, port: **1080**).
-
-In some other applications, this might be written as **localhost:1080** if there's only one proxy entry field.
-
-## Supported Applications
-
-Any application which can be redirected over Socks5 proxy should work. Nym community has been successfully running over Nym Mixnet these applications:
-
-- Bitcoin Electrum wallet
-- Monero wallet (GUI and CLI with monerod)
-- Telegram chat
-- Element/Matrix chat
-- Firo wallet
-- ircd chat
-- Blockstream Green
-
-Keep in mind that Nym has been developing a new client **[NymVPN](https://nymvpn.com) (GUI and CLI) routing all users traffic through the Mixnet.**
-
-## Further reading
-
-If you want to dig more into the architecture and use of the socks5 client check out its documentation [here](https://nymtech.net/docs/clients/socks5-client.html).
diff --git a/documentation/dev-portal/src/clients/socks5/usage.md b/documentation/dev-portal/src/clients/socks5/usage.md
new file mode 100644
index 00000000000..f05c594ef0d
--- /dev/null
+++ b/documentation/dev-portal/src/clients/socks5/usage.md
@@ -0,0 +1,33 @@
+# Using Your Client 
+
+## Proxying traffic
+After completing the steps above, your local `nym-socks5-client` will be listening on `localhost:1080` ready to proxy traffic to the Network Requester set as the `--provider` when initialising.
+
+When trying to connect your app, generally the proxy settings are found in `settings->advanced` or `settings->connection`.
+
+Here is an example of setting the proxy connecting in Blockstream Green:
+
+![Blockstream Green settings](../../images/blockstream-green.gif)
+
+Most wallets and other applications will work basically the same way: find the network proxy settings, enter the proxy url (host: **localhost**, port: **1080**).
+
+In some other applications, this might be written as **localhost:1080** if there's only one proxy entry field.
+
+## Supported Applications
+
+Any application which can be redirected over Socks5 proxy should work. Nym community has been successfully running over Nym Mixnet these applications:
+
+- Bitcoin Electrum wallet
+- Monero wallet (GUI and CLI with monerod)
+- Telegram chat
+- Element/Matrix chat
+- Firo wallet
+- Blockstream Green
+
+> DarkFi's ircd chat was previously supported: they have moved to DarkIrc: whether the existing integration work is still operational needs to be tested. 
+
+Keep in mind that Nym has been developing a new client **[NymVPN](https://nymvpn.com) (GUI and CLI) routing all users traffic through the Mixnet.**
+
+## Further reading
+
+If you want to dig more into the architecture and use of the socks5 client check out its documentation [here](https://nymtech.net/docs/clients/socks5-client.html).
diff --git a/documentation/docs/src/clients/webassembly-client.md b/documentation/dev-portal/src/clients/webassembly-client.md
similarity index 100%
rename from documentation/docs/src/clients/webassembly-client.md
rename to documentation/dev-portal/src/clients/webassembly-client.md
diff --git a/documentation/docs/src/clients/websocket-client.md b/documentation/dev-portal/src/clients/websocket-client.md
similarity index 100%
rename from documentation/docs/src/clients/websocket-client.md
rename to documentation/dev-portal/src/clients/websocket-client.md
diff --git a/documentation/docs/src/clients/websocket/config.md b/documentation/dev-portal/src/clients/websocket/config.md
similarity index 100%
rename from documentation/docs/src/clients/websocket/config.md
rename to documentation/dev-portal/src/clients/websocket/config.md
diff --git a/documentation/docs/src/clients/websocket/examples.md b/documentation/dev-portal/src/clients/websocket/examples.md
similarity index 100%
rename from documentation/docs/src/clients/websocket/examples.md
rename to documentation/dev-portal/src/clients/websocket/examples.md
diff --git a/documentation/docs/src/clients/websocket/setup.md b/documentation/dev-portal/src/clients/websocket/setup.md
similarity index 100%
rename from documentation/docs/src/clients/websocket/setup.md
rename to documentation/dev-portal/src/clients/websocket/setup.md
diff --git a/documentation/docs/src/clients/websocket/usage.md b/documentation/dev-portal/src/clients/websocket/usage.md
similarity index 90%
rename from documentation/docs/src/clients/websocket/usage.md
rename to documentation/dev-portal/src/clients/websocket/usage.md
index 2c5f3f4d051..aab3af6b2bf 100644
--- a/documentation/docs/src/clients/websocket/usage.md
+++ b/documentation/dev-portal/src/clients/websocket/usage.md
@@ -11,7 +11,7 @@ There are a number of message types that you can send up the websocket as define
 ```
 
 ## Getting your own address
-When you start your app, it is best practice to ask the native client to tell you what your own address is (from the generated configuration files - see [here](../addressing-system.md) for more on Nym's addressing scheme). If you are running a service, you need to do this in order to know what address to give others. In a client-side piece of code you can also use this as a test to make sure your websocket connection is running smoothly. To do this, send:
+When you start your app, it is best practice to ask the native client to tell you what your own address is (from the generated configuration files - see [here](https://nymtech.net/docs/architecture/addressing-system.md) for more on Nym's addressing scheme). If you are running a service, you need to do this in order to know what address to give others. In a client-side piece of code you can also use this as a test to make sure your websocket connection is running smoothly. To do this, send:
 
 ```json
 {
@@ -58,7 +58,7 @@ In some applications, e.g. where people are chatting with friends who they know,
 
 **If that fits your security model, good. However, will probably be the case that you want to send anonymous replies using Single Use Reply Blocks (SURBs)**.
 
-You can read more about SURBs [here](../../architecture/traffic-flow.md#private-replies-using-surbs) but in short they are ways for the receiver of this message to anonymously reply to you - the sender - **without them having to know your client address**.
+You can read more about SURBs [here](https://nymtech.net/docs/architecture/traffic-flow.md#private-replies-using-surbs) but in short they are ways for the receiver of this message to anonymously reply to you - the sender - **without them having to know your client address**.
 
 Your client will send along a number of `replySurbs` to the recipient of the message. These are pre-addressed Sphinx packets that the recipient can write to the payload of (i.e. write response data to), but not view the final destination of. If the recipient is unable to fit the response data into the bucket of SURBs sent to it, it will use a SURB to request more SURBs be sent to it from your client.
 
diff --git a/documentation/dev-portal/src/community-resources/ama.md b/documentation/dev-portal/src/community-resources/ama.md
deleted file mode 100644
index 580cb7b5c12..00000000000
--- a/documentation/dev-portal/src/community-resources/ama.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# DevRel AMAs
-
-The Nym Technology Developer Relations AMA (Ask Me Anything) is an event organised by the Nym team to engage and connect with the developer community as well as answer any questions that they may have.
-
-> ⚠️ Hosted every fortnight on Wednesday @ 4pm UTC
-
-Archives of these calls can be found [here](https://www.youtube.com/watch?v=0kVXR7aNOyg&list=PLoc3wV2YJYwohgwzf5IinyebV4GGYsa9K).
diff --git a/documentation/dev-portal/src/community-resources/community-applications-and-guides.md b/documentation/dev-portal/src/community-resources/community-applications-and-guides.md
deleted file mode 100644
index 85a842342df..00000000000
--- a/documentation/dev-portal/src/community-resources/community-applications-and-guides.md
+++ /dev/null
@@ -1,122 +0,0 @@
-# Community Applications
-
-If you would like to share your application here, please submit a pull request to the `main` branch of the `nymtech/dev-portal` [repository](https://github.com/nymtech/dev-portal).
-
-## <img src='../images/profile_picture/pastenym_ntv_pp.png' style="float: right; width: 75px; height: 75px;">Pastenym
-
->A [pastebin](https://pastebin.com) inspired project, offer a solution for sharing text with Nym products to offer full anonymity, even on metadata level.
-
-* [Github](https://github.com/notrustverify/pastenym)
-* [Deployed App](https://pastenym.ch)
-
-
-
-
-## <img src='../images/profile_picture/pineappleproxy_pp.png' style="float: right; width: 75px; height: 75px;">Nostr-Nym
-
-> [Nostr-nym](https://github.com/notrustverify/nostr-nym) offer a solution to use [Nostr](https://nostr.how/en/what-is-nostr) protocol by giving the possibility to run a relay on mixnet. By using a  nostr client compatible with the mixnet, users can protect their privacy to be able to use Nostr has the want, without being observed.
-
-* [Github](https://github.com/notrustverify/nostr-nym)
-* [Deployed App](https://nostrnym.pnproxy.org/) 
-* [Documentation](https://blog.notrustverify.ch/nostr-relay-on-nym) 
-
-
-
-
-## <img src='../images/profile_picture/ethereum_rpc_spook_pp.png' style="float: right; width: 75px; height: 75px;"> Spook
-
-> Ethereum RPC request mixer uses the Nym network mixing service to anonymize RPC requests to the Ethereum network without revealing sensitive data and metadata.
-* [Github](https://github.com/EdenBlockVC/spook)
-	  
-
-
-
-## <img src='../images/profile_picture/ethereum_transaction_broadcaster_root_pp.png' style="float: right; width: 75px; height: 75px;"> Ethereum Transaction Broadcaster
-
-> Ethereum Transaction Broadcaster that uses the Nym Mixnet to provide privacy and anonymity for transactions on the Ethereum network command-line interface.
-
-* [Github](https://github.com/noot/nym-ethtx)
-
-
-
-
-## <img src='../images/profile_picture/nymdrive_saleel_pp.png' style="float: right; width: 75px; height: 75px;">NymDrive
-
-> An open-source, decentralized, E2E encrypted, privacy friendly alternative to Google Drive/Dropbox, allowing for file encryption and decryption using the Nym Mixnet.
-* [Github](https://github.com/saleel/nymdrive)
-* [Demo](https://www.youtube.com/watch?v=5Rx73nw8NYI)
-* [Presentation](https://docs.google.com/presentation/d/1MpvIK32Mx9VKLVfMTcvbeyrsKHHUsTvDQ-3n31dR0NE/edit#slide=id.p)
-
-
-
-
-## <img src='../images/profile_picture/nym_dashboard_pp.svg' style="float: right; width: 75px; height: 75px;">Nym Dashboard
-
-> Developed by No Trust Verify, this dashboard is a great tool to get information about the mixnet, gateways and mixnodes.
-* [Deployed App](https://status.notrustverify.ch/d/CW3L7dVVk/nym-mixnet?orgId=1)
-
-
-
-
-## <img src='../images/profile_picture/pastenym_ntv_pp.png' style="float: right; width: 75px; height: 75px;">Is Nym Up
- 
-> Explore whether we're up through IsNymUp, a tool that helps check the heath of the Nym network as well as some mixnet related statistics!
-* [Deployed App](https://isnymup.com/)
-
-
-
-
-## <img src='../images/profile_picture/darkfi_over_nym_pp.png' style="float: right; width: 75px; height: 75px;">DarkFi over Nym
-
-> DarkFi leverages Nym's mixnet as a pluggable transport for IRCD, their p2p IRC variant. Users can anonymously connect to peers over the network, ensuring secure and private communication within the DarkFi ecosystem.
-* [Github](https://github.com/darkrenaissance/darkfi)
-* [Documentation](https://darkrenaissance.github.io/darkfi/clients/nym_outbound.html)
-
-
-
-
-## <img src='../images/profile_picture/nymstr_email_pp.png' style="float: right; width: 75px; height: 75px;">Nymstr email
-
-> Experience secure and private email communication with ease using Nymstr email, which enables seamless transmission of emails over a SOCKS5 proxy and our NYM mixnet! 
-* [Github](https://github.com/dial0ut/nymstr-email)
-
-
-
-
-## <img src='../images/profile_picture/minibolt_pp.png' style="float: right; width: 75px; height: 75px;">Minibolt
-
-> Proxies the clearnet connections of a Bitcoin node and its associated tools using the NYM mixnet.
-* [Github](https://github.com/minibolt-guide/minibolt)
-* [Documentation](https://v2.minibolt.info/bonus-guides/system/nym-mixnet#proxying-bitcoin-core)
-
-
-
-## <img src='../images/profile_picture/nymgraph_pp.png' style="float: right; width: 75px; height: 75px;">NymGraph
-
-> NymGraph is a graphical chat client for Nym running on Ubuntu and Debian. Test it to chat over the Nym network!
-* [Github](https://github.com/Tyz3/nymgraph)
-
-
-
-
-<br/> <br/>
-  
-# Community Guides
-
-We aren't the only ones writing documentation: the Nym developer community is also a great source of guides and resources, some of which we've included here.
-
-## <img src='../images/profile_picture/pastenym_ntv_pp.png' style="float: right; width: 75px; height: 75px;"> No Trust Verify
-
->No Trust Verify is a project that aims to build open-source, privacy-enhancing technologies that make it easier to use the Internet securely and anonymously. Their focus is on providing tools and services that make it simple for developers to create decentralized applications (dApps) that respect users' privacy.
-
-* [Awesome Nym list](https://notrustverify.github.io/awesome-nym/) ([GitHub](https://github.com/notrustverify/awesome-nym))
-* A lot of guides can be found on the [NTV Blog](https://blog.notrustverify.ch/)
-
-
-## <img src='../images/profile_picture/pineappleproxy_pp.png' style="float: right; width: 75px; height: 75px;">The Way of the NYMJA
-
-by Pineapple Proxy🍍
-
->Born out of a study group from Nym's Shipyard Academy, Pineapple Proxy has emerged as a cluster of motivated and skilled individuals who see the new internet taking shape. With vibecare at the heart of their approach, this zesty collective is on a mission to make privacy convenient for everyone via content, new tools, events, and novel experiences. They believe in collective intelligence, empathy, and collaboration as the means by which privacy will become a meaningful reality.
-* [Website](https://pnproxy.org/welcome.html) ([GitHub](https://github.com/Pineapple-Proxy-DAO/web))
-
diff --git a/documentation/dev-portal/src/community-resources/forums.md b/documentation/dev-portal/src/community-resources/forums.md
deleted file mode 100644
index 533008e1e14..00000000000
--- a/documentation/dev-portal/src/community-resources/forums.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Forums
-
-Welcome to our page dedicated to providing you with links to open forums discussing privacy-enhancing technologies, as well as general privacy topics. These forums are a great place to learn more about the latest developments in privacy technology, as well as to connect with other individuals who are passionate about protecting their online privacy. Whether you're new to the world of privacy or an experienced user, you're sure to find valuable information and resources on these forums.
-
-
-🚧 coming soon 🚧
\ No newline at end of file
diff --git a/documentation/dev-portal/src/examples/browser-only.md b/documentation/dev-portal/src/examples/browser-only.md
index e9f8a74a06d..b41367d76e4 100644
--- a/documentation/dev-portal/src/examples/browser-only.md
+++ b/documentation/dev-portal/src/examples/browser-only.md
@@ -1,6 +1,9 @@
 # Browser only
 With the Typescript SDK you can run a Nym client in a webworker - meaning you can connect to the mixnet through the browser without having to worry about any other code than your web framework. 
 
+- Oreowallet have integrated `mixFetch` into their browser-extension wallet to run transactions through the mixnet. 
+  - [Codebase](https://github.com/oreoslabs/oreowallet-extension/tree/mixFetch) 
+
 - [NoTrustVerify](https://notrustverify.ch/) have set up an example application using [`mixFetch`](https://sdk.nymtech.net/examples/mix-fetch) to fetch crypto prices from CoinGecko over the mixnet. 
   - [Website](https://notrustverify.github.io/mixfetch-examples/) 
   - [Codebase](https://github.com/notrustverify/mixfetch-examples)  
diff --git a/documentation/dev-portal/src/examples/custom-services.md b/documentation/dev-portal/src/examples/custom-services.md
index 4602ffa7f05..94ff7434644 100644
--- a/documentation/dev-portal/src/examples/custom-services.md
+++ b/documentation/dev-portal/src/examples/custom-services.md
@@ -1,6 +1,11 @@
 # Custom Services 
 Custom services involve two pieces of code that communicate via the mixnet: a client, and a custom server/service. This custom service will most likely interact with the wider internet / a clearnet service on your behalf, with the mixnet between you and the service, acting as a privacy shield. 
 
+> The current model of relying on a Service Provider has some issues, such as additional complexity in deployment and maintenance, as well as creating potential chokepoints for app traffic. Work is going on (in the open in our [monorepo](https://github.com/nymtech/nym) ofc) to start removing this requirement as much as possible, by allowing for the creation of packet-contents in such a way that the existing Network Requester/Exit Gateway infrastructure can support network requests in a similar way to `mixFetch`. More on this as and when it is released. 
+
+- [Nym Zcash RPC demo](https://github.com/nymtech/nym-zcash-rpc-demo), although used to only pipe RPC traffic, is a proof of concept 'generic' mixnet piping example which exposes a TPC Socket on the client side for incoming traffic, pipes this through the mixnet, and then streams TCP packets 'out' the other side. A good example of non-app-specific traffic transport which developers could also quite easily use as a template for their own app-specific work. 
+  - [Codebase](https://github.com/nymtech/nym-zcash-rpc-demo)
+
 - PasteNym is a private pastebin alternative. It involves a browser-based frontend utilising the Typescript SDK and a Python-based backend service communicating with a standalone Nym Websocket Client. **If you're a Python developer, start here!**.
   - [Frontend codebase](https://github.com/notrustverify/pastenym)
   - [Backend codebase](https://github.com/notrustverify/pastenym-frontend) 
diff --git a/documentation/dev-portal/src/faq/general-faq.md b/documentation/dev-portal/src/faq/general-faq.md
deleted file mode 100644
index a6192b2d1d4..00000000000
--- a/documentation/dev-portal/src/faq/general-faq.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# Nym General FAQ
-
-> If you have questions which are not answered below, please share them at our [DevRel AMAs](../community-resources/ama.md) or seek support in [Nym's community](https://nymtech.net/community)
-
-### What is Nym? 
-
-Nym is a privacy platform that secures user data and protects against surveillance at the network level. 
-
-The platform does so by  leveraging different technological components:  
-
-- **Nym Mixnet**, a type of overlay network that makes both content and metadata of transactions private through mixing, network-level obfuscation and incentivisation (using Sphinx);
-- A blockchain called **Nyx**, our Cosmos SDK blockchain, to allow for us to use payment tokens in the form of NYM, as well as smart contracts, in order to create a robust, decentralized, and secure environment incentives for the Mixnet;
-- **Coconut**, a zero-knowledge signature scheme, that creates an application-level private access control layer to power Zk-Nyms;
-- A utility token **NYM**, to pay for usage, measure reputation and serve as rewards for the privacy infrastructure.
-
-Simply put, the [Nym network ("Nym")](https://www.feat-nym-update-nym-web.websites.dev.nymte.ch/nym-whitepaper.pdf) is a decentralized and incentivized infrastructure to provision privacy to a broad range of message-based applications and services. Think of it as a [*"Layer 0" privacy infrastructure*](https://blog.nymtech.net/nym-layer-0-privacy-infrastructure-for-the-whole-internet-e53238f9b8e7) for the entire internet.
-
-**Related articles:**  
-- [*Nym is not a blockchain, but is powered by one*](https://blog.nymtech.net/nym-is-not-a-blockchain-but-it-is-powered-by-one-4bb16ef16587)
-- [*Nym tokens*](https://blog.nymtech.net/nym-tokens-where-do-they-live-and-how-are-they-distributed-cross-chain-8d134bf9c41f)
-- [*A breakdown of the smart contracts that run the Nym token economics*](https://blog.nymtech.net/a-breakdown-of-the-smart-contracts-that-run-the-nym-token-economics-3a61b4139f95)
-- [*Zk-Nyms are here*](https://blog.nymtech.net/a-breakdown-of-the-smart-contracts-that-run-the-nym-token-economics-3a61b4139f95)
-- [*Sphinx: the anonymous data format that powers Nym*](https://blog.nymtech.net/sphinx-tl-dr-the-data-packet-that-can-anonymize-bitcoin-and-the-internet-18d152c6e4dc)
-
-
-### What's the difference between Nym and VPNs?
-
-Nym is not an onion routing system, it is not a decentralized VPN - it’s much more than that. Nym is a mixnet meant to stop precisely the traffic analysis attacks that Tor and dVPNs are vulnerable to. 
-
-It is an orthogonal design that maintains better privacy and can support anonymity, although usually with a cost in terms of latency.
-It basically is an infrastructure on which privacy preserving apps can be built, leveraging the Mixnet and Coconut credentials, amongst others. 
-The **Nym mixnet and VPNs differ** because VPNs do not mix nor do they protect metadata from an adversary who may be able to watch the entire network. 
-
-**Related articles:**   
-- [*VPNs, Tor, I2P, how does Nym compare? *](https://blog.nymtech.net/vpns-tor-i2p-how-does-nym-compare-8576824617b8)
-
-
-### What is Nym’s VPN?
-
-Since Q2 2023 the Nym core team has been working on launching the **first major consumer facing product** that runs on top of the Nym mixnet: a high speed, trustless and decentralized VPN, paid for via the NYM token - facilitating anonymous payments if wished. 
-The product positions itself as a full-network protection service available across all of a user’s devices, **leveraging the Nym Mixnet** and other primitives to offer split tunneling and traffic obfuscation techniques to protect against censorship. 
-
-**Related articles:**  
-- [*What does it take to build the most powerful VPN?*](https://blog.nymtech.net/what-does-it-take-to-build-the-worlds-most-powerful-vpn-d351a76ec4e6)
-
diff --git a/documentation/dev-portal/src/faq/rewards-faq.md b/documentation/dev-portal/src/faq/rewards-faq.md
index 5c9bb5dc88a..ecf1ceda7ec 100644
--- a/documentation/dev-portal/src/faq/rewards-faq.md
+++ b/documentation/dev-portal/src/faq/rewards-faq.md
@@ -46,4 +46,4 @@ If you have successfully completed KYC on Synaps earlier and provided your Nym w
 
 Using the Nym network is free for now, but user fees will be introduced in the future and those will be paid in NYM tokens, so set them aside! And until then, you can contribute to running our decentralized infrastructure and earn mix mining rewards by setting up Nym mix nodes and bonding your tokens to them. You don't need to run nodes to contribute to the security and performance of the Nym network though. You can pledge your trust in someone else's node by delegating your NYM tokens to it, and receive a share of their mix mining rewards.
 
-You can find out more about how staking works in [this](https://www.youtube.com/watch?v=PcNGcTwlm0I) video from our Chief Scientist Claudia Diaz and if you need help setting up your mix node, choosing one to delegate your tokens to, or anything else, our community is there to help on [Discord](https://discord.gg/FaTJb8q8) and [Telegram](https://t.me/nymchan). 
+You can find out more about how staking works in [this](https://www.youtube.com/watch?v=PcNGcTwlm0I) video from our Chief Scientist Claudia Diaz and if you need help setting up your mix node, choosing one to delegate your tokens to, or anything else, our community is there to help on [Discord](https://nymtech.net/go/discord) and [Telegram](https://t.me/nymchan).
diff --git a/documentation/dev-portal/src/images/wallet-proxy-settings/blockstream-green.gif b/documentation/dev-portal/src/images/wallet-proxy-settings/blockstream-green.gif
new file mode 100644
index 00000000000..33e2725c291
Binary files /dev/null and b/documentation/dev-portal/src/images/wallet-proxy-settings/blockstream-green.gif differ
diff --git a/documentation/dev-portal/src/integrations/integration-options.md b/documentation/dev-portal/src/integrations/integration-options.md
index 328ec154a37..5c7d4174202 100644
--- a/documentation/dev-portal/src/integrations/integration-options.md
+++ b/documentation/dev-portal/src/integrations/integration-options.md
@@ -1,5 +1,5 @@
 # Integration Options
-If you've already gone through the different [Quick Start](../quickstart/overview.md) options and had a look at the tutorials, you have seen the possibilities available to you for quickly connecting existing application code to another Nym process. 
+If you've already gone through the different options and had a look at the tutorials, you have seen the possibilities available to you for quickly connecting existing application code to another Nym process. 
 
 Below are a resources that will be useful for either beginning to integrate mixnet functionality into existing application code or build a new app using Nym.  
 
@@ -7,8 +7,6 @@ Below are a resources that will be useful for either beginning to integrate mixn
 
 - The [integrations FAQ](../faq/integrations-faq.md) has a list of common questions regarding integrating with Nym and Nyx, as well as commonly required links. 
 
-- To get an idea of what is possible / has already been built, check the [community applications and resources](../community-resources/community-applications-and-guides.md) page, as well as the [developer tutorials codebase](https://github.com/nymtech/developer-tutorials). 
-
 > If you wish to integrate with the Nyx blockchain to use `NYM` for payments, start with the [payment integration](./payment-integration.md) page.
 
 
diff --git a/documentation/dev-portal/src/quickstart/chat-demo.md b/documentation/dev-portal/src/quickstart/chat-demo.md
deleted file mode 100644
index 6e2f5c244a0..00000000000
--- a/documentation/dev-portal/src/quickstart/chat-demo.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Chat demo (webapp)
-
-You can find a browser-based 'hello world' chat app [here](https://chat-demo.nymtech.net).
-
-Either open in two browser windows and send messages to yourself, or share with a friend and send messages to each other through the mixnet.
diff --git a/documentation/dev-portal/src/quickstart/cred-playground.md b/documentation/dev-portal/src/quickstart/cred-playground.md
deleted file mode 100644
index aa2220940c6..00000000000
--- a/documentation/dev-portal/src/quickstart/cred-playground.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Coconut Credential Playground (webapp)
-
-There is a coconut-scheme based Credential Library playground [here](https://coco-demo.nymtech.net/). This is a WASM implementation of our Coconut libraries which generate raw Coconut credentials. Test it to create and re-randomize your own credentials.
-
-For more information on what is happening here check out the [Coconut docs](https://nymtech.net/docs/coconut.html).
diff --git a/documentation/dev-portal/src/quickstart/nymconnect-gui.md b/documentation/dev-portal/src/quickstart/nymconnect-gui.md
deleted file mode 100644
index cf7644b616d..00000000000
--- a/documentation/dev-portal/src/quickstart/nymconnect-gui.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# NymConnect Beta (GUI)
-
-NymConnect is a one-button GUI application that wraps around the `nym-socks5-client` for proxying application traffic through the Mixnet. 
-
-You can watch our video on getting started with NymConnect: 
-
-<iframe width="700" height="400" src="https://www.youtube.com/embed/quj8H2qeOwY" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
-
-Install NymConnect and select an application that you want to privacy-enhance from the dropdown menu. For now, NymConnect can be used with Electrum Wallet, Keybase, desktop Telegram and Blockstream Green. Configure these to run via a SOCKS5 proxy and send their data through the Nym mixnet!
-
-**Please note that NymConnect is currently released in beta. Please report bugs via Github**. 
-
-## Usage instuctions 
-* [Download](https://github.com/nymtech/nym/releases/) and install NymConnect.
-* Select your service provider from the dropdown menu.
-* Click `connect` - NymConnect will connect to a service provider and its SOCKS Proxy (IP) and Port will be displayed.
-* Click on IP or Port to copy their values to the clipboard.
-* Go to your app settings and look for the network/proxy settings. Select `running via SOCKS5 proxy` and paste the IP and Port values given by NymConnect.
-
-Your traffic from that application will now run through the mixnet for privacy and unlinkability!
-
-
diff --git a/documentation/dev-portal/src/quickstart/overview.md b/documentation/dev-portal/src/quickstart/overview.md
deleted file mode 100644
index 534ed60fe5d..00000000000
--- a/documentation/dev-portal/src/quickstart/overview.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Overview
-
-There are multiple options to quickly connect to Nym and play with both the mixnet and credentials on the Sandbox testnet.
-
-At most, these involve running Nym as a second process alongside an existing application in order to send traffic through the mixnet, most are either interact webpages or a standalone app.
-
-If you've already covered the information in this section, or want to jump straight into integrating/ a Nym connection into an existing application, head to the [Integrations](../integrations/integration-options.md) section.
diff --git a/documentation/docs/src/sdk/rust/examples.md b/documentation/dev-portal/src/sdk/rust/examples.md
similarity index 100%
rename from documentation/docs/src/sdk/rust/examples.md
rename to documentation/dev-portal/src/sdk/rust/examples.md
diff --git a/documentation/docs/src/sdk/rust/examples/cargo.md b/documentation/dev-portal/src/sdk/rust/examples/cargo.md
similarity index 100%
rename from documentation/docs/src/sdk/rust/examples/cargo.md
rename to documentation/dev-portal/src/sdk/rust/examples/cargo.md
diff --git a/documentation/docs/src/sdk/rust/examples/credential.md b/documentation/dev-portal/src/sdk/rust/examples/credential.md
similarity index 64%
rename from documentation/docs/src/sdk/rust/examples/credential.md
rename to documentation/dev-portal/src/sdk/rust/examples/credential.md
index e62cfb454ac..979d0219147 100644
--- a/documentation/docs/src/sdk/rust/examples/credential.md
+++ b/documentation/dev-portal/src/sdk/rust/examples/credential.md
@@ -1,9 +1,9 @@
 # Coconut credential generation
-The following code shows how you can use the SDK to create and use a [credential](../../../bandwidth-credentials.md) representing paid bandwidth on the Sandbox testnet.
+The following code shows how you can use the SDK to create and use a credential representing paid bandwidth on the Sandbox testnet.
 
 ```rust,noplayground
 {{#include ../../../../../../sdk/rust/nym-sdk/examples/bandwidth.rs}}
 ```
 
-You can read more about Coconut credentials (also referred to as `zk-Nym`) [here](../../../coconut.md).
+You can read more about Coconut credentials (also referred to as `zk-Nym`) [here](https://nymtech.net/docs/coconut.md).
 
diff --git a/documentation/docs/src/sdk/rust/examples/custom-network.md b/documentation/dev-portal/src/sdk/rust/examples/custom-network.md
similarity index 100%
rename from documentation/docs/src/sdk/rust/examples/custom-network.md
rename to documentation/dev-portal/src/sdk/rust/examples/custom-network.md
diff --git a/documentation/docs/src/sdk/rust/examples/keys.md b/documentation/dev-portal/src/sdk/rust/examples/keys.md
similarity index 100%
rename from documentation/docs/src/sdk/rust/examples/keys.md
rename to documentation/dev-portal/src/sdk/rust/examples/keys.md
diff --git a/documentation/docs/src/sdk/rust/examples/simple.md b/documentation/dev-portal/src/sdk/rust/examples/simple.md
similarity index 100%
rename from documentation/docs/src/sdk/rust/examples/simple.md
rename to documentation/dev-portal/src/sdk/rust/examples/simple.md
diff --git a/documentation/docs/src/sdk/rust/examples/socks.md b/documentation/dev-portal/src/sdk/rust/examples/socks.md
similarity index 100%
rename from documentation/docs/src/sdk/rust/examples/socks.md
rename to documentation/dev-portal/src/sdk/rust/examples/socks.md
diff --git a/documentation/docs/src/sdk/rust/examples/split-send.md b/documentation/dev-portal/src/sdk/rust/examples/split-send.md
similarity index 100%
rename from documentation/docs/src/sdk/rust/examples/split-send.md
rename to documentation/dev-portal/src/sdk/rust/examples/split-send.md
diff --git a/documentation/docs/src/sdk/rust/examples/storage.md b/documentation/dev-portal/src/sdk/rust/examples/storage.md
similarity index 100%
rename from documentation/docs/src/sdk/rust/examples/storage.md
rename to documentation/dev-portal/src/sdk/rust/examples/storage.md
diff --git a/documentation/docs/src/sdk/rust/examples/surbs.md b/documentation/dev-portal/src/sdk/rust/examples/surbs.md
similarity index 65%
rename from documentation/docs/src/sdk/rust/examples/surbs.md
rename to documentation/dev-portal/src/sdk/rust/examples/surbs.md
index 13de2ec98c5..3cedd45ba10 100644
--- a/documentation/docs/src/sdk/rust/examples/surbs.md
+++ b/documentation/dev-portal/src/sdk/rust/examples/surbs.md
@@ -1,13 +1,7 @@
 # Anonymous Replies with SURBs (Single Use Reply Blocks)
 Both functions used to send messages through the mixnet (`send_message` and `send_plain_message`) send a pre-determined number of SURBs along with their messages by default.
 
-The number of SURBs is set [here](https://github.com/nymtech/nym/blob/master/sdk/rust/nym-sdk/src/mixnet/client.rs#L33).
-
-```rust,noplayground
-{{#include ../../../../../../sdk/rust/nym-sdk/src/mixnet/client.rs:33}}
-```
-
-You can read more about how SURBs function under the hood [here](../../../architecture/traffic-flow.md#private-replies-using-surbs).
+You can read more about how SURBs function under the hood [here](https://nymtech.net/docs/architecture/traffic-flow.md#private-replies-using-surbs).
 
 In order to reply to an incoming message using SURBs, you can construct a `recipient` from the `sender_tag` sent along with the message you wish to reply to:
 
diff --git a/documentation/docs/src/sdk/rust/message-helpers.md b/documentation/dev-portal/src/sdk/rust/message-helpers.md
similarity index 100%
rename from documentation/docs/src/sdk/rust/message-helpers.md
rename to documentation/dev-portal/src/sdk/rust/message-helpers.md
diff --git a/documentation/docs/src/sdk/rust/message-types.md b/documentation/dev-portal/src/sdk/rust/message-types.md
similarity index 100%
rename from documentation/docs/src/sdk/rust/message-types.md
rename to documentation/dev-portal/src/sdk/rust/message-types.md
diff --git a/documentation/docs/src/sdk/rust/rust.md b/documentation/dev-portal/src/sdk/rust/rust.md
similarity index 100%
rename from documentation/docs/src/sdk/rust/rust.md
rename to documentation/dev-portal/src/sdk/rust/rust.md
diff --git a/documentation/docs/src/sdk/rust/troubleshooting.md b/documentation/dev-portal/src/sdk/rust/troubleshooting.md
similarity index 100%
rename from documentation/docs/src/sdk/rust/troubleshooting.md
rename to documentation/dev-portal/src/sdk/rust/troubleshooting.md
diff --git a/documentation/docs/src/sdk/typescript.md b/documentation/dev-portal/src/sdk/typescript.md
similarity index 56%
rename from documentation/docs/src/sdk/typescript.md
rename to documentation/dev-portal/src/sdk/typescript.md
index 4131b0dff45..ee67c3939ab 100644
--- a/documentation/docs/src/sdk/typescript.md
+++ b/documentation/dev-portal/src/sdk/typescript.md
@@ -1,4 +1,4 @@
 # Typescript SDK
 The Typescript SDK allows developers to start building browser-based mixnet applications quickly, by simply importing the SDK into their code via NPM as they would any other Typescript library.
 
-> If you'd like to learn more, build apps or integrate Nym components using the TS SDK, please visit the **dedicated [TS SDK Handbook](https://sdk.nymtech.net/)** !
\ No newline at end of file
+If you'd like to learn more, build apps or integrate Nym components using the TS SDK, visit the dedicated [TS SDK Handbook](https://sdk.nymtech.net/).
diff --git a/documentation/dev-portal/src/tutorials/coming-soon.md b/documentation/dev-portal/src/tutorials/coming-soon.md
new file mode 100644
index 00000000000..a435e701efb
--- /dev/null
+++ b/documentation/dev-portal/src/tutorials/coming-soon.md
@@ -0,0 +1,11 @@
+# Stub: Updates Coming Soon!
+
+There is a lot of development work ongoing with our clients; as such the old tutorials that were here got quite out of date. 
+
+However, you can still access the old [tutorial codebases](https://github.com/nymtech/developer-tutorials) as well as the markdown files in the `tutorial-archives/` directory in the [developer portal docs repo](https://github.com/nymtech/nym/tree/develop/documentation/dev-portal/src/tutorials) if you want. 
+
+More up to date tutorials will be coming soon for using RPC and gRPC, `mixfetch`, as well as using the [FFI libraries](https://github.com/nymtech/nym/tree/develop/sdk/ffi) for interacting with the Mixnet via C++ and Go. 
+
+> Developers who are searching for example code can use the following list as the current 'best practices':
+> * Generic traffic transport: the [`zcash-rpc-demo`](https://github.com/nymtech/nym-zcash-rpc-demo) repo, although here used to only pipe RPC traffic, is a proof of concept 'generic' mixnet piping example which exposes a TPC Socket on the client side for incoming traffic, pipes this through the mixnet, and then streams TCP packets 'out' the other side. 
+> * In-browser usage: see the [browser examples](../examples/browser-only.md) page for examples using `mixFetch`. 
diff --git a/documentation/dev-portal/src/tutorials/cosmos-service/client-src.md b/documentation/dev-portal/src/tutorials/cosmos-service/client-src.md
deleted file mode 100644
index 0692eeabd8e..00000000000
--- a/documentation/dev-portal/src/tutorials/cosmos-service/client-src.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# Preparing Your Client pt2
-
-Open `src/client.rs`. This is where the logic of the command from the `match` statement in `bin/client.rs` is defined.
-
-# Dependencies
-```rust
-use crate::{handle_response, wait_for_non_empty_message, RequestTypes, DEFAULT_VALIDATOR_RPC};
-use cosmrs::AccountId;
-use nym_sdk::mixnet::MixnetClient;
-use nym_sphinx_addressing::clients::Recipient;
-use nym_validator_client::nyxd::Coin;
-```
-
-As well as importing message-handling functionality, request types, and the default RPC endpoint, this file relies on the `AccountId` type to construct blockchain addresses, the `MixnetClient` for interacting with the mixnet, the `Recipient` type to construct mixnet recipient addresses, and the `Coin` type for properly handling the returned balance of the account that will be queried.
-
-# Querying via the Mixnet
-The following is used to construct a `BalanceRequest`, send this to the supplied `service` address, and then handle the response, matching it to a `ResponseType` (in this case the only expected response, a `BalanceResponse`).
-
-The actual sending of the request is performed by `client.send_message`: sending the serialised `BalanceRequest` to the supplied Nym address (the `Recipient` imported from the `nym_sphinx_addressing` crate). It is sending the default number of SURBs along with the message as the third argument, defined [here](https://github.com/nymtech/nym/blob/develop/sdk/rust/nym-sdk/src/mixnet/client.rs#L34).
-
-```rust
-pub async fn query_balance(
-    account: AccountId,
-    client: &mut MixnetClient,
-    sp_address: Recipient,
-) -> anyhow::Result<Coin> {
-    // construct balance request
-    let message = RequestTypes::Balance(crate::BalanceRequest {
-        validator: DEFAULT_VALIDATOR_RPC.to_owned(), // rpc endpoint for broadcaster to use
-        account,
-    });
-
-    // send serialised request to service via mixnet
-    let _ = client
-        .send_message(sp_address, message.serialize(), Default::default())
-        .await;
-
-    let received = wait_for_non_empty_message(client).await?;
-
-    // listen for response from service
-    let sp_response = handle_response(received)?;
-
-    // match JSON -> ResponseType
-    let res = match sp_response {
-        crate::ResponseTypes::Balance(response) => {
-            println!("{:#?}", response);
-            response.balance
-        }
-    };
-
-    Ok(res)
-}
-```
-
-That is all the client code written: now to move on to the `service` that will be interacting with the blockchain on behalf of the `client`.
diff --git a/documentation/dev-portal/src/tutorials/cosmos-service/client.md b/documentation/dev-portal/src/tutorials/cosmos-service/client.md
deleted file mode 100644
index 5916c5e4f4b..00000000000
--- a/documentation/dev-portal/src/tutorials/cosmos-service/client.md
+++ /dev/null
@@ -1,79 +0,0 @@
-# Preparing Your Client
-
-Start by creating the startup logic of your `client` in `bin/client.rs` - creating a Nym client and connecting to the mixnet (or just connecting if your client has been started before and config already exists for it), and defining and running commands.
-
-## Dependencies
-Import the following dependencies:
-```rust
-use clap::{Args, Parser, Subcommand};
-use chain_query::{client::query_balance, create_client};
-use nym_sdk::mixnet::Recipient;
-use nym_validator_client::nyxd::AccountId;
-use nym_bin_common::logging::setup_logging;
-```
-
-`clap` is used so different commands can be passed to the `client` (even though we're only defining one function in this first part of the tutorial, more will be added in subsequent chapters). `nym_sdk::mixnet::Recipient` is the type used to define the recipient of a mixnet message, `nym_bin_common::logging::setup_logging` is the logging setup for `client`'s Nym client, and `chain_query` imports the `create_client` and `query_balance` functions created on the previous page.
-
-## CLI Command with Clap
-The following simply defines the commands that the client can perform. For the  moment, there is only one: the `query_balance` function created in the previous section.
-
-As with the data structures, this structure is being used for ease of adding future commands in subsequent tutorials.
-
-```rust
-#[derive(Debug, Parser)]
-#[clap(name = "rust sdk demo - chain query service")]
-#[clap(about = "query the sandbox testnet blockchain via the mixnet... part 2 coming soon")]
-struct Cli {
-    #[clap(subcommand)]
-    command: Option<Commands>,
-}
-
-#[derive(Debug, Subcommand)]
-enum Commands {
-    QueryBalance(QueryBalance),
-}
-
-#[derive(Debug, Args)]
-struct QueryBalance {
-    /// the account we want to query
-    account: AccountId,
-    /// the address of the broadcaster service - this submits txs and queries the chain on our behalf
-    sp_address: String,
-}
-```
-
-## `main()`
-This is the root logic of the `client`. Using `[tokio](https://tokio.rs/)` for the async runtime, this function performs the following functions:
-* If not already existing, create a Nym client with config at `/tmp/client`. Otherwise load the already existing client from this config.
-* Matche the command from the CLI - in this instance, the `QueryBalance` function which will be defined in the next section. This creates a `BalanceRequest` and sends this to the `service`, before returning the response back to the main thread and print this to the console.
-* Perform a proper shutdown of the Nym client.
-
-```rust
-#[tokio::main]
-async fn main() -> anyhow::Result<()> {
-    setup_logging();
-    let cli = Cli::parse();
-    let mut client = create_client("/tmp/client2".into()).await;
-    let our_address = client.nym_address();
-    println!("\nclient's nym address: {our_address}");
-
-    match cli.command {
-        Some(Commands::QueryBalance(QueryBalance {
-            account,
-            sp_address,
-        })) => {
-            println!("\nsending bank balance request to service via mixnet");
-            let sp_address = Recipient::try_from_base58_string(sp_address).unwrap();
-            let returned_balance = query_balance(account, &mut client, sp_address).await?;
-            println!("\nreturned balance is: {}", returned_balance);
-        }
-        None => {
-            println!("\nno command specified - nothing to do")
-        }
-    }
-    println!("\ndisconnecting client");
-    client.disconnect().await;
-    println!("client disconnected");
-    Ok(())
-}
-```
diff --git a/documentation/dev-portal/src/tutorials/cosmos-service/intro.md b/documentation/dev-portal/src/tutorials/cosmos-service/intro.md
deleted file mode 100644
index cf9dad5fd05..00000000000
--- a/documentation/dev-portal/src/tutorials/cosmos-service/intro.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Interacting with a Cosmos SDK Blockchain via the Mixnet with the Rust SDK
-
-This tutorial is for Rust developers wanting to interact with the Rust SDK and take a first step at building a service with which to interact with a Cosmos SDK blockchain. 
-
-The key here is to think of the service as a proxy: it interacts with the blockchain _on the client's behalf_, shielding the client from the Validator it interacts with, whilst also being shielded from the client by the mixnet.
-
-> This service also nicely highlights the limitations of the mixnet - even though with this code your metadata is shielded from the Validator, and even the service does not know your Nym address, application-level information such as a blockchain address is not made private, in virtue of the fact that using the mixnet provides solely network-level privacy. For information on what application-level privacy Nym offers, check out the [coconut credential SDK example](https://nymtech.net/docs/sdk/rust.html#coconut-credential-generation).
diff --git a/documentation/dev-portal/src/tutorials/cosmos-service/lib.md b/documentation/dev-portal/src/tutorials/cosmos-service/lib.md
deleted file mode 100644
index 0e8e2ad0508..00000000000
--- a/documentation/dev-portal/src/tutorials/cosmos-service/lib.md
+++ /dev/null
@@ -1,164 +0,0 @@
-# Preparing Your Lib
-
-Now move on to preparing shared data structures and functions in `src/lib.rs`.
-
-These include the request and response types the client and the service will be passing through the mixnet, as well as shared functions such as client creation, and message parsing.
-
-## Dependencies
-The dependencies for the shared `lib` file are the following:
-```rust
-use anyhow::bail;
-use cosmrs::AccountId;
-use nym_sdk::mixnet::{
-    AnonymousSenderTag, MixnetClient, MixnetClientBuilder, ReconstructedMessage, StoragePaths,
-};
-use nym_validator_client::nyxd::Coin;
-use serde::{Deserialize, Serialize};
-use std::path::PathBuf;
-
-pub mod client;
-pub mod service;
-```
-
-Since this is the file where client creation and message parsing are handled, the various `nym_sdk` imports, as well as `serde`'s (de)serialisation functionality, are required. `PathBuf` is for reading filepaths, `cosmrs` types are required for defining Nyx blockchain accounts, and the `Coin` type from the `nyxd_validator_client` is for our Coin balance request and response. `anyhow` is for easy error handing.
-
-## Constants
-Below this are the chain-related `const` variables. These have been hardcoded for this demo.
-
-```rust
-pub const DEFAULT_VALIDATOR_RPC: &str = "https://rpc.sandbox.nymtech.net";
-pub const DEFAULT_DENOM: &str = "unym";
-pub const DEFAULT_PREFIX: &str = "n";
-```
-
-These define the RPC endpoint your service will use to interact with the blockchain - in this case the Sandbox testnet - as well as the expected coin denomination, and Bech32-prefix of addresses.
-
-## Shared Data Structures
-Define the following structs for our different request and responses that will be serialised and sent through the mixnet between your client and service binaries:
-
-```rust
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
-pub struct BalanceRequest {
-    pub validator: String,
-    pub account: AccountId,
-}
-
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
-pub struct BalanceResponse {
-    pub balance: Coin,
-}
-
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
-pub enum RequestTypes {
-    Balance(BalanceRequest),
-}
-
-impl RequestTypes {
-    pub fn serialize(&self) -> Vec<u8> {
-        serde_json::to_vec(self).expect("serde failure")
-    }
-
-    pub fn try_deserialize<M: AsRef<[u8]>>(raw: M) -> anyhow::Result<Self> {
-        serde_json::from_slice(raw.as_ref()).map_err(Into::into)
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
-pub enum ResponseTypes {
-    Balance(BalanceResponse),
-}
-
-impl ResponseTypes {
-    pub fn serialize(&self) -> Vec<u8> {
-        serde_json::to_vec(self).expect("serde failure")
-    }
-
-    pub fn try_deserialize<M: AsRef<[u8]>>(raw: M) -> anyhow::Result<Self> {
-        serde_json::from_slice(raw.as_ref()).map_err(Into::into)
-    }
-}
-```
-
-The above data types are pretty straightforward. Even though there are only one instance of a request type (sent from `client` -> mixnet -> `service`) and one of a response type (`service` -> mixnet -> `client`) so far, a pair of enums has been defined to contain additional response and request types that will be added in part 2 of this tutorial, when adding credential functionality.
-
-`BalanceRequest` will be used when requesting the service to query the token balance of the supplied address on the client's behalf. You can see the information that will be returned from the chain to the service, and from the service to the client, in `BalanceResponse`.
-
-Custom serialistion and deserialisation have been implemented for each enum for ease of future modification and testing.
-
-## Shared Functions
-Now to define functions shared by the `client` and `service` binaries.
-
-### Client Creation
-The following function is called on startup by each binary, with the `config_path` being a filepath for storing client config:
-
-```rust
-// create our client with specified path for key storage
-pub async fn create_client(config_path: PathBuf) -> MixnetClient {
-    let config_dir = config_path;
-    let storage_paths = StoragePaths::new_from_dir(&config_dir).unwrap();
-    let client = MixnetClientBuilder::new_with_default_storage(storage_paths)
-        .await
-        .unwrap()
-        .build()
-        .unwrap();
-
-    client.connect_to_mixnet().await.unwrap()
-}
-```
-
-If no config files exist at the location designated by `config_path` (in this case `/tmp/service`) then the following files are generated:
-
-```sh
-service
-├── ack_key.pem
-├── db.sqlite
-├── db.sqlite-shm
-├── db.sqlite-wal
-├── gateway_details.json
-├── gateway_shared.pem
-├── persistent_reply_store.sqlite
-├── private_encryption.pem
-├── private_identity.pem
-├── public_encryption.pem
-└── public_identity.pem
-
-1 directory, 11 files
-```
-
-> If keys and config already exist at this location, re-running this function **will not** overwrite them.
-
-### Listening for & Parsing Incoming messages
-Next to define two functions: one for listening _for_ messages from the mixnet (used by `service`), and one for handling a _response_ to a request (used by `client`).
-
-Both functions attempt to deserialise the vec of `ReconstructedMessages` that are reconstructed by the client from delivered Sphinx packets after decryption.
-
-`handle_request` performs one additional function - parsing the `sender_tag` from the incoming reconstructed message. This is the randomised alphanumeric string used to identify a bucket of _SURBs_ (Single Use Reply Blocks) that are sent along with any outgoing message by default. More information about them can be found [here](https://nymtech.net/docs/architecture/traffic-flow.html#private-replies-using-surbs) but all that is necessary to know for now is that these are pre-addressed packets that clients send out with their messages. Any reply to their message that is to be sent back to them back be written to the payload of these packets, but without the replying party being able to see the destination that the reply is being sent to. This allows for services to **anonymously reply to clients without being able to doxx them by knowing their Nym address**.
-
-```rust
-pub fn handle_response(message: ReconstructedMessage) -> anyhow::Result<ResponseTypes> {
-    ResponseTypes::try_deserialize(message.message)
-}
-
-pub fn handle_request(
-    message: ReconstructedMessage,
-) -> anyhow::Result<(RequestTypes, Option<AnonymousSenderTag>)> {
-    let request = RequestTypes::try_deserialize(message.message)?;
-    Ok((request, message.sender_tag))
-}
-```
-
-Before moving on to the `client` and `service` code, one more function is needed. This allows for both binaries to parse empty incoming messages that they might receive. This is necessary as incoming SURBs, as well as requests for more SURBs, contain empty data fields.
-
-```rust
-pub async fn wait_for_non_empty_message(
-    client: &mut MixnetClient,
-) -> anyhow::Result<ReconstructedMessage> {
-    while let Some(mut new_message) = client.wait_for_messages().await {
-        if !new_message.is_empty() {
-            return Ok(new_message.pop().unwrap());
-        }
-    }
-
-    bail!("did not receive any non-empty message")
-}
-```
diff --git a/documentation/dev-portal/src/tutorials/cosmos-service/overview.md b/documentation/dev-portal/src/tutorials/cosmos-service/overview.md
deleted file mode 100644
index 96a19d7c6dd..00000000000
--- a/documentation/dev-portal/src/tutorials/cosmos-service/overview.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Tutorial Overview
-
-This tutorial involves writing two pieces of code in Rust:
-
-- A client side binary used to construct a blockchain query and send this query to a service, which will query the Cosmos SDK blockchain and then pass the response back to the client (bear in mind this principle works for all blockchains - we're just utilising the `cosmrs` library to interact with the Sandbox testnet blockchain in this tutorial). This query will be to query the balance of an account, in preparation for spending these tokens on a [bandwidth credential](https://nymtech.net/docs/bandwidth-credentials.html) in a subsequent tutorial.
-- A service which will listen out for requests from the mixnet, act on those requests, and anonymously reply to the client sending the requests.
-
-You will learn how to do the following with the Rust SDK:
-- Create clients with manual storage settings.
-- Parse incoming traffic from the mixnet and reply anonymously using [SURBs](https://nymtech.net/docs/architecture/traffic-flow.html#private-replies-using-surbs).
-
-> Services usually run on remote servers to assure reliable uptime and to unlink sender and receiver metadata. For demonstration purposes however, you will run both components on your local machine, looping messages through the mixnet to yourself.
-
-You can find the code for these components [here](https://github.com/nymtech/developer-tutorials). You can use it as a reference while building or simply download it and follow along as you progress through the tutorial.
-
-Notice that this tutorial attempts to use very few external libraries. This tutorial is not showing you how to build production-grade code, but **to understand how to connect and send messages to, as well as receive messages from, the mixnet.**
-
-```admonish note title="Sidenote: What is a Service / Service Provider?"
-'Service' or 'Service Provider' are catchall names used to refer to any type of app that can communicate with the mixnet via a Nym client - in this case, one embedded in its app process via the Rust SDK.
-
-The first SP to have been released is the [Network Requester](https://nymtech.net/docs/nodes/network-requester-setup.html) - a binary that receives a network request from the mixnet, performs that request (e.g. authenticating with a message server and receiving new messages for a user) and then passes the response back to the user who requested it anonymously, shielding their metadata from the message server.
-
-The SP you will build in this tutorial is far more simple than this, showing you how to approach building something that can:
-* connect to the mixnet,
-* listen for messages, and
-* perform some action with them - in this case, query a Cosmos SDK blockchain.
-
-However, once you see how easy it is to integrate with the mixnet for traffic transport, you will be able to build apps with real-world uses easily.
-```
diff --git a/documentation/dev-portal/src/tutorials/cosmos-service/preparing-env.md b/documentation/dev-portal/src/tutorials/cosmos-service/preparing-env.md
deleted file mode 100644
index e970821148e..00000000000
--- a/documentation/dev-portal/src/tutorials/cosmos-service/preparing-env.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# Preparing Your Environment
-
-## Prerequisites
-* `Rust` & `cargo`
-
-## Creating your Project Structure
-
-* Make a new cargo project:
-```
-cargo new nym-cosmos-service
-```
-
-* Create the following directory structure and files:
-```
-.
-├── Cargo.toml
-├── bin
-│   ├── client.rs
-│   └── service.rs
-└── src
-    ├── client.rs
-    ├── lib.rs
-    └── service.rs
-
-3 directories, 6 files
-```
-
-* Add the following dependencies to your `Cargo.toml` file:
-```
-[dependencies]
-clap = { version = "4.0", features = ["derive"] }
-cosmrs = "=0.15.0"
-tokio = { version = "1.24.1", features = ["rt-multi-thread", "macros"] }
-serde = "1.0.152"
-serde_json = "1.0.91"
-anyhow = "1.0.72"
-```
-
-These are non Nym-specific dependencies for the project. `clap` is for setting up the CLI commands, `cosmrs` for cosmos-specific types and functionality, `tokio` for the async/await environment, and `serde` for (de)serialisation. `anyhow` is for catch-all error handling.
-
-* Next add Nym-specific dependencies. Since these libraries are not yet on [crates io](https://crates.io) then you need to import them from the Nym monorepo:
-```
-nym-sdk = { git = "https://github.com/nymtech/nym", rev = "85a7ec9f02ca8262d47eebb6c3b19d832341b55d" }
-nym-sphinx-addressing = { git = "https://github.com/nymtech/nym", rev = "85a7ec9f02ca8262d47eebb6c3b19d832341b55d" }
-nym-validator-client = { git = "https://github.com/nymtech/nym", rev = "85a7ec9f02ca8262d47eebb6c3b19d832341b55d" }
-nym-bin-common = { git = "https://github.com/nymtech/nym", rev = "85a7ec9f02ca8262d47eebb6c3b19d832341b55d" }
-nym-sphinx-anonymous-replies = { git = "https://github.com/nymtech/nym", rev = "85a7ec9f02ca8262d47eebb6c3b19d832341b55d" }
-```
-
-The `sphinx` dependencies are for packet- and address-related functionality, the `validator-client` for Nyx blockchain specific configs, `common` for client logging, and the `sdk` for SDK functionality: creating and managing client storage and connections, and sending and receiving messages to and from the mixnet.
-
-* Finally add the following underneath your `[dependencies]`:
-```
-[[bin]]
-name = "client"
-path = "bin/client.rs"
-
-[[bin]]
-name = "service"
-path = "bin/service.rs"
-```
-This defines multiple binaries to run in a single cargo project, as outlined [here](https://doc.rust-lang.org/cargo/reference/cargo-targets.html#binaries).
diff --git a/documentation/dev-portal/src/tutorials/cosmos-service/querying.md b/documentation/dev-portal/src/tutorials/cosmos-service/querying.md
deleted file mode 100644
index 09691702b54..00000000000
--- a/documentation/dev-portal/src/tutorials/cosmos-service/querying.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Querying the Chain
-Now that all the code has been written, time to query the blockchain.
-
-To test against the account operating one of the mix nodes on the testnet, use `n1lcutqz94k739s39u26rvexql40ehf42zd27fwe` in the following instructions:
-
-```sh
-# build the binaries
-cargo build --release
-
-# open two console windows. In one run the following
-./target/release/service
-
-# copy the printed Nym address from the console - this is used by the client when running the chain query
-
-# in the other run
-./target/release/client query-balance n1lcutqz94k739s39u26rvexql40ehf42zd27fwe <SERVICE_ADDRESS_FROM_CLIPBOARD>
-```
-
-The following happens:
-* `client` and `service` both start their Nym clients and log the address. `service` is listening for incoming messages from the mixnet.
-* `client` sends a request to `service` using the supplied `n1...` address as the Nyx account to query the balance of, and the supplied Nym address to communicate with this instance of `service`.
-* `service` queries the Sandbox testnet blockchain using the `broadcaster` http client. It then serialises the response and returns it using SURBs to the `client`.
-
-All in all, quite simple. By using the service as a proxy, the client never interacts with the blockchain, thus is not revealing metadata to the operator of the Validator nor any entities monitoring its incoming and outgoing traffic. Furthermore, the client doesn't even need to share its Nym address with the service, as the service is able to reply via SURBs.
-
-## Creating Sandbox Account
-If you wish to create an account on Sandbox to use instead of the supplied account above, the easiest way is by building the `nym-cli` tool and using that to create one:
-
-```sh
-# start from the root of the nym monorepo
-cd tools/nym-cli
-# build
-cargo build --release
-# create account using Sandbox testnet environment
-../../target/release/nym-cli --config-env-file ../../envs/sandbox.env account create
-```
-
-However, since this account is fresh, it won't have any tokens. Querying the balance will still work obviously, it will just return `0`.
-
-## Get Tokens
-We're working on getting the faucet up and running again in preparation for part 2 of this tutorial: using the tokens you have privately checked the balance of to generate a [bandwidth credential](https://nymtech.net/docs/bandwidth-credentials.html).
-
-If you wish to get testnet tokens already then feel free to ask in the [Dev channel](https://matrix.to/#/#dev:nymtech.chat) on Matrix.
diff --git a/documentation/dev-portal/src/tutorials/cosmos-service/service-src.md b/documentation/dev-portal/src/tutorials/cosmos-service/service-src.md
deleted file mode 100644
index 0e463362e8c..00000000000
--- a/documentation/dev-portal/src/tutorials/cosmos-service/service-src.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# Preparing Your Service pt2
-
-Now to define the logic of creating the `broadcaster` for interacting with the blockchain, and querying it in `src/service.rs`. 
-
-## Dependencies
-The following dependencies are for creating a client to interact with the blockchain, and deal with the returned `Coin` type in `BalanceResponse`. 
-
-```rust
-use crate::{BalanceResponse, DEFAULT_DENOM, DEFAULT_VALIDATOR_RPC};
-use cosmrs::rpc::HttpClient;
-use cosmrs::AccountId;
-use nym_validator_client::nyxd::{Coin, CosmWasmClient};
-```
-
-## Creating a `broadcaster` 
-The `broadcaster` is an `HttpClient` taken from `cosmrs`, created with the `DEFAULT_VALIDATOR_RPC` as its default endpoint. The service will use this to query the Sandbox testnet chain. 
-
-```rust
-pub async fn create_broadcaster() -> anyhow::Result<HttpClient> {
-    let broadcaster: HttpClient = HttpClient::new(DEFAULT_VALIDATOR_RPC)?;
-    Ok(broadcaster)
-}
-```
-
-## Querying the Chain 
-Now to write the logic for querying the chain, using the `broadcaster` created in the previous step to query for the balance of the `account` that the client sent via the mixnet in the `BalanceRequest`. This function returns a `BalanceResponse` containing a `Coin` type, denoting the `balance` and `denom` returned by `get_balance()`. 
-
-```rust
-pub async fn get_balance(
-    broadcaster: HttpClient,
-    account: AccountId,
-) -> anyhow::Result<BalanceResponse> {
-    let balance = broadcaster
-        .get_balance(&account, DEFAULT_DENOM.to_string())
-        .await
-        .unwrap()
-        .unwrap();
-    Ok(BalanceResponse {
-        balance: Coin {
-            amount: balance.amount,
-            denom: balance.denom,
-        }, 
-    })
-}
-```
\ No newline at end of file
diff --git a/documentation/dev-portal/src/tutorials/cosmos-service/service.md b/documentation/dev-portal/src/tutorials/cosmos-service/service.md
deleted file mode 100644
index 23cc190fb36..00000000000
--- a/documentation/dev-portal/src/tutorials/cosmos-service/service.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# Preparing Your Service
-In `bin/src.rs` define the startup and response logic of the `service`. Client connection / config reading happens as it does in `bin/client.rs`.
-
-## Dependencies
-```rust
-use chain_query::{
-    create_client, handle_request,
-    service::{create_broadcaster, get_balance},
-    BalanceResponse, RequestTypes, ResponseTypes,
-};
-use nym_sphinx_anonymous_replies::{self, requests::AnonymousSenderTag};
-use nym_bin_common::logging::setup_logging;
-use nym_sdk::mixnet::MixnetMessageSender;
-```
-
-The imports from `chain_query` are most of the data types and functions defined in the previous sections of this tutorial.
-
-The `AnonymousSenderTag` type is used for SURBs.
-
-## main()
-Also using tokio for the async runtime, `main` does the following:
-* Create a Nym client with config at `/tmp/service`, or load the existing client from this config directory.
-* Create a `broadcaster` - this is used by the service to interact with the blockchain, using the consts defined in `src/lib.rs` as chain config.
-* Listen out for incoming messages, and in much the same way as the `client`, handle and match the incoming request.
-* Using the `sender_tag`, anonymously reply to the `client` with the response from the blockchain **without having to know the client's Nym address**.
-
-```rust
-#[tokio::main]
-async fn main() -> anyhow::Result<()> {
-    setup_logging();
-    let mut client = create_client("/tmp/service".into()).await;
-    let our_address = client.nym_address();
-    println!("\nservice's nym address: {our_address}");
-    // the httpclient we will use to broadcast our query to the blockchain
-    let broadcaster = create_broadcaster().await?;
-    println!("listening for messages, press CTRL-C to exit");
-
-    while let Some(received) = client.wait_for_messages().await {
-        for msg in received {
-            let request = match handle_request(msg) {
-                Ok(request) => request,
-                Err(err) => {
-                    eprintln!("failed to handle received request: {err}");
-                    continue;
-                }
-            };
-
-            let return_recipient: AnonymousSenderTag = request.1.expect("no sender tag received");
-            match request.0 {
-                RequestTypes::Balance(request) => {
-                    println!("\nincoming balance request for: {}\n", request.account);
-
-                    let balance: BalanceResponse =
-                        get_balance(broadcaster.clone(), request.account).await?;
-
-                    let response = ResponseTypes::Balance(balance);
-
-                    println!("response from chain: {:#?}", response);
-
-                    println!("\nreturn recipient surb bucket: {}", &return_recipient);
-                    println!("\nsending response to {}", &return_recipient);
-                    // send response back to anon requesting client via mixnet
-                    let _ = client
-                        .send_reply(return_recipient, &serde_json::to_string(&response)?)
-                        .await;
-                }
-            }
-        }
-    }
-
-    Ok(())
-```
diff --git a/documentation/dev-portal/src/tutorials/electrum.md b/documentation/dev-portal/src/tutorials/electrum.md
deleted file mode 100644
index bc5e9b00228..00000000000
--- a/documentation/dev-portal/src/tutorials/electrum.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Electrum Wallet NymConnect Integration
-
-Electrum is one of the most favorite Bitcoin wallet for desktop users and it is used as a backend wallet for various crypto aplications in smart phones. Electrum was among the first integrations of Nym. This easy setup allows users to enhance privacy when managing the flagship of blochain cryptocurencies Bitcoin.
-
-## How can I use Bitcoin over the Nym mixnet?
-
-> Any syntax in `<>` brackets is a user’s unique variable. Exchange with a corresponding name without the `<>` brackets.
-
-### NymConnect Installation
-
-NymConnect application is for everyone who does not want to install and run `nym-socks5-client`. NymConnect is plug-and-play, fast and easy use. Electrum Bitcoin wallet, Monero wallet (desktop and CLI) and Matrix (Element app) connects through NymConnect automatically to the Mixnet.
-
-1. [Download](https://nymtech.net/download/nymconnect) NymConnect
-2. On Linux and Mac, make executable by opening terminal in the same directory and run:
-
-```sh
-chmod +x ./nym-connect_<VERSION>
-```
-
-3. Start the application
-4. Click on `Connect` button to initialise the connection with the Mixnet
-5. Anytime you'll need to setup Host and Port in your applications, click on `IP` and `Port` to copy the values to clipboard
-6. In case you have problems such as `Gateway Issues`, try to reconnect or restart the application
-
-### Electrum Bitcoin wallet via NymConnect
-
-
-To download Electrum visit the [official webpage](https://electrum.org/#download). To connect to the Mixnet follow these steps:
-
-7. Start and connect [NymConnect](./electrum.md#nymconnect-installation) (or [`nym-socks5-client`](https://nymtech.net/docs/clients/socks5-client.html))
-2. Start your Electrum Bitcoin wallet
-3. Go to: *Tools* -> *Network* -> *Proxy*
-4. Set *Use proxy* to ✅, choose `SOCKS5` from the drop-down and add the values from your NymConnect application
-5. Now your Electrum Bitcoin wallet runs through the Mixnet and it will be connected only if your NymConnect or `nym-socks5-client` are connected.
-
-![Electrum Bitcoin wallet setup](../images/electrum_tutorial/electrum.gif)
diff --git a/documentation/dev-portal/src/tutorials/firo.md b/documentation/dev-portal/src/tutorials/firo.md
deleted file mode 100644
index db09a87d796..00000000000
--- a/documentation/dev-portal/src/tutorials/firo.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Firo-Electrum Wallet NymConnect Integration
-
-[Firo](https://github.com/firoorg/firo#firo) (formerly Zcoin) is a privacy focused, zk-proof based cryptocurrency. Now users can enjoy Firo with network privacy by Nym as Firo's fork of Electrum wallet was integrated to work behind the Mixnet. Read more about Firo on their [official webpage](https://firo.org/).
-
-## How can I use Firo over the Nym Mixnet?
-
-> Any syntax in `<>` brackets is a user’s unique variable. Exchange with a corresponding name without the `<>` brackets.
-
-### NymConnect Installation
-
-NymConnect application is for everyone who does not want to install and run `nym-socks5-client`. NymConnect is plug-and-play, fast and easy use. Electrum Bitcoin wallet, Monero wallet (desktop and CLI) and Matrix (Element app) connects through NymConnect automatically to the Mixnet.
-
-1. [Download](https://nymtech.net/download/nymconnect) NymConnect
-2. On Linux and Mac, make executable by opening terminal in the same directory and run:
-
-```sh
-chmod +x ./nym-connect_<VERSION>
-```
-
-3. Start the application
-4. Click on `Connect` button to initialise the connection with the Mixnet
-5. Anytime you'll need to setup Host and Port in your applications, click on `IP` and `Port` to copy the values to clipboard
-6. In case you have problems such as `Gateway Issues`, try to reconnect or restart the application
-
-### Firo Electrum wallet via NymConnect
-
-
-To download Firo Electrum wallet visit the [Firo's repository](https://github.com/firoorg/firo) or [Github release page](https://github.com/firoorg/electrum-firo/releases/tag/4.1.5.2). To connect to the Mixnet follow these steps:
-
-7. Start and connect [NymConnect](./firo.md#nymconnect-installation) (or [`nym-socks5-client`](https://nymtech.net/docs/clients/socks5-client.html))
-8. Start your Firo Electrum wallet
-9. Go to: *Tools* -> *Network* -> *Proxy*
-10. Set *Use proxy* to ✅, choose `SOCKS5` from the drop-down and add the values from your NymConnect application
-11. Now your Firo Electrum wallet runs through the Mixnet and it will be connected only if your NymConnect or `nym-socks5-client` are connected.
-
-![Firo Electrum wallet setup](../images/firo_tutorial/firo.png)
diff --git a/documentation/dev-portal/src/tutorials/matrix.md b/documentation/dev-portal/src/tutorials/matrix.md
deleted file mode 100644
index 66b06b54db5..00000000000
--- a/documentation/dev-portal/src/tutorials/matrix.md
+++ /dev/null
@@ -1,89 +0,0 @@
-# Matrix NymConnect Integration
-
-![](../images//matrix.png)
-
-Chat applications became an essential part of human communication. Matrix chat has end to end encryption on protocol level and Element app users can sort their communication into spaces and rooms. Now the Matrix communities can rely on network privacy as NymConnect supports Matrix chat protocol.
-
-Currently there is no option in Matrix's Element client to set a Socks5 proxy. In order to use Element via NymConnect users have to start it from the command-line. The setup is simple, for convenience a keyboard shortcut setting or terminal alias can be easily done.
-
-
-## Setup & Run
-
-Make sure you have installed and started **[NymConnect](https://nymtech.net/developers/quickstart/nymconnect-gui.html)** on your desktop.
-
-To then start Matrix's Element client via a Socks5 proxy connected to NymConnect, open terminal and run:
-
-**Linux**
-
-```sh
-element-desktop --proxy-server=socks5://127.0.0.1:1080
-```
-
-**Mac**
-
-```sh
-open -a Element --args --proxy-server=socks5://127.0.0.1:1080
-```
-
-## Optimise setup with a keybinding / alias
-
-### Keybinding
-An eloquent solution to avoid entering a command every time is to setup your keybinding. Open your settings, navigate to `Keyboard Shortcuts` and choose to `Set Custom Shortcut`. `Name` and `Shortcut` fields are up to your preference, to the `Command` line add:
-
-```sh
-element-desktop --proxy-server=socks5://127.0.0.1:1080
-```
-Make sure your `Shortcut` isn't already taken by something else in the menu.
-
-An example can look like this.
-
-![](../images/element_nym_keybind.png)
-
-Alternatively you can add a keybinding via the CLI, using whatever config files you edit for your given desktop environment / window manager.
-
-### Create an alias
-If you prefer to simply shorten the length of the command (or all your keybindings are already taken) then you can simply create an alias for this long-winded command (this example aliases that command to the single word `element`, but you can replace it with whatever you like):
-
-**Linux**
-
-```sh
-alias element="element-desktop --proxy-server=socks5://127.0.0.1:1080"
-```
-
-To make this alias persist, then add this to your `.bashrc` or `.zshrc` file (usually located in your `$HOME` directory) and `source` that file. This can be done by appending the alias command directly to the shell config file with one command. 
-
-For `bash` enter:
-
-```sh
-alias element="element-desktop --proxy-server=socks5://127.0.0.1:1080" >> ~/.bashrc
-```
-
-For `zsh` enter:
-
-```sh
-alias element="element-desktop --proxy-server=socks5://127.0.0.1:1080" >> ~/.zshrc
-```
-
-You can add the alias manually by opening your `$HOME` directory, enable hidden files (press `ctrl` + `h`) and open `.bashrc` or `.zshrc` file (based on your terminal setup) in a text editor, paste the string `alias element="element-desktop --proxy-server=socks5://127.0.0.1:1080"` to the the end, save and exit. Start a new terminal and run `element`.
-
-**Mac**
-
-```sh
-alias element="open -a Element --args --proxy-server=socks5://127.0.0.1:1080"
-
-```
-
-To make this alias persist, then add this to your `.zshrc` (or `.bashrc`/`.profile`) file (usually located in your `$HOME` directory) and `source` that file. This can be done by appending the alias command directly to the shell config file with one command.
-
-For `zsh` enter:
-
-```sh
-alias element="open -a Element --args --proxy-server=socks5://127.0.0.1:1080" >> ~/.zshrc
-```
-
-For `.bashrc` or `.profile` just change the end of the command.  
-
-You can add the alias manually by opening your `$HOME` directory, enable hidden files (in Finder press `Shift` + `Command` + `.`) and open `.zshrc` file (or `.bashrc`/`.profile`) in a text editor, paste the string `alias element="open -a Element --args --proxy-server=socks5://127.0.0.1:1080"` to the the end, save and exit. Start a new terminal and run `element`.  
-
-
-**Now you can run Element through the Nym Mixnet with a single-word command.**
diff --git a/documentation/dev-portal/src/tutorials/monero.md b/documentation/dev-portal/src/tutorials/monero.md
deleted file mode 100644
index 68f3bf35788..00000000000
--- a/documentation/dev-portal/src/tutorials/monero.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# Monero NymConnect Integration
-
-*New Nym mixnet integration launched for Monero desktop to secure the right to financial privacy and censorship-resistance*
-
-![](../images/monero_tutorial/monero.png)
-
-Financial privacy is an important component of digital currencies and the use of Nym will provide users with the highest level of privacy at the infrastructure level. All users of digital currencies should be afforded equal rights to protection from financial surveillance.
-
-A team made up of Monero community members have successfully set up a service provider to use Monero (using the Monero desktop wallet) over the Nym mixnet. This allows Monero users to easily use NymConnect to run Monero over the mixnet, thereby enhancing the privacy of Monero transactions.
-
-## How can I use Monero over the Nym mixnet?
-
-> Any syntax in `<>` brackets is a user's unique variable. Exchange with a corresponding name without the `<>` brackets.
-
-The mainnet service provider to Monero over the Nym mixnet is now ready for use via [NymConnect](https://nymtech.net/download-nymconnect/).
-
-* **Download** the latest version of [**NymConnect**](https://nymtech.net/download-nymconnect/).
-* Make sure your NymConnect is executable.
-```sh
-# in Linux open terminal in the same folder and run:
-chmod +x ./nym-connect_<YOUR_VERSION>.AppImage
-```
-* **Open NymConnect app**
-* **Turn it on** - Monero wallet is listed in the apps supported by default, no need for any setup
-* **Copy** the **Socks5 address** and **Port**
-
-Then go to your Monero wallet (desktop or CLI) and change the settings to run over socks5 proxy:
-
-**Monero desktop wallet:**
-
-* Settings -> Interface -> Socks5 proxy -> Add values: IP address `127.0.0.1`, Port `1080` (the values copied from NymConnect)
-
-<!---commenting the video as it has a redundant part about manual NR setup
-<iframe width="700" height="400" src="https://www.youtube.com/embed/oSHnk1BG_f0" title="Demo: Connect Your Monero Wallet to the Nym Mixnet via NymConnect" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
---->
-**CLI wallet**
-
-* **Monerod:** add `--proxy 127.0.0.1:1080 --bootstrap-daemon-proxy 127.0.0.1:1080` to args
-
-* **Monero-wallet-{rpc, cli}:** add `--proxy 127.0.0.1:1080 --daemon-ssl-allow-any-cert` to args
-
-For those who want to try it out in testnet, a stagenet service provider is also available: [https://nymtech.net/.wellknown/connect/service-providers.json](https://nymtech.net/.wellknown/connect/service-providers.json)
-
-Now your Monero traffic is protected by the network privacy of Nym Mixnet. 
diff --git a/documentation/dev-portal/src/tutorials/rust-sdk.md b/documentation/dev-portal/src/tutorials/rust-sdk.md
deleted file mode 100644
index 48bdb1dd3b9..00000000000
--- a/documentation/dev-portal/src/tutorials/rust-sdk.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Rust SDK
-
-The Rust SDK allows developers building applications in Rust to import and interact with Nym clients as they would any other dependency, instead of running the client as a seperate process on their machine.
-
-[Read the docs](https://nymtech.net/docs/sdk/rust/rust.html). 
diff --git a/documentation/dev-portal/src/tutorials/simple-service-provider/overview.md b/documentation/dev-portal/src/tutorials/simple-service-provider/overview.md
deleted file mode 100644
index be73bdfe90a..00000000000
--- a/documentation/dev-portal/src/tutorials/simple-service-provider/overview.md
+++ /dev/null
@@ -1,70 +0,0 @@
-# Tutorial Overview
-
-## Components Created in this Tutorial
-This tutorial involves writing two pieces of code in Typescript:
-
-- A **User Client** (UC) with which you can access the mixnet through a browser on your local machine. You will use this to communicate with the second component outlined below.  
-- A **Service Provider** (SP) which can communicate with the UC via the mixnet.
-
-Additionally you will learn how to configure a pair of **Nym Websocket Clients** which both components use to connect to and communicate with the Mixnet.
-
-> SPs usually run on remote servers to assure reliable uptime and to unlink sender and receiver metadata. For demonstration purposes however, you will run both components on your local machine, looping messages through the mixnet to yourself.  
-
-
-
-```
-       +----------+              +----------+             +----------+ 
-       | Mix Node |<-----------> | Mix Node |<----------->| Mix Node |
-       | Layer 1  |              | Layer 2  |             | Layer 3  |
-       +----------+              +----------+             +----------+  
-            ^                                                   ^      
-            |                                                   |      
-            |<--------------------------------------------------+
-            |                                                          
-            v                                                        
-    +--------------+                                
-    | Your gateway |                               
-    +--------------+                               
-            ^                                       
-            |                                                                      
-            |                                                                         
-            v                                                        
-+-------------------------------------------+                         
-|                                           |                        
-|  +------------+     +------------+        |                      
-|  | Nym Client |     | Nym Client |        |                     
-|  +------------+     +------------+        |                    
-|        ^                  ^               |                   
-|        |                  |               |                  
-|        |                  |               |                 
-|        v                  v               |                
-|  +-------------+    +------------------+  |               
-|  | User Client |    | Service Provider |  |              
-|  +-------------+    +------------------+  |             
-|                                           |            
-+-------------------------------------------+           
-            Your Local Machine          
-```       
-
-## Aims of this Tutorial 
-* Create a user-friendly experience for sending data through the mixnet via a simple form accessible through a web browser. 
-* Configure and use a pair of Nym Websocket Clients. 
-* Send a properly formatted message through the mixnet to the SP from a browser-based GUI. 
-
-You can find the code for these components [here](https://github.com/nymtech/developer-tutorials). You can use it as a reference while building or simply download it and follow along as you progress through the tutorial.
-
-Notice that this tutorial attempts to use very few external libraries (the User Client codebase is basically vanilla Typescript!). This tutorial is not showing you how to build production-grade code, but **to understand how to connect and send messages to, as well as recieve messages from, the mixnet.**
-
-```admonish note title="Sidenote: What is a Service Provider?" 
-'Service Provider' is a catchall name used to refer to any type of app that can communicate with the mixnet via a Nym client. 
-
-The first SP to have been released is the [Network Requester](https://nymtech.net/docs/nodes/network-requester.html) - a binary that receives a network request from the mixnet, performs that request (e.g. authenticating with a message server and receiving new messages for a user) and then passes the response back to the user who requested it anonymously, shielding their metadata from the message server. 
-
-The SP you will build in this tutorial is far more simple than this. It is just to show you how to approach building something that can:
-* connect to the mixnet, 
-* listen for messages, and 
-* perform some action with them (in this case, log them in a console and reply to the original sender). 
-
-However, once you see how easy it is to integrate with the mixnet for traffic transport, you will be able to build apps with real-world uses easily. 
-```
- 
diff --git a/documentation/dev-portal/src/tutorials/simple-service-provider/preparating-env.md b/documentation/dev-portal/src/tutorials/simple-service-provider/preparating-env.md
deleted file mode 100644
index a7744d956b5..00000000000
--- a/documentation/dev-portal/src/tutorials/simple-service-provider/preparating-env.md
+++ /dev/null
@@ -1,118 +0,0 @@
-# Preparing Your User Client Environment 
-
-## Prerequisites
-* `NodeJS` & `npm` 
-* `typescript` 
-
-## Preparing your TypeScript environment  
-
-* Make a new directory called `simple-service-provider-tutorial` containing a directory named `user-client`:
-
-```
-mkdir -p simple-service-provider/user-client
-```
-
-* Create a `package.json` and install dependencies: 
-
-```
-cd simple-service-provider/user-client 
-npm init  
-npm install typescript # allows you to write and use typescript 
-npm install ts-node --save-dev # allows you to build a typescript application in a NodeJS environment 
-```
-
-* Create a `tsconfig.json` containing the following:
-
-```json
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "esModuleInterop": true,
-        "target": "es6",
-        "moduleResolution": "node",
-        "sourceMap": true,
-        "outDir": "dist"
-    },
-    "lib": ["es2015"]
-}
-```
-
-## Preparing your Bundler 
-* We will use the [`Parcel`](https://parceljs.org/getting-started/webapp/) bundler to build and run our app locally. `Parcel` also supports hot reloading, making for a nicer developer experience when working on our app. Install it with:
-
-```
-npm install parcel-bundler
-```
-
-* Create the file structure for our frontend code: 
-
-```
-mkdir src 
-touch src/index.html src/index.ts
-```
-
-~~~admonish note title=""
-At this point your directory should look like this (check yourself with `tree -L 2 simple-service-provider/`): 
-```
-simple-service-provider/
-└── user-client
-    ├── node_modules
-    ├── package.json
-    ├── package-lock.json
-    ├── src
-    └── tsconfig.json
-
-4 directories, 3 files
-```
-
-And `user-client/src/` should look like this: 
-```
-user-client/src
-├── index.html
-└── index.ts
-
-1 directory, 2 files
-```
-~~~
-
-* Time to check everything is working. Paste the following into `src/index.html`:
-    
-```
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>App Test</title>
-        <meta charset="utf-8"/>
-    </head>
-    <body>
-        <h1>Test</h1>
-        <div id="app"></div>
-        <script src="index.ts"></script>
-    </body>
-</html>
-```
-
-* Paste the following into `src/index.ts`
-
-```
-console.log('test log')
-```
-    
-* Add the following to `package.json` in the `"scripts"` array, above `"test"`:
-
-```
-"start": "parcel src/index.html"
-```
-
-* `npm start` should return: 
-
-```
-> user-client@1.0.0 start
-> parcel src/index.html
-
-Server running at http://localhost:1234
-✨  Built in 1.57s.
-```
-
-Open [localhost:1234](http://localhost:1234/) in your browser. Your web application should be up and running, with `Test` displayed in the browser window. Checking the `console.log` output is done by right-clicking on the browser and selecting _Inspect_, then navigating to the _Console_ section of the resulting panel. You should see the message `test log` displayed there.
- 
\ No newline at end of file
diff --git a/documentation/dev-portal/src/tutorials/simple-service-provider/preparating-env2.md b/documentation/dev-portal/src/tutorials/simple-service-provider/preparating-env2.md
deleted file mode 100644
index 6639f910f1a..00000000000
--- a/documentation/dev-portal/src/tutorials/simple-service-provider/preparating-env2.md
+++ /dev/null
@@ -1,121 +0,0 @@
-# Preparing Your Service Provider Environment
-
-* Now to move on to prepare our development environment for the Service Provider code. Create a directory for it:
-
-```
-# run this from the root of `simple-service-provider/`
-mkdir service-provider
-cd service-provider
-```
-
-* Create a `package.json`: 
-
-```
-npm init
-```
-
-* Inside your newly generated `package.json`, paste in the following code:
-
-```json
-{
-    "name": "service-provider",
-    "version": "1.0.0",
-    "description": "",
-    "main": "index.js",
-    "scripts": {
-        "start:dev": "nodemon",
-        "test": "echo \"Error: no test specified\" && exit 1"
-    },
-    "devDependencies": {
-        "@types/node": "^18.14.0",
-        "@types/ws": "^8.5.4",
-        "nodemon": "^2.0.20",
-        "ts-node": "^10.9.1",
-        "typescript": "^4.8.4"
-    },
-    "author": "",
-    "license": "ISC",
-    "dependencies": {
-        "ws": "^8.12.0"
-    }
-}
-```
-
-* install dependecies: 
-
-```
-npm install
-``` 
-
-* create a `tsconfig.json` file containing the following: 
-
-```json
-{
-    "compilerOptions": {
-    "target": "es2017", 
-    "lib": [
-        "es6"
-    ],
-    "module": "Node16", 
-    "rootDir": "src", 
-    "resolveJsonModule": true, 
-    "allowJs": true,                      
-    "outDir": "build", 
-    "esModuleInterop": true, 
-    "forceConsistentCasingInFileNames": true, 
-    "strict": true, 
-    "noImplicitAny": true, 
-    "skipLibCheck": true 
-    }
-}
-```
-
-* You will use [Nodemon](https://www.npmjs.com/package/nodemon) to reload your app on code changes. Create a `nodemon.json` file in the same directory which will act as our `nodemon` configuration. Paste in the following code inside that file:
-
-```json
-{
-    "watch": [
-        "src"
-    ],
-    "ext": ".ts,.js",
-    "ignore": [],
-    "exec": "ts-node ./src/index.ts"
-}
-```
-
-* Finally, create a typescript file for our app logic: 
-
-```
-mkdir src
-touch src/index.ts
-```
-
-~~~admonish note title=""
-At this point your directory should look like this (check yourself with `tree -L 2 simple-service-provider`): 
-```
-simple-service-provider
-├── service-provider
-│   ├── node_modules
-│   ├── nodemon.json
-│   ├── package.json
-│   ├── package-lock.json
-│   ├── src
-│   └── tsconfig.json
-└── user-client
-    ├── node_modules
-    ├── package.json
-    ├── package-lock.json
-    ├── src
-    └── tsconfig.json
-
-7 directories, 7 files
-```
-
-And `service-provider/src/` should look like this: 
-```
-service-provider/src
-└── index.ts
-
-1 directory, 1 file
-```
-~~~
diff --git a/documentation/dev-portal/src/tutorials/simple-service-provider/sending-message.md b/documentation/dev-portal/src/tutorials/simple-service-provider/sending-message.md
deleted file mode 100644
index d0083f0a013..00000000000
--- a/documentation/dev-portal/src/tutorials/simple-service-provider/sending-message.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Sending a Message Through the Mixnet
-
-You are now ready to send a message through the mixnet! 
-
-You should have the following set up:
-
-* A __User Client__ Web App 
-* A __Service Provider__ backend service 
-* 2 Nym websocket clients, one for each component above
-
-Simply fill in the fields in your browser and click `Send`. In your browser you will see the message sent to the SP, followed by the response from the SP. In your console you will see the logged incoming message from the UC, and the reply message to itfrom the SP.  
-
-<img src="../../images/tutorial_image_5.png"/>
-
-This small project can be used as a template to start conceptualizing and developing more complex PEApps. Stay tuned for more soon, and if you're searching for inspiration check out the [community apps](../../community-resources/community-applications-and-guides.md) list! 
-
-
-
diff --git a/documentation/dev-portal/src/tutorials/simple-service-provider/service-provider.md b/documentation/dev-portal/src/tutorials/simple-service-provider/service-provider.md
deleted file mode 100644
index c107b57d7ce..00000000000
--- a/documentation/dev-portal/src/tutorials/simple-service-provider/service-provider.md
+++ /dev/null
@@ -1,142 +0,0 @@
-# Building Your Service Provider
-
-> Since a lot of logic you will write in this section is similar or the same to UC code you just written, this section will only focus on SP-specific functionality 
-
-* Paste the following code into `src/index.ts`
-
-```typescript
-import WebSocket, { MessageEvent } from "ws";
-
-var ourAddress:          string;
-var websocketConnection: any;
-
-async function main() {
-    var port = '1978' 
-    var localClientUrl = "ws://127.0.0.1:" + port;
-
-    // Set up and handle websocket connection to our desktop client.
-    websocketConnection = await connectWebsocket(localClientUrl).then(function (c) {
-        return c;
-    }).catch(function (err) {
-        console.log("Websocket connection error. Is the client running with <pre>--connection-type WebSocket</pre> on port " + port + "?");
-        console.log(err);
-    })
-
-    websocketConnection.onmessage = function (e : any) {
-        handleResponse(e);
-    };
-
-    sendSelfAddressRequest();
-}
-
-// Handle any messages that come back down the websocket. 
-function handleResponse(responseMessageEvent : MessageEvent) {
-
-    try {
-            let response = JSON.parse(responseMessageEvent.data.toString());
-        if (response.type == "error") {
-            console.log("\x1b[91mAn error occured: " + response.message + "\x1b[0m")
-        } else if (response.type == "selfAddress") {
-            ourAddress = response.address;
-            console.log("\x1b[94mOur address is: " + ourAddress + "\x1b[0m")
-        } else if (response.type == "received") {
-            let messageContent = JSON.parse(response.message)
-
-            console.log('\x1b[93mRecieved : \x1b[0m');
-            console.log('\x1b[92mName : ' + messageContent.name + '\x1b[0m');
-            console.log('\x1b[92mService : ' + messageContent.service + '\x1b[0m');
-            console.log('\x1b[92mComment : ' + messageContent.comment + '\x1b[0m');
-
-            console.log('\x1b[93mSending response back to client... \x1b[0m')
-
-	    sendMessageToMixnet(response.senderTag)
-        }
-    } catch (_) {
-        console.log('something went wrong in handleResponse')
-    }
-}
-
-function sendMessageToMixnet(senderTag: string) {
-
-    // Place each of the form values into a single object to be sent.
-    const messageContentToSend = {
-        text: 'We recieved your request - this reply sent to you anonymously with SURBs',
-        fromAddress : ourAddress
-    }
-    
-    const message = {
-        type: "reply",
-        message: JSON.stringify(messageContentToSend),
-    	senderTag: senderTag
-    }
-    
-    // Send our message object via out via our websocket connection.
-    websocketConnection.send(JSON.stringify(message));
-}
-
-// Send a message to the mixnet client, asking what our own address is. 
-function sendSelfAddressRequest() {
-    var selfAddress = {
-        type: "selfAddress"
-    }
-    websocketConnection.send(JSON.stringify(selfAddress));
-}
-
-// Function that connects our application to the mixnet Websocket. We want to call this first in our main function.
-function connectWebsocket(url : string) {
-    return new Promise(function (resolve, reject) {
-        var server = new WebSocket(url);
-        console.log('connecting to Mixnet Websocket (Nym Client)...')
-        server.onopen = function () {
-            resolve(server);
-        };
-        server.onerror = function (err) {
-            reject(err);
-        };
-
-    });
-}
-
-main();
-```
-
-`main()` is still the function in charge of initializing and executing your application. Note that the SP's client is running on port `1978`. This is so we don't have a conflict with the client we have running for the UC part of our tutorial code! 
-
-`handleResponse()` works in a similar manner as the function with the same name in `simple-service-provider/user-client/src/index.ts`. This implementation logs to the console instead of passing messages to a UI.  
-
-The `\x1b` prefix you see in `console.log` adds colour to console ouput. The number that you see following the `[` and preceeding `m` is the colour code that can be compared [here](https://en.m.wikipedia.org/wiki/ANSI_escape_code#Colors). Its a nice and quick way of styling our terminal output.
-
-When the SP receives a message from the mixnet, `sendMessageToMixnet()` sends a response back to notify the the user that the SP recieved their request successfully. 
-
-## Connecting to your Nym Client
-
-* Follow instructions in the [Nym websocket client documentation](https://nymtech.net/docs/clients/websocket-client.html#initialising-your-client)to `init` and `run` a client. 
-
-```admonish caution title=""
-Remember to `init` and `run` this client using port `1978` to avoid port clashes. 
-```
-
-* Refresh your browser window. You should see a successful response, including a Nym address, in your console: 
-
-```
-> service-provider@1.0.0 start:dev
-> nodemon
-
-[nodemon] 2.0.20
-[nodemon] to restart at any time, enter `rs`
-[nodemon] watching path(s): src/**/*
-[nodemon] watching extensions: ts,js
-[nodemon] starting `ts-node ./src/index.ts`
-connecting to Mixnet Websocket (Nym Client)...
-Our address is: 6V5eEguz4rUsfntVLKQuD2ymgdY5iDKCV2GY2EH3CxG4.AKdk22atwRaVkN2PLEDsWUKKDc3ieNm1avKqVGgmJx8s@FQon7UwF5knbUr2jf6jHhmNLbJnMreck1eUcVH59kxYE
-```
-
-## Set Service Address in User Client
-The final step of this tutorial is to update our User Client code with the address of the now-running Service Provider so it can send it a message.  
-
-Copy the SP's Nym address from your console and set it as the value of the `targetAddress` variable on line 2 of `simple-service-provider/user-client/src/index.ts`. 
-
-```
-var targetAddress: string = '6V5eEguz4rUsfntVLKQuD2ymgdY5iDKCV2GY2EH3CxG4.AKdk22atwRaVkN2PLEDsWUKKDc3ieNm1avKqVGgmJx8s@FQon7UwF5knbUr2jf6jHhmNLbJnMreck1eUcVH59kxYE';
-```
-
diff --git a/documentation/dev-portal/src/tutorials/simple-service-provider/simple-service-provider.md b/documentation/dev-portal/src/tutorials/simple-service-provider/simple-service-provider.md
deleted file mode 100644
index ece24270414..00000000000
--- a/documentation/dev-portal/src/tutorials/simple-service-provider/simple-service-provider.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# Building a Simple Service Provider
-
-```admonish warning
-This tutorial was written before the creation of the [Typescript SDK](https://sdk.nymtech.net), and involves running a Nym Client alongside your application processes, instead of relying on the SDK to integrate the Client process into your application logic.  
-
-As such, although this tutorial is still a valid way of approaching building on Nym, it is a little less streamlined than it could be.
-
-A more streamlined rewrite of this tutorial will be coming soon. 
-```
-This tutorial is the best place to start for developers new to Nym. You will learn how to build a minimum viable privacy-enabled application (PEApp) able to send and receive traffic via the mixnet.
-
-This tutorial is less about building an immediately useful application, and more about beginning to understand:
-* Sending messages through the mixnet to another Nym client  
-* Receiving messages from the mixnet and handling them 
-* Anonymous replies with Single Use Reply Blocks (SURBs)
-
-That said, this tutorial will give you the skeleton of an application, onto which you can add more useful functionality. 
-
-
-
-
-
-
-
-
-
-
-
-
-    
-
-    
-
-
-
-
-
-    
-
-
-
-   
diff --git a/documentation/dev-portal/src/tutorials/simple-service-provider/user-client.md b/documentation/dev-portal/src/tutorials/simple-service-provider/user-client.md
deleted file mode 100644
index e14f4bc4eb5..00000000000
--- a/documentation/dev-portal/src/tutorials/simple-service-provider/user-client.md
+++ /dev/null
@@ -1,262 +0,0 @@
-# Building Your User Client
-
-## Adding Core Functionality 
-Most of the work here will be configuring and adding functionality to `src/index.ts` file, allowing you to establish and handle the websocket connection to your local Nym client, and create and send messages to the SP. 
-
-* Replace the existing content of `src/index.ts` with: 
-    
-```typescript
-async function main() {}
-
-function connectWebsocket(url) {
-    return new Promise(function (resolve, reject) {
-        var server = new WebSocket(url);
-        console.log('connecting to Websocket Server (Nym Client)...')
-        server.onopen = function () {
-            resolve(server);
-        };
-        server.onerror = function (err) {
-            reject(err);
-        };
-      
-    });
-}
-    
-main();
-```
-
-`main()` will the majority of the app's logic. It's best to declare it at the start of the file and call it at the end to run when launching the application.
-
-`connectWebsocket(url)` returns a `Promise` that attempts to create a websocket connection to `url`. If the connection is successful, you will get a notification in your running application in the browser, as well as the connected Nym client. If it fails an error will be displayed in the browser. 
-
-* Now to implement the functions that will handle DOM (Document Object Model) manipulation. Add the following below `connectWebsocket()`:
-   
-```typescript
-function handleResponse(resp) {
-    try {
-        let response = JSON.parse(resp.data);
-        if (response.type == "error") {
-            displayJsonResponse("Server responded with error: " + response.message);
-        } else if (response.type == "selfAddress") {
-            ourAddress = response.address;
-            displayClientMessage("Our address is:  " + ourAddress + ", we will now send messages to ourself.");
-        } else if (response.type == "received") {
-            handleReceivedTextMessage(response)
-        }
-    } catch (_) {
-            displayJsonResponse(resp.data)
-    }
-}
-       
-function handleReceivedTextMessage(message) {
-    const text = JSON.parse(message.message);
-    displayJsonResponse(text);
-}
-        
-// Display websocket responses in the Activity Log.
-function displayJsonResponse(message) {
-    let receivedDiv = document.createElement("div")
-    let paragraph = document.createElement("p")
-    paragraph.setAttribute('style', 'color: orange')
-    let textNode = document.createTextNode("received >>> " + message.text)
-    paragraph.appendChild(textNode)
-    
-    receivedDiv.appendChild(paragraph)
-    document.getElementById("output").appendChild(receivedDiv)
-}
-
-function displayClientMessage(message) {
-    document.getElementById("output").innerHTML += "<p>" + message + "</p >";
-}
-```
-
-`handleResponse()` parses the type of any messages received from the websocket, and handles forwarding the message on to the appropriate function depending on this `type`. You can find documentation on these types [here](https://nymtech.net/docs/clients/websocket-client.html#message-types). 
-
-`handleReceivedTextMessage()` ensures that data is `json` data before displaying on the UI. 
-
-`displayJsonResponse()` is responsible for displaying received messages on the UI, creating a new `<p>` HTML element for each message that needs to be displayed on screen.
-
-`displayClientMessage()` displays the address of the connected Nym client.  
-
-* Declare the following variables above `main()`  
-
-```typescript
-var ourAddress:          string;
-var targetAddress:       string;
-var websocketConnection: any;
-```
-
-`ourAddress` takes the value of the connected Nym client address.
-
-`targetAddress` will be the Nym address of the SP. 
-
-`websocketConnection` populated upon a successful response from `connectWebsocket()`. 
-
-* Add the following to `main()`:
-  
-```typescript
-async function main() {
-    var port = '1977' // Nym Websocket Client listens on 1977 by default.
-    var localClientUrl = "ws://127.0.0.1:" + port;
-    
-    // Set up and handle websocket connection to our desktop client.
-    websocketConnection = await connectWebsocket(localClientUrl).then(function (c) {
-        return c;
-    }).catch(function (err) {
-        displayClientMessage("Websocket connection error. Is the client running with <pre>--connection-type WebSocket</pre> on port " + port + "?");
-    })
-
-    websocketConnection.onmessage = function (e) {
-        handleResponse(e);
-    };
-    
-    sendSelfAddressRequest();
-    
-    // Set up the send button
-    const sendButton = document.querySelector('#send-button');
-    
-    sendButton?.addEventListener('click', function handleClick(event) {
-        sendMessageToMixnet(); 
-    });
-```
-
-And between `main()` and `displayClientMessage()`:
-
-```typescript
-function sendSelfAddressRequest() {
-    var selfAddress = {
-        type: "selfAddress"
-    }
-    displayJsonSend(selfAddress);
-    websocketConnection.send(JSON.stringify(selfAddress));
-}
-```
-
-`sendSelfAddressRequest()` sends a `selfAddress` message to the connected websocket client, passing the response to `displayJsonSend()` to be displayed on your UI. 
-
-`main()` now contains logic for: connecting to a local Nym client, getting its address with a `selfAddress` message, and displaying it on the UI. Now your app can display its connection status, letting you know whether it is(n't) connected to a running client! 
-
-* Underneath `sendSelfAddressRequest()` implement a function to send messages down the websocket connection to the SP:
-
-```typescript
-function sendMessageToMixnet() {
-
-    var nameInput = (<HTMLInputElement>document.getElementById("nameInput")).value;
-    var textInput = (<HTMLInputElement>document.getElementById("textInput")).value;
-   
-    const messageContentToSend = {
-        name : nameInput,
-        comment : textInput,
-    }
-    
-    const message = {
-        type: "sendAnonymous",
-        message: JSON.stringify(messageContentToSend),
-        recipient: targetAddress,
-        replySurbs: 5
-    }
-    
-    displayJsonSend(message);
-    websocketConnection.send(JSON.stringify(message));
-}
-```
-
-Nym clients accept messages in either binary or JSON formats. Since you are sending JSON data, you need to `stringify` any `message`s you wish to send through the mixnet. 
-
-You are sending [replySURBs](https://nymtech.net/docs/architecture/traffic-flow.html#private-replies-using-surbs) along with the message to the SP. This allows the SP to reply to you without you having to doxx yourself and supply a 'return address' in a readable form to it. TLDR; SURBs allow for anonymous replies from mixnet services! 
-
-* Below `sendMessageToMixnet()`, add the following:
-
-```typescript
-function displayJsonSend(message) {
-    let sendDiv = document.createElement("div")
-    let paragraph = document.createElement("p")
-    paragraph.setAttribute('style', 'color: #36d481')
-    let paragraphContent = document.createTextNode("sent >>> " + JSON.stringify(message))
-    paragraph.appendChild(paragraphContent)
-            
-    sendDiv.appendChild(paragraph)
-    document.getElementById("output").appendChild(sendDiv)
-}
-```
-
-`displayJsonSend()` displays sent messages in the "Activity Log" section of the UI.
-
-* Replace the contents of `src/index.html` with the following:
-
-```html
-<!doctype html>
-<html>
-    <head>
-        <meta charset="UTF-8">
-        <title>Mixnet Websocket Starter Client</title>
-        <link rel="stylesheet" href="../assets/styles.css"/>
-    </head>
-    <body>
-        <div class="content" role="main">
-            <div class="toolbar">
-                <h3>Mixnet Websocket Starter User Client</h3>
-            </div>
-            
-            <div class="section-container">
-               
-                <label for="nameInput" class="form-field-label">Moniker</label>
-                <input id="nameInput" type="text" value="An0n" name="nameInput">
-
-                <label for="textInput" class="form-field-label">Comment</label>
-                <input id="textInput" type="text" value="I would like to use your private service" name="textInput">
-         
-                <div id="send-button">
-                    <label for="send-button" class="submit-button">Send</label>
-                </div>
-            </div>
-        </div>
-        
-        <div class="" style="margin-left:20px;max-width: fit-content;">
-            <div style="color: white;margin-bottom: 2rem;">
-                <h4>How it works</h4>
-                <p>Once you have started your Nym Websocket client, you can fill out the form and send data to the Service Provider via mixnet using the <b>"Send"</b> button.</p>
-                <p>Below, you can see the activity log. <b style='color: #36d481;'>Sent</b> messages will display in <b style='color: #36d481;'>green</b> while <b style='color: orange;'>received</b> messages will display in <b style='color: orange;'>orange</b>.</p>
-            </div>
-        </div>
-        
-        <h3 style="margin-left:10px">Activity Log</h3>
-        
-        <p class="output-container">
-            <span id="output"></div>
-        </p>
-        <script src="index.ts"></script>
-    </body>
-</html>
-```
-
-Lets add the finishing touches to the UI by adding in the stylesheet which we specified at the top of `index.html`: 
-
-```
-mkdir -p assets
-touch assets/styles.css
-
-# grab the stylesheet from the remote repo and save it to the newly created css file
-curl https://raw.githubusercontent.com/nymtech/developer-tutorials/main/simple-service-provider-tutorial/user-client/assets/styles.css -o assets/styles.css
-```
-
-* Return back to your terminal and run:
-
-```
-npm start
-```
-
-Return to [localhost:1234](http://localhost:1234/)) and you should see an updated UI.  
-
-<img src="../../images/tutorial_image_2.png"/>
-
-## Connecting to your Nym Client
-
-Follow instructions in the [Nym websocket client documentation](https://nymtech.net/docs/clients/websocket-client.html#initialising-your-client)to `init` and `run` a client then refresh your browser window. You should see a successful response, including a Nym address, in the 'Activity Log' of the UI
-
-Your User Client application code is connected to a Nym websocket client, and ready to send messages through the mixnet! 
-
-<img src="../../images/tutorial_image_1.png"/>
-
-In the next section, you will build the Service application you will send these messages to. 
- 
diff --git a/documentation/dev-portal/src/tutorials/telegram.md b/documentation/dev-portal/src/tutorials/telegram.md
index 4131b652e13..7d1b447ffc2 100644
--- a/documentation/dev-portal/src/tutorials/telegram.md
+++ b/documentation/dev-portal/src/tutorials/telegram.md
@@ -39,5 +39,5 @@ Follow this [video](https://youtu.be/quj8H2qeOwY?t=97) to see the steps on Teleg
 
 **Now your Telegram runs over NymConnect.**
 
-NymConnect is currently available for several applications and service providers. Support for more apps is on the way. For any bug reports or feedback please reach out to us on Telegram or our [Discord](http://discord.gg/FaTJb8q8) server.
+NymConnect is currently available for several applications and service providers. Support for more apps is on the way. For any bug reports or feedback please reach out to us on Telegram or our [Discord](https://nymtech.net/go/discord) server.
 
diff --git a/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/client-src.md b/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/client-src.md
new file mode 100644
index 00000000000..85e1d368fbe
--- /dev/null
+++ b/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/client-src.md
@@ -0,0 +1 @@
+# Preparing Your Client pt2
diff --git a/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/client.md b/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/client.md
new file mode 100644
index 00000000000..c6db01fb6a9
--- /dev/null
+++ b/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/client.md
@@ -0,0 +1 @@
+# Preparing Your Client
diff --git a/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/intro.md b/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/intro.md
new file mode 100644
index 00000000000..627054da8d6
--- /dev/null
+++ b/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/intro.md
@@ -0,0 +1 @@
+# Blockchain Service pt1
diff --git a/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/lib.md b/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/lib.md
new file mode 100644
index 00000000000..4be852e7aef
--- /dev/null
+++ b/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/lib.md
@@ -0,0 +1 @@
+# Preparing Your Lib
diff --git a/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/overview.md b/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/overview.md
new file mode 100644
index 00000000000..e7bbb2f8f10
--- /dev/null
+++ b/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/overview.md
@@ -0,0 +1 @@
+# Tutorial Overview
diff --git a/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/preparing-env.md b/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/preparing-env.md
new file mode 100644
index 00000000000..ea95eb3fa85
--- /dev/null
+++ b/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/preparing-env.md
@@ -0,0 +1 @@
+# Preparing Your Environment
diff --git a/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/querying.md b/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/querying.md
new file mode 100644
index 00000000000..6830e38016a
--- /dev/null
+++ b/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/querying.md
@@ -0,0 +1 @@
+# Querying the Chain
diff --git a/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/service-src.md b/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/service-src.md
new file mode 100644
index 00000000000..cc140cc11fd
--- /dev/null
+++ b/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/service-src.md
@@ -0,0 +1 @@
+# Preparing Your Service pt2
diff --git a/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/service.md b/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/service.md
new file mode 100644
index 00000000000..10904437025
--- /dev/null
+++ b/documentation/dev-portal/src/tutorials/tutorial-archives/cosmos-service/service.md
@@ -0,0 +1 @@
+# Preparing Your Service
diff --git a/documentation/dev-portal/src/tutorials/rust.md b/documentation/dev-portal/src/tutorials/tutorial-archives/rust-sdk.md
similarity index 100%
rename from documentation/dev-portal/src/tutorials/rust.md
rename to documentation/dev-portal/src/tutorials/tutorial-archives/rust-sdk.md
diff --git a/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/overview.md b/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/overview.md
new file mode 100644
index 00000000000..e7bbb2f8f10
--- /dev/null
+++ b/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/overview.md
@@ -0,0 +1 @@
+# Tutorial Overview
diff --git a/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/preparating-env.md b/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/preparating-env.md
new file mode 100644
index 00000000000..df2ffc650c7
--- /dev/null
+++ b/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/preparating-env.md
@@ -0,0 +1 @@
+# Preparing Your User Client Environment
diff --git a/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/preparating-env2.md b/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/preparating-env2.md
new file mode 100644
index 00000000000..5d9a9d20c75
--- /dev/null
+++ b/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/preparating-env2.md
@@ -0,0 +1 @@
+# Preparing Your Service Provider Environment
diff --git a/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/sending-message.md b/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/sending-message.md
new file mode 100644
index 00000000000..05f320eeae7
--- /dev/null
+++ b/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/sending-message.md
@@ -0,0 +1 @@
+# Sending a Message Through the Mixnet
diff --git a/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/service-provider.md b/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/service-provider.md
new file mode 100644
index 00000000000..e69d01ee83d
--- /dev/null
+++ b/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/service-provider.md
@@ -0,0 +1 @@
+# Building Your Service Provider
diff --git a/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/simple-service-provider.md b/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/simple-service-provider.md
new file mode 100644
index 00000000000..246eebb2f98
--- /dev/null
+++ b/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/simple-service-provider.md
@@ -0,0 +1 @@
+# Simple Service Provider
diff --git a/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/user-client.md b/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/user-client.md
new file mode 100644
index 00000000000..d8c44a4841e
--- /dev/null
+++ b/documentation/dev-portal/src/tutorials/tutorial-archives/simple-service-provider/user-client.md
@@ -0,0 +1 @@
+# Building Your User Client
diff --git a/documentation/dev-portal/src/tutorials/tutorial-archives/typescript.md b/documentation/dev-portal/src/tutorials/tutorial-archives/typescript.md
new file mode 100644
index 00000000000..42c9775801c
--- /dev/null
+++ b/documentation/dev-portal/src/tutorials/tutorial-archives/typescript.md
@@ -0,0 +1 @@
+# Typescript
diff --git a/documentation/dev-portal/src/tutorials/typescript.md b/documentation/dev-portal/src/tutorials/typescript.md
deleted file mode 100644
index c1c6ef688ad..00000000000
--- a/documentation/dev-portal/src/tutorials/typescript.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Typescript
-
-Tutorial code in this section is built to interact with a standalone Nym client. You can read about interacting with standalone clients [here](https://nymtech.net/docs/clients/websocket-client.html#connecting-to-the-local-websocket), although it is usually preferable to use the [Typescript SDK](https://sdk.nymtech.net/). 
\ No newline at end of file
diff --git a/documentation/docs/README.md b/documentation/docs/README.md
index 7cf76123e4a..472f219c979 100644
--- a/documentation/docs/README.md
+++ b/documentation/docs/README.md
@@ -11,7 +11,7 @@ Since these docs autogenerate command output and import docs from binaries in `t
 Changes merged to `master` will be autodeployed to the production site.
 
 ### Contributing a new translation
-To contribute tranlsations in a new language, please get in touch via [Matrix](https://matrix.to/#/#general:nymtech.chat) or [Discord](https://discord.gg/FaTJb8q8).
+To contribute tranlsations in a new language, please get in touch via [Matrix](https://matrix.to/#/#general:nymtech.chat) or [Discord](https://nymtech.net/go/discord).
 
 ### Variables
 There are some variables that are shared across the entire docs site, such as the current latest software version.
diff --git a/documentation/docs/src/SUMMARY.md b/documentation/docs/src/SUMMARY.md
index 9ae4e3aa875..6ca7e2d1560 100644
--- a/documentation/docs/src/SUMMARY.md
+++ b/documentation/docs/src/SUMMARY.md
@@ -4,50 +4,17 @@
 
 # Architecture
 - [Network Overview](architecture/network-overview.md)
+- [Nym vs Other Systems](architecture/nym-vs-others.md)
 - [Mixnet Traffic Flow](architecture/traffic-flow.md)
-<!-- TODO reintroduce this with themed images  -->
-<!-- - [Network Rewards](architecture/network-rewards.md) -->
+- [Addressing System](architecture/addressing-system.md)
 
 # Binaries
 - [Pre-built Binaries](binaries/pre-built-binaries.md)
     - [Binary Initialisation and Configuration](binaries/init-and-config.md)
 - [Building from Source](binaries/building-nym.md)
-<!-- - [Version Compatibility Table](binaries/version-compatiblity.md) -->
 
 # Nodes
 - [Node Types (Previously Setup Guides)](nodes/overview.md)
-    - [Mix Node](nodes/mixnode.md)
-    - [Gateway](nodes/gateway.md)
-    - [Network Requester](nodes/network-requester.md)
-    - [Validator](nodes/validator.md)
-
-# Clients
-- [Clients Overview](clients/overview.md)
-- [Websocket Client](clients/websocket-client.md)
-  - [Setup & Run](clients/websocket/setup.md)
-  - [Configuration](clients/websocket/config.md)
-  - [Using Your Client](clients/websocket/usage.md)
-  - [Examples](clients/websocket/examples.md)
-- [Socks5 Client](clients/socks5-client.md)
-- [Webassembly Client](clients/webassembly-client.md)
-- [Addressing System](clients/addressing-system.md)
-
-# SDK
-- [Typescript SDK](sdk/typescript.md)
-- [Rust SDK](sdk/rust/rust.md)
-  - [Message Types](sdk/rust/message-types.md)
-  - [Message Helpers](sdk/rust/message-helpers.md)
-  - [Troubleshooting](sdk/rust/troubleshooting.md)
-  - [Examples](sdk/rust/examples.md)
-    - [Simple Send](sdk/rust/examples/simple.md)
-    - [Create and Store Keys](sdk/rust/examples/keys.md)
-    - [Manual Storage](sdk/rust/examples/storage.md)
-    - [Anonymous Replies](sdk/rust/examples/surbs.md)
-    - [Use Custom Network Topology](sdk/rust/examples/custom-network.md)
-    - [Socks Proxy](sdk/rust/examples/socks.md)
-    - [Split Send and Receive](sdk/rust/examples/split-send.md)
-    - [Testnet Bandwidth Cred](sdk/rust/examples/credential.md)
-    - [Example Cargo file](sdk/rust/examples/cargo.md)
 
 # Wallet
 - [Desktop Wallet](wallet/desktop-wallet.md)
diff --git a/documentation/docs/src/clients/addressing-system.md b/documentation/docs/src/architecture/addressing-system.md
similarity index 100%
rename from documentation/docs/src/clients/addressing-system.md
rename to documentation/docs/src/architecture/addressing-system.md
diff --git a/documentation/docs/src/architecture/network-overview.md b/documentation/docs/src/architecture/network-overview.md
index 3a69f78be70..69c19aaa037 100644
--- a/documentation/docs/src/architecture/network-overview.md
+++ b/documentation/docs/src/architecture/network-overview.md
@@ -9,31 +9,31 @@ At a high level, our technologies include:
 * a **mixnet**, which encrypts and mixes Sphinx packet traffic so that it cannot be determined who is communicating with whom. Our mixnet is based on a modified version of the **Loopix** design.
 * a privacy enhancing signature scheme called **Coconut**. Coconut allows a shift in thinking about resource access control, from an identity-based paradigm based on _who you are_ to a privacy-preserving paradigm based on _right to use_.
 * **Sphinx**, a way of transmitting armoured, layer-encrypted information packets which are indistinguishable from each other at a binary level.
-* the **Nyx** blockchain, a general-purpose CosmWasm-enabled smart contract platform, and the home of the smart contracts which keep track of the mixnet. 
+* the **Nyx** blockchain, a general-purpose CosmWasm-enabled smart contract platform, and the home of the smart contracts which keep track of the mixnet.
 
 The most important thing to note is that these technologies ensure privacy at two different levels of the stack: **network data transmission**, and **transactions**.
 
-Here's an overview diagram of the different types of nodes making up the network: 
+Here's an overview diagram of the different types of nodes making up the network:
 
 ![Nym Platform](../images/nym-platform-dark.png)
 
-Developers can think of the network as being comprised of **infrastructure nodes** and **clients** for interacting with this infrastructure via **P**rivacy-**e**nhanced **app**lications (PEApps). 
+Developers can think of the network as being comprised of **infrastructure nodes** and **clients** for interacting with this infrastructure via **P**rivacy-**e**nhanced **app**lications (PEApps).
 
-## Mixnet Infrastructure 
+## Mixnet Infrastructure
 The mixnet - the different pieces of software that your traffic will pass through when using an privacy-enhanced app (PEApp) - is made up of several different types of nodes:
 
-* **Mix Nodes** provide network security for network content _and_ metadata, making it impossible to see who is communicating with who, by performing packet-mixing on traffic travelling through the network. 
+* **Mix Nodes** provide network security for network content _and_ metadata, making it impossible to see who is communicating with who, by performing packet-mixing on traffic travelling through the network.
 
 * **Gateways** act as message storage for clients which may go offline and come back online again, and defend against denial of service attacks. The default gateway implementation included in the Nym platform code holds packets for later retrieval. For many applications (such as simple chat), this is usable out of the box, as it provides a place that potentially offline clients can retrieve packets from. The access token allows clients to pull messages from the gateway node.
 
-* **Services** are applications that communicate with nym clients, listening and sending traffic to the mixnet. This is an umbrella term for a variety of different pieces of code, such as the [network requester](../nodes/network-requester.md) binary.
+* **Services** are applications that communicate with nym clients, listening and sending traffic to the mixnet. This is an umbrella term for a variety of different pieces of code, such as the network requester binary.
 
 * **Nyx Blockchain Validators** secure the network with proof-of-stake Sybil defenses, determine which nodes are included within the network, and work together to create Coconut threshold credentials which provide anonymous access to data and resources. They also produce blocks and secure the Nyx Blockchain. Initially, this chain was used only to house the CosmWasm smart contracts keeping track of Nym's network topology, token vesting contracts, and the `NYM` token itself. In recent months, we've decided to expand the role of Nyx and instead expand its role by making it an open smart contract platform for anyone to upload CosmWasm smart contracts to. Validators also provide privacy-enhanced credentials based on the testimony of a set of decentralized, blockchain-based issuing authorities. Nym validators use the [Coconut](https://arxiv.org/abs/1802.07344) [signature scheme](https://en.wikipedia.org/wiki/Digital_signature) to issue credentials. This allows privacy apps to generate anonymous resource claims through decentralised authorities, then use them with Service Providers.
 
-## Privacy-enhanced applications (PEApps) 
+## Privacy-enhanced applications (PEApps)
 PEApps use a Nym client to connect to the network in order to get the available Network Topology for traffic routing, and send/receive packets to other users and services. Clients, in order to send traffic through the mixnet, connect to gateways. Since applications may go online and offline, a client's gateway provides a sort of mailbox where apps can receive their messages.
 
-Nym clients connect to gateways. Messages are automatically piped to connected clients and deleted from the gateway's disk storage. If a client is offline when a message arrives, it will be stored for later retrieval. When the client connects, all messages will be delivered, and deleted from the gateway's disk. 
+Nym clients connect to gateways. Messages are automatically piped to connected clients and deleted from the gateway's disk storage. If a client is offline when a message arrives, it will be stored for later retrieval. When the client connects, all messages will be delivered, and deleted from the gateway's disk.
 
 When it starts up, a client registers itself with a gateway, and the gateway returns an access token. The access token plus the gateway's IP can then be used as a form of addressing for delivering packets.
 
@@ -46,4 +46,4 @@ Service Providers (SPs) may interact with external systems on behalf of a user.
 
 There is also a special category of Service Provider, namely SPs that do not visibly interact with any external systems. You might think of these as crypto-utopiapps: they're doing something, but it's not possible from outside to say with any certainty what their function is, or who is interacting with them.
 
-All apps talk with gateways using Sphinx packets and a small set of simple control messages. These messages are sent to gateways over websockets. Each app client has a long-lived relationship with its gateway; Nym defines messages for clients registering and authenticating with gateways, as well as sending encrypted Sphinx packets. 
+All apps talk with gateways using Sphinx packets and a small set of simple control messages. These messages are sent to gateways over websockets. Each app client has a long-lived relationship with its gateway; Nym defines messages for clients registering and authenticating with gateways, as well as sending encrypted Sphinx packets.
diff --git a/documentation/dev-portal/src/infrastructure/nym-vs-others.md b/documentation/docs/src/architecture/nym-vs-others.md
similarity index 100%
rename from documentation/dev-portal/src/infrastructure/nym-vs-others.md
rename to documentation/docs/src/architecture/nym-vs-others.md
diff --git a/documentation/docs/src/bandwidth-credentials.md b/documentation/docs/src/bandwidth-credentials.md
index 0a56b7d5ad7..c3d61e47975 100644
--- a/documentation/docs/src/bandwidth-credentials.md
+++ b/documentation/docs/src/bandwidth-credentials.md
@@ -36,7 +36,7 @@ Create an account on Sandbox using the nym-cli:
 
 ```./nym-cli --config-env-file <path-to>sandbox.env account create```
 
-You will need `nymt` funds sent to this account. Get in touch via Nym [Telegram](https://t.me/nymchan) or [Discord](https://discord.gg/FaTJb8q8) and we can send them to you. 
+You will need `nymt` funds sent to this account. Get in touch via Nym [Telegram](https://t.me/nymchan) or [Discord](https://nymtech.net/go/discord) and we can send them to you. 
 
 Next, you init the nym-client with the enabled credentials mode set to true:  
 
diff --git a/documentation/docs/src/binaries/building-nym.md b/documentation/docs/src/binaries/building-nym.md
index 90406150b8c..dd9cd9f7fca 100644
--- a/documentation/docs/src/binaries/building-nym.md
+++ b/documentation/docs/src/binaries/building-nym.md
@@ -8,7 +8,7 @@ Nym has two main codebases:
 - the [Nym platform](https://github.com/nymtech/nym), written in Rust. This contains all of our code _except_ for the validators.
 - the [Nym validators](https://github.com/nymtech/nyxd), written in Go.
 
-> This page details how to build the main Nym platform code. **If you want to build and run a validator, [go here](../nodes/validator.md) instead.**
+> This page details how to build the main Nym platform code. **If you want to build and run a validator, [go here](https://nymtech.net/operators/nodes/validator-setup.html) instead.**
 
 ## Prerequisites
 - Debian/Ubuntu: `pkg-config`, `build-essential`, `libssl-dev`, `curl`, `jq`, `git`
@@ -54,18 +54,17 @@ cargo build --release # build your binaries with **mainnet** configuration
 
 Quite a bit of stuff gets built. The key working parts are:
 
-* [mix node](../nodes/mixnode.md): `nym-mixnode`
-* [gateway node](../nodes/gateway.md): `nym-gateway`
-* [websocket client](../clients/websocket-client.md): `nym-client`
-* [socks5 client](../clients/socks5-client.md): `nym-socks5-client`
-* [network requester](../nodes/network-requester.md): `nym-network-requester`
-* [nym-cli tool](../tools/nym-cli.md): `nym-cli`
+* [Nym Node](https://nymtech.net/operators/nodes/nym-node.html): `nym-node`
+* [Validator](https://nymtech.net/operators/nodes/validator-setup.html)
+* [websocket client](https://nymtech.net/docs/clients/websocket-client.html): `nym-client`
+* [socks5 client](https://nymtech.net/docs/clients/socks5-client.html): `nym-socks5-client`
+* [webassembly client](https://nymtech.net/docs/clients/webassembly-client.html): `webassembly-client`
+* [nym-cli tool](https://nymtech.net/docs/tools/nym-cli.html): `nym-cli`
 * [nym-api](https://nymtech.net/operators/nodes/nym-api.html): `nym-api`
-
-[//]: # (* [nymvisor]&#40;https://nymtech.net/operators/nodes/nymvisor-upgrade.html&#41;: `nymvisor`)
+* [nymvisor](https://nymtech.net/operators/nodes/nymvisor-upgrade.html): `nymvisor`
 
 The repository also contains Typescript applications which aren't built in this process. These can be built by following the instructions on their respective docs pages.
-* [Nym Wallet](../wallet/desktop-wallet.md)
-* [Network Explorer UI](../explorers/mixnet-explorer.md)
+* [Nym Wallet](https://nymtech.net/docs/wallet/desktop-wallet.html)
+* [Network Explorer UI](https://nymtech.net/docs/explorers/mixnet-explorer.html)
 
 > You cannot build from GitHub's .zip or .tar.gz archive files on the releases page - the Nym build scripts automatically include the current git commit hash in the built binary during compilation, so the build will fail if you use the archive code (which isn't a Git repository). Check the code out from github using `git clone` instead.
diff --git a/documentation/docs/src/nodes/gateway.md b/documentation/docs/src/nodes/gateway.md
index 3634c366524..ffdee59f7c4 100644
--- a/documentation/docs/src/nodes/gateway.md
+++ b/documentation/docs/src/nodes/gateway.md
@@ -4,7 +4,7 @@
 
 Gateways are key to both the usability of the mixnet, and the operation of the mixnet's tokenomics. They serve two main functions: 
 * In the future (when the mixnet is no longer running in 'free to use' mode), to check for zkNym credentials (previously referred to as [Coconut Credentials](../bandwidth-credentials.md)) with which users can anonymously prove they have paid to send traffic through the mixnet. A % of the worth of these credentials will be distributed to the operator of the gateway periodically as payment for providing their service. The more credentials user clients 'spend' with them, the higher the rewards for the gateway operator and their delegators will be. The rest of this value will be sent to the Mixmining Pool, a pool of tokens from which `NYM` rewards are distributed to mix node operators. 
-* Act as a mailbox for connected clients. Clients create a lasting relationship with a gateway on initialisation, binding themselves to always use a particular gateway as their ingress point for mixnet traffic (this also means that this gateway is the egress point for any traffic sent _to_ this client - see the [mixnet traffic flow page](../architecture/traffic-flow.md) and the [addressing scheme](../clients/addressing-system.md) for further details). If a client is offline and the Gateway can't deliver packets addressed to it, they will hold these packets until the client comes back online. 
+* Act as a mailbox for connected clients. Clients create a lasting relationship with a gateway on initialisation, binding themselves to always use a particular gateway as their ingress point for mixnet traffic (this also means that this gateway is the egress point for any traffic sent _to_ this client - see the [mixnet traffic flow page](../architecture/traffic-flow.md) and the [addressing scheme](../architecture/addressing-system.md) for further details). If a client is offline and the Gateway can't deliver packets addressed to it, they will hold these packets until the client comes back online. 
 
 ## Further Reading 
 * [Nym Whitepaper](https://nymtech.net/nym-whitepaper.pdf) section 4.2 
diff --git a/documentation/docs/src/nodes/overview.md b/documentation/docs/src/nodes/overview.md
index 497a3473657..ec0d8015835 100644
--- a/documentation/docs/src/nodes/overview.md
+++ b/documentation/docs/src/nodes/overview.md
@@ -1,9 +1,7 @@
 # Node Types
 
-> This section was previously the node setup guides. These have been migrated to their own [**Operator Guides**](https://nymtech.net/operators) book. 
-> 
-> For setup and maintenance guides, go to the Operators book linked above. 
-> 
-> This section is a little spartan for the moment, but we will be adding detailed information about how exactly each node functions, as well as references to any literature and technical specs in the near future. 
+```admonish info
+We are working on a detailed description of how each component of Nym Mixnet and Nyx blockchain functions, as well as references to any literature and technical specs.
 
-This section contains information on the different node types of the mixnet and blockchain.  
\ No newline at end of file
+Meanwhile please refer to our [**Operators Guide**](https://nymtech.net/operators) book.
+```
diff --git a/documentation/operators/src/changelog.md b/documentation/operators/src/changelog.md
index 26613a2b6a8..4e0adb3d1a5 100644
--- a/documentation/operators/src/changelog.md
+++ b/documentation/operators/src/changelog.md
@@ -2,6 +2,280 @@
 
 This page displays a full list of all the changes during our release cycle from [`v2024.3-eclipse`](https://github.com/nymtech/nym/blob/nym-binaries-v2024.3-eclipse/CHANGELOG.md) onwards. Operators can find here the newest updates together with links to relevant documentation. The list is sorted so that the newest changes appear first.
 
+## `v2024.8-wispa`
+
+- [Release binaries](https://github.com/nymtech/nym/releases/tag/nym-binaries-v2024.8-wispa)
+- [Release CHANGELOG.md](https://github.com/nymtech/nym/blob/nym-binaries-v2024.8-wispa/CHANGELOG.md)
+- [`nym-node`](nodes/nym-node.md) version `1.1.5`
+
+~~~admonish example collapsible=true title='CHANGELOG.md'
+- add event parsing to support cosmos_sdk > 0.50 ([#4697])
+- Fix NR config compatibility ([#4690])
+- Remove UserAgent constructor since it's weakly typed ([#4689])
+- [bugfix]: Node_api_check CLI looked over roles on blacklisted nodes ([#4687])
+- Add mixnodes to self describing api cache ([#4684])
+- Move and whole bump of crates to workspace and upgrade some ([#4680])
+- Remove code that refers to removed nym-network-statistics ([#4679])
+- Remove nym-network-statistics ([#4678])
+- Create UserAgent that can be passed from the binary to the nym api client ([#4677])
+- Add authenticator ([#4667])
+
+[#4697]: https://github.com/nymtech/nym/pull/4697
+[#4690]: https://github.com/nymtech/nym/pull/4690
+[#4689]: https://github.com/nymtech/nym/pull/4689
+[#4687]: https://github.com/nymtech/nym/pull/4687
+[#4684]: https://github.com/nymtech/nym/pull/4684
+[#4680]: https://github.com/nymtech/nym/pull/4680
+[#4679]: https://github.com/nymtech/nym/pull/4679
+[#4678]: https://github.com/nymtech/nym/pull/4678
+[#4677]: https://github.com/nymtech/nym/pull/4677
+[#4667]: https://github.com/nymtech/nym/pull/4667
+~~~
+
+
+### Features
+
+* [Default construct NodeRole](https://github.com/nymtech/nym/pull/4721): To preserve compatibility with newer clients interacting with older `nym-api`
+~~~admonish example collapsible=true title='Testing steps performed'
+ 1. Reviewed the changes in the `nym-api-requests/src/models.rs` file.
+ 2. Verified that the `NymNodeDescription` struct includes the new `role` field with a default value set by `default_node_role`.
+ 3. Checked the implementation of the `default_node_role` function to ensure it returns `NodeRole::Inactive`.
+ 4. Ran the updated code in the sandbox environment.
+ 5. Monitored the sandbox environment for any issues or errors related to the changes.
+ 
+ 
+ **Notes (if any):**
+ The test was successful. No issues were flagged during the testing in the sandbox environment. The new default value for `NodeRole` ensures backward compatibility without causing disruptions.
+~~~
+
+* [Default construct NodeRole for backwards compatibility (apply [\#4721](https://github.com/nymtech/nym/pull/4721) on develop)](https://github.com/nymtech/nym/pull/4722)
+* [Add upgrades to `nym-node` for `authenticator` changes](https://github.com/nymtech/nym/pull/4703)
+~~~admonish example collapsible=true title='Testing steps performed'
+ 1. Reviewed the changes in the `gateway/src/error.rs` and `gateway/src/node/mod.rs` files.
+ 2. Verified the new error enum `AuthenticatorStartupFailure` was added to `GatewayError`.
+ 3. Confirmed the implementation of the `StartedAuthenticator` struct and its usage in the `start_authenticator` function.
+ 4. Ran the updated code in the canary environment.
+ 5. Monitored the canary environment for any issues or errors related to the changes.
+~~~
+
+* [Add event parsing to support `cosmos_sdk` > `0.50`](https://github.com/nymtech/nym/pull/4697)
+~~~admonish example collapsible=true title='Testing steps performed'
+ 1. Reviewed the changes in `common/client-libs/validator-client/src/nyxd/cosmwasm_client/client_traits/signing_client.rs`, `logs.rs`, `types.rs`, and `nym-api/src/coconut/tests/mod.rs` files.
+ 2. Verified the addition of event parsing in the relevant functions and structs.
+ 3. Ensured that the `find_attribute` function correctly parses event attributes.
+ 4. Ran the updated code in the sandbox environment.
+ 5. Broadcasted transactions on the sandbox network to test the changes.
+ 6. Monitored the sandbox network for any malformed responses or errors after the test chain upgrade.
+~~~
+
+* [Send bandwidth status messages when connecting](https://github.com/nymtech/nym/pull/4691): When connecting to the gateway we get received the available bandwidth left. Emit a status messages for this, for consumption by the application layer.
+~~~admonish example collapsible=true title='Testing steps performed'
+ 1. Reviewed the changes in `common/bandwidth-controller/src/event.rs`, `common/bandwidth-controller/src/lib.rs`, and `common/client-libs/gateway-client/src/client.rs` files.
+ 2. Verified the implementation of `BandwidthStatusMessage` enum for emitting status messages.
+ 3. Ensured `GatewayClient` is updated to send bandwidth status messages when connecting.
+ 4. Deployed the updated code on the canary environment.
+ 5. Connected to the gateway and checked for the emission of bandwidth status messages.
+ 6. Verified that the messages were correctly parsed and consumed by the application layer.
+ 7. Ran the VPN client to observe the parsed events.
+ ~~~
+
+* [Fix NR config compatibility](https://github.com/nymtech/nym/pull/4690): Recently we deleted the old statistics service provider. This fixes some issues where old configs didn't work with the latest changes.
+    - Make NR able to read config with old keys in
+    - Remove deleted config keys from NR template
+~~~admonish example collapsible=true title='Testing steps performed'
+ 1. Reviewed the changes in the `service-providers/network-requester/src/config/mod.rs` and `service-providers/network-requester/src/config/template.rs` files.
+ 2. Ensured `NetworkRequester` config is able to read old keys for compatibility.
+ 3. Removed old and deleted config keys from the `NetworkRequester` template.
+ 4. Compiled the project to verify no issues or warnings appeared.
+ 5. Ran all tests to ensure that the changes did not affect the functionality.
+ 6. Validated that no leftover code from the old statistics service provider caused any issues.
+ ~~~
+
+* [Remove `UserAgent` constructor since it's weakly typed](https://github.com/nymtech/nym/pull/4689): 
+~~~admonish example collapsible=true title='Testing steps performed'
+ 1. Reviewed the changes in `common/http-api-client/src/user_agent.rs` file.
+ 2. Verified the removal of the `UserAgent` constructor and ensured that all instances of `UserAgent::new` are updated accordingly.
+ 3. Checked the implementation of `UserAgent` struct using `BinaryBuildInformation` and `BinaryBuildInformationOwned`.
+ 4. Deployed the updated code across different environments (QA, sandbox, and canary).
+ 5. Ran tests to ensure that the `UserAgent` struct functions correctly without the constructor.
+ ~~~
+ 
+* [Add mixnodes to self describing api cache](https://github.com/nymtech/nym/pull/4684):
+    - Abstracts getting the self describing info a bit
+    - Adds mixnodes to the cache refresher as well
+    - Adds `role` field to the `NodeDescription` struct, to be able to distinguish between mixnodes and gateways
+    - Switched to using `NodeStatusCache` instead of `ContractCache`
+~~~admonish example collapsible=true title='Testing steps performed'
+Called the new `/mixnodes/described` endpoint as well as the existing `/gateways/described` endpoint and verified that the data returned for each was correct based on the settings that different nodes have when they are setup. 
+
+For gateway endpoint, the “role” for now does not differentiate between entry and exit gateways, this will be implemented in the future.
+~~~
+
+* [Move and whole bump of crates to workspace and upgrade some](https://github.com/nymtech/nym/pull/4680):
+    - Fix cargo warning for `default_features`
+    - Move dirs 4.0 to workspace
+    - Use workspace `base64` dep
+    - Move `rand_chacha` and `x25519-dalek` to workspace
+    - Use workspace `ed25519-dalek` dep
+    - Move `itertools` to workspace deps and upgrade
+    - Move a few partial deps to workspace  while preserving versions
+~~~admonish example collapsible=true title='Testing steps performed'
+ 1. Reviewed the changes to move and upgrade crates to the workspace.
+ 2. Verified the updated dependencies:
+    - Moved `dirs` to version 4.0 in the workspace.
+    - Updated the `base64` dependency to use the workspace version.
+    - Moved `rand_chacha` and `x25519-dalek` to the workspace.
+    - Updated `ed25519-dalek` to use the workspace version.
+    - Moved and upgraded `itertools` in the workspace.
+    - Moved other partial dependencies to the workspace while preserving their versions.
+ 3. Ensured the `Cargo.toml` files across the project reflect these changes correctly.
+ 4. Compiled the entire project to check for any issues or warnings.
+ 5. Verified that all tests pass successfully after the changes.
+ ~~~
+
+* [Remove `nym-network-statistics`](https://github.com/nymtech/nym/pull/4678): Remove `nym-network-statistics` service provider that is no longer used.
+~~~admonish example collapsible=true title='Testing steps performed'
+ 1. Reviewed the project to identify all references to `nym-network-statistics`.
+ 2. Removed all code and dependencies associated with `nym-network-statistics`.
+ 3. Ensured that no references to `nym-network-statistics` remain in the codebase, including comments, imports, and configuration files.
+ 4. Compiled the project to check for any issues or warnings.
+ 5. Ran all tests to ensure the removal did not affect the functionality of the project.
+ ~~~
+
+ 
+* [Remove code that refers to removed `nym-network-statistics`](https://github.com/nymtech/nym/pull/4679): Follow up to [\#4678](https://github.com/nymtech/nym/pull/4678) where all code interacting with it is removed.
+~~~admonish example collapsible=true title='Testing steps performed'
+ 1. Reviewed the project to identify all references to `nym-network-statistics`.
+ 2. Removed all code and dependencies associated with `nym-network-statistics`.
+ 3. Ensured that no references to `nym-network-statistics` remain in the codebase, including comments, imports, and configuration files.
+ 4. Compiled the project to check for any issues or warnings.
+ 5. Ran all tests to ensure the removal did not affect the functionality of the project.
+ ~~~
+
+* [Create `UserAgent` that can be passed from the binary to the `nym-api` client](https://github.com/nymtech/nym/pull/4677):
+    - Support setting `UserAgent` for the validator client
+    - Support setting `UserAgent` in the SDK `MixnetClient`
+     - Set `UserAgent` when getting the list of gateways and topology in
+         - `nym-client`
+         - `nym-socks5-client`
+         - Standalone `ip-packet-router`
+ 
+~~~admonish example collapsible=true title='Testing steps performed'
+Used the nym-vpn-cli to test this, and we can visibly see the `UserAgent`, no issues with the comments mentioned above.
+
+Example of the user agent sent:
+`nym-client/1.1.36/x86_64-unknown-linux-gnu/e18bb70`
+
+<img width="1435" alt="image" src="https://github.com/nymtech/nym/assets/60836166/5d4cc76f-84e6-45cb-9102-adc2b58a25d9">
+ 
+Connected with no problems
+~~~
+
+* [Add `authenticator`](https://github.com/nymtech/nym/pull/4667)
+
+### Bugfix
+
+* [`Node_api_check.py` CLI looked over roles on blacklisted nodes](https://github.com/nymtech/nym/pull/4687): Removing/correcting this redundant function which results in unwanted error print, will resolve in the program not looking up the `roles` endpoint for blacklisted GWs, instead just ignores the role description and still return all other endpoints.
+
+### Operators Guide updates
+
+* [Create a guide to backup and restore `nym-node`](https://nymtech.net/operators/nodes/maintenance.html#backup-a-node), PR [\#4720](https://github.com/nymtech/nym/pull/4720)
+* [Add manual IPv6 ifup/down network configuration](https://nymtech.net/operators/troubleshooting/vps-isp.html#network-configuration), PR [\#4651](https://github.com/nymtech/nym/pull/4651)
+* [Extend ISP list](https://nymtech.net/operators/legal/isp-list.html)
+* [Add SSL cert bot block to WSS setup](https://nymtech.net/operators/nodes/proxy-configuration.html#web-secure-socket-setup), [PR here](https://github.com/nymtech/nym/commits/develop/): WSS setup fully works!
+* [Correct `HTTP API port` in bonding page](https://nymtech.net/operators/nodes/bonding.html#bond-via-the-desktop-wallet-recommended) , [PR \#4707](https://github.com/nymtech/nym/pull/4707): Change `HTTP API port` to `8080` on every `nym-node` by opening `config.toml` and making sure that your binding addresses and ports are as in the block below. Then go to desktop wallet and open the box called `Show advanced options` and make sure all your ports are set correctly (usually this means to change `HTTP api port` to `8080` for `mixnode` mode).
+~~~admonish example collapsible=true title='snap of binding addresses and ports in `config.toml`'
+```toml
+[host]
+public_ips = [
+'<YOUR_PUBLIC_IPv4>'
+]
+
+[mixnet]
+bind_address = '0.0.0.0:1789'
+
+[http]
+bind_address = '0.0.0.0:8080'
+
+[mixnode]
+[mixnode.verloc]
+bind_address = '0.0.0.0:1790'
+
+[entry_gateway]
+bind_address = '0.0.0.0:9000'
+```
+~~~
+
+* [Comment our deprecated node pages in `/docs`](https://github.com/nymtech/nym/pull/4727)
+    - Fixes [issue \#4632](https://github.com/nymtech/nym/issues/4632)
+* [Remove redundant syntax from the setup guide](https://github.com/nymtech/nym/pull/4682)
+
+---
+
+## `v2024.7-doubledecker`
+
+- [Release binaries](https://github.com/nymtech/nym/releases/tag/nym-binaries-v2024.7-doubledecker)
+- [Release CHANGELOG.md](https://github.com/nymtech/nym/blob/nym-binaries-v2024.7-doubledecker/CHANGELOG.md)
+- [`nym-node`](nodes/nym-node.md) version `1.1.4`
+
+~~~admonish example collapsible=true title='CHANGELOG.md'
+- Add an early return in `parse_raw_str_logs` for empty raw log strings. ([#4686])
+- Bump braces from 3.0.2 to 3.0.3 in /wasm/mix-fetch/internal-dev ([#4672])
+- add expiry returned on import ([#4670])
+- [bugfix] missing rustls feature ([#4666])
+- Bump ws from 8.13.0 to 8.17.1 in /wasm/client/internal-dev-node ([#4665])
+- Bump braces from 3.0.2 to 3.0.3 in /clients/native/examples/js-examples/websocket ([#4663])
+- Bump ws from 8.14.2 to 8.17.1 in /sdk/typescript/packages/nodejs-client ([#4662])
+- Update setup.md ([#4661])
+- New clippy lints ([#4660])
+- Bump braces from 3.0.2 to 3.0.3 in /nym-api/tests ([#4659])
+- Bump braces from 3.0.2 to 3.0.3 in /docker/typescript_client/upload_contract ([#4658])
+- Update vps-setup.md ([#4656])
+- Update configuration.md ([#4655])
+- Remove old PR template ([#4639])
+
+[#4686]: https://github.com/nymtech/nym/pull/4686
+[#4672]: https://github.com/nymtech/nym/pull/4672
+[#4670]: https://github.com/nymtech/nym/pull/4670
+[#4666]: https://github.com/nymtech/nym/pull/4666
+[#4665]: https://github.com/nymtech/nym/pull/4665
+[#4663]: https://github.com/nymtech/nym/pull/4663
+[#4662]: https://github.com/nymtech/nym/pull/4662
+[#4661]: https://github.com/nymtech/nym/pull/4661
+[#4660]: https://github.com/nymtech/nym/pull/4660
+[#4659]: https://github.com/nymtech/nym/pull/4659
+[#4658]: https://github.com/nymtech/nym/pull/4658
+[#4656]: https://github.com/nymtech/nym/pull/4656
+[#4655]: https://github.com/nymtech/nym/pull/4655
+[#4639]: https://github.com/nymtech/nym/pull/4639
+~~~
+
+### Features
+
+- [Remove the `nym-mixnode` and `nym-gateway` binaries from the CI upload builds action](https://github.com/nymtech/nym/pull/4693)
+- [Add an early return in `parse_raw_str_logs` for empty raw log strings.](https://github.com/nymtech/nym/pull/4686): This accommodates for the v50 + chain upgrade.
+- [Bump braces from `3.0.2` to `3.0.3` in `/wasm/mix-fetch/internal-dev`](https://github.com/nymtech/nym/pull/4672): Version update of [braces](https://github.com/micromatch/braces)
+- [Bump braces from `3.0.2` to `3.0.3` in `/clients/native/examples/js-examples/websocket`](https://github.com/nymtech/nym/pull/4663): Version update of [braces](https://github.com/micromatch/braces).
+- [Bump braces from `3.0.2` to `3.0.3` in `/nym-api/tests`](https://github.com/nymtech/nym/pull/4659): Version update of [braces](https://github.com/micromatch/braces).
+- [Bump braces from `3.0.2` to `3.0.3` in `/docker/typescript_client/upload_contract`](https://github.com/nymtech/nym/pull/4658): Version update of  [braces](https://github.com/micromatch/braces).
+- [Bump `ws` from `8.13.0` to `8.17.1` in `/wasm/client/internal-dev-node`](https://github.com/nymtech/nym/pull/4665): Version update of [`ws`](https://github.com/websockets/ws).
+- [Bump `ws` from `8.14.2` to `8.17.1` in `/sdk/typescript/packages/nodejs-client`](https://github.com/nymtech/nym/pull/4662): Version update of [`ws`](https://github.com/websockets/ws).
+- [Add expiry returned on import](https://github.com/nymtech/nym/pull/4670): We need to return the expiry on import for desktop daemon `nym-vpnd`.
+- [New clippy lints](https://github.com/nymtech/nym/pull/4660)
+- [Remove `nym-connect` directory](https://github.com/nymtech/nym/pull/4643): Since the `nym-vpn` has superseded `nym-connect`, remove `nym-connect` from the repo.
+- [Remove old PR template](https://github.com/nymtech/nym/pull/4639)
+
+### Bugfix
+
+- [missing rustls feature](https://github.com/nymtech/nym/pull/4666): It just happens to work due to `feature-unification`. It should probably have this feature inbuild.
+
+### Operators Guide updates
+
+- [Node description guide](nodes/configuration.md#node-description): Steps to add self-description to `nym-node` and query this information from any node.
+- [Web Secure Socket (WSS) guide and reverse proxy update](nodes/proxy-configuration.md), PR [here](https://github.com/nymtech/nym/pull/4694): A guide to setup `nym-node` in a secure fashion, using WSS via Nginx and Certbot. Landing page (reversed proxy) is updated and simplified.
+
+---
+
 ## `v2024.6-chomp`
 
 - [Release binaries](https://github.com/nymtech/nym/releases/tag/nym-binaries-v2024.6-chomp)
diff --git a/documentation/operators/src/data/isp-sheet.csv b/documentation/operators/src/data/isp-sheet.csv
index 54c01dd81e3..f72973f9240 100644
--- a/documentation/operators/src/data/isp-sheet.csv
+++ b/documentation/operators/src/data/isp-sheet.csv
@@ -8,3 +8,19 @@
 [HostSailor](https://hostsailor.com),"USA","Yes, based on ticket","Yes","The IPv6 setup needs custom research and is not documented","05/2024"
 [Misaka](https://www.misaka.io/),"South Africa","Yes, native support","No","Very Expensive","05/2024"
 [IsHosting](https://ishosting.com/en),"Brazil, Netherlands","Yes, based on ticket","Yes","Expensive","05/2024"
+[AlexHost](https://alexhost.com),"Moldova, Bulgaria, Sweden, Netherlands","Yes, on by default","Yes","They allow TOR Bridges, Relays. Exit nodes are only allowed on dedicated servers (prices start from 26 EUR)","07/2024"
+[iHostArt](https://ihostart.com),"Romania","Yes, on by default","Yes","Super permissive provider. They do allow Tor Exit/Relay/Bridge. Pro-free speech etc. Recently, IPv6 geolocation was set to North Korea, so be aware.","07/2024"
+[Incognet](https://incognet.io),"Netherlands and USA","Yes, on by default","Yes","They allow Tor exit nodes but you must adhere to their rules https://incognet.io/tor-exits","07/2024"
+[vSys Host](https://vsys.host),"Ukraine, Netherlands, USA","Yes, on by default","Yes","Pretty permissive provider registered in Ukraine. Should allow Relay/Exit nodes but nothing in T&C, so better double check.","07/2024"
+[LiteServer](https://liteserver.nl),"Netherlands","Yes, on by default","Yes","Very reliable Dutch provider. They do allow Relay nodes but for Exit nodes you need to contact them. Always check T&C https://liteserver.nl/legal","07/2024"
+[TerraHost](https://terrahost.no),"Norway","Yes, on by default","Yes","Very reliable Norwegian provider. Only allow exit nodes on Dedicated servers subject to certain caveats (you must open a ticket). Always check T&C https://terrahost.no/avtalebetingelser","07/2024"
+[Mevspace](https://mevspace.com),"Poland","Yes, on by default","Yes","Flexible Polish providers with 3 DCs in Poland. They do allow Tor Exit nodes but you may need a dedicated server for this. Make sure you open a ticket to check. As of today's date, they have 48h for 1 EUR tariff","07/2024"
+[Hostiko](https://hostiko.com.ua),"Ukraine, Germany","Yes, on by default","Yes","Ukrainian provider. They allow Exit nodes on Germany boxes but limit the bandwidth, you also have to restrict certain ports like 25 and 587. Make sure you open a ticket.","07/2024"
+[Hostslick](https://hostslick.com),"Netherlands, Germany","Yes, on by default","Yes","Good amount of bandwidth for the price. Make sure you open the ticket if you want to run Exit node","07/2024"
+[RDP](https://rdp.sh),"Netherlands, USA, Poland","Yes, on by default","Yes","German provider. Exit nodes are allowed, policy is here https://rdp.sh/docs/faq/tor ports 25,465,587 must be closed. Make sure you open a ticket before running an exit node.","07/2024"
+
+
+
+
+
+
diff --git a/documentation/operators/src/images/wallet-screenshots/new_http_port.png b/documentation/operators/src/images/wallet-screenshots/new_http_port.png
new file mode 100644
index 00000000000..7db2a30d727
Binary files /dev/null and b/documentation/operators/src/images/wallet-screenshots/new_http_port.png differ
diff --git a/documentation/operators/src/images/wallet-screenshots/old_http_port.png b/documentation/operators/src/images/wallet-screenshots/old_http_port.png
new file mode 100644
index 00000000000..5d92ecb233c
Binary files /dev/null and b/documentation/operators/src/images/wallet-screenshots/old_http_port.png differ
diff --git a/documentation/operators/src/legal/exit-gateway.md b/documentation/operators/src/legal/exit-gateway.md
index 11d24870d06..9294e97837b 100644
--- a/documentation/operators/src/legal/exit-gateway.md
+++ b/documentation/operators/src/legal/exit-gateway.md
@@ -11,7 +11,7 @@ This document presents an initiative to further support Nym’s mission of allow
 All the technical changes on the side of Nym nodes - ***Project Smoosh*** - are described in the [FAQ section](../archive/faq/smoosh-faq.md).
 
 ```admonish warning
-Nym core team cannot provide comprehensive legal advice across all jurisdictions. Knowledge and experience with the legalities are being built up with the help of our counsel and with you, the community of Nym node operators. We encourage Nym node operators to join the operator channels ([Element](https://matrix.to/#/#operators:nymtech.chat), [Discord](https://discord.gg/FaTJb8q8), [Telegram](https://t.me/nymchan_help_chat)) to share best practices and experiences.
+Nym core team cannot provide comprehensive legal advice across all jurisdictions. Knowledge and experience with the legalities are being built up with the help of our counsel and with you, the community of Nym node operators. We encourage Nym node operators to join the operator channels ([Element](https://matrix.to/#/#operators:nymtech.chat), [Discord](https://nymtech.net/go/discord), [Telegram](https://t.me/nymchan_help_chat)) to share best practices and experiences.
 ```
 
 
diff --git a/documentation/operators/src/nodes/bonding.md b/documentation/operators/src/nodes/bonding.md
index 18a5a90f0bb..3982dad973e 100644
--- a/documentation/operators/src/nodes/bonding.md
+++ b/documentation/operators/src/nodes/bonding.md
@@ -28,16 +28,29 @@ You can bond your `nym-node` via the Desktop wallet.
   - To find out your `nym-node` details, run `./nym-node bonding-information --id <ID>`
   - To get a correct host address, run `echo "$(curl -4 https://ifconfig.me)"`
 
+2. Open the box called `Show advanced options` and make sure all your ports are set correctly, like the values in this table:
 
-2. Enter the `Amount`, `Operating cost` and `Profit margin` and press `Next`.
+| Node type              | Port name                           | Correct port value |
+| :--                    | :--                                 | :--                |
+| Mixnode                | Mix port                            | `1789`             |
+| Mixnode                | Verloc port                         | `1790`             |
+| Mixnode                | HTTP api port (picture below)       | `8080`             |
+| Gateway (entry & exit) | Mix port                            | `1789`             |
+| Gateway (entry & exit) | Client WS API port                  | `9000`             |
 
-3. You will be asked to run a `sign` command with your `nym-node` - copy and paste the long signature as the value of `--contract-msg` and run it.
+- If you bonding `nym-node --mode mixnode` through *Bond mixnode* desktop wallet menu, change manually *HTTP api port* value from deprecated `8000` to `8080` - a generic `nym-node` HTTP port (for all modes).
+
+![](../images/wallet-screenshots/new_http_port.png)
+
+3. Enter the `Amount`, `Operating cost` and `Profit margin` and press `Next`.
+
+4. You will be asked to run a `sign` command with your `nym-node` - copy and paste the long signature as the value of `--contract-msg` and run it.
 
 ```
 ./nym-node sign --contract-msg <PAYLOAD_GENERATED_BY_THE_WALLET>
 ```
 
-4. Copy the resulting signature string and paste it into the wallet nodal, press `Next` and confirm the transaction:
+5. Copy the resulting signature string and paste it into the wallet nodal, press `Next` and confirm the transaction:
 
 ```sh
 # This is just an example, copy the one from your process
@@ -46,9 +59,10 @@ You can bond your `nym-node` via the Desktop wallet.
 ```
 
 ![Paste Signature](../images/wallet-screenshots/wallet-sign.png)
+
 *This image is just an example, copy-paste your own base58-encoded signature*
 
-5. Your node will now be bonded and ready to recieve traffic, latest at the beginning of the next epoch (at most 1 hour)
+6. Your node will now be bonded and ready to recieve traffic, latest at the beginning of the next epoch (at most 1 hour)
 
 
 If everything worked, you'll see your node running on the either the [Sandbox testnet network explorer](https://sandbox-explorer.nymtech.net) or the [mainnet network explorer](https://explorer.nymtech.net), depending on which network you're running.
diff --git a/documentation/operators/src/nodes/configuration.md b/documentation/operators/src/nodes/configuration.md
index b219976fafb..87d2f795ed9 100644
--- a/documentation/operators/src/nodes/configuration.md
+++ b/documentation/operators/src/nodes/configuration.md
@@ -4,6 +4,28 @@
 
 Nym Node can be configured directly by editing the config file (`config.toml`) located at `~/.nym/nym-nodes/<ID>/config/config.toml` (by default `~/.nym/nym-nodes/default-nym-node/config/config.toml`) or through commands on the binary.
 
+### Node Description
+
+Operators can add a description themselves to share more information about their `nym-node` publicly.
+
+To add or change `nym-node` description is done by editing `description.toml` file located in `~/.nym/nym-nodes/<NODE_ID>/data/description.toml`. After saving, don't forget to reload and restart your node [service](#systemd) or simply restart your `nym-node` if you run it without a service (not recommended).
+
+**Query description**
+
+Nodes description can be queried from API endpoint `/api/v1/description` or via Swagger API UI page `/api/v1/swagger/#/Node/description`.
+
+```bash
+curl -X 'GET' \
+  'http://<NODE_IP_ADDRESS>:8080/api/v1/description' \
+  -H 'accept: application/json'
+
+# or for https reversed proxy or WSS setup
+
+curl -X 'GET' \
+  'https://<HOSTNAME>/api/v1/description' \
+  -H 'accept: application/json'
+```
+
 ### Commands & Examples
 
 Disable sharing of system hardware info with the network:
@@ -100,6 +122,10 @@ RestartSec=30
 WantedBy=multi-user.target
 ```
 
+```admonish warning title=""
+[Accepting T&Cs](setup.md#terms--conditions) is done via a flag `--accept-operator-terms-and-conditions` added explicitly to `nym-node run` command every time. If you use systemd automation, add the flag to your service file's `ExecStart` line.
+```
+
 3. Save the file
 
 ```admonish note
diff --git a/documentation/operators/src/nodes/maintenance.md b/documentation/operators/src/nodes/maintenance.md
index 6a83aeb5523..00b91f1b693 100644
--- a/documentation/operators/src/nodes/maintenance.md
+++ b/documentation/operators/src/nodes/maintenance.md
@@ -114,6 +114,8 @@ tmux attach-session
 
 #### systemd
 
+> Configuration of `systemd` service files for `nym-node` is under [Nym Node - Configuration](configuration.md#systemd) page.
+
 ##### For Nymvisor
 > Since you're running your node via a Nymvisor instance, as well as creating a Nymvisor `.service` file, you will also want to **stop any previous node automation process you already have running**.
 
@@ -200,8 +202,57 @@ systemctl status <NODE>.service
 systemctl daemon-reload
 ```
 
-This lets your operating system know it's ok to reload the service configuration. Then restart your `<NODE>`.
+This lets your operating system know it's OK to reload the service configuration. Then restart your `<NODE>`.
+
+
+## Backup a node
+
+Anything can happen to the server on which your node is running. To back up your `nym-node` keys and configuration protects the operators against the negative impact of unexpected events. To restart your node on another server, two essential pieces are needed:
+
+1. Node keys to initialise the same node on a new VPS
+2. Access to the bonding Nym account (wallet seeds) to edit the IP on smart contract
+
+Assuming that everyone access their wallets from local machine and does *not* store their seeds on VPS, point \#2 should be a given. To backup your `nym-node` keys and configuration in the easiest way possible, copy the entire config directory `.nym` from your VPS to your local desktop, using a special copy command `scp`:
+
+1. Create a directory where you want to store your backup
+```sh
+mkdir -pv <PATH_TO_TARGET_DIRECTORY>
+```
 
+2. Copy configuration folder `.nym` from your VPS to your newly created backup directory:
+
+```sh
+scp -r <SOURCE_USER_NAME>@<SOURCE_HOST_ADDRESS>:~/.nym/nym-nodes/<YOUR_NODE_ID> <PATH_TO_TARGET_DIRECTORY>
+```
+
+3. The `scp` command should print logs, an operator can see directly whether it was successful or if it encountered any error. However, double check that all your needed configuration is in the backup directory.
+
+## Restoring a node
+
+In case your VPS shut down and you have a [backup](#backup-a-node) of your node keys and access to your bonding wallet, you can easily restore your node on another server without losing your delegation.
+
+1. On VPS: Do all [preliminary steps](preliminary-steps.md) needed to run a `nym-node`.
+
+2. On VPS: Create a `.nym/nym-nodes` configuration folder:
+```sh
+mkdir -pv ~/.nym/nym-nodes
+```
+
+3. From machine where your node is backed up (usually local desktop): Copy the folder with your node keys and configuration to the newly created folder on your VPS using `scp` command. Make sure to grab the entire `nym-node` configuration folder, which is called after your local `nym-node` ID, the `-r` flag will take care of all sub-directories and their content:
+```sh
+scp -r <LOCAL_NODE_CONFIGURATION_FOLDER> <VPS_USER_NAME>@<VPS_HOST_ADDRESS>:~/.nym/nym-nodes/
+```
+
+4. The `scp` command should print logs, an operator can see directly whether it was successful or if it encountered any error. However, double check that all your needed configuration is in the target directory `.nym/nym-nodes` on your VPS.
+
+
+5. Configure your node on the new VPS:
+
+* Edit `~/.nym/nym-nodes/<ID>/config/config.toml` config with the new listening address IP - it's the one under the header `[host]`, called `public_ips = ['<YOUR_PUBLIC_IP>',]` and add your new location (field `location = <LOCATION>`, formats like: 'Jamaica', or two-letter alpha2 (e.g. 'JM'), three-letter alpha3 (e.g. 'JAM') or three-digit numeric-3 (e.g. '388') can be provided). You can see your IP by running a command `echo "$(curl -4 https://ifconfig.me)"`.
+* Try to run the node and see if everything works.
+* Setup the [systemd](#systemd) automation (don't forget to add the [terms and conditions flag](setup.md#terms--conditions)) to `ExecStart` command, reload the daemon and run the service.
+
+6. And finally change the node smart contract info via the wallet interface. Open Nym Wallet, go to *Bonding*, open *Gateway Settings* or *Mixnode Settings* and change *Host* value to the new `nym-node` IP address. Otherwise the keys will point to the old IP address in the smart contract, and the node will not be able to be connected, and it will fail up-time checks, returning zero performance.
 
 ## Moving a node
 
@@ -224,11 +275,22 @@ mkdir ~/.nym/nym-nodes
 scp -r -3 <SOURCE_USER_NAME>@<SOURCE_HOST_ADDRESS>:~/.nym/nym-nodes <TARGET_USER_NAME>@<TARGET_HOST_ADDRESS>:~/.nym/nym-nodes/
 ```
 
-**On new/target machine**
+**On new/target VPS**
+
+* Edit `~/.nym/nym-nodes/<ID>/config/config.toml` config with the new listening address IP - it's the one under the header `[host]`, called `public_ips = ['<YOUR_PUBLIC_IP>',]` and add your new location (field `location = <LOCATION>`, formats like: 'Jamaica', or two-letter alpha2 (e.g. 'JM'), three-letter alpha3 (e.g. 'JAM') or three-digit numeric-3 (e.g. '388') can be provided). You can see your IP by running a command `echo "$(curl -4 https://ifconfig.me)"`.
+* Try to run the node and see if everything works.
+* Setup the [systemd](#systemd) automation. If you want to use the exact same service config file, you can also copy it from one VPS to another following the same logic by opening your **local terminal** (as that one's ssh key is authorized in both of the VPS) and running:
+```sh
+scp -r -3 <SOURCE_USER_NAME>@<SOURCE_HOST_ADDRESS>:/etc/systemd/system/nym-node.service <TARGET_USER_NAME>@<TARGET_HOST_ADDRESS>:/etc/systemd/system/nym-node.service
+```
+
+Note: [Accepting T&Cs](setup.md#terms--conditions) is done via a flag `--accept-operator-terms-and-conditions` added explicitly to `nym-node run` command every time. If you use [systemd](configuration.md#systemd) automation, add the flag to your service file's `ExecStart` line.
+
+**In your desktop wallet**
+
+* Change the node smart contract info via the wallet interface. Open Nym Wallet, go to *Bonding*, open *Gateway Settings* or *Mixnode Settings* and change *Host* value to the new `nym-node` IP address. Otherwise the keys will point to the old IP address in the smart contract, and the node will not be able to be connected, and it will fail up-time checks, returning zero performance.
 
-* Edit `~/.nym/nym-nodes/<ID>/config/config.toml` config with the new listening address IP.
-* Setup the [systemd](#systemd) automation, reload the daemon and run the service, or just simply run the node if you don't use automation
-* Change the node smart contract info via the wallet interface. Otherwise the keys will point to the old IP address in the smart contract, and the node will not be able to be connected, and it will fail up-time checks.
+Make sure to stop the old node.
 
 ## Rename node local ID
 
@@ -282,12 +344,12 @@ less ~/.nym/nym-nodes/default-nym-node/config/config.toml
 ## Ports
 All `<NODE>`-specific port configuration can be found in `$HOME/.nym/<NODE>/<YOUR_ID>/config/config.toml`. If you do edit any port configs, remember to restart your client and node processes.
 
-### Nym Node: Minode mode port reference
+### Nym Node: Mixnode mode port reference
 | Default port | Use                       |
 | ------------ | ------------------------- |
 | `1789`       | Listen for Mixnet traffic |
 | `1790`       | Listen for VerLoc traffic |
-| `8000`       | Metrics http API endpoint |
+| `8080`       | Metrics http API endpoint |
 
 
 ### Nym Node: Gateway modes port reference
diff --git a/documentation/operators/src/nodes/proxy-configuration.md b/documentation/operators/src/nodes/proxy-configuration.md
index d765ec51b4f..ff4864e801c 100644
--- a/documentation/operators/src/nodes/proxy-configuration.md
+++ b/documentation/operators/src/nodes/proxy-configuration.md
@@ -1,70 +1,53 @@
 # Reversed Proxy & Web Secure Socket
 
-It's useful to put your Exit Gateway behind a reversed proxy and have it accessible via `https` domain, where you can host a [landing page](../legal/landing-pages.md). The guide is right [below](#reversed-proxy).
+It's useful to put your Nym Node behind a reversed proxy and have it accessible via `https` domain, where you can host a [landing page](../legal/landing-pages.md). The guide is right [below](#reversed-proxy).
 
-Another solution is to have a your Gateway behind WSS. With ongoing migration from `nym-gateway` to `nym-node --mode exit-gateway` we are working on a detailed guide for WSS setup.
-
-## Reversed Proxy: Avril 14th Exit Gateways Guide
+More advanced and secure solution is to have your node behind Web Secure Socket (WSS). Follow this [this guide](#web-secure-socket-setup) for installation.
 
 ```admonish info
-This guide was created by a Nym node operator, Avril 14th as a part of [Nym Operators Community Counsel](../legal/community-counsel.md)
-
-The entire content of this page is under [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/).
+For both of these configurations you will need to register a DNS domain and configure a record to your VPS.
 ```
 
-The following snippet needs  be modified as described below according to the public identity that you may want to show on this public notice, i.e. your graphics and your email.
-It would allow you to serve it as a landing page resembling the one proposed by [Tor](https://gitlab.torproject.org/tpo/core/tor/-/raw/HEAD/contrib/operator-tools/tor-exit-notice.html) but with all the changes needed to adhere to the Nym's operators case.
+## Variables Explanation
 
-[Avril 14th](https://avril14th.org/) is a team of professionals and optimistic realists eager to contribute to a future of privacy, decentralization and connectivity.
+This guide contains several variables. Substitute them with your own value, without `<>` brackets. Here is a list of variables we used below.
 
-```admonish warning
-With a migration from `nym-gateway` to `nym-node --mode exit-gateway` the directory tree has been slightly changed. After the migration the configuration directory is in `~/.nym/nym-nodes/`. **The pathways and exact syntax in this guide is yet to be modified!**
-```
+| Variable              | Description                                                                                 | Syntax example                                            |
+| :---                  | :---                                                                                        | :---                                                      |
+| `<HOSTNAME>`          | Your registered DNS domain, asigned to the VPS with `nym-node`                              | exit-gateway1.squad.nsl                                   |
+| `<WSS_PORT>`          | Port listening to WSS, default is `9001`                                                    | 9001                                                      |
+| `<YOUR_WELCOME_TEXT>` | Any text you want to show on the landing page                                               | Welcome to Nym Node, operator contact is example@email.me |
+| `<LANDING_PAGE_PATH>` | A sub-directory located at `/var/www/<HOSTNAME>` containing html configuration files        | `/var/www/exit-gateway1.squad.nsl`                        |
+| `<NODE_ID>`           | A local only `nym-node` identifier, specified by flag `--id`, default is `default-nym-node` | alice_super_node                                          |
+| `<PATH_TO>`           | Specify a full path to the given file, directory or binary behind this variable             | `/root/src/nym/target/release/`                                |
 
-When done with the customization needs as described below, you'll need to upload the file and reference it as the `landing_page_assets_path` on the `[http]` section of the config.toml file:
-```
-landing_page_assets_path = '<PATH_TO_YOUR_CUSTOM_FILE>'
+```admonish warning title=""
+The commands in this setup need to be run with root permission. Either add a prefix `sudo` or execute them from a root shell.
 ```
 
-### HTML file customization
+## Reversed Proxy Setup
 
-- add your favicon logo on the line:
-```
-<link rel="icon" type="image/png" href="">
+```admonish info
+This guide was created by a Nym node operator, [Avril 14th](https://avril14th.org) as a part of [Nym Operators Community Counsel](../legal/community-counsel.md), edited by Nym.
 ```
 
-and your header logo on the line:
-```
-<img class="logo" src="<FIXME>">
-```
+The following snippet needs  be modified as described below according to the public identity that you may want to show on this public notice, i.e. your graphics and your email.
+It would allow you to serve it as a landing page resembling the one proposed by [Tor](https://gitlab.torproject.org/tpo/core/tor/-/raw/HEAD/contrib/operator-tools/tor-exit-notice.html) but with all the changes needed to adhere to the Nym's operators case.
 
-by either setting the URl to the image (if you're hosting it publicly, i.e. on your web server)
-```
-href="<PATH_TO_YOUR_PUBLIC_URL>"
-```
-and
-```
-src="<PATH_TO_YOUR_PUBLIC_URL>"
 
-```
-**or** by adding the image inline as base64 encoded image
-```
-href="href="data:image/x-icon;base64,AAABAAMA....""
-```
-and
-```
-src="href="data:image/x-icon;base64,AAABAAMA....""
-```
 
+### HTML File Customization
 
-- add the email address you're willing to use for being contacted.
-```
-<a href="mailto:>FIXME>">maintainer</a>
+File for html configuration are by convention located at `/var/www/<HOSTNAME>` directory and it's subdirectories. We refer to this directory as `<LANDING_PAGE_PATH>`.
+
+1. Start by creating this directory:
+```sh
+mkdir -p /var/www/<HOSTNAME>
 ```
 
-- If you're running the node within the US check the sections marked as FIXME, add your DNS name and uncomment those.
-***
+2. Use your own html code or copy the template below to a new file called `index.html` located in `/var/www/<HOSTNAME>` directory.
 
+~~~admonish example collapsible=true title="An example template for `/var/www/<HOSTNAME>/index.html` page"
 ```html
 <!DOCTYPE html>
 <html lang="en-US">
@@ -265,7 +248,7 @@ which are two established safeguards.
 
 <p>
 That being said, if you still have a complaint about the router, you may email the
- <a href="mailto:>FIXME>">maintainer</a>. If complaints are related
+ <a href="mailto:>YOUR_EMAIL_ADDRESS>">maintainer</a>. If complaints are related
  to a particular service that is being abused, the maintainer will submit that to the
  NYM Operators Community in order to add it to the Exit Policy cited above.
 If approved, that would prevent this router from allowing that traffic to exit through it.
@@ -281,202 +264,578 @@ specified IP:port combination. Please be considerate when using these options.</
 </body>
 </html>
 ```
-***
-### Reverse proxy
-You may set up a [reverse proxy](https://www.nginx.com/resources/glossary/reverse-proxy-server/) in order to serve this landing page with proper SSL and DNS management, i.e. to resolve it to https://nym-exit.<YOUR_DOMAIN> or https://nym-readme.<YOUR_DOMAIN>.
+~~~
 
-The following assumes that you're owning a domain and that you've already set the Let's Encrypt certificates on your hosting, and you've copied those on your Gateway, i.e. copy the two Let's Encript pem files on your Gateway's home folder.
-Else you may obtain a Let's Encrypt certificate using a -[-certonly procedure](https://eff-certbot.readthedocs.io/en/latest/using.html#getting-certificates-and-choosing-plugins).
+3. Before you save and close the file, make sure to edit the text, especially the information in these points:
 
+- Add your favicon logo on the line:
 ```
-sudo apt install nginx
+<link rel="icon" type="image/png" href="">
 ```
-If you're running your Gateway (you should...) exposing only the needed ports as listed [here](https://nymtech.net/operators/nodes/maintenance.html?highlight=port#ports), you need to add the Nginx service to your ufw configuration:
+
+- Add your header logo on the line:
 ```
-sudo ufw app list
-sudo ufw allow 'Nginx Full'
-sudo ufw reload
+<img class="logo" src="<FIXME>">
 ```
-Disable the default Nginx landing page
+
+- By either setting the URl to the image (if you're hosting it publicly, i.e. on your web server)
 ```
-sudo systemctl status nginx
-sudo unlink /etc/nginx/sites-enabled/default
-sudo systemctl restart nginx
+href="<PATH_TO_YOUR_PUBLIC_URL>"
+
+# and
+
+src="<PATH_TO_YOUR_PUBLIC_URL>"
 ```
-Add your endpoint configuration to Nginx changing <YOUR_DOMAIN> occurrencies below with your domain name, including the top-level domain, i.e. *avril4th.org*
 
+- **or** by adding the image inline as base64 encoded image
 ```
-sudo nano /etc/nginx/sites-available/nym-exit.<YOUR_DOMAIN>
+href="href="data:image/x-icon;base64,AAABAAMA....""
+
+# and
+
+src="href="data:image/x-icon;base64,AAABAAMA....""
 ```
 
+- Add the email address you're willing to use for being contacted.
+```
+<a href="mailto:>YOUR_EMAIL_ADDRESS>">maintainer</a>
+```
+
+- If you're running the node within the US check the sections marked as `FIXME`, add your DNS name and un-comment those.
+
+4. Save and exit
+
+Now your html page is configured.
+
+### `nym-node` Configuration
+
+When done with the customization, you'll need to make sure your `nym-node` uploads the file and reference to it. This is done by opening your node configuration file located at `~/.nym/nym-nodes/<NODE_ID>/config/config.toml` and changing the value of the line `landing_page_assets_path` on the `[http]` section:
+```
+landing_page_assets_path = '<LANDING_PAGE_PATH>'
+```
+
+### Reverse Proxy Configuration
+
+You may set up a [reverse proxy](https://www.nginx.com/resources/glossary/reverse-proxy-server/) in order to serve this landing page with proper SSL and DNS management, i.e. to resolve it to https://<HOSTNAME>.
+
+The following assumes that you're owning a domain and that you've already set the Let's Encrypt certificates on your hosting, and you've copied those on your Gateway, i.e. copy the two Let's Encript pem files on your Gateway's home folder.
+Else you may obtain a Let's Encrypt certificate using a [`--certonly` procedure](https://eff-certbot.readthedocs.io/en/latest/using.html#getting-certificates-and-choosing-plugins).
+
+**Configure Nginx**
+
+1. Install `nginx`:
+```sh
+sudo apt install nginx
+```
+
+2. Setup firewall with `ufw`. `ufw` has three profile pre-configured for `nginx`, we will need the first one for `nym-node`:
+
+- `Nginx Full`: This profile opens both port 80 (normal, unencrypted web traffic) and port 443 (TLS/SSL encrypted traffic)
+- `Nginx HTTP`: This profile opens only port 80 (normal, unencrypted web traffic)
+- `Nginx HTTPS`: This profile opens only port 443 (TLS/SSL encrypted traffic)
+
+```sh
+ufw allow 'Nginx Full'
+
+# you can verify by
+ufw status
+
+# possibly reload ufw by
+ufw reload
+```
+
+3. Disable the default Nginx landing page
+```
+systemctl status nginx
+unlink /etc/nginx/sites-enabled/default
+systemctl restart nginx
+```
+
+4. Add your endpoint configuration to Nginx by creating file:
+
+
+```sh
+nano /etc/nginx/sites-available/<HOSTNAME>
+```
+- and changing `<HOSTNAME>` occurrences below with your domain name:
+
 ```
 server {
-  listen 443 ssl http2;
-  listen [::]:443 ssl http2;
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
 
-  server_name nym-exit.<YOUR_DOMAIN>;
+    server_name nym-exit.<HOSTNAME>;
 
-  ssl_certificate <PATH_TO>/fullchain.pem;
-  ssl_certificate_key <PATH_TO>/privkey.pem;
+    ssl_certificate /etc/letsencrypt/live/<HOSTNAME>/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/<HOSTNAME>/privkey.pem;
 
-  access_log /var/log/nginx/access.log;
-  error_log /var/log/nginx/error.log;
+    access_log /var/log/nginx/access.log;
+    error_log /var/log/nginx/error.log;
 
   location / {
-    proxy_pass http://127.0.0.1:8080;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header Host $host;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_pass http://127.0.0.1:8080;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header Host $host;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 }
 
 server {
-  listen 80;
-  listen [::]:80;
+    listen 80;
+    listen [::]:80;
 
-  if ($host = nym-exit.<YOUR_DOMAIN>) {
-    return 301 https://$host$request_uri;
+    if ($host = <HOSTNAME>) {
+      return 301 https://$host$request_uri;
   }
 
-  server_name <YOUR_DOMAIN> www.<YOUR_DOMAIN>;
+    server_name <HOSTNAME> www.<HOSTNAME>;
 
-  return 301 https://<YOUR_DOMAIN>$request_uri;
+    return 301 https://<HOSTNAME>$request_uri;
 }
 ```
 
-```
-sudo ln -s /etc/nginx/sites-available/nym-exit.<YOUR_DOMAIN> /etc/nginx/sites-enabled/
-sudo nginx -t
-sudo systemctl restart nginx
-```
 
-When done with the customization needs as described below, you'll need to upload the file and reference it as the `landing_page_assets_path` on the `[http]` section of the config.toml file that you'll find in the `~/.nym/gateways/<YOUR_GATEWAY_ID>/config/config.toml` file
-```
-nano ${HOME}/.nym/gateways/<YOUR_GATEWAY_ID>/config/config.toml
-```
-change
-```
-landing_page_assets_path = '<PATH_TO_YOUR_CUSTOM_FILE>'
+5. Activate the configuration by creating a simlink to `/etc/nginx/sites-enabled`:
+```sh
+ln -s /etc/nginx/sites-available/<HOSTNAME> /etc/nginx/sites-enabled
 ```
 
-If you're running the Gateway as a service as described [here](https://nymtech.net/operators/nodes/maintenance.html#systemd) and [here](https://nymtech.net/operators/nodes/maintenance.html#following-steps-for-nym-nodes-running-as-systemd-service) you may just restart your service
-```
-service nym-gateway stop
-service nym-gateway start
+6. Test your configuration syntax:
+```sh
+nginx -t
 ```
-and check for the page being served either checking the service logs
+
+7. Restart `nginx`:
+```sh
+systemctl daemon-reload && systemctl restart nginx
 ```
-sudo journalctl -u  nym-gateway.service | grep 8080
+
+8. Get an `SSL` certificate using certbot:
+
+```sh
+apt install certbot python3-certbot-nginx
+certbot renew --dry-run
+certbot --nginx -d <HOSTNAME>
 ```
-where you should read out
+
+9. Restart your `nym-node` or if you're running your `nym-node` as a [`systemd` service](configuration.md#systemd), restart your service:
+```sh
+systemctl daemon-reload
+service nym-node restart
 ```
+
+10. Check for the page being served reading the service logs
+```sh
+journalctl -u  nym-gateway.service | grep 8080
+
+# where you should see
 ... Started NymNodeHTTPServer on 0.0.0.0:8080
 ```
-or just point your browser to the URI which you set above, such as https://nym-exit.<YOUR_DOMAIN>
 
-<!--
-## Run Web Secure Socket (WSS) on Gateway
+Now your `nginx` should be configured, up and running. Test it by inserting your `<HOSTNAME>` as a URL in a browser.
 
-Now you can run WSS on your `nym-node` with an Exit Gateway functionality.
 
-### WSS on a new Gateway
+## Web Secure Socket Setup
 
-These steps are for an operator who is setting up a [Gateway](gateway-setup.md) for the first time and wants to run it with WSS.
+For better security of transfered data, we recommend node operators to run their nodes through Secure Socket instead of be out in open. You can read more about *Secure Socket Layer* (SSL) in [here](https://www.geeksforgeeks.org/secure-socket-layer-ssl/).
 
-1. Make sure to enable all necessary [ports](maintenance.md#configure-your-firewall) on the Gateway:
+Before you start, don't forget to register a DNS and configure a record for your VPS with `nym-node`.
 
-```sh
-sudo ufw allow 1789,1790,8000,9000,9001,22/tcp, 9001/tcp
+
+If you haven't configure reversed proxy before, start with [*Preliminary steps* chapter](#preliminary-steps) below and only then move to WSS setup. If you have reversed proxy already running and your `nym-node` can be reached via https, you can skip *Preliminary steps* and begin to setup WSS directly. Remember that there may be some unique variables and customization depending on the way your reversed proxy is done which you may have to adjust when installing WSS in order to make it work.
+
+```admonish tip
+To see description of used variables (noted in `<>` brackets), scroll to the top of this page, chapter [*Variables Explanation*](#variables-explanation).
 ```
 
-The Gateway will then be accessible on something like: *http://85.159.211.99:8080/api/v1/swagger/index.html*
+We documented two options for node operators to setup WSS for `nym-node`:
 
-Are you seeing something like: *this node attempted to announce an invalid public address: 0.0.0.0.*?
+1. [Using a script](#using-a-script)
+2. [Step by step](#step-by-step)
 
-Please modify `[host.public_ips]` section of your config file stored as `~/.nym/gateways/<ID>/config/config.toml`.
 
-### WSS on an existing Gateway
+### Preliminary Steps
 
-In case you already run a working Gateway and want to add WSS on it, here are the pre-requisites to running WSS on Gateways:
+Whether you choose to setup WSS manually or using the script, the preliminary steps are mandatory to begin with before you continue with the installation.
 
-* You need to use the latest `nym-gateway` binary [version](./gateway-setup.md#current-version) and restart it.
-* That will add the relevant fields to update your config.
-* These two values will be added and need to be amended in your config.toml:
+#### Firewall configuration
+
+Make sure to open all [needed ports](vps-setup.md#configure-your-firewall), adding your `<WSS_PORT>`:
 
 ```sh
-clients_wss_port = 0
-hostname = ""
+ufw allow <WSS_PORT>/tcp
+
+# for example
+# ufw allow 9001/tcp
 ```
 
-Then you can run this:
+#### Landing page configuration
 
+1. Create server block directory for your https site:
 ```sh
-port=$1 // in the example below we will use 9001
-host=$2 = // this would be a domain name registered for your Gateway for example: mainnet-gateway2.nymtech.net
+sudo mkdir -p /var/www/<HOSTNAME>
+```
 
+2. Assign ownership using `$USER` environmental variable:
+```sh
+sudo chown -R $USER:$USER /var/www/<HOSTNAME>
+```
 
-sed -i "s/clients_wss_port = 0/clients_wss_port = ${port}/" ${HOME}/.nym/gateways/*/config/config.toml
-sed -i "s|hostname = ''|hostname = '${host}'|" ${HOME}/.nym/gateways/*/config/config.toml
+3. Create a landing page in `/var/www/<HOSTNAME>`. Either configure your own page (basic [syntax example](https://www.freecodecamp.org/news/introduction-to-html-basics/) or use our [template](#html-file-customization). Alternatively you can just make a simple welcome text using this command:
+```sh
+echo "<h1><YOUR_WELCOME_TEXT></h1>" | sudo tee /var/www/<HOSTNAME>/index.html
 ```
-The following shell script can be run:
 
+4. When done with the customization, you'll need to make sure your `nym-node` uploads the file and reference to it. This is done by opening your node configuration file located at `~/.nym/nym-nodes/<NODE_ID>/config/config.toml` and changing the value of the line `landing_page_assets_path` on the `[http]` section:
 ```sh
+landing_page_assets_path = '<LANDING_PAGE_PATH>'
+
+# for example
+# landing_page_assets_path = '/var/www/exit-gateway1.squad.nsl'
+```
+
+Now you are ready to set up WSS, ether using a [script](#using-a-script) or [step-by-step](#step-by-step) tutorial.
+
+### Using a Script
+
+Using a script is a more convenient option but it takes away some customization possibilities. If you like to have your setup fully in your hands, use [*Step by step guide*](#step-by-step-guide). Before you move on, make sure you went through [*Preliminary steps*](#preliminary-steps).
+
+1. Create a script by copying the block below and save it on your VPS as `wss_nginx_setup.sh`.
+
+~~~admonish example collapsible=true title="Script `wss_nginx_setup.sh`"
+```bash
 #!/bin/bash
 
 if [ "$#" -ne 2 ]; then
-    echo "Usage: sudo ./install_run_caddy.sh <host_name> <port_to_run_wss>"
+    echo "usage: sudo ./wss_nginx_setup.sh <host_name> <port_to_run_wss>"
     exit 1
 fi
 
-host=$1
+host_name=$1
 port_value=$2
 
-apt install -y debian-keyring debian-archive-keyring apt-transport-https
-apt --fix-broken install
+# preliminary checks
+config_file_path="${HOME}/.nym/nym-nodes/*/config/config.toml"
+
+# check if the configuration file exists
+if [ ! -f $config_file_path ]; then
+    echo "configuration file not found at $config_file_path"
+    exit 1
+fi
+
+# extract hostname and wss port
+hostname=$(grep "hostname" $config_file_path | awk -F" = " '{print $2}' | tr -d "'")
+wss_port=$(grep "announce_wss_port" $config_file_path | awk -F" = " '{print $2}' | tr -d ' ')
 
-curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | sudo gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg
+# check if hostname is empty
+if [ -z "$hostname" ]; then
+    echo "hostname is empty, updating it to ${host_name}"
+    sed -i "s|hostname = ''|hostname = '${host_name}'|" $config_file_path
+else
+    echo "current hostname: $hostname"
+fi
 
-curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | sudo tee /etc/apt/sources.list.d/caddy-stable.list
+# check if wss port is set to 0 and update it
+if [ "$wss_port" -eq 0 ]; then
+    echo "wss port is 0, updating it to ${port_value}"
+    sed -i "s/announce_wss_port *= *0/announce_wss_port = ${port_value}/" $config_file_path
+else
+    echo "current wss port: $wss_port"
+fi
 
+# install nginx
 apt update
-apt install caddy
+apt install -y nginx
 
-systemctl enable caddy.service
+# install certbot and the nginx plugin
+apt install -y certbot python3-certbot-nginx
 
-cd /etc/caddy
+# enable nginx service
+systemctl enable nginx.service
 
-# check if Caddyfile exists, if it does, remove and insert a new one
-if [ -f Caddyfile ]; then
-    echo "removing caddyfile inserting a new one"
-    rm -f Caddyfile
-fi
+# create a consolidated nginx configuration file
+nginx_config_file="/etc/nginx/sites-available/${host_name}"
+cat <<EOF > $nginx_config_file
+# Reversed proxy configuration for landing page
+server {
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+
+    server_name ${host_name};
+
+    ssl_certificate /etc/letsencrypt/live/${host_name}/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/${host_name}/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
+
+
+    access_log /var/log/nginx/access.log;
+    error_log /var/log/nginx/error.log;
+
+    location / {
+        proxy_pass http://127.0.0.1:8080;
+        proxy_set_header X-Real-IP \$remote_addr;
+        proxy_set_header Host \$host;
+        proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
+  }
+}
+
+# http configuration
+server {
+    listen 80;
+    listen [::]:80;
+
+  server_name ${host_name} www.${host_name};
+
+  return 301 https://${host_name}\$request_uri;
+}
+
+# WSS configuration
+server {
+    listen ${port_value} ssl http2;
+    listen [::]:${port_value} ssl http2;
+
+    server_name ${host_name};
+
+    ssl_certificate /etc/letsencrypt/live/${host_name}/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/${host_name}/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
+
+
+    access_log /var/log/nginx/access.log;
+    error_log /var/log/nginx/error.log;
+
+    location / {
+
+	add_header 'Access-Control-Allow-Origin' '*';
+        add_header 'Access-Control-Allow-Credentials' 'true';
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, HEAD';
+	add_header 'Access-Control-Allow-Headers' '*';
+
+	proxy_http_version 1.1;
+        proxy_set_header Upgrade \$http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header X-Forwarded-For \$remote_addr;
+        proxy_pass http://localhost:9000;
+        proxy_intercept_errors on; # Enable intercepting errors from the proxy
+    }
 
-cat  <<EOF >> Caddyfile
-${host}:${port_value} {
-	@websockets {
-		header Connection *Upgrade*
-		header Upgrade websocket
-	}
-	reverse_proxy @websockets localhost:9000
 }
 EOF
 
-cat Caddyfile
+# create a symbolic link in sites-enabled
+ln -s /etc/nginx/sites-available/${host_name} /etc/nginx/sites-enabled/
 
-echo "script completed successfully!"
+# test nginx configuration
+if ! nginx -t; then
+    echo "nginx configuration test failed"
+    exit 1
+fi
+
+# reload nginx service
+systemctl reload nginx.service
 
-systemctl restart caddy.service
+# obtain ssl certificates using certbot
+if ! certbot --nginx -d ${host_name} --non-interactive --agree-tos -m your-email@example.com; then
+    echo "certbot failed to obtain certificates"
+    exit 1
+fi
+
+# test nginx configuration again
+if ! nginx -t; then
+    echo "nginx configuration test failed after obtaining ssl certificates"
+    exit 1
+fi
+
+# reload nginx service to apply the new configuration
+systemctl reload nginx.service
+
+echo "script completed successfully!"
 echo "have a nice day!"
 exit 0
+```
+~~~
 
+2. Make the script executable:
+```sh
+chmod u+x wss_nginx_setup.sh
+```
+
+3. Run the script as root (with `sudo` or from the root shell):
+```sh
+./wss_nginx_setup.sh <HOSTNAME> <WSS_PORT>
+# hostname is your domain
+# wss default port is 9001
 ```
 
-Although your Gateway is Now ready to use its `wss_port`, your server may not be ready - the following commands will allow you to set up a properly configured firewall using `ufw`:
 
+4. Restart your `nym-node` or if you're running your `nym-node` as a [`systemd` service](configuration.md#systemd), restart your service:
 ```sh
-ufw allow 9001/tcp
+systemctl daemon-reload
+service nym-node restart
 ```
 
-Lastly don't forget to restart your Gateway, now the API will render the WSS details for this Gateway:
+Your `nym-node` should be configured to run over WSS now. Test it using the steps in the chapter [below](#test-wss-setup)
 
--->
+
+### Step by Step Guide
+
+Step by step guide is more advanced than using a [script](#using-a-script), but it allows for more customisation. Before you move on, make sure you finished [*Preliminary steps*](#preliminary-steps*).
+
+
+#### Nginx Configuration
+
+
+1. Install `nginx`:
+```sh
+apt install nginx
+```
+
+2. Setup firewall with `ufw`. `ufw` has three profile pre-configured for `nginx`, we will need the first one for `nym-node`:
+
+- `Nginx Full`: This profile opens both port 80 (normal, unencrypted web traffic) and port 443 (TLS/SSL encrypted traffic)
+- `Nginx HTTP`: This profile opens only port 80 (normal, unencrypted web traffic)
+- `Nginx HTTPS`: This profile opens only port 443 (TLS/SSL encrypted traffic)
+
+```sh
+ufw allow 'Nginx Full'
+
+# you can verify by
+ufw status
+```
+
+#### WSS & Landing page configuration
+
+We made the landing page customization directory in [*Preliminary steps*](#preliminary-steps), next steps will configure that with Nginx.
+
+3. Configure your site to work with `nginx`. Open a new text file `/etc/nginx/sites-available/<HOSTNAME>` and paste the block below. Don't forget to insert your correct values.
+~~~admonish example collapsible=true title="Site configuration `/etc/nginx/sites-available/<HOSTNAME>`"
+```bash
+#####################################################
+# EXCHANGE ALL <HOSTNAME> & <WSS_PORT> VARIABLES ! #
+####################################################
+
+# Reversed proxy configuration for landing page
+server {
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+
+    server_name <HOSTNAME>;
+
+    ssl_certificate /etc/letsencrypt/live/<HOSTNAME>/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/<HOSTNAME>/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
+
+    access_log /var/log/nginx/access.log;
+    error_log /var/log/nginx/error.log;
+
+  location / {
+      proxy_pass http://127.0.0.1:8080;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header Host $host;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  }
+}
+
+
+# http configuration
+server {
+    listen 80;
+    listen [::]:80;
+
+  if ($host = <HOSTNAME>) {
+    return 301 https://$host$request_uri;
+  }
+
+    server_name <HOSTNAME> www.<HOSTNAME>;
+
+    return 301 https://<HOSTNAME>$request_uri;
+}
+
+
+# WSS configuration
+server {
+    listen <WSS_PORT> ssl http2;
+    listen [::]:<WSS_PORT> ssl http2;
+
+    server_name <HOSTNAME>;
+
+    ssl_certificate /etc/letsencrypt/live/<HOSTNAME>/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/<HOSTNAME>/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
+
+    access_log /var/log/nginx/access.log;
+    error_log /var/log/nginx/error.log;
+
+    location / {
+
+	add_header 'Access-Control-Allow-Origin' '*';
+        add_header 'Access-Control-Allow-Credentials' 'true';
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, HEAD';
+        add_header 'Access-Control-Allow-Headers' '*';
+
+	proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header X-Forwarded-For $remote_addr;
+
+        proxy_pass http://localhost:9000;
+        proxy_intercept_errors on; # Enable intercepting errors from the proxy
+    }
+
+}
+```
+~~~
+
+4. Activate the configuration by creating a simlink to `/etc/nginx/sites-enabled`:
+```sh
+ln -s /etc/nginx/sites-available/<HOSTNAME> /etc/nginx/sites-enabled
+```
+
+5. Test your configuration syntax:
+```sh
+nginx -t
+```
+
+6. Restart `nginx`:
+```sh
+systemctl daemon-reload && systemctl restart nginx
+```
+
+#### SSL Setup using certbot
+
+7. Get an `SSL` certificate using certbot:
+
+```sh
+apt install certbot python3-certbot-nginx
+certbot renew --dry-run
+certbot --nginx -d <HOSTNAME>
+```
+
+8. Restart your `nym-node` or if you're running your `nym-node` as a [`systemd` service](configuration.md#systemd), restart your service:
+```sh
+systemctl daemon-reload
+service nym-node restart
+```
+
+Your `nym-node` should be configured to run over WSS now. Test it using the steps in the chapter [below](#test-wss-setup).
+
+### Test WSS Setup
+
+You can do a few quick checks to test that your installation worked out and your `nym-node` is running correctly using WSS:
+
+- Check out connection with `wscat` from another (local) machine:
+```sh
+# install
+sudo apt install node-ws
+
+# run
+wscat -c ws://<HOSTNAME>:<WSS_PORT>
+```
+
+- Browse your `<HOSTNAME>` as URL and see your landing page.
+
+- Check Swagger API of your node using the hostname: `https://<HOSTNAME>/api/v1/swagger/#/`
diff --git a/documentation/operators/src/nodes/setup.md b/documentation/operators/src/nodes/setup.md
index 2b0cb464e63..f35185e040d 100644
--- a/documentation/operators/src/nodes/setup.md
+++ b/documentation/operators/src/nodes/setup.md
@@ -114,7 +114,7 @@ From `nym-node` version `1.1.3` onward is required to accept [**Operators Terms
 
 There has been a long ongoing discussion whether and how to apply Terms and Conditions for Nym network operators, with an aim to stay aligned with the philosophy of Free Software and provide legal defense for both node operators and Nym developers. To understand better the reasoning behind this decision, you can listen to the first [Nym Operator Town Hall](https://www.youtube.com/live/7hwb8bAZIuc?si=3mQ2ed7AyUA1SsCp&t=915) introducing the T&Cs or to [Operator AMA with CEO Harry Halpin](https://www.youtube.com/watch?v=yIN-zYQw0I0) from June 4th, 2024, explaining pros and cons of T&Cs implementation.
 
-Accepting T&Cs is done via an explicit flag `--accept-operator-terms-and-conditions` added to `nym-node run` command.
+Accepting T&Cs is done via a flag `--accept-operator-terms-and-conditions` added explicitly to `nym-node run` command every time. If you use [systemd](configuration.md#systemd) automation, add the flag to your service file's `ExecStart` line.
 
 To check whether any node has T&Cs accepted or not can be done by querying Swagger API endpoint `/auxiliary_details` via one of these ports (depending on node setup):
 ```sh
@@ -230,11 +230,6 @@ Run the node with custom `--id` without initialising:
 ./nym-node run --id <ID> --deny-init --mode mixnode --accept-operator-terms-and-conditions
 ```
 
-Run the node with custom `--id` without initialising:
-```sh
-./nym-node run --id <ID> --deny-init --mode entry-gateway --accept-operator-terms-and-conditions
-```
-
 ### Migrate
 
 ```admonish caution
diff --git a/documentation/operators/src/troubleshooting/validators.md b/documentation/operators/src/troubleshooting/validators.md
index 96b8921b017..f0fedf8f80f 100644
--- a/documentation/operators/src/troubleshooting/validators.md
+++ b/documentation/operators/src/troubleshooting/validators.md
@@ -11,6 +11,6 @@ If the `/dev/sda` partition is almost full, try pruning some of the `.gz` syslog
 
 ## Where can I get more help?
 
-The fastest way to reach one of us or get a help from the community, visit our [Telegram Node Setup Help Chat](https://t.me/nymchan_help_chat) or head to our [Discord](https://discord.gg/FaTJb8q8).
+The fastest way to reach one of us or get a help from the community, visit our [Telegram Node Setup Help Chat](https://t.me/nymchan_help_chat) or head to our [Discord](https://nymtech.net/go/discord).
 
 For more tech heavy question join our [Matrix core community channel](https://matrix.to/#/#general:nymtech.chat), where you can meet other builders and Nym core team members.
diff --git a/documentation/operators/src/troubleshooting/vps-isp.md b/documentation/operators/src/troubleshooting/vps-isp.md
index 5b967a6239c..3a1c5d6d91d 100644
--- a/documentation/operators/src/troubleshooting/vps-isp.md
+++ b/documentation/operators/src/troubleshooting/vps-isp.md
@@ -23,8 +23,48 @@ Begin with the steps listed in [*Connectivity Test and Configuration*](../nodes/
 4. Search or ask your ISP for additional documentation related to IPv6 routing and ask them to provide you with `IPv6 IP address` and `IPv6 IP gateway address`
 - For example Digital Ocean setup isn't the most straight forward, but it's [well documented](https://docs.digitalocean.com/products/networking/ipv6/how-to/enable/#on-existing-droplets) and it works.
 
-5. Search for guides regarding your particular system and distribution. For Debian based distributions using systemd, some generic guides such as [this one](https://cloudzy.com/blog/configure-ipv6-on-ubuntu/) work as well.
+5. Search for guides regarding your particular system and distribution. For Debian based distributions using systemd, some generic guides such as [this one](https://cloudzy.com/blog/configure-ipv6-on-ubuntu/) or [this one](https://help.ovhcloud.com/csm/en-ie-vps-configuring-ipv6?id=kb_article_view&sysparm_article=KB0047567) work as well.
 
+### Network configuration
+
+On modern Debian based Linux distributions, the network is configured by either [Netplan](https://netplan.io/) or [ifup/ifdown](https://manpages.debian.org/testing/ifupdown/ifup.8.en.html) utilities . It is very easy to check which one you have.
+
+1. If you have the following folder `/etc/netplan` which has got a YAML file - you are likely to have Netplan.
+2. If you have the following folder `/etc/network` and it is not empty - you are likely to have ifup/down.
+
+Most contemporary Ubuntu/Debian distributions come with Netplan, however it is possible that your hosting provider is using a custom version of ISO. For example, Debian 12 (latest version as of June 2024) may come with ifup/down.
+
+Nym operator community members have tested a VPS with Netplan and where in some cases `nym-node --mode exit-gateway` was not routing IP packets properly even after running `network_tunnel_manager.sh` script. We are working on a guide to setup Netplan configuration manually for such cases.
+
+Configuration of ifup/ifdown is a bit simpler. If the `network_tunnel_manager.sh` script doesn't do the job, open `/etc/network/interfaces` file (research if your system uses a different naming for it) and configure it similarly to this:
+
+```sh
+auto lo
+iface lo inet loopback
+
+auto eth0
+iface eth0 inet static
+address <YOUR_IPV4_ADDRESS>
+netmask NETMASK
+
+gateway <YOUR_IPV4_GATEWAY>
+iface eth0 inet6 static
+        accept_ra 0
+        address <YOUR_IPV6_ADDRESS>
+        netmask 64
+        gateway <YOUR_IPV6_GATEWAY>
+post-up /sbin/ip -r route add <YOUR_IPV6_GATEWAY> dev eth0
+post-up /sbin/ip -r route add default via <YOUR_IPV6_GATEWAY>
+```
+Last two lines are particularly important as they enable IPv6 routing. You can find YOUR_IPV6_GATEWAY using your server's control panel. There is no single way to find the gateway, so please access your control panel to find yours or open a support ticket. Here is an example of how it looks on [OVH](https://help.ovhcloud.com/csm/en-ie-vps-configuring-ipv6?id=kb_article_view&sysparm_article=KB0047567).
+
+```admonish warning title="WARNING"
+Be extra careful editing this file since you may lock yourself out of the server. If it happens, you can always access the server via the hoster's VNC panel.
+```
+
+Once finished, save the file and reboot the server. Now, running `ip a` command should return correct IPv4 and IPv6 addresses.
+
+Finally re-run `network_tunnel_manager.sh` script, following the steps in node [IPv6 configuration chapter](https://github.com/nymtech/nym/nodes/configuration.md#ipv6-configuration).
 
 ## Other VPS troubleshooting
 
diff --git a/explorer-api/Cargo.toml b/explorer-api/Cargo.toml
index fa799825b15..2a33ae5fc8b 100644
--- a/explorer-api/Cargo.toml
+++ b/explorer-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "explorer-api"
-version = "1.1.37"
+version = "1.1.38"
 edition = "2021"
 license.workspace = true
 
diff --git a/explorer-nextjs/app/components/Socials.tsx b/explorer-nextjs/app/components/Socials.tsx
index 7b2bb98283e..4a4856c8f27 100644
--- a/explorer-nextjs/app/components/Socials.tsx
+++ b/explorer-nextjs/app/components/Socials.tsx
@@ -7,10 +7,10 @@ import { TwitterIcon } from '../icons/socials/TwitterIcon'
 import { DiscordIcon } from '../icons/socials/DiscordIcon'
 
 // socials
-export const TELEGRAM_LINK = 'https://t.me/nymchan'
-export const TWITTER_LINK = 'https://twitter.com/nymproject'
-export const GITHUB_LINK = 'https://github.com/nymtech'
-export const DISCORD_LINK = 'https://discord.gg/FaTJb8q8'
+export const TELEGRAM_LINK = 'https://nymtech.net/go/telegram';
+export const TWITTER_LINK = 'https://nymtech.net/go/x';
+export const GITHUB_LINK = 'https://nymtech.net/go/github';
+export const DISCORD_LINK = 'https://nymtech.net/go/discord';
 
 export const Socials: FCWithChildren<{ isFooter?: boolean }> = ({
   isFooter = false,
diff --git a/explorer/src/components/Socials.tsx b/explorer/src/components/Socials.tsx
index 8beb517b6e7..e1bb33970b7 100644
--- a/explorer/src/components/Socials.tsx
+++ b/explorer/src/components/Socials.tsx
@@ -7,10 +7,10 @@ import { TwitterIcon } from '../icons/socials/TwitterIcon';
 import { DiscordIcon } from '../icons/socials/DiscordIcon';
 
 // socials
-export const TELEGRAM_LINK = 'https://t.me/nymchan';
-export const TWITTER_LINK = 'https://twitter.com/nymproject';
-export const GITHUB_LINK = 'https://github.com/nymtech';
-export const DISCORD_LINK = 'https://discord.gg/FaTJb8q8';
+export const TELEGRAM_LINK = 'https://nymtech.net/go/telegram';
+export const TWITTER_LINK = 'https://nymtech.net/go/x';
+export const GITHUB_LINK = 'https://nymtech.net/go/github';
+export const DISCORD_LINK = 'https://nymtech.net/go/discord';
 
 export const Socials: FCWithChildren<{ isFooter?: boolean }> = ({ isFooter }) => {
   const theme = useTheme();
diff --git a/gateway/src/commands/helpers.rs b/gateway/src/commands/helpers.rs
index d1672999a70..c8551cc4452 100644
--- a/gateway/src/commands/helpers.rs
+++ b/gateway/src/commands/helpers.rs
@@ -1,7 +1,6 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
-use crate::commands::upgrade_helpers;
 use log::{error, info};
 use nym_config::{save_formatted_config_to_file, OptionalSet};
 use nym_crypto::asymmetric::identity;
@@ -122,8 +121,6 @@ pub(crate) fn ensure_correct_bech32_prefix(address: &AccountId) -> Result<(), Ga
 }
 
 pub(crate) fn try_load_current_config(id: &str) -> Result<Config, GatewayError> {
-    upgrade_helpers::try_upgrade_config(id)?;
-
     Config::read_from_default_path(id).map_err(|err| {
         error!(
             "Failed to load config for {id}. Are you sure you have run `init` before? (Error was: {err})",
diff --git a/gateway/src/commands/mod.rs b/gateway/src/commands/mod.rs
index 3cd84a1c0a2..d2100efab61 100644
--- a/gateway/src/commands/mod.rs
+++ b/gateway/src/commands/mod.rs
@@ -2,9 +2,10 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use crate::Cli;
+use anyhow::bail;
 use clap::CommandFactory;
 use clap::Subcommand;
-use log::warn;
+use log::{error, warn};
 use nym_bin_common::completions::{fig_generate, ArgShell};
 use std::io::IsTerminal;
 use std::time::Duration;
@@ -17,7 +18,6 @@ pub(crate) mod run;
 pub(crate) mod setup_ip_packet_router;
 pub(crate) mod setup_network_requester;
 pub(crate) mod sign;
-mod upgrade_helpers;
 
 #[derive(Subcommand)]
 pub(crate) enum Commands {
@@ -55,6 +55,12 @@ pub(crate) enum Commands {
 pub(crate) async fn execute(args: Cli) -> anyhow::Result<()> {
     let bin_name = "nym-gateway";
 
+    if !args.force_run {
+        let msg = "standalone gateways have been deprecated - please migrate to a `nym-node` via `nym-node migrate gateways` command";
+        error!("{msg}");
+        bail!("{msg}")
+    }
+
     warn!("standalone gateways have been deprecated - please consider migrating it to a `nym-node` via `nym-node migrate gateway` command");
     if std::io::stdout().is_terminal() {
         // if user is running it in terminal session,
diff --git a/gateway/src/commands/upgrade_helpers.rs b/gateway/src/commands/upgrade_helpers.rs
deleted file mode 100644
index 3087b24aa86..00000000000
--- a/gateway/src/commands/upgrade_helpers.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use log::info;
-use nym_gateway::config::old_config_v1_1_20::ConfigV1_1_20;
-use nym_gateway::config::old_config_v1_1_28::ConfigV1_1_28;
-use nym_gateway::config::old_config_v1_1_29::ConfigV1_1_29;
-use nym_gateway::config::old_config_v1_1_31::ConfigV1_1_31;
-use nym_gateway::config::old_config_v1_1_36::ConfigV1_1_36;
-use nym_gateway::config::{default_config_filepath, Config};
-use nym_gateway::error::GatewayError;
-
-fn try_upgrade_v1_1_20_config(id: &str) -> Result<bool, GatewayError> {
-    use nym_config::legacy_helpers::nym_config::MigrationNymConfig;
-
-    // explicitly load it as v1.1.20 (which is incompatible with the current, i.e. 1.1.21+)
-    let Ok(old_config) = ConfigV1_1_20::load_from_file(id) else {
-        // if we failed to load it, there might have been nothing to upgrade
-        // or maybe it was an even older file. in either way. just ignore it and carry on with our day
-        return Ok(false);
-    };
-    info!("It seems the gateway is using <= v1.1.20 config template.");
-    info!("It is going to get updated to the current specification.");
-
-    let updated_step1: ConfigV1_1_28 = old_config.into();
-    let updated_step2: ConfigV1_1_29 = updated_step1.into();
-    let updated_step3: ConfigV1_1_31 = updated_step2.into();
-    let updated_step4: ConfigV1_1_36 = updated_step3.into();
-    let updated: Config = updated_step4.into();
-    updated
-        .save_to_default_location()
-        .map_err(|err| GatewayError::ConfigSaveFailure {
-            path: default_config_filepath(id),
-            id: id.to_string(),
-            source: err,
-        })?;
-
-    Ok(true)
-}
-
-fn try_upgrade_v1_1_28_config(id: &str) -> Result<bool, GatewayError> {
-    // explicitly load it as v1.1.28 (which is incompatible with the current, i.e. 1.1.29+)
-    let Ok(old_config) = ConfigV1_1_28::read_from_default_path(id) else {
-        // if we failed to load it, there might have been nothing to upgrade
-        // or maybe it was an even older file. in either way. just ignore it and carry on with our day
-        return Ok(false);
-    };
-    info!("It seems the gateway is using <= v1.1.28 config template.");
-    info!("It is going to get updated to the current specification.");
-
-    let updated_step1: ConfigV1_1_29 = old_config.into();
-    let updated_step2: ConfigV1_1_31 = updated_step1.into();
-    let updated_step3: ConfigV1_1_36 = updated_step2.into();
-    let updated: Config = updated_step3.into();
-    updated
-        .save_to_default_location()
-        .map_err(|err| GatewayError::ConfigSaveFailure {
-            path: default_config_filepath(id),
-            id: id.to_string(),
-            source: err,
-        })?;
-
-    Ok(true)
-}
-
-fn try_upgrade_v1_1_29_config(id: &str) -> Result<bool, GatewayError> {
-    // explicitly load it as v1.1.29 (which is incompatible with the current, i.e. 1.1.30+)
-    let Ok(old_config) = ConfigV1_1_29::read_from_default_path(id) else {
-        // if we failed to load it, there might have been nothing to upgrade
-        // or maybe it was an even older file. in either way. just ignore it and carry on with our day
-        return Ok(false);
-    };
-    info!("It seems the gateway is using <= v1.1.29 config template.");
-    info!("It is going to get updated to the current specification.");
-
-    let updated_step1: ConfigV1_1_31 = old_config.into();
-    let updated_step2: ConfigV1_1_36 = updated_step1.into();
-    let updated: Config = updated_step2.into();
-    updated
-        .save_to_default_location()
-        .map_err(|err| GatewayError::ConfigSaveFailure {
-            path: default_config_filepath(id),
-            id: id.to_string(),
-            source: err,
-        })?;
-
-    Ok(true)
-}
-
-fn try_upgrade_v1_1_31_config(id: &str) -> Result<bool, GatewayError> {
-    // explicitly load it as v1.1.31 (which is incompatible with the current, i.e. 1.1.32+)
-    let Ok(old_config) = ConfigV1_1_31::read_from_default_path(id) else {
-        // if we failed to load it, there might have been nothing to upgrade
-        // or maybe it was an even older file. in either way. just ignore it and carry on with our day
-        return Ok(false);
-    };
-    info!("It seems the gateway is using <= v1.1.31 config template.");
-    info!("It is going to get updated to the current specification.");
-
-    let updated_step1: ConfigV1_1_36 = old_config.into();
-    let updated: Config = updated_step1.into();
-    updated
-        .save_to_default_location()
-        .map_err(|err| GatewayError::ConfigSaveFailure {
-            path: default_config_filepath(id),
-            id: id.to_string(),
-            source: err,
-        })?;
-
-    Ok(true)
-}
-
-fn try_upgrade_v1_1_36_config(id: &str) -> Result<bool, GatewayError> {
-    // explicitly load it as v1.1.36 (which is incompatible with the current, i.e. 1.1.37+)
-    let Ok(old_config) = ConfigV1_1_36::read_from_default_path(id) else {
-        // if we failed to load it, there might have been nothing to upgrade
-        // or maybe it was an even older file. in either way. just ignore it and carry on with our day
-        return Ok(false);
-    };
-    info!("It seems the gateway is using <= v1.1.36 config template.");
-    info!("It is going to get updated to the current specification.");
-
-    let updated: Config = old_config.into();
-    updated
-        .save_to_default_location()
-        .map_err(|err| GatewayError::ConfigSaveFailure {
-            path: default_config_filepath(id),
-            id: id.to_string(),
-            source: err,
-        })?;
-
-    Ok(true)
-}
-
-pub(crate) fn try_upgrade_config(id: &str) -> Result<(), GatewayError> {
-    if try_upgrade_v1_1_20_config(id)? {
-        return Ok(());
-    }
-    if try_upgrade_v1_1_28_config(id)? {
-        return Ok(());
-    }
-    if try_upgrade_v1_1_29_config(id)? {
-        return Ok(());
-    }
-    if try_upgrade_v1_1_31_config(id)? {
-        return Ok(());
-    }
-    if try_upgrade_v1_1_36_config(id)? {
-        return Ok(());
-    }
-
-    Ok(())
-}
diff --git a/gateway/src/config/mod.rs b/gateway/src/config/mod.rs
index 564c0b60a58..91d1e3b92e9 100644
--- a/gateway/src/config/mod.rs
+++ b/gateway/src/config/mod.rs
@@ -22,11 +22,6 @@ use zeroize::{Zeroize, ZeroizeOnDrop};
 
 pub use crate::config::persistence::paths::GatewayPaths;
 
-pub mod old_config_v1_1_20;
-pub mod old_config_v1_1_28;
-pub mod old_config_v1_1_29;
-pub mod old_config_v1_1_31;
-pub mod old_config_v1_1_36;
 pub mod persistence;
 mod template;
 
diff --git a/gateway/src/config/old_config_v1_1_20.rs b/gateway/src/config/old_config_v1_1_20.rs
deleted file mode 100644
index 2ab7431a318..00000000000
--- a/gateway/src/config/old_config_v1_1_20.rs
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use crate::config::old_config_v1_1_28::{
-    ConfigV1_1_28, DebugV1_1_28, GatewayPathsV1_1_28, GatewayV1_1_28, KeysPathsV1_1_28,
-    LoggingSettingsV1_1_28,
-};
-use nym_config::legacy_helpers::nym_config::MigrationNymConfig;
-use nym_validator_client::nyxd;
-use serde::{Deserialize, Serialize};
-use std::net::{IpAddr, Ipv4Addr};
-use std::path::PathBuf;
-use std::str::FromStr;
-use std::time::Duration;
-use url::Url;
-
-const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "https://mainnet-stats.nymte.ch:8090/";
-const NYXD_URL: &str = "https://rpc.nymtech.net";
-const NYM_API: &str = "https://validator.nymtech.net/api/";
-const DEFAULT_MIX_LISTENING_PORT: u16 = 1789;
-const DEFAULT_CLIENT_LISTENING_PORT: u16 = 9000;
-
-const DEFAULT_PRESENCE_SENDING_DELAY: Duration = Duration::from_millis(10_000);
-const DEFAULT_PACKET_FORWARDING_INITIAL_BACKOFF: Duration = Duration::from_millis(10_000);
-const DEFAULT_PACKET_FORWARDING_MAXIMUM_BACKOFF: Duration = Duration::from_millis(300_000);
-const DEFAULT_INITIAL_CONNECTION_TIMEOUT: Duration = Duration::from_millis(1_500);
-const DEFAULT_MAXIMUM_CONNECTION_BUFFER_SIZE: usize = 2000;
-
-const DEFAULT_STORED_MESSAGE_FILENAME_LENGTH: u16 = 16;
-const DEFAULT_MESSAGE_RETRIEVAL_LIMIT: i64 = 100;
-
-/// returns a `0.0.0.0` / INADDR_ANY
-fn bind_all_address() -> IpAddr {
-    IpAddr::V4(Ipv4Addr::UNSPECIFIED)
-}
-
-#[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
-pub struct ConfigV1_1_20 {
-    gateway: GatewayV1_1_20,
-
-    #[serde(default)]
-    logging: LoggingV1_1_20,
-    #[serde(default)]
-    debug: DebugV1_1_20,
-}
-
-impl From<ConfigV1_1_20> for ConfigV1_1_28 {
-    fn from(value: ConfigV1_1_20) -> Self {
-        ConfigV1_1_28 {
-            gateway: GatewayV1_1_28 {
-                version: value.gateway.version,
-                id: value.gateway.id,
-                only_coconut_credentials: value.gateway.only_coconut_credentials,
-                listening_address: value.gateway.listening_address,
-                mix_port: value.gateway.mix_port,
-                clients_port: value.gateway.clients_port,
-                enabled_statistics: value.gateway.enabled_statistics,
-                nym_api_urls: value.gateway.nym_api_urls,
-                nyxd_urls: value.gateway.nyxd_urls,
-                statistics_service_url: value.gateway.statistics_service_url,
-                cosmos_mnemonic: value.gateway.cosmos_mnemonic,
-            },
-            storage_paths: GatewayPathsV1_1_28 {
-                keys: KeysPathsV1_1_28 {
-                    private_identity_key_file: value.gateway.private_identity_key_file,
-                    public_identity_key_file: value.gateway.public_identity_key_file,
-                    private_sphinx_key_file: value.gateway.private_sphinx_key_file,
-                    public_sphinx_key_file: value.gateway.public_sphinx_key_file,
-                },
-                clients_storage: value.gateway.persistent_storage,
-            },
-            logging: value.logging.into(),
-            debug: value.debug.into(),
-        }
-    }
-}
-
-impl MigrationNymConfig for ConfigV1_1_20 {
-    fn default_root_directory() -> PathBuf {
-        // unless this is run on some esoteric system, it should not fail thus the expect is fine
-        #[allow(clippy::expect_used)]
-        dirs::home_dir()
-            .expect("Failed to evaluate $HOME value")
-            .join(".nym")
-            .join("gateways")
-    }
-}
-
-#[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
-pub struct GatewayV1_1_20 {
-    version: String,
-    id: String,
-
-    #[serde(default)]
-    only_coconut_credentials: bool,
-    #[serde(default = "bind_all_address")]
-    listening_address: IpAddr,
-    announce_address: String,
-    mix_port: u16,
-    clients_port: u16,
-    private_identity_key_file: PathBuf,
-    public_identity_key_file: PathBuf,
-    private_sphinx_key_file: PathBuf,
-    public_sphinx_key_file: PathBuf,
-    enabled_statistics: bool,
-    statistics_service_url: Url,
-    #[serde(alias = "validator_api_urls")]
-    nym_api_urls: Vec<Url>,
-    #[serde(alias = "validator_nymd_urls")]
-    nyxd_urls: Vec<Url>,
-    cosmos_mnemonic: bip39::Mnemonic,
-    nym_root_directory: PathBuf,
-    persistent_storage: PathBuf,
-    wallet_address: Option<nyxd::AccountId>,
-}
-
-impl Default for GatewayV1_1_20 {
-    fn default() -> Self {
-        // allow usage of `expect` here as our default mainnet values should have been well-formed.
-        #[allow(clippy::expect_used)]
-        GatewayV1_1_20 {
-            version: env!("CARGO_PKG_VERSION").to_string(),
-            id: "".to_string(),
-            only_coconut_credentials: false,
-            listening_address: bind_all_address(),
-            announce_address: "127.0.0.1".to_string(),
-            mix_port: DEFAULT_MIX_LISTENING_PORT,
-            clients_port: DEFAULT_CLIENT_LISTENING_PORT,
-            private_identity_key_file: Default::default(),
-            public_identity_key_file: Default::default(),
-            private_sphinx_key_file: Default::default(),
-            public_sphinx_key_file: Default::default(),
-            enabled_statistics: false,
-            statistics_service_url: Url::from_str(STATISTICS_SERVICE_DOMAIN_ADDRESS)
-                .expect("Invalid default statistics service URL"),
-            nym_api_urls: vec![Url::from_str(NYM_API).expect("Invalid default API URL")],
-            nyxd_urls: vec![Url::from_str(NYXD_URL).expect("Invalid default nyxd URL")],
-            cosmos_mnemonic: bip39::Mnemonic::generate(24)
-                .expect("failed to generate fresh mnemonic"),
-            nym_root_directory: ConfigV1_1_20::default_root_directory(),
-            persistent_storage: Default::default(),
-            wallet_address: None,
-        }
-    }
-}
-
-#[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
-#[serde(deny_unknown_fields)]
-struct LoggingV1_1_20 {}
-
-impl From<LoggingV1_1_20> for LoggingSettingsV1_1_28 {
-    fn from(_value: LoggingV1_1_20) -> Self {
-        LoggingSettingsV1_1_28 {}
-    }
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(default)]
-struct DebugV1_1_20 {
-    #[serde(with = "humantime_serde")]
-    packet_forwarding_initial_backoff: Duration,
-    #[serde(with = "humantime_serde")]
-    packet_forwarding_maximum_backoff: Duration,
-    #[serde(with = "humantime_serde")]
-    initial_connection_timeout: Duration,
-    maximum_connection_buffer_size: usize,
-    #[serde(with = "humantime_serde")]
-    presence_sending_delay: Duration,
-    stored_messages_filename_length: u16,
-    message_retrieval_limit: i64,
-    use_legacy_framed_packet_version: bool,
-}
-
-impl From<DebugV1_1_20> for DebugV1_1_28 {
-    fn from(value: DebugV1_1_20) -> Self {
-        DebugV1_1_28 {
-            packet_forwarding_initial_backoff: value.packet_forwarding_initial_backoff,
-            packet_forwarding_maximum_backoff: value.packet_forwarding_maximum_backoff,
-            initial_connection_timeout: value.initial_connection_timeout,
-            maximum_connection_buffer_size: value.maximum_connection_buffer_size,
-            presence_sending_delay: value.presence_sending_delay,
-            stored_messages_filename_length: value.stored_messages_filename_length,
-            message_retrieval_limit: value.message_retrieval_limit,
-            use_legacy_framed_packet_version: value.use_legacy_framed_packet_version,
-        }
-    }
-}
-
-impl Default for DebugV1_1_20 {
-    fn default() -> Self {
-        DebugV1_1_20 {
-            packet_forwarding_initial_backoff: DEFAULT_PACKET_FORWARDING_INITIAL_BACKOFF,
-            packet_forwarding_maximum_backoff: DEFAULT_PACKET_FORWARDING_MAXIMUM_BACKOFF,
-            initial_connection_timeout: DEFAULT_INITIAL_CONNECTION_TIMEOUT,
-            presence_sending_delay: DEFAULT_PRESENCE_SENDING_DELAY,
-            maximum_connection_buffer_size: DEFAULT_MAXIMUM_CONNECTION_BUFFER_SIZE,
-            stored_messages_filename_length: DEFAULT_STORED_MESSAGE_FILENAME_LENGTH,
-            message_retrieval_limit: DEFAULT_MESSAGE_RETRIEVAL_LIMIT,
-            // TODO: remember to change it in one of future releases!!
-            use_legacy_framed_packet_version: true,
-        }
-    }
-}
diff --git a/gateway/src/config/old_config_v1_1_28.rs b/gateway/src/config/old_config_v1_1_28.rs
deleted file mode 100644
index 42311d36de1..00000000000
--- a/gateway/src/config/old_config_v1_1_28.rs
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright 2020-2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use crate::config::old_config_v1_1_29::{
-    ConfigV1_1_29, DebugV1_1_29, GatewayPathsV1_1_29, GatewayV1_1_29, KeysPathsV1_1_29,
-    LoggingSettingsV1_1_29,
-};
-use nym_config::{
-    must_get_home, read_config_from_toml_file, DEFAULT_CONFIG_DIR, DEFAULT_CONFIG_FILENAME, NYM_DIR,
-};
-use serde::{Deserialize, Serialize};
-use std::io;
-use std::net::IpAddr;
-use std::path::{Path, PathBuf};
-use std::time::Duration;
-use url::Url;
-
-const DEFAULT_GATEWAYS_DIR: &str = "gateways";
-
-// 'DEBUG'
-// where applicable, the below are defined in milliseconds
-const DEFAULT_PRESENCE_SENDING_DELAY: Duration = Duration::from_millis(10_000);
-const DEFAULT_PACKET_FORWARDING_INITIAL_BACKOFF: Duration = Duration::from_millis(10_000);
-const DEFAULT_PACKET_FORWARDING_MAXIMUM_BACKOFF: Duration = Duration::from_millis(300_000);
-const DEFAULT_INITIAL_CONNECTION_TIMEOUT: Duration = Duration::from_millis(1_500);
-const DEFAULT_MAXIMUM_CONNECTION_BUFFER_SIZE: usize = 2000;
-
-const DEFAULT_STORED_MESSAGE_FILENAME_LENGTH: u16 = 16;
-const DEFAULT_MESSAGE_RETRIEVAL_LIMIT: i64 = 100;
-
-/// Derive default path to gateway's config directory.
-/// It should get resolved to `$HOME/.nym/gateways/<id>/config`
-pub fn default_config_directory<P: AsRef<Path>>(id: P) -> PathBuf {
-    must_get_home()
-        .join(NYM_DIR)
-        .join(DEFAULT_GATEWAYS_DIR)
-        .join(id)
-        .join(DEFAULT_CONFIG_DIR)
-}
-
-/// Derive default path to gateways's config file.
-/// It should get resolved to `$HOME/.nym/gateways/<id>/config/config.toml`
-pub fn default_config_filepath<P: AsRef<Path>>(id: P) -> PathBuf {
-    default_config_directory(id).join(DEFAULT_CONFIG_FILENAME)
-}
-
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct KeysPathsV1_1_28 {
-    pub private_identity_key_file: PathBuf,
-    pub public_identity_key_file: PathBuf,
-    pub private_sphinx_key_file: PathBuf,
-    pub public_sphinx_key_file: PathBuf,
-}
-
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct GatewayPathsV1_1_28 {
-    pub keys: KeysPathsV1_1_28,
-    #[serde(alias = "persistent_storage")]
-    pub clients_storage: PathBuf,
-}
-
-#[derive(Debug, Default, Clone, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct LoggingSettingsV1_1_28 {}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct ConfigV1_1_28 {
-    pub gateway: GatewayV1_1_28,
-
-    pub storage_paths: GatewayPathsV1_1_28,
-
-    #[serde(default)]
-    pub logging: LoggingSettingsV1_1_28,
-
-    #[serde(default)]
-    pub debug: DebugV1_1_28,
-}
-
-impl ConfigV1_1_28 {
-    pub fn read_from_default_path<P: AsRef<Path>>(id: P) -> io::Result<Self> {
-        read_config_from_toml_file(default_config_filepath(id))
-    }
-}
-
-impl From<ConfigV1_1_28> for ConfigV1_1_29 {
-    fn from(value: ConfigV1_1_28) -> Self {
-        ConfigV1_1_29 {
-            // \/ ADDED
-            save_path: None,
-            // /\ ADDED
-            gateway: GatewayV1_1_29 {
-                version: value.gateway.version,
-                id: value.gateway.id,
-                only_coconut_credentials: value.gateway.only_coconut_credentials,
-                listening_address: value.gateway.listening_address,
-                mix_port: value.gateway.mix_port,
-                clients_port: value.gateway.clients_port,
-                enabled_statistics: value.gateway.enabled_statistics,
-                nym_api_urls: value.gateway.nym_api_urls,
-                nyxd_urls: value.gateway.nyxd_urls,
-                statistics_service_url: value.gateway.statistics_service_url,
-                cosmos_mnemonic: value.gateway.cosmos_mnemonic,
-            },
-            storage_paths: GatewayPathsV1_1_29 {
-                keys: KeysPathsV1_1_29 {
-                    private_identity_key_file: value.storage_paths.keys.private_identity_key_file,
-                    public_identity_key_file: value.storage_paths.keys.public_identity_key_file,
-                    private_sphinx_key_file: value.storage_paths.keys.private_sphinx_key_file,
-                    public_sphinx_key_file: value.storage_paths.keys.public_sphinx_key_file,
-                },
-                clients_storage: value.storage_paths.clients_storage,
-
-                // \/ ADDED
-                network_requester_config: None,
-                // /\ ADDED
-            },
-
-            // \/ ADDED
-            network_requester: Default::default(),
-            // /\ ADDED
-            logging: LoggingSettingsV1_1_29 {},
-            debug: DebugV1_1_29 {
-                packet_forwarding_initial_backoff: value.debug.packet_forwarding_initial_backoff,
-                packet_forwarding_maximum_backoff: value.debug.packet_forwarding_maximum_backoff,
-                initial_connection_timeout: value.debug.initial_connection_timeout,
-                maximum_connection_buffer_size: value.debug.maximum_connection_buffer_size,
-                presence_sending_delay: value.debug.presence_sending_delay,
-                stored_messages_filename_length: value.debug.stored_messages_filename_length,
-                message_retrieval_limit: value.debug.message_retrieval_limit,
-                use_legacy_framed_packet_version: value.debug.use_legacy_framed_packet_version,
-            },
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
-pub struct GatewayV1_1_28 {
-    /// Version of the gateway for which this configuration was created.
-    pub version: String,
-
-    /// ID specifies the human readable ID of this particular gateway.
-    pub id: String,
-
-    /// Indicates whether this gateway is accepting only coconut credentials for accessing the
-    /// the mixnet, or if it also accepts non-paying clients
-    #[serde(default)]
-    pub only_coconut_credentials: bool,
-
-    /// Address to which this mixnode will bind to and will be listening for packets.
-    pub listening_address: IpAddr,
-
-    /// Port used for listening for all mixnet traffic.
-    /// (default: 1789)
-    pub mix_port: u16,
-
-    /// Port used for listening for all client-related traffic.
-    /// (default: 9000)
-    pub clients_port: u16,
-
-    /// Whether gateway collects and sends anonymized statistics
-    pub enabled_statistics: bool,
-
-    /// Domain address of the statistics service
-    pub statistics_service_url: Url,
-
-    /// Addresses to APIs from which the node gets the view of the network.
-    #[serde(alias = "validator_api_urls")]
-    pub nym_api_urls: Vec<Url>,
-
-    /// Addresses to validators which the node uses to check for double spending of ERC20 tokens.
-    #[serde(alias = "validator_nymd_urls")]
-    pub nyxd_urls: Vec<Url>,
-
-    /// Mnemonic of a cosmos wallet used in checking for double spending.
-    // #[deprecated(note = "move to storage")]
-    // TODO: I don't think this should be stored directly in the config...
-    pub cosmos_mnemonic: bip39::Mnemonic,
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(default)]
-pub struct DebugV1_1_28 {
-    /// Initial value of an exponential backoff to reconnect to dropped TCP connection when
-    /// forwarding sphinx packets.
-    #[serde(with = "humantime_serde")]
-    pub packet_forwarding_initial_backoff: Duration,
-
-    /// Maximum value of an exponential backoff to reconnect to dropped TCP connection when
-    /// forwarding sphinx packets.
-    #[serde(with = "humantime_serde")]
-    pub packet_forwarding_maximum_backoff: Duration,
-
-    /// Timeout for establishing initial connection when trying to forward a sphinx packet.
-    #[serde(with = "humantime_serde")]
-    pub initial_connection_timeout: Duration,
-
-    /// Maximum number of packets that can be stored waiting to get sent to a particular connection.
-    pub maximum_connection_buffer_size: usize,
-
-    /// Delay between each subsequent presence data being sent.
-    #[serde(with = "humantime_serde")]
-    pub presence_sending_delay: Duration,
-
-    /// Length of filenames for new client messages.
-    pub stored_messages_filename_length: u16,
-
-    /// Number of messages from offline client that can be pulled at once from the storage.
-    pub message_retrieval_limit: i64,
-
-    /// Specifies whether the mixnode should be using the legacy framing for the sphinx packets.
-    // it's set to true by default. The reason for that decision is to preserve compatibility with the
-    // existing nodes whilst everyone else is upgrading and getting the code for handling the new field.
-    // It shall be disabled in the subsequent releases.
-    pub use_legacy_framed_packet_version: bool,
-}
-
-impl Default for DebugV1_1_28 {
-    fn default() -> Self {
-        DebugV1_1_28 {
-            packet_forwarding_initial_backoff: DEFAULT_PACKET_FORWARDING_INITIAL_BACKOFF,
-            packet_forwarding_maximum_backoff: DEFAULT_PACKET_FORWARDING_MAXIMUM_BACKOFF,
-            initial_connection_timeout: DEFAULT_INITIAL_CONNECTION_TIMEOUT,
-            presence_sending_delay: DEFAULT_PRESENCE_SENDING_DELAY,
-            maximum_connection_buffer_size: DEFAULT_MAXIMUM_CONNECTION_BUFFER_SIZE,
-            stored_messages_filename_length: DEFAULT_STORED_MESSAGE_FILENAME_LENGTH,
-            message_retrieval_limit: DEFAULT_MESSAGE_RETRIEVAL_LIMIT,
-            use_legacy_framed_packet_version: false,
-        }
-    }
-}
diff --git a/gateway/src/config/old_config_v1_1_29.rs b/gateway/src/config/old_config_v1_1_29.rs
deleted file mode 100644
index e3fd44a8c9e..00000000000
--- a/gateway/src/config/old_config_v1_1_29.rs
+++ /dev/null
@@ -1,282 +0,0 @@
-// Copyright 2020-2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use crate::config::Host;
-use nym_config::{
-    must_get_home, read_config_from_toml_file, DEFAULT_CONFIG_DIR, DEFAULT_CONFIG_FILENAME, NYM_DIR,
-};
-use serde::{Deserialize, Deserializer, Serialize};
-use std::io;
-use std::net::IpAddr;
-use std::path::{Path, PathBuf};
-use std::time::Duration;
-use url::Url;
-
-use super::old_config_v1_1_31::{
-    ConfigV1_1_31, DebugV1_1_31, GatewayPathsV1_1_31, GatewayV1_1_31, KeysPathsV1_1_31,
-    LoggingSettingsV1_1_31, NetworkRequesterV1_1_31,
-};
-
-const DEFAULT_GATEWAYS_DIR: &str = "gateways";
-
-// 'DEBUG'
-// where applicable, the below are defined in milliseconds
-const DEFAULT_PRESENCE_SENDING_DELAY: Duration = Duration::from_millis(10_000);
-const DEFAULT_PACKET_FORWARDING_INITIAL_BACKOFF: Duration = Duration::from_millis(10_000);
-const DEFAULT_PACKET_FORWARDING_MAXIMUM_BACKOFF: Duration = Duration::from_millis(300_000);
-const DEFAULT_INITIAL_CONNECTION_TIMEOUT: Duration = Duration::from_millis(1_500);
-const DEFAULT_MAXIMUM_CONNECTION_BUFFER_SIZE: usize = 2000;
-
-const DEFAULT_STORED_MESSAGE_FILENAME_LENGTH: u16 = 16;
-const DEFAULT_MESSAGE_RETRIEVAL_LIMIT: i64 = 100;
-
-/// Derive default path to gateway's config directory.
-/// It should get resolved to `$HOME/.nym/gateways/<id>/config`
-pub fn default_config_directory<P: AsRef<Path>>(id: P) -> PathBuf {
-    must_get_home()
-        .join(NYM_DIR)
-        .join(DEFAULT_GATEWAYS_DIR)
-        .join(id)
-        .join(DEFAULT_CONFIG_DIR)
-}
-
-/// Derive default path to gateways's config file.
-/// It should get resolved to `$HOME/.nym/gateways/<id>/config/config.toml`
-pub fn default_config_filepath<P: AsRef<Path>>(id: P) -> PathBuf {
-    default_config_directory(id).join(DEFAULT_CONFIG_FILENAME)
-}
-
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct KeysPathsV1_1_29 {
-    pub private_identity_key_file: PathBuf,
-    pub public_identity_key_file: PathBuf,
-    pub private_sphinx_key_file: PathBuf,
-    pub public_sphinx_key_file: PathBuf,
-}
-
-fn de_maybe_path<'de, D>(deserializer: D) -> Result<Option<PathBuf>, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let path = PathBuf::deserialize(deserializer)?;
-    if path.as_os_str().is_empty() {
-        Ok(None)
-    } else {
-        Ok(Some(path))
-    }
-}
-
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct GatewayPathsV1_1_29 {
-    pub keys: KeysPathsV1_1_29,
-
-    #[serde(alias = "persistent_storage")]
-    pub clients_storage: PathBuf,
-
-    #[serde(deserialize_with = "de_maybe_path")]
-    pub network_requester_config: Option<PathBuf>,
-}
-
-#[derive(Debug, Default, Clone, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct LoggingSettingsV1_1_29 {}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct ConfigV1_1_29 {
-    #[serde(skip)]
-    pub save_path: Option<PathBuf>,
-
-    pub gateway: GatewayV1_1_29,
-
-    pub storage_paths: GatewayPathsV1_1_29,
-
-    pub network_requester: NetworkRequesterV1_1_29,
-
-    #[serde(default)]
-    pub logging: LoggingSettingsV1_1_29,
-
-    #[serde(default)]
-    pub debug: DebugV1_1_29,
-}
-
-impl ConfigV1_1_29 {
-    pub fn read_from_default_path<P: AsRef<Path>>(id: P) -> io::Result<Self> {
-        read_config_from_toml_file(default_config_filepath(id))
-    }
-}
-
-impl From<ConfigV1_1_29> for ConfigV1_1_31 {
-    fn from(value: ConfigV1_1_29) -> Self {
-        ConfigV1_1_31 {
-            save_path: value.save_path,
-
-            // \/ ADDED
-            host: Host {
-                // this is a very bad default!
-                public_ips: vec![value.gateway.listening_address],
-                hostname: None,
-            },
-            // /\ ADDED
-
-            // \/ ADDED
-            http: Default::default(),
-            // /\ ADDED
-            gateway: GatewayV1_1_31 {
-                version: value.gateway.version,
-                id: value.gateway.id,
-                only_coconut_credentials: value.gateway.only_coconut_credentials,
-                listening_address: value.gateway.listening_address,
-                mix_port: value.gateway.mix_port,
-                clients_port: value.gateway.clients_port,
-
-                // \/ ADDED
-                clients_wss_port: None,
-                // /\ ADDED
-                enabled_statistics: value.gateway.enabled_statistics,
-                nym_api_urls: value.gateway.nym_api_urls,
-                nyxd_urls: value.gateway.nyxd_urls,
-                statistics_service_url: value.gateway.statistics_service_url,
-                cosmos_mnemonic: value.gateway.cosmos_mnemonic,
-            },
-            // \/ ADDED
-            wireguard: Default::default(),
-            // /\ ADDED
-            storage_paths: GatewayPathsV1_1_31 {
-                keys: KeysPathsV1_1_31 {
-                    private_identity_key_file: value.storage_paths.keys.private_identity_key_file,
-                    public_identity_key_file: value.storage_paths.keys.public_identity_key_file,
-                    private_sphinx_key_file: value.storage_paths.keys.private_sphinx_key_file,
-                    public_sphinx_key_file: value.storage_paths.keys.public_sphinx_key_file,
-                },
-                clients_storage: value.storage_paths.clients_storage,
-                network_requester_config: value.storage_paths.network_requester_config,
-            },
-            network_requester: NetworkRequesterV1_1_31 {
-                enabled: value.network_requester.enabled,
-            },
-            logging: LoggingSettingsV1_1_31 {},
-            debug: DebugV1_1_31 {
-                packet_forwarding_initial_backoff: value.debug.packet_forwarding_initial_backoff,
-                packet_forwarding_maximum_backoff: value.debug.packet_forwarding_maximum_backoff,
-                initial_connection_timeout: value.debug.initial_connection_timeout,
-                maximum_connection_buffer_size: value.debug.maximum_connection_buffer_size,
-                presence_sending_delay: value.debug.presence_sending_delay,
-                stored_messages_filename_length: value.debug.stored_messages_filename_length,
-                message_retrieval_limit: value.debug.message_retrieval_limit,
-                use_legacy_framed_packet_version: value.debug.use_legacy_framed_packet_version,
-            },
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
-pub struct GatewayV1_1_29 {
-    /// Version of the gateway for which this configuration was created.
-    pub version: String,
-
-    /// ID specifies the human readable ID of this particular gateway.
-    pub id: String,
-
-    /// Indicates whether this gateway is accepting only coconut credentials for accessing the
-    /// the mixnet, or if it also accepts non-paying clients
-    #[serde(default)]
-    pub only_coconut_credentials: bool,
-
-    /// Address to which this mixnode will bind to and will be listening for packets.
-    pub listening_address: IpAddr,
-
-    /// Port used for listening for all mixnet traffic.
-    /// (default: 1789)
-    pub mix_port: u16,
-
-    /// Port used for listening for all client-related traffic.
-    /// (default: 9000)
-    pub clients_port: u16,
-
-    /// Whether gateway collects and sends anonymized statistics
-    pub enabled_statistics: bool,
-
-    /// Domain address of the statistics service
-    pub statistics_service_url: Url,
-
-    /// Addresses to APIs from which the node gets the view of the network.
-    #[serde(alias = "validator_api_urls")]
-    pub nym_api_urls: Vec<Url>,
-
-    /// Addresses to validators which the node uses to check for double spending of ERC20 tokens.
-    #[serde(alias = "validator_nymd_urls")]
-    pub nyxd_urls: Vec<Url>,
-
-    /// Mnemonic of a cosmos wallet used in checking for double spending.
-    // #[deprecated(note = "move to storage")]
-    // TODO: I don't think this should be stored directly in the config...
-    pub cosmos_mnemonic: bip39::Mnemonic,
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(default)]
-pub struct NetworkRequesterV1_1_29 {
-    pub enabled: bool,
-}
-
-#[allow(clippy::derivable_impls)]
-impl Default for NetworkRequesterV1_1_29 {
-    fn default() -> Self {
-        NetworkRequesterV1_1_29 { enabled: false }
-    }
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(default)]
-pub struct DebugV1_1_29 {
-    /// Initial value of an exponential backoff to reconnect to dropped TCP connection when
-    /// forwarding sphinx packets.
-    #[serde(with = "humantime_serde")]
-    pub packet_forwarding_initial_backoff: Duration,
-
-    /// Maximum value of an exponential backoff to reconnect to dropped TCP connection when
-    /// forwarding sphinx packets.
-    #[serde(with = "humantime_serde")]
-    pub packet_forwarding_maximum_backoff: Duration,
-
-    /// Timeout for establishing initial connection when trying to forward a sphinx packet.
-    #[serde(with = "humantime_serde")]
-    pub initial_connection_timeout: Duration,
-
-    /// Maximum number of packets that can be stored waiting to get sent to a particular connection.
-    pub maximum_connection_buffer_size: usize,
-
-    /// Delay between each subsequent presence data being sent.
-    #[serde(with = "humantime_serde")]
-    pub presence_sending_delay: Duration,
-
-    /// Length of filenames for new client messages.
-    pub stored_messages_filename_length: u16,
-
-    /// Number of messages from offline client that can be pulled at once from the storage.
-    pub message_retrieval_limit: i64,
-
-    /// Specifies whether the mixnode should be using the legacy framing for the sphinx packets.
-    // it's set to true by default. The reason for that decision is to preserve compatibility with the
-    // existing nodes whilst everyone else is upgrading and getting the code for handling the new field.
-    // It shall be disabled in the subsequent releases.
-    pub use_legacy_framed_packet_version: bool,
-}
-
-impl Default for DebugV1_1_29 {
-    fn default() -> Self {
-        DebugV1_1_29 {
-            packet_forwarding_initial_backoff: DEFAULT_PACKET_FORWARDING_INITIAL_BACKOFF,
-            packet_forwarding_maximum_backoff: DEFAULT_PACKET_FORWARDING_MAXIMUM_BACKOFF,
-            initial_connection_timeout: DEFAULT_INITIAL_CONNECTION_TIMEOUT,
-            presence_sending_delay: DEFAULT_PRESENCE_SENDING_DELAY,
-            maximum_connection_buffer_size: DEFAULT_MAXIMUM_CONNECTION_BUFFER_SIZE,
-            stored_messages_filename_length: DEFAULT_STORED_MESSAGE_FILENAME_LENGTH,
-            message_retrieval_limit: DEFAULT_MESSAGE_RETRIEVAL_LIMIT,
-            use_legacy_framed_packet_version: false,
-        }
-    }
-}
diff --git a/gateway/src/config/old_config_v1_1_31.rs b/gateway/src/config/old_config_v1_1_31.rs
deleted file mode 100644
index be4ed819a2b..00000000000
--- a/gateway/src/config/old_config_v1_1_31.rs
+++ /dev/null
@@ -1,362 +0,0 @@
-// Copyright 2020-2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use nym_config::{
-    must_get_home, read_config_from_toml_file, DEFAULT_CONFIG_DIR, DEFAULT_CONFIG_FILENAME, NYM_DIR,
-};
-use nym_network_defaults::WG_PORT;
-use serde::{Deserialize, Deserializer, Serialize};
-use std::io;
-use std::net::{IpAddr, Ipv4Addr, SocketAddr};
-use std::path::{Path, PathBuf};
-use std::time::Duration;
-use url::Url;
-
-use super::old_config_v1_1_36::{
-    ConfigV1_1_36, DebugV1_1_36, GatewayPathsV1_1_36, GatewayV1_1_36, KeysPathsV1_1_36,
-    LoggingSettingsV1_1_36, NetworkRequesterV1_1_36, WireguardPathsV1_1_36, WireguardV1_1_36,
-};
-use super::{Host, Http};
-
-const DEFAULT_GATEWAYS_DIR: &str = "gateways";
-
-// 'DEBUG'
-// where applicable, the below are defined in milliseconds
-const DEFAULT_PRESENCE_SENDING_DELAY: Duration = Duration::from_millis(10_000);
-const DEFAULT_PACKET_FORWARDING_INITIAL_BACKOFF: Duration = Duration::from_millis(10_000);
-const DEFAULT_PACKET_FORWARDING_MAXIMUM_BACKOFF: Duration = Duration::from_millis(300_000);
-const DEFAULT_INITIAL_CONNECTION_TIMEOUT: Duration = Duration::from_millis(1_500);
-const DEFAULT_MAXIMUM_CONNECTION_BUFFER_SIZE: usize = 2000;
-
-const DEFAULT_STORED_MESSAGE_FILENAME_LENGTH: u16 = 16;
-const DEFAULT_MESSAGE_RETRIEVAL_LIMIT: i64 = 100;
-
-fn de_maybe_port<'de, D>(deserializer: D) -> Result<Option<u16>, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let port = u16::deserialize(deserializer)?;
-    if port == 0 {
-        Ok(None)
-    } else {
-        Ok(Some(port))
-    }
-}
-
-fn de_maybe_path<'de, D>(deserializer: D) -> Result<Option<PathBuf>, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let path = PathBuf::deserialize(deserializer)?;
-    if path.as_os_str().is_empty() {
-        Ok(None)
-    } else {
-        Ok(Some(path))
-    }
-}
-
-/// Derive default path to gateway's config directory.
-/// It should get resolved to `$HOME/.nym/gateways/<id>/config`
-pub fn default_config_directory<P: AsRef<Path>>(id: P) -> PathBuf {
-    must_get_home()
-        .join(NYM_DIR)
-        .join(DEFAULT_GATEWAYS_DIR)
-        .join(id)
-        .join(DEFAULT_CONFIG_DIR)
-}
-
-/// Derive default path to gateways's config file.
-/// It should get resolved to `$HOME/.nym/gateways/<id>/config/config.toml`
-pub fn default_config_filepath<P: AsRef<Path>>(id: P) -> PathBuf {
-    default_config_directory(id).join(DEFAULT_CONFIG_FILENAME)
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct ConfigV1_1_31 {
-    // additional metadata holding on-disk location of this config file
-    #[serde(skip)]
-    pub(crate) save_path: Option<PathBuf>,
-
-    pub host: Host,
-
-    #[serde(default)]
-    pub http: Http,
-
-    pub gateway: GatewayV1_1_31,
-
-    #[serde(default)]
-    // currently not really used for anything useful
-    pub wireguard: WireguardV1_1_31,
-
-    pub storage_paths: GatewayPathsV1_1_31,
-
-    pub network_requester: NetworkRequesterV1_1_31,
-
-    #[serde(default)]
-    pub logging: LoggingSettingsV1_1_31,
-
-    #[serde(default)]
-    pub debug: DebugV1_1_31,
-}
-
-impl ConfigV1_1_31 {
-    pub fn read_from_default_path<P: AsRef<Path>>(id: P) -> io::Result<Self> {
-        read_config_from_toml_file(default_config_filepath(id))
-    }
-}
-
-impl From<ConfigV1_1_31> for ConfigV1_1_36 {
-    fn from(value: ConfigV1_1_31) -> Self {
-        Self {
-            save_path: value.save_path,
-            host: value.host,
-            http: value.http,
-            gateway: GatewayV1_1_36 {
-                version: value.gateway.version,
-                id: value.gateway.id,
-                only_coconut_credentials: value.gateway.only_coconut_credentials,
-                listening_address: value.gateway.listening_address,
-                mix_port: value.gateway.mix_port,
-                clients_port: value.gateway.clients_port,
-                clients_wss_port: value.gateway.clients_wss_port,
-                enabled_statistics: value.gateway.enabled_statistics,
-                statistics_service_url: value.gateway.statistics_service_url,
-                nym_api_urls: value.gateway.nym_api_urls,
-                nyxd_urls: value.gateway.nyxd_urls,
-                cosmos_mnemonic: value.gateway.cosmos_mnemonic,
-            },
-            wireguard: WireguardV1_1_36 {
-                enabled: value.wireguard.enabled,
-                bind_address: value.wireguard.bind_address,
-                announced_port: value.wireguard.announced_port,
-                private_network_prefix: Default::default(),
-                storage_paths: WireguardPathsV1_1_36 {
-                    // no fields (yet)
-                },
-            },
-            storage_paths: GatewayPathsV1_1_36 {
-                keys: KeysPathsV1_1_36 {
-                    private_identity_key_file: value.storage_paths.keys.private_identity_key_file,
-                    public_identity_key_file: value.storage_paths.keys.public_identity_key_file,
-                    private_sphinx_key_file: value.storage_paths.keys.private_sphinx_key_file,
-                    public_sphinx_key_file: value.storage_paths.keys.public_sphinx_key_file,
-                },
-                clients_storage: value.storage_paths.clients_storage,
-                network_requester_config: value.storage_paths.network_requester_config,
-                // \/ ADDED
-                ip_packet_router_config: Default::default(),
-                // /\ ADDED
-            },
-            network_requester: NetworkRequesterV1_1_36 {
-                enabled: value.network_requester.enabled,
-            },
-            // \/ ADDED
-            ip_packet_router: Default::default(),
-            // /\ ADDED
-            logging: LoggingSettingsV1_1_36 {
-                // no fields (yet)
-            },
-            debug: DebugV1_1_36 {
-                packet_forwarding_initial_backoff: value.debug.packet_forwarding_initial_backoff,
-                packet_forwarding_maximum_backoff: value.debug.packet_forwarding_maximum_backoff,
-                initial_connection_timeout: value.debug.initial_connection_timeout,
-                maximum_connection_buffer_size: value.debug.maximum_connection_buffer_size,
-                presence_sending_delay: value.debug.presence_sending_delay,
-                stored_messages_filename_length: value.debug.stored_messages_filename_length,
-                message_retrieval_limit: value.debug.message_retrieval_limit,
-                use_legacy_framed_packet_version: value.debug.use_legacy_framed_packet_version,
-            },
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
-pub struct GatewayV1_1_31 {
-    /// Version of the gateway for which this configuration was created.
-    pub version: String,
-
-    /// ID specifies the human readable ID of this particular gateway.
-    pub id: String,
-
-    /// Indicates whether this gateway is accepting only coconut credentials for accessing the
-    /// the mixnet, or if it also accepts non-paying clients
-    #[serde(default)]
-    pub only_coconut_credentials: bool,
-
-    /// Address to which this mixnode will bind to and will be listening for packets.
-    pub listening_address: IpAddr,
-
-    /// Port used for listening for all mixnet traffic.
-    /// (default: 1789)
-    pub mix_port: u16,
-
-    /// Port used for listening for all client-related traffic.
-    /// (default: 9000)
-    pub clients_port: u16,
-
-    /// If applicable, announced port for listening for secure websocket client traffic.
-    /// (default: None)
-    #[serde(deserialize_with = "de_maybe_port")]
-    pub clients_wss_port: Option<u16>,
-
-    /// Whether gateway collects and sends anonymized statistics
-    pub enabled_statistics: bool,
-
-    /// Domain address of the statistics service
-    pub statistics_service_url: Url,
-
-    /// Addresses to APIs from which the node gets the view of the network.
-    #[serde(alias = "validator_api_urls")]
-    pub nym_api_urls: Vec<Url>,
-
-    /// Addresses to validators which the node uses to check for double spending of ERC20 tokens.
-    #[serde(alias = "validator_nymd_urls")]
-    pub nyxd_urls: Vec<Url>,
-
-    /// Mnemonic of a cosmos wallet used in checking for double spending.
-    // #[deprecated(note = "move to storage")]
-    // TODO: I don't think this should be stored directly in the config...
-    pub cosmos_mnemonic: bip39::Mnemonic,
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(default)]
-#[serde(deny_unknown_fields)]
-pub struct WireguardV1_1_31 {
-    /// Specifies whether the wireguard service is enabled on this node.
-    pub enabled: bool,
-
-    /// Socket address this node will use for binding its wireguard interface.
-    /// default: `0.0.0.0:51820`
-    pub bind_address: SocketAddr,
-
-    /// Port announced to external clients wishing to connect to the wireguard interface.
-    /// Useful in the instances where the node is behind a proxy.
-    pub announced_port: u16,
-
-    /// Paths for wireguard keys, client registries, etc.
-    pub storage_paths: WireguardPathsV1_1_31,
-}
-
-impl Default for WireguardV1_1_31 {
-    fn default() -> Self {
-        Self {
-            enabled: false,
-            bind_address: SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), WG_PORT),
-            announced_port: WG_PORT,
-            storage_paths: WireguardPathsV1_1_31 {},
-        }
-    }
-}
-
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct WireguardPathsV1_1_31 {
-    // pub keys:
-}
-
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct GatewayPathsV1_1_31 {
-    pub keys: KeysPathsV1_1_31,
-
-    /// Path to sqlite database containing all persistent data: messages for offline clients,
-    /// derived shared keys and available client bandwidths.
-    #[serde(alias = "persistent_storage")]
-    pub clients_storage: PathBuf,
-
-    /// Path to the configuration of the embedded network requester.
-    #[serde(deserialize_with = "de_maybe_path")]
-    pub network_requester_config: Option<PathBuf>,
-    // pub node_description: PathBuf,
-
-    // pub cosmos_bip39_mnemonic: PathBuf,
-}
-
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
-pub struct KeysPathsV1_1_31 {
-    /// Path to file containing private identity key.
-    pub private_identity_key_file: PathBuf,
-
-    /// Path to file containing public identity key.
-    pub public_identity_key_file: PathBuf,
-
-    /// Path to file containing private sphinx key.
-    pub private_sphinx_key_file: PathBuf,
-
-    /// Path to file containing public sphinx key.
-    pub public_sphinx_key_file: PathBuf,
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(default)]
-pub struct NetworkRequesterV1_1_31 {
-    /// Specifies whether network requester service is enabled in this process.
-    pub enabled: bool,
-}
-
-#[allow(clippy::derivable_impls)]
-impl Default for NetworkRequesterV1_1_31 {
-    fn default() -> Self {
-        Self { enabled: false }
-    }
-}
-
-#[derive(Debug, Default, Clone, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct LoggingSettingsV1_1_31 {
-    // well, we need to implement something here at some point...
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(default)]
-pub struct DebugV1_1_31 {
-    /// Initial value of an exponential backoff to reconnect to dropped TCP connection when
-    /// forwarding sphinx packets.
-    #[serde(with = "humantime_serde")]
-    pub packet_forwarding_initial_backoff: Duration,
-
-    /// Maximum value of an exponential backoff to reconnect to dropped TCP connection when
-    /// forwarding sphinx packets.
-    #[serde(with = "humantime_serde")]
-    pub packet_forwarding_maximum_backoff: Duration,
-
-    /// Timeout for establishing initial connection when trying to forward a sphinx packet.
-    #[serde(with = "humantime_serde")]
-    pub initial_connection_timeout: Duration,
-
-    /// Maximum number of packets that can be stored waiting to get sent to a particular connection.
-    pub maximum_connection_buffer_size: usize,
-
-    /// Delay between each subsequent presence data being sent.
-    #[serde(with = "humantime_serde")]
-    pub presence_sending_delay: Duration,
-
-    /// Length of filenames for new client messages.
-    pub stored_messages_filename_length: u16,
-
-    /// Number of messages from offline client that can be pulled at once from the storage.
-    pub message_retrieval_limit: i64,
-
-    /// Specifies whether the mixnode should be using the legacy framing for the sphinx packets.
-    // it's set to true by default. The reason for that decision is to preserve compatibility with the
-    // existing nodes whilst everyone else is upgrading and getting the code for handling the new field.
-    // It shall be disabled in the subsequent releases.
-    pub use_legacy_framed_packet_version: bool,
-}
-
-impl Default for DebugV1_1_31 {
-    fn default() -> Self {
-        Self {
-            packet_forwarding_initial_backoff: DEFAULT_PACKET_FORWARDING_INITIAL_BACKOFF,
-            packet_forwarding_maximum_backoff: DEFAULT_PACKET_FORWARDING_MAXIMUM_BACKOFF,
-            initial_connection_timeout: DEFAULT_INITIAL_CONNECTION_TIMEOUT,
-            presence_sending_delay: DEFAULT_PRESENCE_SENDING_DELAY,
-            maximum_connection_buffer_size: DEFAULT_MAXIMUM_CONNECTION_BUFFER_SIZE,
-            stored_messages_filename_length: DEFAULT_STORED_MESSAGE_FILENAME_LENGTH,
-            message_retrieval_limit: DEFAULT_MESSAGE_RETRIEVAL_LIMIT,
-            use_legacy_framed_packet_version: false,
-        }
-    }
-}
diff --git a/gateway/src/config/old_config_v1_1_36.rs b/gateway/src/config/old_config_v1_1_36.rs
deleted file mode 100644
index 8087f8041d3..00000000000
--- a/gateway/src/config/old_config_v1_1_36.rs
+++ /dev/null
@@ -1,376 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use crate::config::persistence::paths::GatewayPaths;
-use nym_bin_common::logging::LoggingSettings;
-use nym_config::{
-    must_get_home, read_config_from_toml_file, DEFAULT_CONFIG_DIR, DEFAULT_CONFIG_FILENAME, NYM_DIR,
-};
-use nym_network_defaults::WG_PORT;
-use serde::{Deserialize, Deserializer, Serialize};
-use std::io;
-use std::net::{IpAddr, Ipv4Addr, SocketAddr};
-use std::path::{Path, PathBuf};
-use std::time::Duration;
-use url::Url;
-
-use super::persistence::paths::KeysPaths;
-use super::{Config, Debug, Gateway, Host, Http, NetworkRequester};
-
-const DEFAULT_GATEWAYS_DIR: &str = "gateways";
-
-// 'DEBUG'
-// where applicable, the below are defined in milliseconds
-const DEFAULT_PRESENCE_SENDING_DELAY: Duration = Duration::from_millis(10_000);
-const DEFAULT_PACKET_FORWARDING_INITIAL_BACKOFF: Duration = Duration::from_millis(10_000);
-const DEFAULT_PACKET_FORWARDING_MAXIMUM_BACKOFF: Duration = Duration::from_millis(300_000);
-const DEFAULT_INITIAL_CONNECTION_TIMEOUT: Duration = Duration::from_millis(1_500);
-const DEFAULT_MAXIMUM_CONNECTION_BUFFER_SIZE: usize = 2000;
-
-const DEFAULT_STORED_MESSAGE_FILENAME_LENGTH: u16 = 16;
-const DEFAULT_MESSAGE_RETRIEVAL_LIMIT: i64 = 100;
-
-fn de_maybe_port<'de, D>(deserializer: D) -> Result<Option<u16>, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let port = u16::deserialize(deserializer)?;
-    if port == 0 {
-        Ok(None)
-    } else {
-        Ok(Some(port))
-    }
-}
-
-fn de_maybe_path<'de, D>(deserializer: D) -> Result<Option<PathBuf>, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let path = PathBuf::deserialize(deserializer)?;
-    if path.as_os_str().is_empty() {
-        Ok(None)
-    } else {
-        Ok(Some(path))
-    }
-}
-
-/// Derive default path to gateway's config directory.
-/// It should get resolved to `$HOME/.nym/gateways/<id>/config`
-pub fn default_config_directory<P: AsRef<Path>>(id: P) -> PathBuf {
-    must_get_home()
-        .join(NYM_DIR)
-        .join(DEFAULT_GATEWAYS_DIR)
-        .join(id)
-        .join(DEFAULT_CONFIG_DIR)
-}
-
-/// Derive default path to gateways's config file.
-/// It should get resolved to `$HOME/.nym/gateways/<id>/config/config.toml`
-pub fn default_config_filepath<P: AsRef<Path>>(id: P) -> PathBuf {
-    default_config_directory(id).join(DEFAULT_CONFIG_FILENAME)
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct ConfigV1_1_36 {
-    // additional metadata holding on-disk location of this config file
-    #[serde(skip)]
-    pub(crate) save_path: Option<PathBuf>,
-
-    pub host: Host,
-
-    #[serde(default)]
-    pub http: Http,
-
-    pub gateway: GatewayV1_1_36,
-
-    #[serde(default)]
-    // currently not really used for anything useful
-    pub wireguard: WireguardV1_1_36,
-
-    pub storage_paths: GatewayPathsV1_1_36,
-
-    pub network_requester: NetworkRequesterV1_1_36,
-
-    #[serde(default)]
-    pub ip_packet_router: IpPacketRouterV1_1_36,
-
-    #[serde(default)]
-    pub logging: LoggingSettingsV1_1_36,
-
-    #[serde(default)]
-    pub debug: DebugV1_1_36,
-}
-
-impl ConfigV1_1_36 {
-    pub fn read_from_default_path<P: AsRef<Path>>(id: P) -> io::Result<Self> {
-        read_config_from_toml_file(default_config_filepath(id))
-    }
-}
-
-impl From<ConfigV1_1_36> for Config {
-    fn from(value: ConfigV1_1_36) -> Self {
-        Self {
-            save_path: value.save_path,
-            host: value.host,
-            http: value.http,
-            gateway: Gateway {
-                version: value.gateway.version,
-                id: value.gateway.id,
-                only_coconut_credentials: value.gateway.only_coconut_credentials,
-                listening_address: value.gateway.listening_address,
-                mix_port: value.gateway.mix_port,
-                clients_port: value.gateway.clients_port,
-                clients_wss_port: value.gateway.clients_wss_port,
-                nym_api_urls: value.gateway.nym_api_urls,
-                nyxd_urls: value.gateway.nyxd_urls,
-                cosmos_mnemonic: value.gateway.cosmos_mnemonic,
-            },
-            storage_paths: GatewayPaths {
-                keys: KeysPaths {
-                    private_identity_key_file: value.storage_paths.keys.private_identity_key_file,
-                    public_identity_key_file: value.storage_paths.keys.public_identity_key_file,
-                    private_sphinx_key_file: value.storage_paths.keys.private_sphinx_key_file,
-                    public_sphinx_key_file: value.storage_paths.keys.public_sphinx_key_file,
-                },
-                clients_storage: value.storage_paths.clients_storage,
-                network_requester_config: value.storage_paths.network_requester_config,
-                // \/ ADDED
-                ip_packet_router_config: Default::default(),
-                // /\ ADDED
-            },
-            network_requester: NetworkRequester {
-                enabled: value.network_requester.enabled,
-            },
-            // \/ ADDED
-            ip_packet_router: Default::default(),
-            // /\ ADDED
-            logging: LoggingSettings {
-                // no fields (yet)
-            },
-            debug: Debug {
-                packet_forwarding_initial_backoff: value.debug.packet_forwarding_initial_backoff,
-                packet_forwarding_maximum_backoff: value.debug.packet_forwarding_maximum_backoff,
-                initial_connection_timeout: value.debug.initial_connection_timeout,
-                maximum_connection_buffer_size: value.debug.maximum_connection_buffer_size,
-                presence_sending_delay: value.debug.presence_sending_delay,
-                stored_messages_filename_length: value.debug.stored_messages_filename_length,
-                message_retrieval_limit: value.debug.message_retrieval_limit,
-                use_legacy_framed_packet_version: value.debug.use_legacy_framed_packet_version,
-                ..Default::default()
-            },
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
-pub struct GatewayV1_1_36 {
-    /// Version of the gateway for which this configuration was created.
-    pub version: String,
-
-    /// ID specifies the human readable ID of this particular gateway.
-    pub id: String,
-
-    /// Indicates whether this gateway is accepting only coconut credentials for accessing the
-    /// the mixnet, or if it also accepts non-paying clients
-    #[serde(default)]
-    pub only_coconut_credentials: bool,
-
-    /// Address to which this mixnode will bind to and will be listening for packets.
-    pub listening_address: IpAddr,
-
-    /// Port used for listening for all mixnet traffic.
-    /// (default: 1789)
-    pub mix_port: u16,
-
-    /// Port used for listening for all client-related traffic.
-    /// (default: 9000)
-    pub clients_port: u16,
-
-    /// If applicable, announced port for listening for secure websocket client traffic.
-    /// (default: None)
-    #[serde(deserialize_with = "de_maybe_port")]
-    pub clients_wss_port: Option<u16>,
-
-    /// Whether gateway collects and sends anonymized statistics
-    pub enabled_statistics: bool,
-
-    /// Domain address of the statistics service
-    pub statistics_service_url: Url,
-
-    /// Addresses to APIs from which the node gets the view of the network.
-    #[serde(alias = "validator_api_urls")]
-    pub nym_api_urls: Vec<Url>,
-
-    /// Addresses to validators which the node uses to check for double spending of ERC20 tokens.
-    #[serde(alias = "validator_nymd_urls")]
-    pub nyxd_urls: Vec<Url>,
-
-    /// Mnemonic of a cosmos wallet used in checking for double spending.
-    // #[deprecated(note = "move to storage")]
-    // TODO: I don't think this should be stored directly in the config...
-    pub cosmos_mnemonic: bip39::Mnemonic,
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(default)]
-#[serde(deny_unknown_fields)]
-pub struct WireguardV1_1_36 {
-    /// Specifies whether the wireguard service is enabled on this node.
-    pub enabled: bool,
-
-    /// Socket address this node will use for binding its wireguard interface.
-    /// default: `0.0.0.0:51820`
-    pub bind_address: SocketAddr,
-
-    /// Port announced to external clients wishing to connect to the wireguard interface.
-    /// Useful in the instances where the node is behind a proxy.
-    pub announced_port: u16,
-
-    /// The prefix denoting the maximum number of the clients that can be connected via Wireguard.
-    /// The maximum value for IPv4 is 32 and for IPv6 is 128
-    pub private_network_prefix: u8,
-
-    /// Paths for wireguard keys, client registries, etc.
-    pub storage_paths: WireguardPathsV1_1_36,
-}
-
-impl Default for WireguardV1_1_36 {
-    fn default() -> Self {
-        Self {
-            enabled: false,
-            bind_address: SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), WG_PORT),
-            announced_port: WG_PORT,
-            storage_paths: WireguardPathsV1_1_36 {},
-            private_network_prefix: 16,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct WireguardPathsV1_1_36 {
-    // pub keys:
-}
-
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct GatewayPathsV1_1_36 {
-    pub keys: KeysPathsV1_1_36,
-
-    /// Path to sqlite database containing all persistent data: messages for offline clients,
-    /// derived shared keys and available client bandwidths.
-    #[serde(alias = "persistent_storage")]
-    pub clients_storage: PathBuf,
-
-    /// Path to the configuration of the embedded network requester.
-    #[serde(deserialize_with = "de_maybe_path")]
-    pub network_requester_config: Option<PathBuf>,
-    // pub node_description: PathBuf,
-
-    // pub cosmos_bip39_mnemonic: PathBuf,
-    /// Path to the configuration of the embedded ip packet router.
-    #[serde(deserialize_with = "de_maybe_path")]
-    pub ip_packet_router_config: Option<PathBuf>,
-}
-
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
-pub struct KeysPathsV1_1_36 {
-    /// Path to file containing private identity key.
-    pub private_identity_key_file: PathBuf,
-
-    /// Path to file containing public identity key.
-    pub public_identity_key_file: PathBuf,
-
-    /// Path to file containing private sphinx key.
-    pub private_sphinx_key_file: PathBuf,
-
-    /// Path to file containing public sphinx key.
-    pub public_sphinx_key_file: PathBuf,
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(default)]
-pub struct NetworkRequesterV1_1_36 {
-    /// Specifies whether network requester service is enabled in this process.
-    pub enabled: bool,
-}
-
-#[allow(clippy::derivable_impls)]
-impl Default for NetworkRequesterV1_1_36 {
-    fn default() -> Self {
-        Self { enabled: false }
-    }
-}
-
-#[derive(Debug, Default, Clone, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct LoggingSettingsV1_1_36 {
-    // well, we need to implement something here at some point...
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(default)]
-pub struct DebugV1_1_36 {
-    /// Initial value of an exponential backoff to reconnect to dropped TCP connection when
-    /// forwarding sphinx packets.
-    #[serde(with = "humantime_serde")]
-    pub packet_forwarding_initial_backoff: Duration,
-
-    /// Maximum value of an exponential backoff to reconnect to dropped TCP connection when
-    /// forwarding sphinx packets.
-    #[serde(with = "humantime_serde")]
-    pub packet_forwarding_maximum_backoff: Duration,
-
-    /// Timeout for establishing initial connection when trying to forward a sphinx packet.
-    #[serde(with = "humantime_serde")]
-    pub initial_connection_timeout: Duration,
-
-    /// Maximum number of packets that can be stored waiting to get sent to a particular connection.
-    pub maximum_connection_buffer_size: usize,
-
-    /// Delay between each subsequent presence data being sent.
-    #[serde(with = "humantime_serde")]
-    pub presence_sending_delay: Duration,
-
-    /// Length of filenames for new client messages.
-    pub stored_messages_filename_length: u16,
-
-    /// Number of messages from offline client that can be pulled at once from the storage.
-    pub message_retrieval_limit: i64,
-
-    /// Specifies whether the mixnode should be using the legacy framing for the sphinx packets.
-    // it's set to true by default. The reason for that decision is to preserve compatibility with the
-    // existing nodes whilst everyone else is upgrading and getting the code for handling the new field.
-    // It shall be disabled in the subsequent releases.
-    pub use_legacy_framed_packet_version: bool,
-}
-
-impl Default for DebugV1_1_36 {
-    fn default() -> Self {
-        Self {
-            packet_forwarding_initial_backoff: DEFAULT_PACKET_FORWARDING_INITIAL_BACKOFF,
-            packet_forwarding_maximum_backoff: DEFAULT_PACKET_FORWARDING_MAXIMUM_BACKOFF,
-            initial_connection_timeout: DEFAULT_INITIAL_CONNECTION_TIMEOUT,
-            presence_sending_delay: DEFAULT_PRESENCE_SENDING_DELAY,
-            maximum_connection_buffer_size: DEFAULT_MAXIMUM_CONNECTION_BUFFER_SIZE,
-            stored_messages_filename_length: DEFAULT_STORED_MESSAGE_FILENAME_LENGTH,
-            message_retrieval_limit: DEFAULT_MESSAGE_RETRIEVAL_LIMIT,
-            use_legacy_framed_packet_version: false,
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(default)]
-pub struct IpPacketRouterV1_1_36 {
-    /// Specifies whether ip packet router service is enabled in this process.
-    pub enabled: bool,
-}
-
-#[allow(clippy::derivable_impls)]
-impl Default for IpPacketRouterV1_1_36 {
-    fn default() -> Self {
-        Self { enabled: false }
-    }
-}
diff --git a/gateway/src/main.rs b/gateway/src/main.rs
index 81c9d329d4b..3c5109817b7 100644
--- a/gateway/src/main.rs
+++ b/gateway/src/main.rs
@@ -27,6 +27,10 @@ struct Cli {
     #[clap(short, long)]
     pub(crate) config_env_file: Option<std::path::PathBuf>,
 
+    /// Force run the binary bypassing the deprecation in favour of nym-node
+    #[clap(long, hide = true)]
+    pub(crate) force_run: bool,
+
     /// Flag used for disabling the printed banner in tty.
     #[clap(long)]
     pub(crate) no_banner: bool,
diff --git a/gateway/src/node/mod.rs b/gateway/src/node/mod.rs
index 3f8690dd79d..c17c9dd4a8d 100644
--- a/gateway/src/node/mod.rs
+++ b/gateway/src/node/mod.rs
@@ -257,6 +257,7 @@ impl<St> Gateway<St> {
             .ok_or(GatewayError::UnspecifiedAuthenticatorConfig)?;
         let (router_tx, mut router_rx) = oneshot::channel();
         let (auth_mix_sender, auth_mix_receiver) = mpsc::unbounded();
+        let (peer_response_tx, peer_response_rx) = tokio::sync::mpsc::unbounded_channel();
         let router_shutdown = shutdown.fork("message_router");
         let transceiver = LocalGateway::new(
             *self.identity_keypair.public_key(),
@@ -269,6 +270,7 @@ impl<St> Gateway<St> {
             let mut authenticator_server = nym_authenticator::Authenticator::new(
                 opts.config.clone(),
                 wireguard_data.inner.clone(),
+                peer_response_rx,
             )
             .with_custom_gateway_transceiver(Box::new(transceiver))
             .with_shutdown(shutdown.fork("authenticator"))
@@ -299,7 +301,8 @@ impl<St> Gateway<St> {
             MessageRouter::new(auth_mix_receiver, packet_router)
                 .start_with_shutdown(router_shutdown);
 
-            let wg_api = nym_wireguard::start_wireguard(shutdown, wireguard_data).await?;
+            let wg_api =
+                nym_wireguard::start_wireguard(shutdown, wireguard_data, peer_response_tx).await?;
 
             Ok(StartedAuthenticator {
                 wg_api,
diff --git a/mixnode/src/commands/mod.rs b/mixnode/src/commands/mod.rs
index 4891cd2798b..a5cdfcc6c71 100644
--- a/mixnode/src/commands/mod.rs
+++ b/mixnode/src/commands/mod.rs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use crate::Cli;
+use anyhow::bail;
 use clap::CommandFactory;
 use clap::Subcommand;
 use colored::Colorize;
@@ -23,7 +24,6 @@ mod init;
 mod node_details;
 mod run;
 mod sign;
-mod upgrade_helpers;
 
 #[derive(Subcommand)]
 pub(crate) enum Commands {
@@ -67,6 +67,12 @@ struct OverrideConfig {
 pub(crate) async fn execute(args: Cli) -> anyhow::Result<()> {
     let bin_name = "nym-mixnode";
 
+    if !args.force_run {
+        let msg = "standalone mixnodes have been deprecated - please migrate to a `nym-node` via `nym-node migrate mixnode` command";
+        error!("{msg}");
+        bail!("{msg}")
+    }
+
     warn!("standalone mixnodes have been deprecated - please consider migrating it to a `nym-node` via `nym-node migrate mixnode` command");
     if std::io::stdout().is_terminal() {
         // if user is running it in terminal session,
@@ -125,8 +131,6 @@ pub(crate) fn validate_bech32_address_or_exit(address: &str) {
 }
 
 fn try_load_current_config(id: &str) -> Result<Config, MixnodeError> {
-    upgrade_helpers::try_upgrade_config(id)?;
-
     Config::read_from_default_path(id).map_err(|err| {
         error!(
             "Failed to load config for {id}. Are you sure you have run `init` before? (Error was: {err})",
diff --git a/mixnode/src/commands/upgrade_helpers.rs b/mixnode/src/commands/upgrade_helpers.rs
deleted file mode 100644
index bf5e1a38820..00000000000
--- a/mixnode/src/commands/upgrade_helpers.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use log::info;
-use nym_mixnode::config::old_config_v1_1_21::ConfigV1_1_21;
-use nym_mixnode::config::old_config_v1_1_32::ConfigV1_1_32;
-use nym_mixnode::config::{default_config_filepath, Config};
-use nym_mixnode::error::MixnodeError;
-
-fn try_upgrade_v1_1_21_config(id: &str) -> Result<bool, MixnodeError> {
-    use nym_config::legacy_helpers::nym_config::MigrationNymConfig;
-
-    // explicitly load it as v1.1.21 (which is incompatible with the current, i.e. 1.1.22+)
-    let Ok(old_config) = ConfigV1_1_21::load_from_file(id) else {
-        // if we failed to load it, there might have been nothing to upgrade
-        // or maybe it was an even older file. in either way. just ignore it and carry on with our day
-        return Ok(false);
-    };
-    info!("It seems the mixnode is using <= v1.1.21 config template.");
-    info!("It is going to get updated to the current specification.");
-
-    let updated_step1: ConfigV1_1_32 = old_config.into();
-
-    let updated: Config = updated_step1.into();
-    updated
-        .save_to_default_location()
-        .map_err(|err| MixnodeError::ConfigSaveFailure {
-            path: default_config_filepath(id),
-            id: id.to_string(),
-            source: err,
-        })?;
-
-    Ok(true)
-}
-
-fn try_upgrade_v1_1_32_config(id: &str) -> Result<bool, MixnodeError> {
-    // explicitly load it as v1.1.32 (which is incompatible with the current, i.e. 1.1.22+)
-    let Ok(old_config) = ConfigV1_1_32::read_from_default_path(id) else {
-        // if we failed to load it, there might have been nothing to upgrade
-        // or maybe it was an even older file. in either way. just ignore it and carry on with our day
-        return Ok(false);
-    };
-    info!("It seems the mixnode is using <= v1.1.32 config template.");
-    info!("It is going to get updated to the current specification.");
-
-    let updated: Config = old_config.into();
-    updated
-        .save_to_default_location()
-        .map_err(|err| MixnodeError::ConfigSaveFailure {
-            path: default_config_filepath(id),
-            id: id.to_string(),
-            source: err,
-        })?;
-
-    Ok(true)
-}
-
-pub(crate) fn try_upgrade_config(id: &str) -> Result<(), MixnodeError> {
-    if try_upgrade_v1_1_21_config(id)? {
-        return Ok(());
-    }
-    if try_upgrade_v1_1_32_config(id)? {
-        return Ok(());
-    }
-    Ok(())
-}
diff --git a/mixnode/src/config/mod.rs b/mixnode/src/config/mod.rs
index 21a2e3949d5..2f964035440 100644
--- a/mixnode/src/config/mod.rs
+++ b/mixnode/src/config/mod.rs
@@ -22,8 +22,6 @@ use std::str::FromStr;
 use std::time::Duration;
 use url::Url;
 
-pub mod old_config_v1_1_21;
-pub mod old_config_v1_1_32;
 pub mod persistence;
 mod template;
 
diff --git a/mixnode/src/config/old_config_v1_1_21.rs b/mixnode/src/config/old_config_v1_1_21.rs
deleted file mode 100644
index b8f5252893f..00000000000
--- a/mixnode/src/config/old_config_v1_1_21.rs
+++ /dev/null
@@ -1,251 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use crate::config::old_config_v1_1_32::{
-    ConfigV1_1_32, DebugV1_1_32, MixNodeV1_1_32, VerlocV1_1_32,
-};
-use crate::config::persistence::paths::{KeysPaths, MixNodePaths};
-use nym_bin_common::logging::LoggingSettings;
-use nym_config::legacy_helpers::nym_config::MigrationNymConfig;
-use nym_validator_client::nyxd;
-use serde::{Deserialize, Deserializer, Serialize};
-use std::net::{IpAddr, SocketAddr};
-use std::path::PathBuf;
-use std::str::FromStr;
-use std::time::Duration;
-use url::Url;
-
-const DEFAULT_MIX_LISTENING_PORT: u16 = 1789;
-const DEFAULT_VERLOC_LISTENING_PORT: u16 = 1790;
-const DEFAULT_HTTP_API_LISTENING_PORT: u16 = 8000;
-const NYM_API: &str = "https://validator.nymtech.net/api/";
-const DESCRIPTION_FILE: &str = "description.toml";
-
-// 'RTT MEASUREMENT'
-const DEFAULT_PACKETS_PER_NODE: usize = 100;
-const DEFAULT_CONNECTION_TIMEOUT: Duration = Duration::from_millis(5000);
-const DEFAULT_PACKET_TIMEOUT: Duration = Duration::from_millis(1500);
-const DEFAULT_DELAY_BETWEEN_PACKETS: Duration = Duration::from_millis(50);
-const DEFAULT_BATCH_SIZE: usize = 50;
-const DEFAULT_TESTING_INTERVAL: Duration = Duration::from_secs(60 * 60 * 12);
-const DEFAULT_RETRY_TIMEOUT: Duration = Duration::from_secs(60 * 30);
-
-// 'DEBUG'
-const DEFAULT_NODE_STATS_LOGGING_DELAY: Duration = Duration::from_millis(60_000);
-const DEFAULT_NODE_STATS_UPDATING_DELAY: Duration = Duration::from_millis(30_000);
-const DEFAULT_PACKET_FORWARDING_INITIAL_BACKOFF: Duration = Duration::from_millis(10_000);
-const DEFAULT_PACKET_FORWARDING_MAXIMUM_BACKOFF: Duration = Duration::from_millis(300_000);
-const DEFAULT_INITIAL_CONNECTION_TIMEOUT: Duration = Duration::from_millis(1_500);
-const DEFAULT_MAXIMUM_CONNECTION_BUFFER_SIZE: usize = 2000;
-
-pub(super) fn de_ipaddr_from_maybe_str_socks_addr<'de, D>(
-    deserializer: D,
-) -> Result<IpAddr, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let s = String::deserialize(deserializer)?;
-    if let Ok(socket_addr) = SocketAddr::from_str(&s) {
-        Ok(socket_addr.ip())
-    } else {
-        IpAddr::from_str(&s).map_err(serde::de::Error::custom)
-    }
-}
-
-fn bind_all_address() -> IpAddr {
-    "0.0.0.0".parse().unwrap()
-}
-
-#[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct ConfigV1_1_21 {
-    mixnode: MixNodeV1_1_21,
-
-    #[serde(default)]
-    verloc: VerlocV1_1_21,
-    #[serde(default)]
-    logging: LoggingV1_1_21,
-    #[serde(default)]
-    debug: DebugV1_1_21,
-}
-
-impl From<ConfigV1_1_21> for ConfigV1_1_32 {
-    fn from(value: ConfigV1_1_21) -> Self {
-        let node_description =
-            ConfigV1_1_21::default_config_directory(&value.mixnode.id).join(DESCRIPTION_FILE);
-
-        ConfigV1_1_32 {
-            mixnode: MixNodeV1_1_32 {
-                version: value.mixnode.version,
-                id: value.mixnode.id,
-                listening_address: value.mixnode.listening_address,
-                mix_port: value.mixnode.mix_port,
-                verloc_port: value.mixnode.verloc_port,
-                http_api_port: value.mixnode.http_api_port,
-                nym_api_urls: value.mixnode.nym_api_urls,
-            },
-            storage_paths: MixNodePaths {
-                keys: KeysPaths {
-                    private_identity_key_file: value.mixnode.private_identity_key_file,
-                    public_identity_key_file: value.mixnode.public_identity_key_file,
-                    private_sphinx_key_file: value.mixnode.private_sphinx_key_file,
-                    public_sphinx_key_file: value.mixnode.public_sphinx_key_file,
-                },
-                node_description,
-            },
-            verloc: value.verloc.into(),
-            logging: value.logging.into(),
-            debug: value.debug.into(),
-        }
-    }
-}
-
-impl MigrationNymConfig for ConfigV1_1_21 {
-    fn default_root_directory() -> PathBuf {
-        dirs::home_dir()
-            .expect("Failed to evaluate $HOME value")
-            .join(".nym")
-            .join("mixnodes")
-    }
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-struct MixNodeV1_1_21 {
-    version: String,
-    id: String,
-    #[serde(deserialize_with = "de_ipaddr_from_maybe_str_socks_addr")]
-    listening_address: IpAddr,
-    announce_address: String,
-    mix_port: u16,
-    verloc_port: u16,
-    http_api_port: u16,
-    private_identity_key_file: PathBuf,
-    public_identity_key_file: PathBuf,
-    private_sphinx_key_file: PathBuf,
-    public_sphinx_key_file: PathBuf,
-    nym_api_urls: Vec<Url>,
-    nym_root_directory: PathBuf,
-    wallet_address: Option<nyxd::AccountId>,
-}
-
-impl Default for MixNodeV1_1_21 {
-    fn default() -> Self {
-        MixNodeV1_1_21 {
-            version: env!("CARGO_PKG_VERSION").to_string(),
-            id: "".to_string(),
-            listening_address: bind_all_address(),
-            announce_address: "127.0.0.1".to_string(),
-            mix_port: DEFAULT_MIX_LISTENING_PORT,
-            verloc_port: DEFAULT_VERLOC_LISTENING_PORT,
-            http_api_port: DEFAULT_HTTP_API_LISTENING_PORT,
-            private_identity_key_file: Default::default(),
-            public_identity_key_file: Default::default(),
-            private_sphinx_key_file: Default::default(),
-            public_sphinx_key_file: Default::default(),
-            nym_api_urls: vec![Url::from_str(NYM_API).expect("Invalid default API URL")],
-            nym_root_directory: ConfigV1_1_21::default_root_directory(),
-            wallet_address: None,
-        }
-    }
-}
-
-#[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
-#[serde(deny_unknown_fields)]
-struct LoggingV1_1_21 {}
-
-impl From<LoggingV1_1_21> for LoggingSettings {
-    fn from(_value: LoggingV1_1_21) -> Self {
-        LoggingSettings {}
-    }
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(deny_unknown_fields)]
-struct VerlocV1_1_21 {
-    packets_per_node: usize,
-    connection_timeout: Duration,
-    packet_timeout: Duration,
-    delay_between_packets: Duration,
-    tested_nodes_batch_size: usize,
-    testing_interval: Duration,
-    retry_timeout: Duration,
-}
-
-impl From<VerlocV1_1_21> for VerlocV1_1_32 {
-    fn from(value: VerlocV1_1_21) -> Self {
-        VerlocV1_1_32 {
-            packets_per_node: value.packets_per_node,
-            connection_timeout: value.connection_timeout,
-            packet_timeout: value.packet_timeout,
-            delay_between_packets: value.delay_between_packets,
-            tested_nodes_batch_size: value.tested_nodes_batch_size,
-            testing_interval: value.testing_interval,
-            retry_timeout: value.retry_timeout,
-        }
-    }
-}
-
-impl Default for VerlocV1_1_21 {
-    fn default() -> Self {
-        VerlocV1_1_21 {
-            packets_per_node: DEFAULT_PACKETS_PER_NODE,
-            connection_timeout: DEFAULT_CONNECTION_TIMEOUT,
-            packet_timeout: DEFAULT_PACKET_TIMEOUT,
-            delay_between_packets: DEFAULT_DELAY_BETWEEN_PACKETS,
-            tested_nodes_batch_size: DEFAULT_BATCH_SIZE,
-            testing_interval: DEFAULT_TESTING_INTERVAL,
-            retry_timeout: DEFAULT_RETRY_TIMEOUT,
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(default)]
-struct DebugV1_1_21 {
-    #[serde(with = "humantime_serde")]
-    node_stats_logging_delay: Duration,
-
-    #[serde(with = "humantime_serde")]
-    node_stats_updating_delay: Duration,
-
-    #[serde(with = "humantime_serde")]
-    packet_forwarding_initial_backoff: Duration,
-
-    #[serde(with = "humantime_serde")]
-    packet_forwarding_maximum_backoff: Duration,
-
-    #[serde(with = "humantime_serde")]
-    initial_connection_timeout: Duration,
-
-    maximum_connection_buffer_size: usize,
-
-    use_legacy_framed_packet_version: bool,
-}
-
-impl From<DebugV1_1_21> for DebugV1_1_32 {
-    fn from(value: DebugV1_1_21) -> Self {
-        DebugV1_1_32 {
-            node_stats_logging_delay: value.node_stats_logging_delay,
-            node_stats_updating_delay: value.node_stats_updating_delay,
-            packet_forwarding_initial_backoff: value.packet_forwarding_initial_backoff,
-            packet_forwarding_maximum_backoff: value.packet_forwarding_maximum_backoff,
-            initial_connection_timeout: value.initial_connection_timeout,
-            maximum_connection_buffer_size: value.maximum_connection_buffer_size,
-            use_legacy_framed_packet_version: value.use_legacy_framed_packet_version,
-        }
-    }
-}
-
-impl Default for DebugV1_1_21 {
-    fn default() -> Self {
-        DebugV1_1_21 {
-            node_stats_logging_delay: DEFAULT_NODE_STATS_LOGGING_DELAY,
-            node_stats_updating_delay: DEFAULT_NODE_STATS_UPDATING_DELAY,
-            packet_forwarding_initial_backoff: DEFAULT_PACKET_FORWARDING_INITIAL_BACKOFF,
-            packet_forwarding_maximum_backoff: DEFAULT_PACKET_FORWARDING_MAXIMUM_BACKOFF,
-            initial_connection_timeout: DEFAULT_INITIAL_CONNECTION_TIMEOUT,
-            maximum_connection_buffer_size: DEFAULT_MAXIMUM_CONNECTION_BUFFER_SIZE,
-            use_legacy_framed_packet_version: true,
-        }
-    }
-}
diff --git a/mixnode/src/config/old_config_v1_1_32.rs b/mixnode/src/config/old_config_v1_1_32.rs
deleted file mode 100644
index 1c2f2340d5d..00000000000
--- a/mixnode/src/config/old_config_v1_1_32.rs
+++ /dev/null
@@ -1,265 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use crate::config;
-use crate::config::persistence::paths::MixNodePaths;
-use crate::config::{Config, Debug, MixNode, Verloc};
-use nym_bin_common::logging::LoggingSettings;
-use nym_config::{
-    must_get_home, read_config_from_toml_file, DEFAULT_CONFIG_DIR, DEFAULT_CONFIG_FILENAME, NYM_DIR,
-};
-use serde::{Deserialize, Serialize};
-use std::io;
-use std::net::{IpAddr, SocketAddr};
-use std::path::{Path, PathBuf};
-use std::time::Duration;
-use url::Url;
-
-const DEFAULT_MIXNODES_DIR: &str = "mixnodes";
-
-// 'RTT MEASUREMENT'
-const DEFAULT_PACKETS_PER_NODE: usize = 100;
-const DEFAULT_CONNECTION_TIMEOUT: Duration = Duration::from_millis(5000);
-const DEFAULT_PACKET_TIMEOUT: Duration = Duration::from_millis(1500);
-const DEFAULT_DELAY_BETWEEN_PACKETS: Duration = Duration::from_millis(50);
-const DEFAULT_BATCH_SIZE: usize = 50;
-const DEFAULT_TESTING_INTERVAL: Duration = Duration::from_secs(60 * 60 * 12);
-const DEFAULT_RETRY_TIMEOUT: Duration = Duration::from_secs(60 * 30);
-
-// 'DEBUG'
-const DEFAULT_NODE_STATS_LOGGING_DELAY: Duration = Duration::from_millis(60_000);
-const DEFAULT_NODE_STATS_UPDATING_DELAY: Duration = Duration::from_millis(30_000);
-const DEFAULT_PACKET_FORWARDING_INITIAL_BACKOFF: Duration = Duration::from_millis(10_000);
-const DEFAULT_PACKET_FORWARDING_MAXIMUM_BACKOFF: Duration = Duration::from_millis(300_000);
-const DEFAULT_INITIAL_CONNECTION_TIMEOUT: Duration = Duration::from_millis(1_500);
-const DEFAULT_MAXIMUM_CONNECTION_BUFFER_SIZE: usize = 2000;
-
-/// Derive default path to mixnodes's config directory.
-/// It should get resolved to `$HOME/.nym/mixnodes/<id>/config`
-fn default_config_directory<P: AsRef<Path>>(id: P) -> PathBuf {
-    must_get_home()
-        .join(NYM_DIR)
-        .join(DEFAULT_MIXNODES_DIR)
-        .join(id)
-        .join(DEFAULT_CONFIG_DIR)
-}
-
-/// Derive default path to mixnodes's config file.
-/// It should get resolved to `$HOME/.nym/mixnodes/<id>/config/config.toml`
-fn default_config_filepath<P: AsRef<Path>>(id: P) -> PathBuf {
-    default_config_directory(id).join(DEFAULT_CONFIG_FILENAME)
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct ConfigV1_1_32 {
-    pub mixnode: MixNodeV1_1_32,
-
-    // i hope this laziness is not going to backfire...
-    pub storage_paths: MixNodePaths,
-
-    #[serde(default)]
-    pub verloc: VerlocV1_1_32,
-
-    #[serde(default)]
-    pub logging: LoggingSettings,
-
-    #[serde(default)]
-    pub debug: DebugV1_1_32,
-}
-
-impl ConfigV1_1_32 {
-    pub fn read_from_default_path<P: AsRef<Path>>(id: P) -> io::Result<Self> {
-        read_config_from_toml_file(default_config_filepath(id))
-    }
-}
-
-impl From<ConfigV1_1_32> for Config {
-    fn from(value: ConfigV1_1_32) -> Self {
-        Config {
-            // \/ ADDED
-            save_path: None,
-            // /\ ADDED
-
-            // \/ ADDED
-            host: config::Host {
-                // this is a very bad default!
-                public_ips: vec![value.mixnode.listening_address],
-                hostname: None,
-            },
-            // /\ ADDED
-
-            // \/ ADDED
-            http: config::Http {
-                bind_address: SocketAddr::new(
-                    value.mixnode.listening_address,
-                    value.mixnode.http_api_port,
-                ),
-                landing_page_assets_path: None,
-                metrics_key: None,
-            },
-            // /\ ADDED
-            mixnode: MixNode {
-                version: value.mixnode.version,
-                id: value.mixnode.id,
-                listening_address: value.mixnode.listening_address,
-                mix_port: value.mixnode.mix_port,
-                verloc_port: value.mixnode.verloc_port,
-                nym_api_urls: value.mixnode.nym_api_urls,
-            },
-            storage_paths: value.storage_paths,
-            verloc: value.verloc.into(),
-            logging: value.logging,
-            debug: value.debug.into(),
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-pub struct MixNodeV1_1_32 {
-    /// Version of the mixnode for which this configuration was created.
-    pub version: String,
-
-    /// ID specifies the human readable ID of this particular mixnode.
-    pub id: String,
-
-    /// Address to which this mixnode will bind to and will be listening for packets.
-    pub listening_address: IpAddr,
-
-    /// Port used for listening for all mixnet traffic.
-    /// (default: 1789)
-    pub mix_port: u16,
-
-    /// Port used for listening for verloc traffic.
-    /// (default: 1790)
-    pub verloc_port: u16,
-
-    /// Port used for listening for http requests.
-    /// (default: 8000)
-    pub http_api_port: u16,
-
-    /// Addresses to nym APIs from which the node gets the view of the network.
-    pub nym_api_urls: Vec<Url>,
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct VerlocV1_1_32 {
-    /// Specifies number of echo packets sent to each node during a measurement run.
-    pub packets_per_node: usize,
-
-    /// Specifies maximum amount of time to wait for the connection to get established.
-    #[serde(with = "humantime_serde")]
-    pub connection_timeout: Duration,
-
-    /// Specifies maximum amount of time to wait for the reply packet to arrive before abandoning the test.
-    #[serde(with = "humantime_serde")]
-    pub packet_timeout: Duration,
-
-    /// Specifies delay between subsequent test packets being sent (after receiving a reply).
-    #[serde(with = "humantime_serde")]
-    pub delay_between_packets: Duration,
-
-    /// Specifies number of nodes being tested at once.
-    pub tested_nodes_batch_size: usize,
-
-    /// Specifies delay between subsequent test runs.
-    #[serde(with = "humantime_serde")]
-    pub testing_interval: Duration,
-
-    /// Specifies delay between attempting to run the measurement again if the previous run failed
-    /// due to being unable to get the list of nodes.
-    #[serde(with = "humantime_serde")]
-    pub retry_timeout: Duration,
-}
-
-impl From<VerlocV1_1_32> for Verloc {
-    fn from(value: VerlocV1_1_32) -> Self {
-        Verloc {
-            packets_per_node: value.packets_per_node,
-            connection_timeout: value.connection_timeout,
-            packet_timeout: value.packet_timeout,
-            delay_between_packets: value.delay_between_packets,
-            tested_nodes_batch_size: value.tested_nodes_batch_size,
-            testing_interval: value.testing_interval,
-            retry_timeout: value.retry_timeout,
-        }
-    }
-}
-
-impl Default for VerlocV1_1_32 {
-    fn default() -> Self {
-        VerlocV1_1_32 {
-            packets_per_node: DEFAULT_PACKETS_PER_NODE,
-            connection_timeout: DEFAULT_CONNECTION_TIMEOUT,
-            packet_timeout: DEFAULT_PACKET_TIMEOUT,
-            delay_between_packets: DEFAULT_DELAY_BETWEEN_PACKETS,
-            tested_nodes_batch_size: DEFAULT_BATCH_SIZE,
-            testing_interval: DEFAULT_TESTING_INTERVAL,
-            retry_timeout: DEFAULT_RETRY_TIMEOUT,
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, PartialEq, Serialize)]
-#[serde(default)]
-pub struct DebugV1_1_32 {
-    /// Delay between each subsequent node statistics being logged to the console
-    #[serde(with = "humantime_serde")]
-    pub node_stats_logging_delay: Duration,
-
-    /// Delay between each subsequent node statistics being updated
-    #[serde(with = "humantime_serde")]
-    pub node_stats_updating_delay: Duration,
-
-    /// Initial value of an exponential backoff to reconnect to dropped TCP connection when
-    /// forwarding sphinx packets.
-    #[serde(with = "humantime_serde")]
-    pub packet_forwarding_initial_backoff: Duration,
-
-    /// Maximum value of an exponential backoff to reconnect to dropped TCP connection when
-    /// forwarding sphinx packets.
-    #[serde(with = "humantime_serde")]
-    pub packet_forwarding_maximum_backoff: Duration,
-
-    /// Timeout for establishing initial connection when trying to forward a sphinx packet.
-    #[serde(with = "humantime_serde")]
-    pub initial_connection_timeout: Duration,
-
-    /// Maximum number of packets that can be stored waiting to get sent to a particular connection.
-    pub maximum_connection_buffer_size: usize,
-
-    /// Specifies whether the mixnode should be using the legacy framing for the sphinx packets.
-    // it's set to true by default. The reason for that decision is to preserve compatibility with the
-    // existing nodes whilst everyone else is upgrading and getting the code for handling the new field.
-    // It shall be disabled in the subsequent releases.
-    pub use_legacy_framed_packet_version: bool,
-}
-
-impl From<DebugV1_1_32> for Debug {
-    fn from(value: DebugV1_1_32) -> Self {
-        Debug {
-            node_stats_logging_delay: value.node_stats_logging_delay,
-            node_stats_updating_delay: value.node_stats_updating_delay,
-            packet_forwarding_initial_backoff: value.packet_forwarding_initial_backoff,
-            packet_forwarding_maximum_backoff: value.packet_forwarding_maximum_backoff,
-            initial_connection_timeout: value.initial_connection_timeout,
-            maximum_connection_buffer_size: value.maximum_connection_buffer_size,
-            use_legacy_framed_packet_version: value.use_legacy_framed_packet_version,
-        }
-    }
-}
-
-impl Default for DebugV1_1_32 {
-    fn default() -> Self {
-        DebugV1_1_32 {
-            node_stats_logging_delay: DEFAULT_NODE_STATS_LOGGING_DELAY,
-            node_stats_updating_delay: DEFAULT_NODE_STATS_UPDATING_DELAY,
-            packet_forwarding_initial_backoff: DEFAULT_PACKET_FORWARDING_INITIAL_BACKOFF,
-            packet_forwarding_maximum_backoff: DEFAULT_PACKET_FORWARDING_MAXIMUM_BACKOFF,
-            initial_connection_timeout: DEFAULT_INITIAL_CONNECTION_TIMEOUT,
-            maximum_connection_buffer_size: DEFAULT_MAXIMUM_CONNECTION_BUFFER_SIZE,
-            use_legacy_framed_packet_version: false,
-        }
-    }
-}
diff --git a/mixnode/src/main.rs b/mixnode/src/main.rs
index 05300729939..e7a577a80f1 100644
--- a/mixnode/src/main.rs
+++ b/mixnode/src/main.rs
@@ -23,6 +23,10 @@ struct Cli {
     #[clap(short, long)]
     pub(crate) config_env_file: Option<std::path::PathBuf>,
 
+    /// Force run the binary bypassing the deprecation in favour of nym-node
+    #[clap(long, hide = true)]
+    pub(crate) force_run: bool,
+
     /// Flag used for disabling the printed banner in tty.
     #[clap(long)]
     pub(crate) no_banner: bool,
diff --git a/nym-api/Cargo.toml b/nym-api/Cargo.toml
index a3a22e81547..1d11d5994c2 100644
--- a/nym-api/Cargo.toml
+++ b/nym-api/Cargo.toml
@@ -4,7 +4,7 @@
 [package]
 name = "nym-api"
 license = "GPL-3.0"
-version = "1.1.41"
+version = "1.1.42"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",
diff --git a/nym-api/src/coconut/dkg/public_key.rs b/nym-api/src/coconut/dkg/public_key.rs
index b7a899b6cb3..b2b7689923d 100644
--- a/nym-api/src/coconut/dkg/public_key.rs
+++ b/nym-api/src/coconut/dkg/public_key.rs
@@ -20,6 +20,7 @@ impl<R: RngCore + CryptoRng> DkgController<R> {
     /// - BTE public key (alongside the proof of discrete log)
     /// - ed25519 public key
     /// - announce address to be used by clients for obtaining credentials
+    ///
     /// Upon successful registration, the node will receive a unique "NodeIndex"
     /// which is the x-coordinate of the to be derived keys.
     ///
diff --git a/nym-api/src/coconut/storage/manager.rs b/nym-api/src/coconut/storage/manager.rs
index 8cea9ef898f..c22d295459e 100644
--- a/nym-api/src/coconut/storage/manager.rs
+++ b/nym-api/src/coconut/storage/manager.rs
@@ -4,7 +4,6 @@
 use crate::coconut::storage::models::{EpochCredentials, IssuedCredential};
 use crate::support::storage::manager::StorageManager;
 use nym_coconut_dkg_common::types::EpochId;
-use thiserror::Error;
 
 #[async_trait]
 pub trait CoconutStorageManagerExt {
@@ -23,6 +22,7 @@ pub trait CoconutStorageManagerExt {
     /// # Arguments
     ///
     /// * `epoch_id`: Id of the (coconut) epoch in question.
+    #[allow(dead_code)]
     async fn create_epoch_credentials_entry(&self, epoch_id: EpochId) -> Result<(), sqlx::Error>;
 
     /// Update the EpochCredentials by incrementing the total number of issued credentials,
@@ -361,10 +361,3 @@ impl CoconutStorageManagerExt for StorageManager {
         Ok(())
     }
 }
-
-#[derive(Debug, Error)]
-#[error("tried to store an invalid nonce. the received value is {got} while current is {current}. expected {current} + 1")]
-pub struct UnexpectedNonce {
-    current: u32,
-    got: u32,
-}
diff --git a/nym-api/src/coconut/tests/fixtures.rs b/nym-api/src/coconut/tests/fixtures.rs
index 38e964f3950..d883d122baf 100644
--- a/nym-api/src/coconut/tests/fixtures.rs
+++ b/nym-api/src/coconut/tests/fixtures.rs
@@ -33,12 +33,12 @@ pub fn pseudorandom_account(rng: &mut ChaCha20Rng) -> AccountId {
     AccountId::new("n", &dummy_account_key_hash).unwrap()
 }
 
-pub fn dealer_fixture(mut rng: &mut ChaCha20Rng, id: NodeIndex) -> DealerDetails {
+pub fn dealer_fixture(rng: &mut ChaCha20Rng, id: NodeIndex) -> DealerDetails {
     // we might possibly need that private key later on
-    let keypair = DkgKeyPair::new(dkg::params(), &mut rng);
+    let keypair = DkgKeyPair::new(dkg::params(), rng.clone());
 
     let addr = pseudorandom_account(rng);
-    let identity_keypair = identity::KeyPair::new(&mut rng);
+    let identity_keypair = identity::KeyPair::new(rng);
     let bte_public_key_with_proof = bs58::encode(&keypair.public_key().to_bytes()).into_string();
 
     let port = 8080 + id;
diff --git a/nym-api/src/epoch_operations/mod.rs b/nym-api/src/epoch_operations/mod.rs
index 7bb3116086c..c14fd7f90a8 100644
--- a/nym-api/src/epoch_operations/mod.rs
+++ b/nym-api/src/epoch_operations/mod.rs
@@ -63,15 +63,15 @@ impl RewardedSetUpdater {
     /// 2. it queries the mixnet contract to check the current `EpochState` in order to figure out whether
     ///     a different nym-api has already started epoch transition (not yet applicable)
     /// 3. it sends a `BeginEpochTransition` message to the mixnet contract causing the following to happen:
-    ///     - if successful, the address of the this validator is going to be saved as being responsible for progressing this epoch.
-    ///     What it means in practice is that once we have multiple instances of nym-api running,
-    ///     only this one will try to perform the rest of the actions. It will also allow it to
-    ///     more easily recover in case of crashes.
+    ///     - if successful, the address of this validator is going to be saved as being responsible for progressing this epoch.
+    ///         What it means in practice is that once we have multiple instances of nym-api running,
+    ///         only this one will try to perform the rest of the actions. It will also allow it to
+    ///         more easily recover in case of crashes.
     ///     - the `EpochState` changes to `Rewarding`, meaning the nym-api will now be allowed to send
-    ///    `RewardMixnode` transactions. However, it's not going to be able anything else like `ReconcileEpochEvents`
-    ///     until that is done.
+    ///         `RewardMixnode` transactions. However, it's not going to be able anything else like `ReconcileEpochEvents`
+    ///         until that is done.
     ///     - ability to send transactions (by other users) that get resolved once given epoch/interval rolls over,
-    ///     such as `BondMixnode` or `DelegateToMixnode` will temporarily be frozen until the entire procedure is finished.
+    ///         such as `BondMixnode` or `DelegateToMixnode` will temporarily be frozen until the entire procedure is finished.
     /// 4. it obtains the current rewarded set and for each node in there (**SORTED BY MIX_ID!!**),
     ///    it sends (in a single batch) `RewardMixnode` message with the measured performance.
     ///    Once the final message gets executed, the mixnet contract automatically transitions
diff --git a/nym-node/Cargo.toml b/nym-node/Cargo.toml
index 8e1eda2c539..b897f2d0089 100644
--- a/nym-node/Cargo.toml
+++ b/nym-node/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-node"
-version = "1.1.5"
+version = "1.1.6"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true
diff --git a/nym-node/src/config/old_configs/old_config_v1.rs b/nym-node/src/config/old_configs/old_config_v1.rs
index e3a76cdc56c..a09eee36e7c 100644
--- a/nym-node/src/config/old_configs/old_config_v1.rs
+++ b/nym-node/src/config/old_configs/old_config_v1.rs
@@ -15,7 +15,9 @@ use serde::{Deserialize, Serialize};
 #[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct WireguardPathsV1 {
+    #[serde(skip)]
     pub private_diffie_hellman_key_file: PathBuf,
+    #[serde(skip)]
     pub public_diffie_hellman_key_file: PathBuf,
 }
 
diff --git a/nym-node/src/node/mod.rs b/nym-node/src/node/mod.rs
index 4bfbbe2febf..c851decf239 100644
--- a/nym-node/src/node/mod.rs
+++ b/nym-node/src/node/mod.rs
@@ -32,7 +32,7 @@ use nym_node_http_api::{NymNodeHTTPServer, NymNodeRouter};
 use nym_sphinx_acknowledgements::AckKey;
 use nym_sphinx_addressing::Recipient;
 use nym_task::{TaskClient, TaskManager};
-use nym_wireguard::{peer_controller::PeerControlMessage, WireguardGatewayData};
+use nym_wireguard::{peer_controller::PeerControlRequest, WireguardGatewayData};
 use rand::rngs::OsRng;
 use rand::{CryptoRng, RngCore};
 use std::path::Path;
@@ -264,7 +264,7 @@ impl ExitGatewayData {
 
 pub struct WireguardData {
     inner: WireguardGatewayData,
-    peer_rx: UnboundedReceiver<PeerControlMessage>,
+    peer_rx: UnboundedReceiver<PeerControlRequest>,
 }
 
 impl WireguardData {
diff --git a/nym-wallet/src-tauri/src/config/mod.rs b/nym-wallet/src-tauri/src/config/mod.rs
index 371a6343986..ff2ffcf12fa 100644
--- a/nym-wallet/src-tauri/src/config/mod.rs
+++ b/nym-wallet/src-tauri/src/config/mod.rs
@@ -507,7 +507,6 @@ struct NetworkDetails {
     stake_denom: DenomDetailsOwned,
     mixnet_contract_address: String,
     vesting_contract_address: String,
-    statistics_service_url: String,
     validators: Vec<ValidatorDetails>,
 }
 
@@ -527,7 +526,6 @@ impl From<NymNetworkDetails> for NetworkDetails {
                 .contracts
                 .vesting_contract_address
                 .unwrap_or_default(),
-            statistics_service_url: "".to_string(),
             validators: details.endpoints,
         }
     }
diff --git a/nym-wallet/src-tauri/src/state.rs b/nym-wallet/src-tauri/src/state.rs
index 5fd4485e18d..714f542498b 100644
--- a/nym-wallet/src-tauri/src/state.rs
+++ b/nym-wallet/src-tauri/src/state.rs
@@ -272,6 +272,7 @@ impl WalletStateInner {
     /// 1. from the configuration file
     /// 2. provided remotely
     /// 3. hardcoded fallback
+    ///
     /// The format is the config backend format, which is flat due to serialization preference.
     pub fn get_config_validator_entries(
         &self,
diff --git a/nym-wallet/src-tauri/src/wallet_storage/mod.rs b/nym-wallet/src-tauri/src/wallet_storage/mod.rs
index 01b2461982e..14d295a8a49 100644
--- a/nym-wallet/src-tauri/src/wallet_storage/mod.rs
+++ b/nym-wallet/src-tauri/src/wallet_storage/mod.rs
@@ -7,8 +7,8 @@
 ///
 /// Wallet
 /// - Login
-/// -- Account
-/// --- Mnemonic
+///   -- Account
+///     --- Mnemonic
 pub(crate) use crate::wallet_storage::account_data::StoredLogin;
 pub(crate) use crate::wallet_storage::password::{AccountId, LoginId, UserPassword};
 
diff --git a/nym-wallet/webdriver/yarn.lock b/nym-wallet/webdriver/yarn.lock
index 9a472f3167c..58e9f4a4da1 100644
--- a/nym-wallet/webdriver/yarn.lock
+++ b/nym-wallet/webdriver/yarn.lock
@@ -615,11 +615,11 @@ brace-expansion@^2.0.1:
     balanced-match "^1.0.0"
 
 braces@^3.0.1, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 browser-stdout@1.3.1:
   version "1.3.1"
@@ -1107,10 +1107,10 @@ filelist@^1.0.1:
   dependencies:
     minimatch "^5.0.1"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
diff --git a/sdk/rust/nym-sdk/src/mixnet.rs b/sdk/rust/nym-sdk/src/mixnet.rs
index 04c03659c08..1d2fd0fcc17 100644
--- a/sdk/rust/nym-sdk/src/mixnet.rs
+++ b/sdk/rust/nym-sdk/src/mixnet.rs
@@ -67,6 +67,7 @@ pub use nym_credential_storage::{
     ephemeral_storage::EphemeralStorage as EphemeralCredentialStorage,
     models::StoredIssuedCredential, storage::Storage as CredentialStorage,
 };
+pub use nym_crypto::asymmetric::ed25519;
 pub use nym_network_defaults::NymNetworkDetails;
 pub use nym_socks5_client_core::config::Socks5;
 pub use nym_sphinx::{
diff --git a/sdk/rust/nym-sdk/src/mixnet/client.rs b/sdk/rust/nym-sdk/src/mixnet/client.rs
index 52bfa59883c..f22c20e072a 100644
--- a/sdk/rust/nym-sdk/src/mixnet/client.rs
+++ b/sdk/rust/nym-sdk/src/mixnet/client.rs
@@ -610,8 +610,7 @@ where
     ///
     /// - If the client is already registered with a gateway, use that gateway.
     /// - If no gateway is registered, but there is an existing configuration and key, use that.
-    /// - If no gateway is registered, and there is no pre-existing configuration or key, try to
-    /// register a new gateway.
+    /// - If no gateway is registered, and there is no pre-existing configuration or key, try to register a new gateway.
     ///
     /// # Example
     ///
@@ -691,8 +690,7 @@ where
     ///
     /// - If the client is already registered with a gateway, use that gateway.
     /// - If no gateway is registered, but there is an existing configuration and key, use that.
-    /// - If no gateway is registered, and there is no pre-existing configuration or key, try to
-    /// register a new gateway.
+    /// - If no gateway is registered, and there is no pre-existing configuration or key, try to register a new gateway.
     ///
     /// # Example
     ///
diff --git a/sdk/typescript/docs/components/footer.tsx b/sdk/typescript/docs/components/footer.tsx
index 7aa4e112cff..71061b0497e 100644
--- a/sdk/typescript/docs/components/footer.tsx
+++ b/sdk/typescript/docs/components/footer.tsx
@@ -2,10 +2,10 @@ import React from 'react';
 import Stack from '@mui/material/Stack';
 
 const links = [
-  ['Twitter', 'https://twitter.com/nymproject'],
-  ['Telegram', 'https://t.me/nymchan'],
-  ['Discord', 'https://discord.gg/FaTJb8q8'],
-  ['GitHub', 'https://github.com/nymtech/nym'],
+  ['Twitter', 'https://nymtech.net/go/twitter'],
+  ['Telegram', 'https://nymtech.net/go/telegram'],
+  ['Discord', 'https://nymtech.net/go/discord'],
+  ['GitHub', 'https://nymtech.net/go/github/nym'],
   ['Nym Wallet', 'https://nymtech.net/download/wallet'],
   ['Nym Explorer', 'https://explorer.nymtech.net/'],
   ['Nym Blog', 'https://nymtech.medium.com/'],
diff --git a/sdk/typescript/docs/theme.config.tsx b/sdk/typescript/docs/theme.config.tsx
index a3116599b05..c9280a6ae9b 100644
--- a/sdk/typescript/docs/theme.config.tsx
+++ b/sdk/typescript/docs/theme.config.tsx
@@ -8,7 +8,7 @@ const config: DocsThemeConfig = {
     link: 'https://github.com/nymtech/nym',
   },
   chat: {
-    link: 'https://discord.gg/FaTJb8q8',
+    link: 'https://nymtech.net/go/discord',
   },
   docsRepositoryBase: 'https://github.com/nymtech/nym/tree/develop/sdk/typescript/docs',
   footer: {
diff --git a/sdk/typescript/packages/react-components/package.json b/sdk/typescript/packages/react-components/package.json
index 6322ded2af3..49c288d4a24 100644
--- a/sdk/typescript/packages/react-components/package.json
+++ b/sdk/typescript/packages/react-components/package.json
@@ -30,15 +30,16 @@
     "@mui/styles": ">= 5",
     "@mui/system": ">= 5",
     "@nymproject/mui-theme": "1",
-    "zxcvbn": "^4.4.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
     "@nymproject/nym-validator-client": "^0.18.0",
     "@nymproject/types": "1",
     "base58": "4",
-    "bech32": "^1.1.4"
+    "bech32": "^1.1.4",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "zxcvbn": "^4.4.2"
   },
   "dependencies": {
+    "@mui/x-tree-view": "^7.10.0",
     "flat": "^5.0.2",
     "use-clipboard-copy": "^0.2.0"
   },
diff --git a/sdk/typescript/packages/react-components/src/playground/theme/MUIThemeExplorer.tsx b/sdk/typescript/packages/react-components/src/playground/theme/MUIThemeExplorer.tsx
index 82b64dae9ce..87cbbd10ba4 100644
--- a/sdk/typescript/packages/react-components/src/playground/theme/MUIThemeExplorer.tsx
+++ b/sdk/typescript/packages/react-components/src/playground/theme/MUIThemeExplorer.tsx
@@ -1,10 +1,7 @@
 /* eslint-disable react/no-array-index-key */
-import type { Theme } from '@mui/material/styles';
 import * as React from 'react';
-import TreeView from '@mui/lab/TreeView';
-import TreeItem from '@mui/lab/TreeItem';
-import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
-import ArrowRightIcon from '@mui/icons-material/ArrowRight';
+import type { Theme } from '@mui/material/styles';
+import { SimpleTreeView, TreeItem } from '@mui/x-tree-view';
 import { Box } from '@mui/material';
 
 const MUIThemeExplorerItem: FCWithChildren<{
@@ -21,7 +18,7 @@ const MUIThemeExplorerItem: FCWithChildren<{
   if (typeof item === 'string') {
     return (
       <TreeItem
-        nodeId={`${path}`}
+        itemId={`${path}`}
         label={
           <Box sx={{ display: 'flex', alignItems: 'center', p: 0.5, pr: 0 }}>
             <Box
@@ -48,7 +45,7 @@ const MUIThemeExplorerItem: FCWithChildren<{
 
   if (Array.isArray(item)) {
     return (
-      <TreeItem nodeId={`${path}-array`} label={`${parentKey}[]`}>
+      <TreeItem itemId={`${path}-array`} label={`${parentKey}[]`}>
         {item.map((i, idx) => (
           <MUIThemeExplorerItem
             key={`${parentKey}-${idx}`}
@@ -65,7 +62,7 @@ const MUIThemeExplorerItem: FCWithChildren<{
 
   if (typeof item === 'object' && Object.keys(item).length) {
     return (
-      <TreeItem nodeId={`${path}`} label={`${parentKey}`}>
+      <TreeItem itemId={`${path}`} label={`${parentKey}`}>
         {Object.keys(item).map((key) => (
           <MUIThemeExplorerItem
             key={`${parentKey}-${key}`}
@@ -85,14 +82,11 @@ const MUIThemeExplorerItem: FCWithChildren<{
 export const MUIThemeExplorer: FCWithChildren<{
   theme: Theme;
 }> = ({ theme }) => (
-  <TreeView
-    defaultExpanded={['theme.palette', 'theme.palette.nym', 'theme.palette.nym.highlight']}
-    defaultCollapseIcon={<ArrowDropDownIcon />}
-    defaultExpandIcon={<ArrowRightIcon />}
-    defaultEndIcon={<div style={{ width: 24 }} />}
+  <SimpleTreeView
+    defaultExpandedItems={['theme.palette', 'theme.palette.nym', 'theme.palette.nym.highlight']}
     sx={{ height: 500, flexGrow: 1, width: '100%', overflowY: 'auto' }}
   >
     <MUIThemeExplorerItem theme={theme} item={theme.palette} parentKey="palette" path="theme.palette" />
-    <TreeItem nodeId="test">Test</TreeItem>
-  </TreeView>
+    <TreeItem itemId="test">Test</TreeItem>
+  </SimpleTreeView>
 );
diff --git a/service-providers/authenticator/src/authenticator.rs b/service-providers/authenticator/src/authenticator.rs
index e8faf1b3715..04e77896a22 100644
--- a/service-providers/authenticator/src/authenticator.rs
+++ b/service-providers/authenticator/src/authenticator.rs
@@ -8,7 +8,8 @@ use ipnetwork::IpNetwork;
 use nym_client_core::{HardcodedTopologyProvider, TopologyProvider};
 use nym_sdk::{mixnet::Recipient, GatewayTransceiver};
 use nym_task::{TaskClient, TaskHandle};
-use nym_wireguard::WireguardGatewayData;
+use nym_wireguard::{peer_controller::PeerControlResponse, WireguardGatewayData};
+use tokio::sync::mpsc::UnboundedReceiver;
 
 use crate::{config::Config, error::AuthenticatorError};
 
@@ -30,18 +31,24 @@ pub struct Authenticator {
     custom_topology_provider: Option<Box<dyn TopologyProvider + Send + Sync>>,
     custom_gateway_transceiver: Option<Box<dyn GatewayTransceiver + Send + Sync>>,
     wireguard_gateway_data: WireguardGatewayData,
+    response_rx: UnboundedReceiver<PeerControlResponse>,
     shutdown: Option<TaskClient>,
     on_start: Option<oneshot::Sender<OnStartData>>,
 }
 
 impl Authenticator {
-    pub fn new(config: Config, wireguard_gateway_data: WireguardGatewayData) -> Self {
+    pub fn new(
+        config: Config,
+        wireguard_gateway_data: WireguardGatewayData,
+        response_rx: UnboundedReceiver<PeerControlResponse>,
+    ) -> Self {
         Self {
             config,
             wait_for_gateway: false,
             custom_topology_provider: None,
             custom_gateway_transceiver: None,
             wireguard_gateway_data,
+            response_rx,
             shutdown: None,
             on_start: None,
         }
@@ -129,6 +136,7 @@ impl Authenticator {
             self.config,
             private_ip_network,
             self.wireguard_gateway_data,
+            self.response_rx,
             mixnet_client,
             task_handle,
         );
diff --git a/service-providers/authenticator/src/cli/peer_handler.rs b/service-providers/authenticator/src/cli/peer_handler.rs
index 599941c5fb9..b4d6e1faea6 100644
--- a/service-providers/authenticator/src/cli/peer_handler.rs
+++ b/service-providers/authenticator/src/cli/peer_handler.rs
@@ -2,21 +2,24 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use nym_sdk::TaskClient;
-use nym_wireguard::peer_controller::PeerControlMessage;
+use nym_wireguard::peer_controller::{PeerControlRequest, PeerControlResponse};
 use tokio::sync::mpsc;
 
 pub struct DummyHandler {
-    peer_rx: mpsc::UnboundedReceiver<PeerControlMessage>,
+    peer_rx: mpsc::UnboundedReceiver<PeerControlRequest>,
+    response_tx: mpsc::UnboundedSender<PeerControlResponse>,
     task_client: TaskClient,
 }
 
 impl DummyHandler {
     pub fn new(
-        peer_rx: mpsc::UnboundedReceiver<PeerControlMessage>,
+        peer_rx: mpsc::UnboundedReceiver<PeerControlRequest>,
+        response_tx: mpsc::UnboundedSender<PeerControlResponse>,
         task_client: TaskClient,
     ) -> Self {
         DummyHandler {
             peer_rx,
+            response_tx,
             task_client,
         }
     }
@@ -27,11 +30,17 @@ impl DummyHandler {
                 msg = self.peer_rx.recv() => {
                     if let Some(msg) = msg {
                         match msg {
-                            PeerControlMessage::AddPeer(peer) => {
+                            PeerControlRequest::AddPeer(peer) => {
                                 log::info!("[DUMMY] Adding peer {:?}", peer);
+                                self.response_tx.send(PeerControlResponse::AddPeer { success: true }).ok();
                             }
-                            PeerControlMessage::RemovePeer(key) => {
+                            PeerControlRequest::RemovePeer(key) => {
                                 log::info!("[DUMMY] Removing peer {:?}", key);
+                                self.response_tx.send(PeerControlResponse::RemovePeer { success: true }).ok();
+                            }
+                            PeerControlRequest::QueryBandwidth(key) => {
+                                log::info!("[DUMMY] Querying bandwidth for peer {:?}", key);
+                                self.response_tx.send(PeerControlResponse::QueryBandwidth { bandwidth_data: None }).ok();
                             }
                         }
                     } else {
diff --git a/service-providers/authenticator/src/cli/run.rs b/service-providers/authenticator/src/cli/run.rs
index e1191449874..0abaa4b3cde 100644
--- a/service-providers/authenticator/src/cli/run.rs
+++ b/service-providers/authenticator/src/cli/run.rs
@@ -14,6 +14,7 @@ use nym_crypto::asymmetric::x25519::KeyPair;
 use nym_task::TaskHandle;
 use nym_wireguard::WireguardGatewayData;
 use rand::rngs::OsRng;
+use tokio::sync::mpsc::unbounded_channel;
 
 #[allow(clippy::struct_excessive_bools)]
 #[derive(Args, Clone)]
@@ -48,11 +49,13 @@ pub(crate) async fn execute(args: &Run) -> Result<(), AuthenticatorError> {
         Arc::new(KeyPair::new(&mut OsRng)),
     );
     let task_handler = TaskHandle::default();
-    let handler = DummyHandler::new(peer_rx, task_handler.fork("peer-handler"));
+    let (response_tx, response_rx) = unbounded_channel();
+    let handler = DummyHandler::new(peer_rx, response_tx, task_handler.fork("peer-handler"));
     tokio::spawn(async move {
         handler.run().await;
     });
-    let mut server = nym_authenticator::Authenticator::new(config, wireguard_gateway_data);
+    let mut server =
+        nym_authenticator::Authenticator::new(config, wireguard_gateway_data, response_rx);
     if let Some(custom_mixnet) = &args.common_args.custom_mixnet {
         server = server.with_stored_topology(custom_mixnet)?
     }
diff --git a/service-providers/authenticator/src/mixnet_listener.rs b/service-providers/authenticator/src/mixnet_listener.rs
index 355a92f28c6..a93b2185ef2 100644
--- a/service-providers/authenticator/src/mixnet_listener.rs
+++ b/service-providers/authenticator/src/mixnet_listener.rs
@@ -17,12 +17,13 @@ use nym_authenticator_requests::v1::{
 use nym_sdk::mixnet::{InputMessage, MixnetMessageSender, Recipient, TransmissionLane};
 use nym_sphinx::receiver::ReconstructedMessage;
 use nym_task::TaskHandle;
-use nym_wireguard::WireguardGatewayData;
+use nym_wireguard::{peer_controller::PeerControlResponse, WireguardGatewayData};
 use nym_wireguard_types::{
-    registration::{PendingRegistrations, PrivateIPs, RegistrationData},
+    registration::{PendingRegistrations, PrivateIPs, RegistrationData, RegistredData},
     GatewayClient, InitMessage, PeerPublicKey,
 };
 use rand::{prelude::IteratorRandom, thread_rng};
+use tokio::sync::mpsc::UnboundedReceiver;
 use tokio_stream::wrappers::IntervalStream;
 
 use crate::{config::Config, error::*};
@@ -45,6 +46,8 @@ pub(crate) struct MixnetListener {
 
     pub(crate) wireguard_gateway_data: WireguardGatewayData,
 
+    pub(crate) response_rx: UnboundedReceiver<PeerControlResponse>,
+
     pub(crate) free_private_network_ips: Arc<PrivateIPs>,
 
     pub(crate) timeout_check_interval: IntervalStream,
@@ -55,6 +58,7 @@ impl MixnetListener {
         config: Config,
         private_ip_network: IpNetwork,
         wireguard_gateway_data: WireguardGatewayData,
+        response_rx: UnboundedReceiver<PeerControlResponse>,
         mixnet_client: nym_sdk::mixnet::MixnetClient,
         task_handle: TaskHandle,
     ) -> Self {
@@ -66,6 +70,7 @@ impl MixnetListener {
             task_handle,
             registration_in_progres: Default::default(),
             wireguard_gateway_data,
+            response_rx,
             free_private_network_ips: Arc::new(
                 private_ip_network.iter().map(|ip| (ip, None)).collect(),
             ),
@@ -73,22 +78,6 @@ impl MixnetListener {
         }
     }
 
-    fn remove_from_registry(
-        &self,
-        remote_public: &PeerPublicKey,
-        gateway_client: &GatewayClient,
-    ) -> Result<()> {
-        self.wireguard_gateway_data
-            .remove_peer(gateway_client)
-            .map_err(|err| {
-                AuthenticatorError::InternalError(format!("could not remove peer: {:?}", err))
-            })?;
-        self.wireguard_gateway_data
-            .client_registry()
-            .remove(remote_public);
-        Ok(())
-    }
-
     fn remove_stale_registrations(&self) -> Result<()> {
         for reg in self.registration_in_progres.iter().map(|reg| reg.clone()) {
             let mut ip = self
@@ -121,7 +110,7 @@ impl MixnetListener {
         Ok(())
     }
 
-    fn on_initial_request(
+    async fn on_initial_request(
         &mut self,
         init_message: InitMessage,
         request_id: u64,
@@ -136,24 +125,26 @@ impl MixnetListener {
                 reply_to,
             ));
         }
-        let gateway_client_opt = if let Some(gateway_client) = self
+        if let Some(gateway_client) = self
             .wireguard_gateway_data
             .client_registry()
             .get(&remote_public)
         {
-            let mut private_ip_ref = self
-                .free_private_network_ips
-                .get_mut(&gateway_client.private_ip)
-                .ok_or(AuthenticatorError::InternalError(String::from(
-                    "could not find private IP",
-                )))?;
-            *private_ip_ref = None;
-            Some(gateway_client.clone())
-        } else {
-            None
-        };
-        if let Some(gateway_client) = gateway_client_opt {
-            self.remove_from_registry(&remote_public, &gateway_client)?;
+            return Ok(AuthenticatorResponse::new_registered(
+                RegistredData {
+                    pub_key: PeerPublicKey::new(
+                        self.wireguard_gateway_data
+                            .keypair()
+                            .public_key()
+                            .to_bytes()
+                            .into(),
+                    ),
+                    private_ip: gateway_client.private_ip,
+                    wg_port: self.config.authenticator.announced_port,
+                },
+                reply_to,
+                request_id,
+            ));
         }
         let mut private_ip_ref = self
             .free_private_network_ips
@@ -184,7 +175,7 @@ impl MixnetListener {
         ))
     }
 
-    fn on_final_request(
+    async fn on_final_request(
         &mut self,
         gateway_client: GatewayClient,
         request_id: u64,
@@ -209,18 +200,77 @@ impl MixnetListener {
                 .map_err(|err| {
                     AuthenticatorError::InternalError(format!("could not add peer: {:?}", err))
                 })?;
+
+            let PeerControlResponse::AddPeer { success } =
+                self.response_rx
+                    .recv()
+                    .await
+                    .ok_or(AuthenticatorError::InternalError(
+                        "no response for add peer".to_string(),
+                    ))?
+            else {
+                return Err(AuthenticatorError::InternalError(
+                    "unexpected response type".to_string(),
+                ));
+            };
+            if !success {
+                return Err(AuthenticatorError::InternalError(
+                    "adding peer could not be performed".to_string(),
+                ));
+            }
             self.registration_in_progres
                 .remove(&gateway_client.pub_key());
             self.wireguard_gateway_data
                 .client_registry()
                 .insert(gateway_client.pub_key(), gateway_client);
 
-            Ok(AuthenticatorResponse::new_registered(reply_to, request_id))
+            Ok(AuthenticatorResponse::new_registered(
+                RegistredData {
+                    pub_key: registration_data.gateway_data.pub_key,
+                    private_ip: registration_data.gateway_data.private_ip,
+                    wg_port: registration_data.wg_port,
+                },
+                reply_to,
+                request_id,
+            ))
         } else {
             Err(AuthenticatorError::MacVerificationFailure)
         }
     }
 
+    async fn on_query_bandwidth_request(
+        &mut self,
+        peer_public_key: PeerPublicKey,
+        request_id: u64,
+        reply_to: Recipient,
+    ) -> AuthenticatorHandleResult {
+        self.wireguard_gateway_data
+            .query_bandwidth(peer_public_key)
+            .map_err(|err| {
+                AuthenticatorError::InternalError(format!(
+                    "could not query peer bandwidth: {:?}",
+                    err
+                ))
+            })?;
+        let PeerControlResponse::QueryBandwidth { bandwidth_data } = self
+            .response_rx
+            .recv()
+            .await
+            .ok_or(AuthenticatorError::InternalError(
+                "no response for query".to_string(),
+            ))?
+        else {
+            return Err(AuthenticatorError::InternalError(
+                "unexpected response type".to_string(),
+            ));
+        };
+        Ok(AuthenticatorResponse::new_remaining_bandwidth(
+            bandwidth_data,
+            reply_to,
+            request_id,
+        ))
+    }
+
     async fn on_reconstructed_message(
         &mut self,
         reconstructed: ReconstructedMessage,
@@ -240,9 +290,19 @@ impl MixnetListener {
         match request.data {
             AuthenticatorRequestData::Initial(init_msg) => {
                 self.on_initial_request(init_msg, request.request_id, request.reply_to)
+                    .await
             }
             AuthenticatorRequestData::Final(client) => {
                 self.on_final_request(client, request.request_id, request.reply_to)
+                    .await
+            }
+            AuthenticatorRequestData::QueryBandwidth(peer_public_key) => {
+                self.on_query_bandwidth_request(
+                    peer_public_key,
+                    request.request_id,
+                    request.reply_to,
+                )
+                .await
             }
         }
     }
diff --git a/service-providers/ip-packet-router/src/connected_client_handler.rs b/service-providers/ip-packet-router/src/connected_client_handler.rs
index c4bfdd8c383..8754fb83943 100644
--- a/service-providers/ip-packet-router/src/connected_client_handler.rs
+++ b/service-providers/ip-packet-router/src/connected_client_handler.rs
@@ -2,12 +2,13 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use bytes::Bytes;
-use nym_ip_packet_requests::{codec::MultiIpPacketCodec, v6::response::IpPacketResponse};
+use nym_ip_packet_requests::codec::MultiIpPacketCodec;
 use nym_sdk::mixnet::{MixnetMessageSender, Recipient};
 
 use crate::{
     constants::CLIENT_HANDLER_ACTIVITY_TIMEOUT,
     error::{IpPacketRouterError, Result},
+    mixnet_listener::SupportedClientVersion,
     util::create_message::create_input_message,
 };
 
@@ -18,13 +19,29 @@ use crate::{
 // This handler is spawned as a task, and it listens to IP packets passed from the tun_listener,
 // encodes it, and then sends to mixnet.
 pub(crate) struct ConnectedClientHandler {
+    // The address of the client that this handler is connected to
     nym_address: Recipient,
+
+    // The number of hops the packet should take before reaching the client
     mix_hops: Option<u8>,
+
+    // Channel to receive packets from the tun_listener
     forward_from_tun_rx: tokio::sync::mpsc::UnboundedReceiver<Vec<u8>>,
+
+    // Channel to send packets to the mixnet
     mixnet_client_sender: nym_sdk::mixnet::MixnetClientSender,
+
+    // Channel to receive close signal
     close_rx: tokio::sync::oneshot::Receiver<()>,
+
+    // Interval to check for activity timeout
     activity_timeout: tokio::time::Interval,
+
+    // Encoder to bundle multiple packets into a single one
     encoder: MultiIpPacketCodec,
+
+    // The version of the client
+    client_version: SupportedClientVersion,
 }
 
 impl ConnectedClientHandler {
@@ -32,6 +49,7 @@ impl ConnectedClientHandler {
         reply_to: Recipient,
         reply_to_hops: Option<u8>,
         buffer_timeout: std::time::Duration,
+        client_version: SupportedClientVersion,
         mixnet_client_sender: nym_sdk::mixnet::MixnetClientSender,
     ) -> (
         tokio::sync::mpsc::UnboundedSender<Vec<u8>>,
@@ -55,6 +73,7 @@ impl ConnectedClientHandler {
             close_rx,
             activity_timeout,
             encoder,
+            client_version,
         };
 
         let handle = tokio::spawn(async move {
@@ -67,9 +86,18 @@ impl ConnectedClientHandler {
     }
 
     async fn send_packets_to_mixnet(&mut self, packets: Bytes) -> Result<()> {
-        let response_packet = IpPacketResponse::new_ip_packet(packets)
-            .to_bytes()
-            .map_err(|err| IpPacketRouterError::FailedToSerializeResponsePacket { source: err })?;
+        let response_packet = match self.client_version {
+            SupportedClientVersion::V6 => {
+                nym_ip_packet_requests::v6::response::IpPacketResponse::new_ip_packet(packets)
+                    .to_bytes()
+            }
+            SupportedClientVersion::V7 => {
+                nym_ip_packet_requests::v7::response::IpPacketResponse::new_ip_packet(packets)
+                    .to_bytes()
+            }
+        }
+        .map_err(|err| IpPacketRouterError::FailedToSerializeResponsePacket { source: err })?;
+
         let input_message = create_input_message(self.nym_address, response_packet, self.mix_hops);
 
         self.mixnet_client_sender
diff --git a/service-providers/ip-packet-router/src/error.rs b/service-providers/ip-packet-router/src/error.rs
index ff9f85cff5e..6a7e5393d7f 100644
--- a/service-providers/ip-packet-router/src/error.rs
+++ b/service-providers/ip-packet-router/src/error.rs
@@ -96,6 +96,9 @@ pub enum IpPacketRouterError {
     FailedToVerifyRequest {
         source: nym_ip_packet_requests::v7::signature::SignatureError,
     },
+
+    #[error("client is connected with an invalid version: {version}")]
+    InvalidConnectedClientVersion { version: u8 },
 }
 
 pub type Result<T> = std::result::Result<T, IpPacketRouterError>;
diff --git a/service-providers/ip-packet-router/src/mixnet_listener.rs b/service-providers/ip-packet-router/src/mixnet_listener.rs
index 4e41f3d996e..914cd03b36a 100644
--- a/service-providers/ip-packet-router/src/mixnet_listener.rs
+++ b/service-providers/ip-packet-router/src/mixnet_listener.rs
@@ -4,22 +4,19 @@ use std::{collections::HashMap, net::SocketAddr};
 
 use bytes::{Bytes, BytesMut};
 use futures::StreamExt;
+use nym_ip_packet_requests::v7::response::{
+    DynamicConnectFailureReason, InfoLevel, InfoResponseReply, StaticConnectFailureReason,
+};
 use nym_ip_packet_requests::{
     codec::MultiIpPacketCodec,
-    v6::{
-        self,
-        response::{
-            DynamicConnectFailureReason, InfoLevel, InfoResponseReply, IpPacketResponse,
-            StaticConnectFailureReason,
-        },
-    },
+    v6,
     v7::{
         self,
         request::{
             DataRequest, DisconnectRequest, DynamicConnectRequest, IpPacketRequest,
             IpPacketRequestData, StaticConnectRequest,
         },
-        signature::{SignatureError, SignedRequest},
+        signature::SignedRequest,
     },
     IpPair,
 };
@@ -266,7 +263,132 @@ impl Drop for CloseTx {
     }
 }
 
-type PacketHandleResult = Result<Option<v6::response::IpPacketResponse>>;
+type PacketHandleResult = Result<Option<Response>>;
+
+#[derive(Debug, Clone)]
+enum Response {
+    V6(v6::response::IpPacketResponse),
+    V7(v7::response::IpPacketResponse),
+}
+
+impl Response {
+    fn recipient(&self) -> Option<&Recipient> {
+        match self {
+            Response::V6(response) => response.recipient(),
+            Response::V7(response) => response.recipient(),
+        }
+    }
+
+    fn new_static_connect_success(
+        request_id: u64,
+        reply_to: Recipient,
+        client_version: SupportedClientVersion,
+    ) -> Self {
+        match client_version {
+            SupportedClientVersion::V6 => Response::V6(
+                v6::response::IpPacketResponse::new_static_connect_success(request_id, reply_to),
+            ),
+            SupportedClientVersion::V7 => Response::V7(
+                v7::response::IpPacketResponse::new_static_connect_success(request_id, reply_to),
+            ),
+        }
+    }
+
+    fn new_static_connect_failure(
+        request_id: u64,
+        reply_to: Recipient,
+        reason: StaticConnectFailureReason,
+        client_version: SupportedClientVersion,
+    ) -> Self {
+        match client_version {
+            SupportedClientVersion::V6 => {
+                Response::V6(v6::response::IpPacketResponse::new_static_connect_failure(
+                    request_id,
+                    reply_to,
+                    reason.into(),
+                ))
+            }
+            SupportedClientVersion::V7 => {
+                Response::V7(v7::response::IpPacketResponse::new_static_connect_failure(
+                    request_id, reply_to, reason,
+                ))
+            }
+        }
+    }
+
+    fn new_dynamic_connect_success(
+        request_id: u64,
+        reply_to: Recipient,
+        ips: IpPair,
+        client_version: SupportedClientVersion,
+    ) -> Self {
+        match client_version {
+            SupportedClientVersion::V6 => {
+                Response::V6(v6::response::IpPacketResponse::new_dynamic_connect_success(
+                    request_id, reply_to, ips,
+                ))
+            }
+            SupportedClientVersion::V7 => {
+                Response::V7(v7::response::IpPacketResponse::new_dynamic_connect_success(
+                    request_id, reply_to, ips,
+                ))
+            }
+        }
+    }
+
+    fn new_dynamic_connect_failure(
+        request_id: u64,
+        reply_to: Recipient,
+        reason: DynamicConnectFailureReason,
+        client_version: SupportedClientVersion,
+    ) -> Self {
+        match client_version {
+            SupportedClientVersion::V6 => {
+                Response::V6(v6::response::IpPacketResponse::new_dynamic_connect_failure(
+                    request_id,
+                    reply_to,
+                    reason.into(),
+                ))
+            }
+            SupportedClientVersion::V7 => {
+                Response::V7(v7::response::IpPacketResponse::new_dynamic_connect_failure(
+                    request_id, reply_to, reason,
+                ))
+            }
+        }
+    }
+
+    fn new_data_info_response(
+        reply_to: Recipient,
+        reply: InfoResponseReply,
+        level: InfoLevel,
+        client_version: SupportedClientVersion,
+    ) -> Self {
+        match client_version {
+            SupportedClientVersion::V6 => {
+                Response::V6(v6::response::IpPacketResponse::new_data_info_response(
+                    reply_to,
+                    reply.into(),
+                    level.into(),
+                ))
+            }
+            SupportedClientVersion::V7 => Response::V7(
+                v7::response::IpPacketResponse::new_data_info_response(reply_to, reply, level),
+            ),
+        }
+    }
+
+    fn to_bytes(&self) -> Result<Vec<u8>> {
+        match self {
+            Response::V6(response) => response.to_bytes(),
+            Response::V7(response) => response.to_bytes(),
+        }
+        .map_err(|err| {
+            log::error!("Failed to serialize response packet");
+            IpPacketRouterError::FailedToSerializeResponsePacket { source: err }
+        })
+    }
+}
 
 #[cfg(target_os = "linux")]
 pub(crate) struct MixnetListener {
@@ -297,6 +419,7 @@ impl MixnetListener {
     async fn on_static_connect_request(
         &mut self,
         connect_request: StaticConnectRequest,
+        client_version: SupportedClientVersion,
     ) -> PacketHandleResult {
         log::info!(
             "Received static connect request from {sender_address}",
@@ -328,8 +451,10 @@ impl MixnetListener {
                 {
                     log::error!("Failed to update activity for client");
                 };
-                Ok(Some(IpPacketResponse::new_static_connect_success(
-                    request_id, reply_to,
+                Ok(Some(Response::new_static_connect_success(
+                    request_id,
+                    reply_to,
+                    client_version,
                 )))
             }
             (false, false) => {
@@ -341,6 +466,7 @@ impl MixnetListener {
                         reply_to,
                         reply_to_hops,
                         buffer_timeout,
+                        client_version,
                         self.mixnet_client.split_sender(),
                     );
 
@@ -353,24 +479,28 @@ impl MixnetListener {
                     close_tx,
                     handle,
                 );
-                Ok(Some(IpPacketResponse::new_static_connect_success(
-                    request_id, reply_to,
+                Ok(Some(Response::new_static_connect_success(
+                    request_id,
+                    reply_to,
+                    client_version,
                 )))
             }
             (true, false) => {
                 log::info!("Requested IP is not available");
-                Ok(Some(IpPacketResponse::new_static_connect_failure(
+                Ok(Some(Response::new_static_connect_failure(
                     request_id,
                     reply_to,
                     StaticConnectFailureReason::RequestedIpAlreadyInUse,
+                    client_version,
                 )))
             }
             (false, true) => {
                 log::info!("Nym address is already registered");
-                Ok(Some(IpPacketResponse::new_static_connect_failure(
+                Ok(Some(Response::new_static_connect_failure(
                     request_id,
                     reply_to,
                     StaticConnectFailureReason::RequestedNymAddressAlreadyInUse,
+                    client_version,
                 )))
             }
         }
@@ -379,6 +509,7 @@ impl MixnetListener {
     async fn on_dynamic_connect_request(
         &mut self,
         connect_request: DynamicConnectRequest,
+        client_version: SupportedClientVersion,
     ) -> PacketHandleResult {
         log::info!(
             "Received dynamic connect request from {sender_address}",
@@ -406,19 +537,21 @@ impl MixnetListener {
             {
                 log::error!("Failed to update activity for client");
             }
-            return Ok(Some(IpPacketResponse::new_dynamic_connect_success(
+            return Ok(Some(Response::new_dynamic_connect_success(
                 request_id,
                 reply_to,
                 existing_ips,
+                client_version,
             )));
         }
 
         let Some(new_ips) = self.connected_clients.find_new_ip() else {
             log::info!("No available IP address");
-            return Ok(Some(IpPacketResponse::new_dynamic_connect_failure(
+            return Ok(Some(Response::new_dynamic_connect_failure(
                 request_id,
                 reply_to,
                 DynamicConnectFailureReason::NoAvailableIp,
+                client_version,
             )));
         };
 
@@ -428,6 +561,7 @@ impl MixnetListener {
                 reply_to,
                 reply_to_hops,
                 buffer_timeout,
+                client_version,
                 self.mixnet_client.split_sender(),
             );
 
@@ -440,17 +574,28 @@ impl MixnetListener {
             close_tx,
             handle,
         );
-        Ok(Some(IpPacketResponse::new_dynamic_connect_success(
-            request_id, reply_to, new_ips,
+        Ok(Some(Response::new_dynamic_connect_success(
+            request_id,
+            reply_to,
+            new_ips,
+            client_version,
         )))
     }
 
-    fn on_disconnect_request(&self, _disconnect_request: DisconnectRequest) -> PacketHandleResult {
+    fn on_disconnect_request(
+        &self,
+        _disconnect_request: DisconnectRequest,
+        _client_version: SupportedClientVersion,
+    ) -> PacketHandleResult {
         log::info!("Received disconnect request: not implemented, dropping");
         Ok(None)
     }
 
-    async fn handle_packet(&mut self, ip_packet: &Bytes) -> PacketHandleResult {
+    async fn handle_packet(
+        &mut self,
+        ip_packet: &Bytes,
+        client_version: SupportedClientVersion,
+    ) -> PacketHandleResult {
         log::trace!("Received data request");
 
         // We don't forward packets that we are not able to parse. BUT, there might be a good
@@ -487,12 +632,13 @@ impl MixnetListener {
                 Ok(None)
             } else {
                 log::info!("Denied filter check: {dst}");
-                Ok(Some(IpPacketResponse::new_data_info_response(
+                Ok(Some(Response::new_data_info_response(
                     connected_client.nym_address,
                     InfoResponseReply::ExitPolicyFilterCheckFailed {
                         dst: dst.to_string(),
                     },
                     InfoLevel::Warn,
+                    client_version,
                 )))
             }
         } else {
@@ -505,13 +651,14 @@ impl MixnetListener {
     async fn on_data_request(
         &mut self,
         data_request: DataRequest,
+        client_version: SupportedClientVersion,
     ) -> Result<Vec<PacketHandleResult>> {
         let mut responses = Vec::new();
         let mut decoder = MultiIpPacketCodec::new(nym_ip_packet_requests::codec::BUFFER_TIMEOUT);
         let mut bytes = BytesMut::new();
         bytes.extend_from_slice(&data_request.ip_packets);
         while let Ok(Some(packet)) = decoder.decode(&mut bytes) {
-            let result = self.handle_packet(&packet).await;
+            let result = self.handle_packet(&packet, client_version).await;
             responses.push(result);
         }
         Ok(responses)
@@ -519,26 +666,13 @@ impl MixnetListener {
 
     fn on_version_mismatch(
         &self,
-        version: u8,
-        reconstructed: &ReconstructedMessage,
+        _version: u8,
+        _reconstructed: &ReconstructedMessage,
     ) -> PacketHandleResult {
-        // If it's possible to parse, do so and return back a response, otherwise just drop
-        let (id, recipient) =
-            v6::request::IpPacketRequest::from_reconstructed_message(reconstructed)
-                .ok()
-                .and_then(|request| {
-                    request
-                        .recipient()
-                        .map(|recipient| (request.id().unwrap_or(0), *recipient))
-                })
-                .ok_or(IpPacketRouterError::InvalidPacketVersion(version))?;
-
-        Ok(Some(IpPacketResponse::new_version_mismatch(
-            id,
-            recipient,
-            version,
-            nym_ip_packet_requests::CURRENT_VERSION,
-        )))
+        // Just drop it. In the future we might want to return a response here, if for example
+        // the client is connecting with a version that is older than the currently supported
+        // ones.
+        Ok(None)
     }
 
     async fn on_reconstructed_message(
@@ -550,7 +684,7 @@ impl MixnetListener {
             reconstructed.sender_tag
         );
 
-        let request = match deserialize_request(&reconstructed) {
+        let (request, client_version) = match deserialize_request(&reconstructed) {
             Err(IpPacketRouterError::InvalidPacketVersion(version)) => {
                 return Ok(vec![self.on_version_mismatch(version, &reconstructed)]);
             }
@@ -559,21 +693,31 @@ impl MixnetListener {
 
         match request.data {
             IpPacketRequestData::StaticConnect(signed_connect_request) => {
-                verify_signed_request(&signed_connect_request)?;
+                verify_signed_request(&signed_connect_request, client_version)?;
                 let connect_request = signed_connect_request.request;
-                Ok(vec![self.on_static_connect_request(connect_request).await])
+                Ok(vec![
+                    self.on_static_connect_request(connect_request, client_version)
+                        .await,
+                ])
             }
             IpPacketRequestData::DynamicConnect(signed_connect_request) => {
-                verify_signed_request(&signed_connect_request)?;
+                verify_signed_request(&signed_connect_request, client_version)?;
                 let connect_request = signed_connect_request.request;
-                Ok(vec![self.on_dynamic_connect_request(connect_request).await])
+                Ok(vec![
+                    self.on_dynamic_connect_request(connect_request, client_version)
+                        .await,
+                ])
             }
             IpPacketRequestData::Disconnect(signed_disconnect_request) => {
-                verify_signed_request(&signed_disconnect_request)?;
+                verify_signed_request(&signed_disconnect_request, client_version)?;
                 let disconnect_request = signed_disconnect_request.request;
-                Ok(vec![self.on_disconnect_request(disconnect_request)])
+                Ok(vec![
+                    self.on_disconnect_request(disconnect_request, client_version)
+                ])
+            }
+            IpPacketRequestData::Data(data_request) => {
+                self.on_data_request(data_request, client_version).await
             }
-            IpPacketRequestData::Data(data_request) => self.on_data_request(data_request).await,
             IpPacketRequestData::Ping(_) => {
                 log::info!("Received ping request: not implemented, dropping");
                 Ok(vec![])
@@ -605,16 +749,13 @@ impl MixnetListener {
 
     // When an incoming mixnet message triggers a response that we send back, such as during
     // connect handshake.
-    async fn handle_response(&self, response: IpPacketResponse) -> Result<()> {
+    async fn handle_response(&self, response: Response) -> Result<()> {
         let Some(recipient) = response.recipient() else {
             log::error!("No recipient in response packet, this should NOT happen!");
             return Err(IpPacketRouterError::NoRecipientInResponse);
         };
 
-        let response_packet = response.to_bytes().map_err(|err| {
-            log::error!("Failed to serialize response packet");
-            IpPacketRouterError::FailedToSerializeResponsePacket { source: err }
-        })?;
+        let response_packet = response.to_bytes()?;
 
         // We could avoid this lookup if we check this when we create the response.
         let mix_hops = if let Some(c) = self
@@ -687,33 +828,65 @@ impl MixnetListener {
     }
 }
 
-fn deserialize_request(reconstructed: &ReconstructedMessage) -> Result<IpPacketRequest> {
+fn deserialize_request(
+    reconstructed: &ReconstructedMessage,
+) -> Result<(IpPacketRequest, SupportedClientVersion)> {
     let request_version = *reconstructed
         .message
         .first()
         .ok_or(IpPacketRouterError::EmptyPacket)?;
 
     // Check version of the request and convert to the latest version if necessary
-    match request_version {
-        6 => v6::request::IpPacketRequest::from_reconstructed_message(reconstructed)
-            .map_err(|err| IpPacketRouterError::FailedToDeserializeTaggedPacket { source: err })
-            .map(|r| r.into()),
-        7 => v7::request::IpPacketRequest::from_reconstructed_message(reconstructed)
-            .map_err(|err| IpPacketRouterError::FailedToDeserializeTaggedPacket { source: err }),
+    let request = match request_version {
+        6 => nym_ip_packet_requests::v6::request::IpPacketRequest::from_reconstructed_message(
+            reconstructed,
+        )
+        .map_err(|err| IpPacketRouterError::FailedToDeserializeTaggedPacket { source: err })
+        .map(|r| r.into()),
+        7 => nym_ip_packet_requests::v7::request::IpPacketRequest::from_reconstructed_message(
+            reconstructed,
+        )
+        .map_err(|err| IpPacketRouterError::FailedToDeserializeTaggedPacket { source: err }),
         _ => {
             log::info!("Received packet with invalid version: v{request_version}");
             Err(IpPacketRouterError::InvalidPacketVersion(request_version))
         }
+    };
+
+    let Some(request_version) = SupportedClientVersion::new(request_version) else {
+        return Err(IpPacketRouterError::InvalidPacketVersion(request_version));
+    };
+
+    // Tag the request with the version of the request
+    request.map(|r| (r, request_version))
+}
+
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub(crate) enum SupportedClientVersion {
+    V6,
+    V7,
+}
+
+impl SupportedClientVersion {
+    fn new(request_version: u8) -> Option<Self> {
+        match request_version {
+            6 => Some(SupportedClientVersion::V6),
+            7 => Some(SupportedClientVersion::V7),
+            _ => None,
+        }
     }
 }
 
-fn verify_signed_request(request: &impl SignedRequest) -> Result<()> {
+fn verify_signed_request(
+    request: &impl SignedRequest,
+    client_version: SupportedClientVersion,
+) -> Result<()> {
     if let Err(err) = request.verify() {
-        // Once we start to require clients to send v7 requests, we will enfore checking
-        // signatures. Until then, we only check if they are present.
-        if !matches!(err, SignatureError::MissingSignature) {
-            return Err(IpPacketRouterError::FailedToVerifyRequest { source: err });
+        // If the client is V6, we don't care about missing signature
+        if client_version == SupportedClientVersion::V6 {
+            return Ok(());
         }
+        return Err(IpPacketRouterError::FailedToVerifyRequest { source: err });
     }
     Ok(())
 }
diff --git a/service-providers/network-requester/Cargo.toml b/service-providers/network-requester/Cargo.toml
index 73700d59b38..7a9ffb06ff8 100644
--- a/service-providers/network-requester/Cargo.toml
+++ b/service-providers/network-requester/Cargo.toml
@@ -4,7 +4,7 @@
 [package]
 name = "nym-network-requester"
 license = "GPL-3.0"
-version = "1.1.39"
+version = "1.1.40"
 authors.workspace = true
 edition.workspace = true
 rust-version = "1.70"
diff --git a/tools/nym-cli/Cargo.toml b/tools/nym-cli/Cargo.toml
index eabfeb4b83e..e590e45141b 100644
--- a/tools/nym-cli/Cargo.toml
+++ b/tools/nym-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-cli"
-version = "1.1.39"
+version = "1.1.40"
 authors.workspace = true
 edition = "2021"
 license.workspace = true
diff --git a/tools/nymvisor/Cargo.toml b/tools/nymvisor/Cargo.toml
index 2049fcf2792..8f5658c8d39 100644
--- a/tools/nymvisor/Cargo.toml
+++ b/tools/nymvisor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nymvisor"
-version = "0.1.4"
+version = "0.1.5"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true
diff --git a/yarn.lock b/yarn.lock
index 541f4289bdd..f17664b8ed2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1212,6 +1212,13 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
+"@babel/runtime@^7.24.7":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.8.tgz#5d958c3827b13cc6d05e038c07fb2e5e3420d82e"
+  integrity sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA==
+  dependencies:
+    regenerator-runtime "^0.14.0"
+
 "@babel/runtime@~7.5.4":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz#74fba56d35efbeca444091c7850ccd494fd2f132"
@@ -2890,14 +2897,6 @@
     yargs "16.2.0"
     yargs-parser "20.2.4"
 
-"@mdx-js/loader@^2.1.5":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-2.3.0.tgz#56a6b07eb0027b6407e953a97c52bd8619601161"
-  integrity sha512-IqsscXh7Q3Rzb+f5DXYk0HU71PK+WuFsEhf+mSV3fOhpLcEpgsHvTQ2h0T6TlZ5gHOaBeFjkXwB52by7ypMyNg==
-  dependencies:
-    "@mdx-js/mdx" "^2.0.0"
-    source-map "^0.7.0"
-
 "@mdx-js/mdx@^1.6.22":
   version "1.6.22"
   resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba"
@@ -2923,29 +2922,6 @@
     unist-builder "2.0.3"
     unist-util-visit "2.0.3"
 
-"@mdx-js/mdx@^2.0.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-2.3.0.tgz#d65d8c3c28f3f46bb0e7cb3bf7613b39980671a9"
-  integrity sha512-jLuwRlz8DQfQNiUCJR50Y09CGPq3fLtmtUQfVrj79E0JWu3dvsVcxVIcfhR5h0iXu+/z++zDrYeiJqifRynJkA==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    "@types/mdx" "^2.0.0"
-    estree-util-build-jsx "^2.0.0"
-    estree-util-is-identifier-name "^2.0.0"
-    estree-util-to-js "^1.1.0"
-    estree-walker "^3.0.0"
-    hast-util-to-estree "^2.0.0"
-    markdown-extensions "^1.0.0"
-    periscopic "^3.0.0"
-    remark-mdx "^2.0.0"
-    remark-parse "^10.0.0"
-    remark-rehype "^10.0.0"
-    unified "^10.0.0"
-    unist-util-position-from-estree "^1.0.0"
-    unist-util-stringify-position "^3.0.0"
-    unist-util-visit "^4.0.0"
-    vfile "^5.0.0"
-
 "@mdx-js/react@^1.6.22":
   version "1.6.22"
   resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573"
@@ -2989,19 +2965,6 @@
   dependencies:
     "@babel/runtime" "^7.23.9"
 
-"@mui/lab@^5.0.0-alpha.72":
-  version "5.0.0-alpha.170"
-  resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-5.0.0-alpha.170.tgz#4519dfc8d1c51ca54fb9d8b91b95a3733d07be16"
-  integrity sha512-0bDVECGmrNjd3+bLdcLiwYZ0O4HP5j5WSQm5DV6iA/Z9kr8O6AnvZ1bv9ImQbbX7Gj3pX4o43EKwCutj3EQxQg==
-  dependencies:
-    "@babel/runtime" "^7.23.9"
-    "@mui/base" "5.0.0-beta.40"
-    "@mui/system" "^5.15.15"
-    "@mui/types" "^7.2.14"
-    "@mui/utils" "^5.15.14"
-    clsx "^2.1.0"
-    prop-types "^15.8.1"
-
 "@mui/material@^5.0.1", "@mui/material@^5.2.2":
   version "5.15.15"
   resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.15.15.tgz#e3ba35f50b510aa677cec3261abddc2db7b20b59"
@@ -3029,6 +2992,15 @@
     "@mui/utils" "^5.15.14"
     prop-types "^15.8.1"
 
+"@mui/private-theming@^5.16.1":
+  version "5.16.1"
+  resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.16.1.tgz#e7f1b0cfd9b238231fca9a0b13a5b2a9d9592b35"
+  integrity sha512-2EGCKnAlq9vRIFj61jNWNXlKAxXp56577OVvsts7fAqRx+G1y6F+N7Q198SBaz8jYQeGKSz8ZMXK/M3FqjdEyw==
+  dependencies:
+    "@babel/runtime" "^7.23.9"
+    "@mui/utils" "^5.16.1"
+    prop-types "^15.8.1"
+
 "@mui/styled-engine@^5.15.14":
   version "5.15.14"
   resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.15.14.tgz#168b154c4327fa4ccc1933a498331d53f61c0de2"
@@ -3039,6 +3011,16 @@
     csstype "^3.1.3"
     prop-types "^15.8.1"
 
+"@mui/styled-engine@^5.16.1":
+  version "5.16.1"
+  resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.16.1.tgz#7518f64f66edd6e09f129289cf6ece502520947f"
+  integrity sha512-JwWUBaYR8HHCFefSeos0z6JoTbu0MnjAuNHu4QoDgPxl2EE70XH38CsKay66Iy0QkNWmGTRXVU2sVFgUOPL/Dw==
+  dependencies:
+    "@babel/runtime" "^7.23.9"
+    "@emotion/cache" "^11.11.0"
+    csstype "^3.1.3"
+    prop-types "^15.8.1"
+
 "@mui/styles@^5.0.1", "@mui/styles@^5.2.2":
   version "5.15.15"
   resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-5.15.15.tgz#cfc974657882cb60c6017d57d81f133d8b5e51a1"
@@ -3062,7 +3044,7 @@
     jss-plugin-vendor-prefixer "^10.10.0"
     prop-types "^15.8.1"
 
-"@mui/system@>= 5", "@mui/system@^5.0.1", "@mui/system@^5.15.14", "@mui/system@^5.15.15":
+"@mui/system@^5.0.1", "@mui/system@^5.15.14", "@mui/system@^5.15.15":
   version "5.15.15"
   resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.15.15.tgz#658771b200ce3c4a0f28e58169f02e5e718d1c53"
   integrity sha512-aulox6N1dnu5PABsfxVGOZffDVmlxPOVgj56HrUnJE8MCSh8lOvvkd47cebIVQQYAjpwieXQXiDPj5pwM40jTQ==
@@ -3076,11 +3058,30 @@
     csstype "^3.1.3"
     prop-types "^15.8.1"
 
+"@mui/system@^5.16.0":
+  version "5.16.1"
+  resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.16.1.tgz#c08fddba592511d6916c6a70da292a7658551ccb"
+  integrity sha512-VaFcClC+uhvIEzhzcNmh9FRBvrG9IPjsOokhj6U1HPZsFnLzHV7AD7dJcT6LxWoiIZj9Ej0GK+MGh/b8+BtSlQ==
+  dependencies:
+    "@babel/runtime" "^7.23.9"
+    "@mui/private-theming" "^5.16.1"
+    "@mui/styled-engine" "^5.16.1"
+    "@mui/types" "^7.2.15"
+    "@mui/utils" "^5.16.1"
+    clsx "^2.1.0"
+    csstype "^3.1.3"
+    prop-types "^15.8.1"
+
 "@mui/types@^7.2.14":
   version "7.2.14"
   resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.14.tgz#8a02ac129b70f3d82f2f9b76ded2c8d48e3fc8c9"
   integrity sha512-MZsBZ4q4HfzBsywtXgM1Ksj6HDThtiwmOKUXH1pKYISI9gAVXCNHNpo7TlGoGrBaYWZTdNoirIN7JsQcQUjmQQ==
 
+"@mui/types@^7.2.15":
+  version "7.2.15"
+  resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.15.tgz#dadd232fe9a70be0d526630675dff3b110f30b53"
+  integrity sha512-nbo7yPhtKJkdf9kcVOF8JZHPZTmqXjJ/tI0bdWgHg5tp9AnIN4Y7f7wm9T+0SyGYJk76+GYZ8Q5XaTYAsUHN0Q==
+
 "@mui/utils@^5.10.3", "@mui/utils@^5.15.14", "@mui/utils@^5.7.0":
   version "5.15.14"
   resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.15.14.tgz#e414d7efd5db00bfdc875273a40c0a89112ade3a"
@@ -3091,6 +3092,16 @@
     prop-types "^15.8.1"
     react-is "^18.2.0"
 
+"@mui/utils@^5.16.0", "@mui/utils@^5.16.1":
+  version "5.16.1"
+  resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.16.1.tgz#068ddc236c10f71768133c144b3286d2cc815f5f"
+  integrity sha512-4UQzK46tAEYs2xZv79hRiIc3GxZScd00kGPDadNrGztAEZlmSaUY8cb9ITd2xCiTfzsx5AN6DH8aaQ8QEKJQeQ==
+  dependencies:
+    "@babel/runtime" "^7.23.9"
+    "@types/prop-types" "^15.7.12"
+    prop-types "^15.8.1"
+    react-is "^18.3.1"
+
 "@mui/x-data-grid@7.1.1":
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/@mui/x-data-grid/-/x-data-grid-7.1.1.tgz#ed4b852bf03c86d39bb4d35eacc35d5d0312f7ed"
@@ -3128,6 +3139,20 @@
     prop-types "^15.8.1"
     react-transition-group "^4.4.5"
 
+"@mui/x-tree-view@^7.10.0":
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/@mui/x-tree-view/-/x-tree-view-7.10.0.tgz#7aed69461df425e6aaebf0fd775ae5ff52cdc065"
+  integrity sha512-9OCAIb0wS5uuEDyjcSwSturrB4RUXBfE0UO/xpKjrMvRzCaAvxbCf2aFILP8uH9NyynYZkIGYfGnlqdAPy2OLg==
+  dependencies:
+    "@babel/runtime" "^7.24.7"
+    "@mui/base" "^5.0.0-beta.40"
+    "@mui/system" "^5.16.0"
+    "@mui/utils" "^5.16.0"
+    "@types/react-transition-group" "^4.4.10"
+    clsx "^2.1.1"
+    prop-types "^15.8.1"
+    react-transition-group "^4.4.5"
+
 "@next/env@14.1.4":
   version "14.1.4"
   resolved "https://registry.yarnpkg.com/@next/env/-/env-14.1.4.tgz#432e80651733fbd67230bf262aee28be65252674"
@@ -4768,98 +4793,6 @@
   resolved "https://registry.yarnpkg.com/@sapphire/utilities/-/utilities-3.15.3.tgz#93d73aa74278b731527113a5b2bd809820d7e228"
   integrity sha512-K5dFGOB5XvblXFN+Av+Tch/dVBAifmxtZ9/2mFo8VqzbiaFJIRUuoPAoNsp8pWYaU423yV8bfD8WsCSNd9w1YQ==
 
-"@sentry-internal/feedback@7.110.0":
-  version "7.110.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.110.0.tgz#7103a08cd6bfb43583087d7476a5f24c5857cc22"
-  integrity sha512-hrfWa3WkSOiBO5Srcr1j4kuGOlbsQic+REpLOofllVIs56DOo9+Aj9svxT+dcvZERv/nlFSV/E0BfGy9g08IEg==
-  dependencies:
-    "@sentry/core" "7.110.0"
-    "@sentry/types" "7.110.0"
-    "@sentry/utils" "7.110.0"
-
-"@sentry-internal/replay-canvas@7.110.0":
-  version "7.110.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.110.0.tgz#af21b56157f44c44a2eedf4326ef37f4ea440fa8"
-  integrity sha512-SNa+AfyfX+vc6Xw0pIfDsa5Qnc9cpexU6M2D19gadtVhmep7qoFBuhBVZrSv6BtdCxvrb5EyYsHYGfjQdIDcvg==
-  dependencies:
-    "@sentry/core" "7.110.0"
-    "@sentry/replay" "7.110.0"
-    "@sentry/types" "7.110.0"
-    "@sentry/utils" "7.110.0"
-
-"@sentry-internal/tracing@7.110.0":
-  version "7.110.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.110.0.tgz#00f2086b0efb8dd5a67831074e52b176aa542d32"
-  integrity sha512-IIHHa9e/mE7uOMJfNELI8adyoELxOy6u6TNCn5t6fphmq84w8FTc9adXkG/FY2AQpglkIvlILojfMROFB2aaAQ==
-  dependencies:
-    "@sentry/core" "7.110.0"
-    "@sentry/types" "7.110.0"
-    "@sentry/utils" "7.110.0"
-
-"@sentry/browser@7.110.0":
-  version "7.110.0"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.110.0.tgz#40900d76a8f423a7163a594ec9267a2e0ebd8a5b"
-  integrity sha512-gIxedVm6ZgkjQfgCDgLWJgAsolq6OxV8hQ2j1+RaDL2RngvelFo/vlX5f2sD6EbjVp77Cri8u5GkMJF+v4p84g==
-  dependencies:
-    "@sentry-internal/feedback" "7.110.0"
-    "@sentry-internal/replay-canvas" "7.110.0"
-    "@sentry-internal/tracing" "7.110.0"
-    "@sentry/core" "7.110.0"
-    "@sentry/replay" "7.110.0"
-    "@sentry/types" "7.110.0"
-    "@sentry/utils" "7.110.0"
-
-"@sentry/core@7.110.0":
-  version "7.110.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.110.0.tgz#2945d3ac0ef116ed313fbfb9da4f483b66fe5bca"
-  integrity sha512-g4suCQO94mZsKVaAbyD1zLFC5YSuBQCIPHXx9fdgtfoPib7BWjWWePkllkrvsKAv4u8Oq05RfnKOhOMRHpOKqg==
-  dependencies:
-    "@sentry/types" "7.110.0"
-    "@sentry/utils" "7.110.0"
-
-"@sentry/integrations@^7.54.0":
-  version "7.110.0"
-  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.110.0.tgz#2ed6fb3687ac965e240e69a44a4847d755f0214e"
-  integrity sha512-cWpEGMTyX1XO4jb0NXMh1thkkiSajM5ydE/ceAdxmG9V7gv7E1pREK8P1NeVvzvjZ67z+uVWYbgYwXxd4eqZ/A==
-  dependencies:
-    "@sentry/core" "7.110.0"
-    "@sentry/types" "7.110.0"
-    "@sentry/utils" "7.110.0"
-    localforage "^1.8.1"
-
-"@sentry/react@^7.54.0":
-  version "7.110.0"
-  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.110.0.tgz#cf125267f9a077d8b0904810d9347583bb0ce1c7"
-  integrity sha512-ryfA2QR41PV+kP3g0lGvpDZ+OkuxSdj2nTjCqPeZKHsK45GYvDMlWkukdHbwrx8ulkbAcWEjPmuZZzHspyieNw==
-  dependencies:
-    "@sentry/browser" "7.110.0"
-    "@sentry/core" "7.110.0"
-    "@sentry/types" "7.110.0"
-    "@sentry/utils" "7.110.0"
-    hoist-non-react-statics "^3.3.2"
-
-"@sentry/replay@7.110.0":
-  version "7.110.0"
-  resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.110.0.tgz#e185c88cec573724b46b79ada7ef5a7098acd1b6"
-  integrity sha512-EEpGPf3iBJjWejvoxKLVMnLtLNwPTUxHJV1oxUkbcSi3B/tG5hW7LArYDjAcvkfa4VmA8JLCwj2vYU5MQ8tj6g==
-  dependencies:
-    "@sentry-internal/tracing" "7.110.0"
-    "@sentry/core" "7.110.0"
-    "@sentry/types" "7.110.0"
-    "@sentry/utils" "7.110.0"
-
-"@sentry/types@7.110.0":
-  version "7.110.0"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.110.0.tgz#c3f252b008cab905097fc71e174191f20bdaf4f3"
-  integrity sha512-DqYBLyE8thC5P5MuPn+sj8tL60nCd/f5cerFFPcudn5nJ4Zs1eI6lKlwwyHYTEu5c4KFjCB0qql6kXfwAHmTyA==
-
-"@sentry/utils@7.110.0":
-  version "7.110.0"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.110.0.tgz#68ef59359d608a1a6a7205b780196a042ad73ab2"
-  integrity sha512-VBsdLLN+5tf73fhf/Cm7JIsUJ6y9DkJj8h4I6Mxx0rszrvOyH6S5px40K+V4jdLBzMEvVinC7q2Cbf1YM18BSw==
-  dependencies:
-    "@sentry/types" "7.110.0"
-
 "@sideway/address@^4.1.5":
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.5.tgz#4bc149a0076623ced99ca8208ba780d65a99b9d5"
@@ -6168,7 +6101,7 @@
   resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.5.11.tgz#c003ce00b36d056a8b08e0ecf4633c2bba00c497"
   integrity sha512-1CexcqUFCis5ypUIMOKllxUBrna09McbftWENgvVXMfA+SP+yPDPAVb8fIvUcdTIwR/yHJwcIucmTB4anww4vg==
 
-"@tauri-apps/cli@^1.0.5", "@tauri-apps/cli@^1.2.2":
+"@tauri-apps/cli@^1.0.5":
   version "1.5.11"
   resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-1.5.11.tgz#02beb559b3b55836c90a1ba9121b3fc50e3760cd"
   integrity sha512-B475D7phZrq5sZ3kDABH4g2mEoUIHtnIO+r4ZGAAfsjMbZCwXxR/jlMGTEL+VO3YzjpF7gQe38IzB4vLBbVppw==
@@ -6287,13 +6220,6 @@
     "@tufjs/canonical-json" "1.0.0"
     minimatch "^9.0.0"
 
-"@types/acorn@^4.0.0":
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/@types/acorn/-/acorn-4.0.6.tgz#d61ca5480300ac41a7d973dd5b84d0a591154a22"
-  integrity sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ==
-  dependencies:
-    "@types/estree" "*"
-
 "@types/aria-query@^5.0.1":
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.4.tgz#1a31c3d378850d2778dabb6374d036dcba4ba708"
@@ -6477,13 +6403,6 @@
     "@types/d3-interpolate" "^1"
     "@types/d3-selection" "^1"
 
-"@types/debug@^4.0.0":
-  version "4.1.12"
-  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.12.tgz#a155f21690871953410df4b6b6f53187f0500917"
-  integrity sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==
-  dependencies:
-    "@types/ms" "*"
-
 "@types/eslint-scope@^3.7.3":
   version "3.7.7"
   resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
@@ -6500,13 +6419,6 @@
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree-jsx@^1.0.0":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree-jsx/-/estree-jsx-1.0.5.tgz#858a88ea20f34fe65111f005a689fa1ebf70dc18"
-  integrity sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==
-  dependencies:
-    "@types/estree" "*"
-
 "@types/estree@*", "@types/estree@^1.0.0", "@types/estree@^1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
@@ -6666,11 +6578,6 @@
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
   integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
 
-"@types/luxon@^2.3.2":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@types/luxon/-/luxon-2.4.0.tgz#897d3abc23b68d78b69d76a12c21e01eb5adab95"
-  integrity sha512-oCavjEjRXuR6URJEtQm0eBdfsBiEcGBZbq21of8iGkeKxU1+1xgKuFPClaBZl2KB8ZZBSWlgk61tH6Mf+nvZVw==
-
 "@types/mdast@^3.0.0":
   version "3.0.15"
   resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.15.tgz#49c524a263f30ffa28b71ae282f813ed000ab9f5"
@@ -6678,11 +6585,6 @@
   dependencies:
     "@types/unist" "^2"
 
-"@types/mdx@^2.0.0":
-  version "2.0.13"
-  resolved "https://registry.yarnpkg.com/@types/mdx/-/mdx-2.0.13.tgz#68f6877043d377092890ff5b298152b0a21671bd"
-  integrity sha512-+OWZQfAYyio6YkJb3HLxDrvnx6SWWDbC0zVPfBRzUk0/nqoDyf6dNxQi3eArPe8rJ473nobTMQ/8Zk+LxJ+Yuw==
-
 "@types/mime@^1":
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.5.tgz#1ef302e01cf7d2b5a0fa526790c9123bf1d06690"
@@ -6703,11 +6605,6 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e"
   integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
 
-"@types/ms@*":
-  version "0.7.34"
-  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433"
-  integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==
-
 "@types/node-fetch@^2.5.7":
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.11.tgz#9b39b78665dae0e82a08f02f4967d62c66f95d24"
@@ -6777,7 +6674,7 @@
   resolved "https://registry.yarnpkg.com/@types/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#ee1bd8c9f7a01b3445786aad0ef23aba5f511a44"
   integrity sha512-nj39q0wAIdhwn7DGUyT9irmsKK1tV0bd5WFEhgpqNTMFZ8cE+jieuTphCW0tfdm47S2zVT5mr09B28b1chmQMA==
 
-"@types/prop-types@*", "@types/prop-types@^15.0.0", "@types/prop-types@^15.7.11":
+"@types/prop-types@*", "@types/prop-types@^15.7.11", "@types/prop-types@^15.7.12":
   version "15.7.12"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.12.tgz#12bb1e2be27293c1406acb6af1c3f3a1481d98c6"
   integrity sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==
@@ -7629,7 +7526,7 @@ acorn-import-assertions@^1.9.0:
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
   integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
 
-acorn-jsx@^5.0.0, acorn-jsx@^5.3.1, acorn-jsx@^5.3.2:
+acorn-jsx@^5.3.1, acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
@@ -7654,7 +7551,7 @@ acorn@^7.1.1, acorn@^7.4.0, acorn@^7.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.0.0, acorn@^8.11.3, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
+acorn@^8.11.3, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
   version "8.11.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
   integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
@@ -8151,11 +8048,6 @@ astral-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
-astring@^1.8.0:
-  version "1.8.6"
-  resolved "https://registry.yarnpkg.com/astring/-/astring-1.8.6.tgz#2c9c157cf1739d67561c56ba896e6948f6b93731"
-  integrity sha512-ISvCdHdlTDlH5IpxQJIex7BWBywFWgjJSVdwst+/iQCoEYnyOaQ95+X1JGshuBjGp6nxKUy1jMgE3zPqN7fQdg==
-
 async-each@^1.0.1:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.6.tgz#52f1d9403818c179b7561e11a5d1b77eb2160e77"
@@ -8404,11 +8296,6 @@ bail@^1.0.0:
   resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776"
   integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==
 
-bail@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/bail/-/bail-2.0.2.tgz#d26f5cd8fe5d6f832a31517b9f7c356040ba6d5d"
-  integrity sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -9078,11 +8965,6 @@ ccount@^1.0.0:
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043"
   integrity sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==
 
-ccount@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ccount/-/ccount-2.0.1.tgz#17a3bf82302e0870d6da43a01311a8bc02a3ecf5"
-  integrity sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==
-
 chain-registry@^1.29.1:
   version "1.40.0"
   resolved "https://registry.yarnpkg.com/chain-registry/-/chain-registry-1.40.0.tgz#6aea76a1aba9fea039d08a1b4111ddcbcb361848"
@@ -9128,41 +9010,21 @@ char-regex@^1.0.2:
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
-character-entities-html4@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-2.1.0.tgz#1f1adb940c971a4b22ba39ddca6b618dc6e56b2b"
-  integrity sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==
-
 character-entities-legacy@^1.0.0:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1"
   integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==
 
-character-entities-legacy@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz#76bc83a90738901d7bc223a9e93759fdd560125b"
-  integrity sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==
-
 character-entities@^1.0.0:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b"
   integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==
 
-character-entities@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.2.tgz#2d09c2e72cd9523076ccb21157dff66ad43fcc22"
-  integrity sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==
-
 character-reference-invalid@^1.0.0:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
   integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
 
-character-reference-invalid@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-2.0.1.tgz#85c66b041e43b47210faf401278abf808ac45cb9"
-  integrity sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==
-
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -9429,6 +9291,11 @@ clsx@^2.0.0, clsx@^2.1.0:
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.0.tgz#e851283bcb5c80ee7608db18487433f7b23f77cb"
   integrity sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==
 
+clsx@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
+  integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==
+
 cmd-shim@6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-6.0.1.tgz#a65878080548e1dca760b3aea1e21ed05194da9d"
@@ -9547,11 +9414,6 @@ comma-separated-tokens@^1.0.0:
   resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea"
   integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==
 
-comma-separated-tokens@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz#4e89c9458acb61bc8fef19f4529973b2392839ee"
-  integrity sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==
-
 commander@2, commander@^2.19.0, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -10414,7 +10276,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
+debug@4, debug@4.3.4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -10456,13 +10318,6 @@ decimal.js@^10.2.1:
   resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
   integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
 
-decode-named-character-reference@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz#daabac9690874c394c81e4162a0304b35d824f0e"
-  integrity sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==
-  dependencies:
-    character-entities "^2.0.0"
-
 decode-uri-component@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
@@ -10640,7 +10495,7 @@ deprecation@^2.0.0:
   resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
   integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
 
-dequal@^2.0.0, dequal@^2.0.2, dequal@^2.0.3:
+dequal@^2.0.2, dequal@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
   integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
@@ -10745,11 +10600,6 @@ diff@^4.0.1:
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
-diff@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-5.2.0.tgz#26ded047cd1179b78b9537d5ef725503ce1ae531"
-  integrity sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==
-
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
@@ -11681,44 +11531,6 @@ estree-to-babel@^3.1.0:
     "@babel/types" "^7.2.0"
     c8 "^7.6.0"
 
-estree-util-attach-comments@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/estree-util-attach-comments/-/estree-util-attach-comments-2.1.1.tgz#ee44f4ff6890ee7dfb3237ac7810154c94c63f84"
-  integrity sha512-+5Ba/xGGS6mnwFbXIuQiDPTbuTxuMCooq3arVv7gPZtYpjp+VXH/NkHAP35OOefPhNG/UGqU3vt/LTABwcHX0w==
-  dependencies:
-    "@types/estree" "^1.0.0"
-
-estree-util-build-jsx@^2.0.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/estree-util-build-jsx/-/estree-util-build-jsx-2.2.2.tgz#32f8a239fb40dc3f3dca75bb5dcf77a831e4e47b"
-  integrity sha512-m56vOXcOBuaF+Igpb9OPAy7f9w9OIkb5yhjsZuaPm7HoGi4oTOQi0h2+yZ+AtKklYFZ+rPC4n0wYCJCEU1ONqg==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    estree-util-is-identifier-name "^2.0.0"
-    estree-walker "^3.0.0"
-
-estree-util-is-identifier-name@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.1.0.tgz#fb70a432dcb19045e77b05c8e732f1364b4b49b2"
-  integrity sha512-bEN9VHRyXAUOjkKVQVvArFym08BTWB0aJPppZZr0UNyAqWsLaVfAqP7hbaTJjzHifmB5ebnR8Wm7r7yGN/HonQ==
-
-estree-util-to-js@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/estree-util-to-js/-/estree-util-to-js-1.2.0.tgz#0f80d42443e3b13bd32f7012fffa6f93603f4a36"
-  integrity sha512-IzU74r1PK5IMMGZXUVZbmiu4A1uhiPgW5hm1GjcOfr4ZzHaMPpLNJjR7HjXiIOzi25nZDrgFTobHTkV5Q6ITjA==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    astring "^1.8.0"
-    source-map "^0.7.0"
-
-estree-util-visit@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/estree-util-visit/-/estree-util-visit-1.2.1.tgz#8bc2bc09f25b00827294703835aabee1cc9ec69d"
-  integrity sha512-xbgqcrkIVbIG+lI/gzbvd9SGTJL4zqJKBFttUl5pP27KhAjtMKbX/mQXJ7qgyXpMgVy/zvpm0xoQQaGL8OloOw==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    "@types/unist" "^2.0.0"
-
 estree-walker@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
@@ -11729,7 +11541,7 @@ estree-walker@^2.0.2:
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
   integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
 
-estree-walker@^3.0.0, estree-walker@^3.0.3:
+estree-walker@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-3.0.3.tgz#67c3e549ec402a487b4fc193d1953a524752340d"
   integrity sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==
@@ -13080,27 +12892,6 @@ hast-util-raw@6.0.1:
     xtend "^4.0.0"
     zwitch "^1.0.0"
 
-hast-util-to-estree@^2.0.0:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/hast-util-to-estree/-/hast-util-to-estree-2.3.3.tgz#da60142ffe19a6296923ec222aba73339c8bf470"
-  integrity sha512-ihhPIUPxN0v0w6M5+IiAZZrn0LH2uZomeWwhn7uP7avZC6TE7lIiEh2yBMPr5+zi1aUCXq6VoYRgs2Bw9xmycQ==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    "@types/estree-jsx" "^1.0.0"
-    "@types/hast" "^2.0.0"
-    "@types/unist" "^2.0.0"
-    comma-separated-tokens "^2.0.0"
-    estree-util-attach-comments "^2.0.0"
-    estree-util-is-identifier-name "^2.0.0"
-    hast-util-whitespace "^2.0.0"
-    mdast-util-mdx-expression "^1.0.0"
-    mdast-util-mdxjs-esm "^1.0.0"
-    property-information "^6.0.0"
-    space-separated-tokens "^2.0.0"
-    style-to-object "^0.4.1"
-    unist-util-position "^4.0.0"
-    zwitch "^2.0.0"
-
 hast-util-to-parse5@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz#1ec44650b631d72952066cea9b1445df699f8479"
@@ -13112,11 +12903,6 @@ hast-util-to-parse5@^6.0.0:
     xtend "^4.0.0"
     zwitch "^1.0.0"
 
-hast-util-whitespace@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-2.0.1.tgz#0ec64e257e6fc216c7d14c8a1b74d27d650b4557"
-  integrity sha512-nAxA0v8+vXSBDt3AnRUNjyRIQ0rD+ntpbAp4LnPkumc5M9yUbSMa4XDU9Q6etY4f1Wp4bNgvc1yjiZtsTTrSng==
-
 hastscript@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640"
@@ -13664,11 +13450,6 @@ is-alphabetical@1.0.4, is-alphabetical@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
   integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==
 
-is-alphabetical@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-2.0.1.tgz#01072053ea7c1036df3c7d19a6daaec7f19e789b"
-  integrity sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==
-
 is-alphanumerical@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf"
@@ -13677,14 +13458,6 @@ is-alphanumerical@^1.0.0:
     is-alphabetical "^1.0.0"
     is-decimal "^1.0.0"
 
-is-alphanumerical@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-2.0.1.tgz#7c03fbe96e3e931113e57f964b0a368cc2dfd875"
-  integrity sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==
-  dependencies:
-    is-alphabetical "^2.0.0"
-    is-decimal "^2.0.0"
-
 is-arguments@^1.0.4, is-arguments@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
@@ -13816,11 +13589,6 @@ is-decimal@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
   integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==
 
-is-decimal@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-2.0.1.tgz#9469d2dc190d0214fd87d78b78caecc0cc14eef7"
-  integrity sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==
-
 is-descriptor@^0.1.0:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.7.tgz#2727eb61fd789dcd5bdf0ed4569f551d2fe3be33"
@@ -13925,11 +13693,6 @@ is-hexadecimal@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
   integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==
 
-is-hexadecimal@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-2.0.1.tgz#86b5bf668fca307498d319dfc03289d781a90027"
-  integrity sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==
-
 is-in-browser@^1.0.2, is-in-browser@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835"
@@ -14035,11 +13798,6 @@ is-plain-obj@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
   integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
 
-is-plain-obj@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.1.0.tgz#d65025edec3657ce032fd7db63c97883eaed71f0"
-  integrity sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==
-
 is-plain-object@5.0.0, is-plain-object@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
@@ -14064,13 +13822,6 @@ is-reference@1.2.1:
   dependencies:
     "@types/estree" "*"
 
-is-reference@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-3.0.2.tgz#154747a01f45cd962404ee89d43837af2cba247c"
-  integrity sha512-v3rht/LgVcsdZa3O2Nqs+NMowLOxeOm7Ay9+/ARQ2F+qEoANRcqrjAZKGN0v8ymUetZGgkp26LTnGT7H0Qo9Pg==
-  dependencies:
-    "@types/estree" "*"
-
 is-regex@^1.1.2, is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
@@ -14357,11 +14108,6 @@ jake@^10.8.5:
     filelist "^1.0.4"
     minimatch "^3.1.2"
 
-javascript-stringify@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-2.1.0.tgz#27c76539be14d8bd128219a2d731b09337904e79"
-  integrity sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==
-
 jest-changed-files@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.1.tgz#a348aed00ec9bf671cc58a66fcbe7c3dfd6a68f5"
@@ -15217,11 +14963,6 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-kleur@^4.0.3:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780"
-  integrity sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==
-
 klona@^2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22"
@@ -15510,7 +15251,7 @@ loader-utils@^2.0.0, loader-utils@^2.0.4:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
-localforage@^1.7.3, localforage@^1.8.1:
+localforage@^1.7.3:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz#5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4"
   integrity sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==
@@ -15620,11 +15361,6 @@ long@^4.0.0:
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
-longest-streak@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-3.1.0.tgz#62fa67cd958742a1574af9f39866364102d90cd4"
-  integrity sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==
-
 loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -15683,11 +15419,6 @@ lunr@^2.3.9:
   resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1"
   integrity sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==
 
-luxon@^2.3.0:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/luxon/-/luxon-2.5.2.tgz#17ed497f0277e72d58a4756d6a9abee4681457b6"
-  integrity sha512-Yg7/RDp4nedqmLgyH0LwgGRvMEKVzKbUdkBYyCosbHgJ+kaOUx0qzSiSatVc3DFygnirTPYnMM2P5dg2uH1WvA==
-
 lz-string@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941"
@@ -15830,11 +15561,6 @@ markdown-escapes@^1.0.0:
   resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
   integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
 
-markdown-extensions@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/markdown-extensions/-/markdown-extensions-1.1.1.tgz#fea03b539faeaee9b4ef02a3769b455b189f7fc3"
-  integrity sha512-WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q==
-
 marked@^4.0.16:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3"
@@ -15873,92 +15599,6 @@ mdast-util-definitions@^4.0.0:
   dependencies:
     unist-util-visit "^2.0.0"
 
-mdast-util-definitions@^5.0.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-5.1.2.tgz#9910abb60ac5d7115d6819b57ae0bcef07a3f7a7"
-  integrity sha512-8SVPMuHqlPME/z3gqVwWY4zVXn8lqKv/pAhC57FuJ40ImXyBpmO5ukh98zB2v7Blql2FiHjHv9LVztSIqjY+MA==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    "@types/unist" "^2.0.0"
-    unist-util-visit "^4.0.0"
-
-mdast-util-from-markdown@^1.0.0, mdast-util-from-markdown@^1.1.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-1.3.1.tgz#9421a5a247f10d31d2faed2a30df5ec89ceafcf0"
-  integrity sha512-4xTO/M8c82qBcnQc1tgpNtubGUW/Y1tBQ1B0i5CtSoelOLKFYlElIr3bvgREYYO5iRqbMY1YuqZng0GVOI8Qww==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    "@types/unist" "^2.0.0"
-    decode-named-character-reference "^1.0.0"
-    mdast-util-to-string "^3.1.0"
-    micromark "^3.0.0"
-    micromark-util-decode-numeric-character-reference "^1.0.0"
-    micromark-util-decode-string "^1.0.0"
-    micromark-util-normalize-identifier "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    unist-util-stringify-position "^3.0.0"
-    uvu "^0.5.0"
-
-mdast-util-mdx-expression@^1.0.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/mdast-util-mdx-expression/-/mdast-util-mdx-expression-1.3.2.tgz#d027789e67524d541d6de543f36d51ae2586f220"
-  integrity sha512-xIPmR5ReJDu/DHH1OoIT1HkuybIfRGYRywC+gJtI7qHjCJp/M9jrmBEJW22O8lskDWm562BX2W8TiAwRTb0rKA==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    "@types/hast" "^2.0.0"
-    "@types/mdast" "^3.0.0"
-    mdast-util-from-markdown "^1.0.0"
-    mdast-util-to-markdown "^1.0.0"
-
-mdast-util-mdx-jsx@^2.0.0:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-2.1.4.tgz#7c1f07f10751a78963cfabee38017cbc8b7786d1"
-  integrity sha512-DtMn9CmVhVzZx3f+optVDF8yFgQVt7FghCRNdlIaS3X5Bnym3hZwPbg/XW86vdpKjlc1PVj26SpnLGeJBXD3JA==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    "@types/hast" "^2.0.0"
-    "@types/mdast" "^3.0.0"
-    "@types/unist" "^2.0.0"
-    ccount "^2.0.0"
-    mdast-util-from-markdown "^1.1.0"
-    mdast-util-to-markdown "^1.3.0"
-    parse-entities "^4.0.0"
-    stringify-entities "^4.0.0"
-    unist-util-remove-position "^4.0.0"
-    unist-util-stringify-position "^3.0.0"
-    vfile-message "^3.0.0"
-
-mdast-util-mdx@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-mdx/-/mdast-util-mdx-2.0.1.tgz#49b6e70819b99bb615d7223c088d295e53bb810f"
-  integrity sha512-38w5y+r8nyKlGvNjSEqWrhG0w5PmnRA+wnBvm+ulYCct7nsGYhFVb0lljS9bQav4psDAS1eGkP2LMVcZBi/aqw==
-  dependencies:
-    mdast-util-from-markdown "^1.0.0"
-    mdast-util-mdx-expression "^1.0.0"
-    mdast-util-mdx-jsx "^2.0.0"
-    mdast-util-mdxjs-esm "^1.0.0"
-    mdast-util-to-markdown "^1.0.0"
-
-mdast-util-mdxjs-esm@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-1.3.1.tgz#645d02cd607a227b49721d146fd81796b2e2d15b"
-  integrity sha512-SXqglS0HrEvSdUEfoXFtcg7DRl7S2cwOXc7jkuusG472Mmjag34DUDeOJUZtl+BVnyeO1frIgVpHlNRWc2gk/w==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    "@types/hast" "^2.0.0"
-    "@types/mdast" "^3.0.0"
-    mdast-util-from-markdown "^1.0.0"
-    mdast-util-to-markdown "^1.0.0"
-
-mdast-util-phrasing@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-phrasing/-/mdast-util-phrasing-3.0.1.tgz#c7c21d0d435d7fb90956038f02e8702781f95463"
-  integrity sha512-WmI1gTXUBJo4/ZmSk79Wcb2HcjPJBzM1nlI/OUWA8yk2X9ik3ffNbBGsU+09BFmXaL1IBb9fiuvq6/KMiNycSg==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    unist-util-is "^5.0.0"
-
 mdast-util-to-hast@10.0.1:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz#0cfc82089494c52d46eb0e3edb7a4eb2aea021eb"
@@ -15973,46 +15613,11 @@ mdast-util-to-hast@10.0.1:
     unist-util-position "^3.0.0"
     unist-util-visit "^2.0.0"
 
-mdast-util-to-hast@^12.1.0:
-  version "12.3.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-12.3.0.tgz#045d2825fb04374e59970f5b3f279b5700f6fb49"
-  integrity sha512-pits93r8PhnIoU4Vy9bjW39M2jJ6/tdHyja9rrot9uujkN7UTU9SDnE6WNJz/IGyQk3XHX6yNNtrBH6cQzm8Hw==
-  dependencies:
-    "@types/hast" "^2.0.0"
-    "@types/mdast" "^3.0.0"
-    mdast-util-definitions "^5.0.0"
-    micromark-util-sanitize-uri "^1.1.0"
-    trim-lines "^3.0.0"
-    unist-util-generated "^2.0.0"
-    unist-util-position "^4.0.0"
-    unist-util-visit "^4.0.0"
-
-mdast-util-to-markdown@^1.0.0, mdast-util-to-markdown@^1.3.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-1.5.0.tgz#c13343cb3fc98621911d33b5cd42e7d0731171c6"
-  integrity sha512-bbv7TPv/WC49thZPg3jXuqzuvI45IL2EVAr/KxF0BSdHsU0ceFHOmwQn6evxAh1GaoK/6GQ1wp4R4oW2+LFL/A==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    "@types/unist" "^2.0.0"
-    longest-streak "^3.0.0"
-    mdast-util-phrasing "^3.0.0"
-    mdast-util-to-string "^3.0.0"
-    micromark-util-decode-string "^1.0.0"
-    unist-util-visit "^4.0.0"
-    zwitch "^2.0.0"
-
 mdast-util-to-string@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz#27055500103f51637bd07d01da01eb1967a43527"
   integrity sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==
 
-mdast-util-to-string@^3.0.0, mdast-util-to-string@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.2.0.tgz#66f7bb6324756741c5f47a53557f0cbf16b6f789"
-  integrity sha512-V4Zn/ncyN1QNSqSBxTrMOLpjr+IKdHl2v3KVLoWmDPscP4r9GcCi71gjgvUV1SFSKh92AjAG4peFuBl2/YgCJg==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-
 mdn-data@2.0.14:
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
@@ -16136,294 +15741,6 @@ microevent.ts@~0.1.1:
   resolved "https://registry.yarnpkg.com/microevent.ts/-/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0"
   integrity sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==
 
-micromark-core-commonmark@^1.0.0, micromark-core-commonmark@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-1.1.0.tgz#1386628df59946b2d39fb2edfd10f3e8e0a75bb8"
-  integrity sha512-BgHO1aRbolh2hcrzL2d1La37V0Aoz73ymF8rAcKnohLy93titmv62E0gP8Hrx9PKcKrqCZ1BbLGbP3bEhoXYlw==
-  dependencies:
-    decode-named-character-reference "^1.0.0"
-    micromark-factory-destination "^1.0.0"
-    micromark-factory-label "^1.0.0"
-    micromark-factory-space "^1.0.0"
-    micromark-factory-title "^1.0.0"
-    micromark-factory-whitespace "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-chunked "^1.0.0"
-    micromark-util-classify-character "^1.0.0"
-    micromark-util-html-tag-name "^1.0.0"
-    micromark-util-normalize-identifier "^1.0.0"
-    micromark-util-resolve-all "^1.0.0"
-    micromark-util-subtokenize "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.1"
-    uvu "^0.5.0"
-
-micromark-extension-mdx-expression@^1.0.0:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-1.0.8.tgz#5bc1f5fd90388e8293b3ef4f7c6f06c24aff6314"
-  integrity sha512-zZpeQtc5wfWKdzDsHRBY003H2Smg+PUi2REhqgIhdzAa5xonhP03FcXxqFSerFiNUr5AWmHpaNPQTBVOS4lrXw==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    micromark-factory-mdx-expression "^1.0.0"
-    micromark-factory-space "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-events-to-acorn "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    uvu "^0.5.0"
-
-micromark-extension-mdx-jsx@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/micromark-extension-mdx-jsx/-/micromark-extension-mdx-jsx-1.0.5.tgz#e72d24b7754a30d20fb797ece11e2c4e2cae9e82"
-  integrity sha512-gPH+9ZdmDflbu19Xkb8+gheqEDqkSpdCEubQyxuz/Hn8DOXiXvrXeikOoBA71+e8Pfi0/UYmU3wW3H58kr7akA==
-  dependencies:
-    "@types/acorn" "^4.0.0"
-    "@types/estree" "^1.0.0"
-    estree-util-is-identifier-name "^2.0.0"
-    micromark-factory-mdx-expression "^1.0.0"
-    micromark-factory-space "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    uvu "^0.5.0"
-    vfile-message "^3.0.0"
-
-micromark-extension-mdx-md@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-extension-mdx-md/-/micromark-extension-mdx-md-1.0.1.tgz#595d4b2f692b134080dca92c12272ab5b74c6d1a"
-  integrity sha512-7MSuj2S7xjOQXAjjkbjBsHkMtb+mDGVW6uI2dBL9snOBCbZmoNgDAeZ0nSn9j3T42UE/g2xVNMn18PJxZvkBEA==
-  dependencies:
-    micromark-util-types "^1.0.0"
-
-micromark-extension-mdxjs-esm@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/micromark-extension-mdxjs-esm/-/micromark-extension-mdxjs-esm-1.0.5.tgz#e4f8be9c14c324a80833d8d3a227419e2b25dec1"
-  integrity sha512-xNRBw4aoURcyz/S69B19WnZAkWJMxHMT5hE36GtDAyhoyn/8TuAeqjFJQlwk+MKQsUD7b3l7kFX+vlfVWgcX1w==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    micromark-core-commonmark "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-events-to-acorn "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    unist-util-position-from-estree "^1.1.0"
-    uvu "^0.5.0"
-    vfile-message "^3.0.0"
-
-micromark-extension-mdxjs@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-extension-mdxjs/-/micromark-extension-mdxjs-1.0.1.tgz#f78d4671678d16395efeda85170c520ee795ded8"
-  integrity sha512-7YA7hF6i5eKOfFUzZ+0z6avRG52GpWR8DL+kN47y3f2KhxbBZMhmxe7auOeaTBrW2DenbbZTf1ea9tA2hDpC2Q==
-  dependencies:
-    acorn "^8.0.0"
-    acorn-jsx "^5.0.0"
-    micromark-extension-mdx-expression "^1.0.0"
-    micromark-extension-mdx-jsx "^1.0.0"
-    micromark-extension-mdx-md "^1.0.0"
-    micromark-extension-mdxjs-esm "^1.0.0"
-    micromark-util-combine-extensions "^1.0.0"
-    micromark-util-types "^1.0.0"
-
-micromark-factory-destination@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-1.1.0.tgz#eb815957d83e6d44479b3df640f010edad667b9f"
-  integrity sha512-XaNDROBgx9SgSChd69pjiGKbV+nfHGDPVYFs5dOoDd7ZnMAE+Cuu91BCpsY8RT2NP9vo/B8pds2VQNCLiu0zhg==
-  dependencies:
-    micromark-util-character "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-
-micromark-factory-label@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-1.1.0.tgz#cc95d5478269085cfa2a7282b3de26eb2e2dec68"
-  integrity sha512-OLtyez4vZo/1NjxGhcpDSbHQ+m0IIGnT8BoPamh+7jVlzLJBH98zzuCoUeMxvM6WsNeh8wx8cKvqLiPHEACn0w==
-  dependencies:
-    micromark-util-character "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    uvu "^0.5.0"
-
-micromark-factory-mdx-expression@^1.0.0:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-1.0.9.tgz#57ba4571b69a867a1530f34741011c71c73a4976"
-  integrity sha512-jGIWzSmNfdnkJq05c7b0+Wv0Kfz3NJ3N4cBjnbO4zjXIlxJr+f8lk+5ZmwFvqdAbUy2q6B5rCY//g0QAAaXDWA==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-events-to-acorn "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    unist-util-position-from-estree "^1.0.0"
-    uvu "^0.5.0"
-    vfile-message "^3.0.0"
-
-micromark-factory-space@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-1.1.0.tgz#c8f40b0640a0150751d3345ed885a080b0d15faf"
-  integrity sha512-cRzEj7c0OL4Mw2v6nwzttyOZe8XY/Z8G0rzmWQZTBi/jjwyw/U4uqKtUORXQrR5bAZZnbTI/feRV/R7hc4jQYQ==
-  dependencies:
-    micromark-util-character "^1.0.0"
-    micromark-util-types "^1.0.0"
-
-micromark-factory-title@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-1.1.0.tgz#dd0fe951d7a0ac71bdc5ee13e5d1465ad7f50ea1"
-  integrity sha512-J7n9R3vMmgjDOCY8NPw55jiyaQnH5kBdV2/UXCtZIpnHH3P6nHUKaH7XXEYuWwx/xUJcawa8plLBEjMPU24HzQ==
-  dependencies:
-    micromark-factory-space "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-
-micromark-factory-whitespace@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-1.1.0.tgz#798fb7489f4c8abafa7ca77eed6b5745853c9705"
-  integrity sha512-v2WlmiymVSp5oMg+1Q0N1Lxmt6pMhIHD457whWM7/GUlEks1hI9xj5w3zbc4uuMKXGisksZk8DzP2UyGbGqNsQ==
-  dependencies:
-    micromark-factory-space "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-
-micromark-util-character@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-1.2.0.tgz#4fedaa3646db249bc58caeb000eb3549a8ca5dcc"
-  integrity sha512-lXraTwcX3yH/vMDaFWCQJP1uIszLVebzUa3ZHdrgxr7KEU/9mL4mVgCpGbyhvNLNlauROiNUq7WN5u7ndbY6xg==
-  dependencies:
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-
-micromark-util-chunked@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-1.1.0.tgz#37a24d33333c8c69a74ba12a14651fd9ea8a368b"
-  integrity sha512-Ye01HXpkZPNcV6FiyoW2fGZDUw4Yc7vT0E9Sad83+bEDiCJ1uXu0S3mr8WLpsz3HaG3x2q0HM6CTuPdcZcluFQ==
-  dependencies:
-    micromark-util-symbol "^1.0.0"
-
-micromark-util-classify-character@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-1.1.0.tgz#6a7f8c8838e8a120c8e3c4f2ae97a2bff9190e9d"
-  integrity sha512-SL0wLxtKSnklKSUplok1WQFoGhUdWYKggKUiqhX+Swala+BtptGCu5iPRc+xvzJ4PXE/hwM3FNXsfEVgoZsWbw==
-  dependencies:
-    micromark-util-character "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-
-micromark-util-combine-extensions@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.1.0.tgz#192e2b3d6567660a85f735e54d8ea6e3952dbe84"
-  integrity sha512-Q20sp4mfNf9yEqDL50WwuWZHUrCO4fEyeDCnMGmG5Pr0Cz15Uo7KBs6jq+dq0EgX4DPwwrh9m0X+zPV1ypFvUA==
-  dependencies:
-    micromark-util-chunked "^1.0.0"
-    micromark-util-types "^1.0.0"
-
-micromark-util-decode-numeric-character-reference@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.1.0.tgz#b1e6e17009b1f20bc652a521309c5f22c85eb1c6"
-  integrity sha512-m9V0ExGv0jB1OT21mrWcuf4QhP46pH1KkfWy9ZEezqHKAxkj4mPCy3nIH1rkbdMlChLHX531eOrymlwyZIf2iw==
-  dependencies:
-    micromark-util-symbol "^1.0.0"
-
-micromark-util-decode-string@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-decode-string/-/micromark-util-decode-string-1.1.0.tgz#dc12b078cba7a3ff690d0203f95b5d5537f2809c"
-  integrity sha512-YphLGCK8gM1tG1bd54azwyrQRjCFcmgj2S2GoJDNnh4vYtnL38JS8M4gpxzOPNyHdNEpheyWXCTnnTDY3N+NVQ==
-  dependencies:
-    decode-named-character-reference "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-decode-numeric-character-reference "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-
-micromark-util-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-1.1.0.tgz#92e4f565fd4ccb19e0dcae1afab9a173bbeb19a5"
-  integrity sha512-EuEzTWSTAj9PA5GOAs992GzNh2dGQO52UvAbtSOMvXTxv3Criqb6IOzJUBCmEqrrXSblJIJBbFFv6zPxpreiJw==
-
-micromark-util-events-to-acorn@^1.0.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-1.2.3.tgz#a4ab157f57a380e646670e49ddee97a72b58b557"
-  integrity sha512-ij4X7Wuc4fED6UoLWkmo0xJQhsktfNh1J0m8g4PbIMPlx+ek/4YdW5mvbye8z/aZvAPUoxgXHrwVlXAPKMRp1w==
-  dependencies:
-    "@types/acorn" "^4.0.0"
-    "@types/estree" "^1.0.0"
-    "@types/unist" "^2.0.0"
-    estree-util-visit "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    uvu "^0.5.0"
-    vfile-message "^3.0.0"
-
-micromark-util-html-tag-name@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.2.0.tgz#48fd7a25826f29d2f71479d3b4e83e94829b3588"
-  integrity sha512-VTQzcuQgFUD7yYztuQFKXT49KghjtETQ+Wv/zUjGSGBioZnkA4P1XXZPT1FHeJA6RwRXSF47yvJ1tsJdoxwO+Q==
-
-micromark-util-normalize-identifier@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.1.0.tgz#7a73f824eb9f10d442b4d7f120fecb9b38ebf8b7"
-  integrity sha512-N+w5vhqrBihhjdpM8+5Xsxy71QWqGn7HYNUvch71iV2PM7+E3uWGox1Qp90loa1ephtCxG2ftRV/Conitc6P2Q==
-  dependencies:
-    micromark-util-symbol "^1.0.0"
-
-micromark-util-resolve-all@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-1.1.0.tgz#4652a591ee8c8fa06714c9b54cd6c8e693671188"
-  integrity sha512-b/G6BTMSg+bX+xVCshPTPyAu2tmA0E4X98NSR7eIbeC6ycCqCeE7wjfDIgzEbkzdEVJXRtOG4FbEm/uGbCRouA==
-  dependencies:
-    micromark-util-types "^1.0.0"
-
-micromark-util-sanitize-uri@^1.0.0, micromark-util-sanitize-uri@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.2.0.tgz#613f738e4400c6eedbc53590c67b197e30d7f90d"
-  integrity sha512-QO4GXv0XZfWey4pYFndLUKEAktKkG5kZTdUNaTAkzbuJxn2tNBOr+QtxR2XpWaMhbImT2dPzyLrPXLlPhph34A==
-  dependencies:
-    micromark-util-character "^1.0.0"
-    micromark-util-encode "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-
-micromark-util-subtokenize@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-1.1.0.tgz#941c74f93a93eaf687b9054aeb94642b0e92edb1"
-  integrity sha512-kUQHyzRoxvZO2PuLzMt2P/dwVsTiivCK8icYTeR+3WgbuPqfHgPPy7nFKbeqRivBvn/3N3GBiNC+JRTMSxEC7A==
-  dependencies:
-    micromark-util-chunked "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    uvu "^0.5.0"
-
-micromark-util-symbol@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-1.1.0.tgz#813cd17837bdb912d069a12ebe3a44b6f7063142"
-  integrity sha512-uEjpEYY6KMs1g7QfJ2eX1SQEV+ZT4rUD3UcF6l57acZvLNK7PBZL+ty82Z1qhK1/yXIY4bdx04FKMgR0g4IAag==
-
-micromark-util-types@^1.0.0, micromark-util-types@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-1.1.0.tgz#e6676a8cae0bb86a2171c498167971886cb7e283"
-  integrity sha512-ukRBgie8TIAcacscVHSiddHjO4k/q3pnedmzMQ4iwDcK0FtFCohKOlFbaOL/mPgfnPsL3C1ZyxJa4sbWrBl3jg==
-
-micromark@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/micromark/-/micromark-3.2.0.tgz#1af9fef3f995ea1ea4ac9c7e2f19c48fd5c006e9"
-  integrity sha512-uD66tJj54JLYq0De10AhWycZWGQNUvDI55xPgk2sQM5kn1JYlhbCMTtEeT27+vAhW2FBQxLlOmS3pmA7/2z4aA==
-  dependencies:
-    "@types/debug" "^4.0.0"
-    debug "^4.0.0"
-    decode-named-character-reference "^1.0.0"
-    micromark-core-commonmark "^1.0.1"
-    micromark-factory-space "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-chunked "^1.0.0"
-    micromark-util-combine-extensions "^1.0.0"
-    micromark-util-decode-numeric-character-reference "^1.0.0"
-    micromark-util-encode "^1.0.0"
-    micromark-util-normalize-identifier "^1.0.0"
-    micromark-util-resolve-all "^1.0.0"
-    micromark-util-sanitize-uri "^1.0.0"
-    micromark-util-subtokenize "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.1"
-    uvu "^0.5.0"
-
 micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -16798,7 +16115,7 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-mri@^1.1.0, mri@^1.2.0:
+mri@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
   integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==
@@ -17869,20 +17186,6 @@ parse-entities@^2.0.0:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
-parse-entities@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-4.0.1.tgz#4e2a01111fb1c986549b944af39eeda258fc9e4e"
-  integrity sha512-SWzvYcSJh4d/SGLIOQfZ/CoNv6BTlI6YEQ7Nj82oDVnRpwe/Z/F1EMx42x3JAOwGBlCjeCH0BRJQbQ/opHL17w==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    character-entities "^2.0.0"
-    character-entities-legacy "^3.0.0"
-    character-reference-invalid "^2.0.0"
-    decode-named-character-reference "^1.0.0"
-    is-alphanumerical "^2.0.0"
-    is-decimal "^2.0.0"
-    is-hexadecimal "^2.0.0"
-
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
@@ -18057,15 +17360,6 @@ pbkdf2@^3.0.3, pbkdf2@^3.1.2:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-periscopic@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/periscopic/-/periscopic-3.1.0.tgz#7e9037bf51c5855bd33b48928828db4afa79d97a"
-  integrity sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    estree-walker "^3.0.0"
-    is-reference "^3.0.0"
-
 picocolors@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
@@ -18562,11 +17856,6 @@ prettier@^2.8.7:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
   integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
-pretty-bytes@^6.0.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-6.1.1.tgz#38cd6bb46f47afbf667c202cfc754bffd2016a3b"
-  integrity sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==
-
 pretty-error@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz#be89f82d81b1c86ec8fdfbc385045882727f93b6"
@@ -18701,7 +17990,7 @@ prop-types@^15.0.0, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2,
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
-property-expr@^2.0.4, property-expr@^2.0.5:
+property-expr@^2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.6.tgz#f77bc00d5928a6c748414ad12882e83f24aec1e8"
   integrity sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==
@@ -18713,11 +18002,6 @@ property-information@^5.0.0, property-information@^5.3.0:
   dependencies:
     xtend "^4.0.0"
 
-property-information@^6.0.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.5.0.tgz#6212fbb52ba757e92ef4fb9d657563b933b7ffec"
-  integrity sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==
-
 protobufjs@^6.11.2, protobufjs@^6.8.8, protobufjs@~6.11.2, protobufjs@~6.11.3:
   version "6.11.4"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.4.tgz#29a412c38bf70d89e537b6d02d904a6f448173aa"
@@ -19103,32 +18387,16 @@ react-is@^18.0.0, react-is@^18.2.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
   integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
 
+react-is@^18.3.1:
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
+  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
+
 react-load-script@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/react-load-script/-/react-load-script-0.0.6.tgz#db6851236aaa25bb622677a2eb51dad4f8d2c258"
   integrity sha512-aRGxDGP9VoLxcsaYvKWIW+LRrMOzz2eEcubTS4NvQPPugjk2VvMhow0wWTkSl7RxookomD1MwcP4l5UStg5ShQ==
 
-react-markdown@^8.0.4:
-  version "8.0.7"
-  resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-8.0.7.tgz#c8dbd1b9ba5f1c5e7e5f2a44de465a3caafdf89b"
-  integrity sha512-bvWbzG4MtOU62XqBx3Xx+zB2raaFFsq4mYiAzfjXJMEz2sixgeAfraA3tvzULF02ZdOMUOKTBFFaZJDDrq+BJQ==
-  dependencies:
-    "@types/hast" "^2.0.0"
-    "@types/prop-types" "^15.0.0"
-    "@types/unist" "^2.0.0"
-    comma-separated-tokens "^2.0.0"
-    hast-util-whitespace "^2.0.0"
-    prop-types "^15.0.0"
-    property-information "^6.0.0"
-    react-is "^18.0.0"
-    remark-parse "^10.0.0"
-    remark-rehype "^10.0.0"
-    space-separated-tokens "^2.0.0"
-    style-to-object "^0.4.0"
-    unified "^10.0.0"
-    unist-util-visit "^4.0.0"
-    vfile "^5.0.0"
-
 react-merge-refs@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/react-merge-refs/-/react-merge-refs-1.1.0.tgz#73d88b892c6c68cbb7a66e0800faa374f4c38b06"
@@ -19149,7 +18417,7 @@ react-refresh@^0.11.0:
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046"
   integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==
 
-react-router-dom@6, react-router-dom@^6.7.0:
+react-router-dom@6:
   version "6.22.3"
   resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.22.3.tgz#9781415667fd1361a475146c5826d9f16752a691"
   integrity sha512-7ZILI7HjcE+p31oQvwbokjk6OA/bnFxrhJ19n82Ex9Ph8fNAq+Hm/7KchpMGlTgWhUxRHMMCut+vEtNpWpowKw==
@@ -19546,14 +18814,6 @@ remark-mdx@1.6.22:
     remark-parse "8.0.3"
     unified "9.2.0"
 
-remark-mdx@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-2.3.0.tgz#efe678025a8c2726681bde8bf111af4a93943db4"
-  integrity sha512-g53hMkpM0I98MU266IzDFMrTD980gNF3BJnkyFcmN+dD873mQeD5rdMO3Y2X+x8umQfbSE0PcoEDl7ledSA+2g==
-  dependencies:
-    mdast-util-mdx "^2.0.0"
-    micromark-extension-mdxjs "^1.0.0"
-
 remark-parse@8.0.3:
   version "8.0.3"
   resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1"
@@ -19576,25 +18836,6 @@ remark-parse@8.0.3:
     vfile-location "^3.0.0"
     xtend "^4.0.1"
 
-remark-parse@^10.0.0:
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-10.0.2.tgz#ca241fde8751c2158933f031a4e3efbaeb8bc262"
-  integrity sha512-3ydxgHa/ZQzG8LvC7jTXccARYDcRld3VfcgIIFs7bI6vbRSxJJmzgLEIIoYKyrfhaY+ujuWaf/PJiMZXoiCXgw==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    mdast-util-from-markdown "^1.0.0"
-    unified "^10.0.0"
-
-remark-rehype@^10.0.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-10.1.0.tgz#32dc99d2034c27ecaf2e0150d22a6dcccd9a6279"
-  integrity sha512-EFmR5zppdBp0WQeDVZ/b66CWJipB2q2VLNFMabzDSGR66Z2fQii83G5gTBbgGEnEEA0QRussvrFHxk1HWGJskw==
-  dependencies:
-    "@types/hast" "^2.0.0"
-    "@types/mdast" "^3.0.0"
-    mdast-util-to-hast "^12.1.0"
-    unified "^10.0.0"
-
 remark-slug@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/remark-slug/-/remark-slug-6.1.0.tgz#0503268d5f0c4ecb1f33315c00465ccdd97923ce"
@@ -19872,13 +19113,6 @@ rxjs@^7.5.5:
   dependencies:
     tslib "^2.1.0"
 
-sade@^1.7.3:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz#0a78e81d658d394887be57d2a409bf703a3b2701"
-  integrity sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==
-  dependencies:
-    mri "^1.1.0"
-
 safe-array-concat@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb"
@@ -20488,7 +19722,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.0, source-map@^0.7.3, source-map@^0.7.4:
+source-map@^0.7.3, source-map@^0.7.4:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
   integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
@@ -20503,11 +19737,6 @@ space-separated-tokens@^1.0.0:
   resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899"
   integrity sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==
 
-space-separated-tokens@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz#1ecd9d2350a3844572c3f4a312bceb018348859f"
-  integrity sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==
-
 spdx-correct@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
@@ -20842,14 +20071,6 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-stringify-entities@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-4.0.4.tgz#b3b79ef5f277cc4ac73caeb0236c5ba939b3a4f3"
-  integrity sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==
-  dependencies:
-    character-entities-html4 "^2.0.0"
-    character-entities-legacy "^3.0.0"
-
 "strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -20971,13 +20192,6 @@ style-to-object@0.3.0, style-to-object@^0.3.0:
   dependencies:
     inline-style-parser "0.1.1"
 
-style-to-object@^0.4.0, style-to-object@^0.4.1:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.4.4.tgz#266e3dfd56391a7eefb7770423612d043c3f33ec"
-  integrity sha512-HYNoHZa2GorYNyqiCaBgsxvcJIn7OHq6inEga+E6Ke3m5JkoqpQbnFssk4jwe+K7AhGa2fcha4wSOf1Kn01dMg==
-  dependencies:
-    inline-style-parser "0.1.1"
-
 styled-jsx@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.1.1.tgz#839a1c3aaacc4e735fed0781b8619ea5d0009d1f"
@@ -21320,11 +20534,6 @@ timers-browserify@^2.0.4:
   dependencies:
     setimmediate "^1.0.4"
 
-tiny-case@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tiny-case/-/tiny-case-1.0.3.tgz#d980d66bc72b5d5a9ca86fb7c9ffdb9c898ddd03"
-  integrity sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==
-
 tiny-invariant@^1.3.1:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
@@ -21456,11 +20665,6 @@ tr46@~0.0.3:
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
-trim-lines@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz#d802e332a07df861c48802c04321017b1bd87338"
-  integrity sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==
-
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
@@ -21486,11 +20690,6 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
   integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
 
-trough@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/trough/-/trough-2.2.0.tgz#94a60bd6bd375c152c1df911a4b11d5b0256f50f"
-  integrity sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==
-
 ts-api-utils@^1.0.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
@@ -21892,19 +21091,6 @@ unified@9.2.0:
     trough "^1.0.0"
     vfile "^4.0.0"
 
-unified@^10.0.0:
-  version "10.1.2"
-  resolved "https://registry.yarnpkg.com/unified/-/unified-10.1.2.tgz#b1d64e55dafe1f0b98bb6c719881103ecf6c86df"
-  integrity sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    bail "^2.0.0"
-    extend "^3.0.0"
-    is-buffer "^2.0.0"
-    is-plain-obj "^4.0.0"
-    trough "^2.0.0"
-    vfile "^5.0.0"
-
 union-value@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
@@ -21967,42 +21153,16 @@ unist-util-generated@^1.0.0:
   resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b"
   integrity sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==
 
-unist-util-generated@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-2.0.1.tgz#e37c50af35d3ed185ac6ceacb6ca0afb28a85cae"
-  integrity sha512-qF72kLmPxAw0oN2fwpWIqbXAVyEqUzDHMsbtPvOudIlUzXYFIeQIuxXQCRCFh22B7cixvU0MG7m3MW8FTq/S+A==
-
 unist-util-is@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797"
   integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==
 
-unist-util-is@^5.0.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-5.2.1.tgz#b74960e145c18dcb6226bc57933597f5486deae9"
-  integrity sha512-u9njyyfEh43npf1M+yGKDGVPbY/JWEemg5nH05ncKPfi+kBbKBJoTdsogMu33uhytuLlv9y0O7GH7fEdwLdLQw==
-  dependencies:
-    "@types/unist" "^2.0.0"
-
-unist-util-position-from-estree@^1.0.0, unist-util-position-from-estree@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/unist-util-position-from-estree/-/unist-util-position-from-estree-1.1.2.tgz#8ac2480027229de76512079e377afbcabcfcce22"
-  integrity sha512-poZa0eXpS+/XpoQwGwl79UUdea4ol2ZuCYguVaJS4qzIOMDzbqz8a3erUCOmubSZkaOuGamb3tX790iwOIROww==
-  dependencies:
-    "@types/unist" "^2.0.0"
-
 unist-util-position@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47"
   integrity sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==
 
-unist-util-position@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-4.0.4.tgz#93f6d8c7d6b373d9b825844645877c127455f037"
-  integrity sha512-kUBE91efOWfIVBo8xzh/uZQ7p9ffYRtUbMRZBNFYwf0RK8koUMx6dGUfwylLOKmaT2cs4wSW96QoYUSXAyEtpg==
-  dependencies:
-    "@types/unist" "^2.0.0"
-
 unist-util-remove-position@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc"
@@ -22010,14 +21170,6 @@ unist-util-remove-position@^2.0.0:
   dependencies:
     unist-util-visit "^2.0.0"
 
-unist-util-remove-position@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-4.0.2.tgz#a89be6ea72e23b1a402350832b02a91f6a9afe51"
-  integrity sha512-TkBb0HABNmxzAcfLf4qsIbFbaPDvMO6wa3b3j4VcEzFVaw1LBKwnW4/sRJ/atSLSzoIg41JWEdnE7N6DIhGDGQ==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-visit "^4.0.0"
-
 unist-util-remove@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/unist-util-remove/-/unist-util-remove-2.1.0.tgz#b0b4738aa7ee445c402fda9328d604a02d010588"
@@ -22032,13 +21184,6 @@ unist-util-stringify-position@^2.0.0:
   dependencies:
     "@types/unist" "^2.0.2"
 
-unist-util-stringify-position@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz#03ad3348210c2d930772d64b489580c13a7db39d"
-  integrity sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==
-  dependencies:
-    "@types/unist" "^2.0.0"
-
 unist-util-visit-parents@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6"
@@ -22047,14 +21192,6 @@ unist-util-visit-parents@^3.0.0:
     "@types/unist" "^2.0.0"
     unist-util-is "^4.0.0"
 
-unist-util-visit-parents@^5.1.1:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-5.1.3.tgz#b4520811b0ca34285633785045df7a8d6776cfeb"
-  integrity sha512-x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-is "^5.0.0"
-
 unist-util-visit@2.0.3, unist-util-visit@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c"
@@ -22064,15 +21201,6 @@ unist-util-visit@2.0.3, unist-util-visit@^2.0.0:
     unist-util-is "^4.0.0"
     unist-util-visit-parents "^3.0.0"
 
-unist-util-visit@^4.0.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.1.2.tgz#125a42d1eb876283715a3cb5cceaa531828c72e2"
-  integrity sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-is "^5.0.0"
-    unist-util-visit-parents "^5.1.1"
-
 universal-user-agent@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.1.tgz#15f20f55da3c930c57bddbf1734c6654d5fd35aa"
@@ -22288,16 +21416,6 @@ uuid@^9.0.0, uuid@^9.0.1:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
   integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
 
-uvu@^0.5.0:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/uvu/-/uvu-0.5.6.tgz#2754ca20bcb0bb59b64e9985e84d2e81058502df"
-  integrity sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==
-  dependencies:
-    dequal "^2.0.0"
-    diff "^5.0.0"
-    kleur "^4.0.3"
-    sade "^1.7.3"
-
 v8-compile-cache-lib@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
@@ -22371,14 +21489,6 @@ vfile-message@^2.0.0:
     "@types/unist" "^2.0.0"
     unist-util-stringify-position "^2.0.0"
 
-vfile-message@^3.0.0:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.1.4.tgz#15a50816ae7d7c2d1fa87090a7f9f96612b59dea"
-  integrity sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-stringify-position "^3.0.0"
-
 vfile@^4.0.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624"
@@ -22389,16 +21499,6 @@ vfile@^4.0.0:
     unist-util-stringify-position "^2.0.0"
     vfile-message "^2.0.0"
 
-vfile@^5.0.0:
-  version "5.3.7"
-  resolved "https://registry.yarnpkg.com/vfile/-/vfile-5.3.7.tgz#de0677e6683e3380fafc46544cfe603118826ab7"
-  integrity sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    is-buffer "^2.0.0"
-    unist-util-stringify-position "^3.0.0"
-    vfile-message "^3.0.0"
-
 victory-vendor@^36.6.8:
   version "36.9.2"
   resolved "https://registry.yarnpkg.com/victory-vendor/-/victory-vendor-36.9.2.tgz#668b02a448fa4ea0f788dbf4228b7e64669ff801"
@@ -23071,25 +22171,11 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml-loader@^0.8.0:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/yaml-loader/-/yaml-loader-0.8.1.tgz#034f901147073cfc307cdcce8bd44c1547e60ba1"
-  integrity sha512-BCEndnUoi3BaZmePkwGGe93txRxLgMhBa/gE725v1/GHnura8QvNs7c4+4C1yyhhKoj3Dg63M7IqhA++15j6ww==
-  dependencies:
-    javascript-stringify "^2.0.1"
-    loader-utils "^2.0.0"
-    yaml "^2.0.0"
-
 yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yaml@^2.0.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.1.tgz#2e57e0b5e995292c25c75d2658f0664765210eed"
-  integrity sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==
-
 yargs-parser@20.2.4:
   version "20.2.4"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
@@ -23169,16 +22255,6 @@ yup@^0.32.9:
     property-expr "^2.0.4"
     toposort "^2.0.2"
 
-yup@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/yup/-/yup-1.4.0.tgz#898dcd660f9fb97c41f181839d3d65c3ee15a43e"
-  integrity sha512-wPbgkJRCqIf+OHyiTBQoJiP5PFuAXaWiJK6AmYkzQAh5/c2K9hzSApBZG5wV9KoKSePF7sAxmNSvh/13YHkFDg==
-  dependencies:
-    property-expr "^2.0.5"
-    tiny-case "^1.0.3"
-    toposort "^2.0.2"
-    type-fest "^2.19.0"
-
 zustand@^4.5.2:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.5.2.tgz#fddbe7cac1e71d45413b3682cdb47b48034c3848"
@@ -23191,11 +22267,6 @@ zwitch@^1.0.0:
   resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"
   integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==
 
-zwitch@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.4.tgz#c827d4b0acb76fc3e685a4c6ec2902d51070e9d7"
-  integrity sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==
-
 zxcvbn@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/zxcvbn/-/zxcvbn-4.4.2.tgz#28ec17cf09743edcab056ddd8b1b06262cc73c30"