deleting comments

fix_for_setup_host_firewall.sh
Correction of the script to avoid problems with an unstable connection when installing a container.
2026-06-09 20:04:31 +03:00 · 2024-06-26 00:16:45 +04:00 · 2024-06-25 07:55:19 +04:00
143 changed files with 4501 additions and 8319 deletions
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -65,13 +65,6 @@ jobs:
        path: deploy/AppDir
        retention-days: 7

-    - name: 'Upload translations artifact'
-      uses: actions/upload-artifact@v4
-      with:
-        name: AmneziaVPN_translations
-        path: client/translations
-        retention-days: 7
-
 # ------------------------------------------------------

  Build-Windows:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)

 set(PROJECT AmneziaVPN)

-project(${PROJECT} VERSION 4.6.1.0
+project(${PROJECT} VERSION 4.6.0.1
        DESCRIPTION "AmneziaVPN"
        HOMEPAGE_URL "https://amnezia.org/"
 )
@@ -11,7 +11,7 @@ string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
 set(RELEASE_DATE "${CURRENT_DATE}")

 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
-set(APP_ANDROID_VERSION_CODE 56)
+set(APP_ANDROID_VERSION_CODE 54)

 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
    set(MZ_PLATFORM_NAME "linux")
--- a/README.md
+++ b/README.md
@@ -6,26 +6,6 @@

 Amnezia is an open-source VPN client, with a key feature that enables you to deploy your own VPN server on your server.

-![Image](https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/uipic4.png)
-
-<br>
-
-<a href="https://github.com/amnezia-vpn/amnezia-client/releases/download/4.6.0.3/AmneziaVPN_4.6.0.3_x64.exe"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/win.png" width="150" style="max-width: 100%;"></a> 
-<a href="https://github.com/amnezia-vpn/amnezia-client/releases/download/4.6.0.3/AmneziaVPN_4.6.0.3.dmg"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/mac.png" width="150" style="max-width: 100%;"></a> 
-<a href="https://github.com/amnezia-vpn/amnezia-client/releases/download/4.6.0.3/AmneziaVPN_Linux_4.6.0.3.tar.zip"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/lin.png" width="150" style="max-width: 100%;"></a>
-<a href="https://github.com/amnezia-vpn/amnezia-client/releases/tag/4.6.0.3"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/andr.png" width="150" style="max-width: 100%;"></a>
-
-<br>
-
-<a href="https://play.google.com/store/search?q=amnezia+vpn&c=apps"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/play.png" width="150" style="max-width: 100%;"></a>
-<a href="https://apps.apple.com/us/app/amneziavpn/id1600529900"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/apl.png" width="150" style="max-width: 100%;"></a>
-
-
-[All releases](https://github.com/amnezia-vpn/amnezia-client/releases)
-
-<br>
-
-
 ## Features

 - Very easy to use - enter your IP address, SSH login, and password, and Amnezia will automatically install VPN docker containers to your server and connect to the VPN.
@@ -36,12 +16,10 @@ Amnezia is an open-source VPN client, with a key feature that enables you to dep

 ## Links

- [https://amnezia.org](https://amnezia.org) - project website  
- [https://www.reddit.com/r/AmneziaVPN](https://www.reddit.com/r/AmneziaVPN) - Reddit  
- [https://t.me/amnezia_vpn_en](https://t.me/amnezia_vpn_en) - Telegram support channel (English) 
- [https://t.me/amnezia_vpn_ir](https://t.me/amnezia_vpn_ir) - Telegram support channel (Farsi) 
- [https://t.me/amnezia_vpn_mm](https://t.me/amnezia_vpn_mm) - Telegram support channel (Myanmar)  
- [https://t.me/amnezia_vpn](https://t.me/amnezia_vpn) - Telegram support channel (Russian)  
+[https://amnezia.org](https://amnezia.org) - project website  
+[https://www.reddit.com/r/AmneziaVPN](https://www.reddit.com/r/AmneziaVPN) - Reddit  
+[https://t.me/amnezia_vpn_en](https://t.me/amnezia_vpn_en) - Telegram support channel (English)  
+[https://t.me/amnezia_vpn](https://t.me/amnezia_vpn) - Telegram support channel (Russian)  

 ## Tech

@@ -66,19 +44,6 @@ git submodule update --init --recursive

 Want to contribute? Welcome!

-### Help with translations
-
-Download the most actual translation files.
-
-Go to ["Actions" tab](https://github.com/amnezia-vpn/amnezia-client/actions?query=is%3Asuccess+branch%3Adev), click on the first line.
-Then scroll down to the "Artifacts" section and download "AmneziaVPN_translations".
-
-Unzip this file.
-Each *.ts file contains strings for one corresponding language.
-
-Translate or correct some strings in one or multiple *.ts files and commit them back to this repository into the ``client/translations`` folder.
-You can do it via a web-interface or any other method you're familiar with.
-
 ### Building sources and deployment

 Check deploy folder for build scripts. 
@@ -87,7 +52,7 @@ Check deploy folder for build scripts.

 1. First, make sure you have [XCode](https://developer.apple.com/xcode/) installed, at least version 14 or higher.

-2. We use QT to generate the XCode project. We need QT version 6.6.2. Install QT for MacOS [here](https://doc.qt.io/qt-6/macos.html) or [QT Online Installer](https://www.qt.io/download-open-source). Required modules:
+2. We use QT to generate the XCode project. We need QT version 6.6.1. Install QT for MacOS [here](https://doc.qt.io/qt-6/macos.html) or [QT Online Installer](https://www.qt.io/download-open-source). Required modules:
   - MacOS
   - iOS
   - Qt 5 Compatibility Module
@@ -177,11 +142,10 @@ GPL v3.0

 ## Donate

-Patreon: [https://www.patreon.com/amneziavpn](https://www.patreon.com/amneziavpn)
-
-USDT BEP20: 0x6abD576765a826f87D1D95183438f9408C901bE4 <br>
-USDT TRC20: TELAitazF1MZGmiNjTcnxDjEiH5oe7LC9d <br>
+Bitcoin: bc1qn9rhsffuxwnhcuuu4qzrwp4upkrq94xnh8r26u  
 XMR: 48spms39jt1L2L5vyw2RQW6CXD6odUd4jFu19GZcDyKKQV9U88wsJVjSbL4CfRys37jVMdoaWVPSvezCQPhHXUW5UKLqUp3  
+payeer.com: P2561305  
+ko-fi.com: [https://ko-fi.com/amnezia_vpn](https://ko-fi.com/amnezia_vpn)  

 ## Acknowledgments

--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
--- a/client/3rd/OpenVPNAdapter
+++ b/client/3rd/OpenVPNAdapter
--- a/client/3rd/amneziawg-apple
+++ b/client/3rd/amneziawg-apple
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -157,7 +157,6 @@ void AmneziaApplication::init()
    connect(this, &AmneziaApplication::translationsUpdated, m_notificationHandler.get(), &NotificationHandler::onTranslationsUpdated);
 #endif

-    m_engine->addImportPath("qrc:/ui/qml/Modules/");
    m_engine->load(url);
    m_systemController->setQmlRoot(m_engine->rootObjects().value(0));

--- a/client/android/AndroidManifest.xml
+++ b/client/android/AndroidManifest.xml
@@ -11,9 +11,6 @@
    <uses-feature android:name="android.hardware.camera" android:required="false" />
    <uses-feature android:name="android.hardware.camera.any" android:required="false" />
    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
-    <!-- for TV -->
-    <uses-feature android:name="android.software.leanback" android:required="false" />
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />

    <!-- The following comment will be replaced upon deployment with default features based on the dependencies
    of the application. Remove the comment if you do not require these default features. -->
@@ -34,11 +31,9 @@
        android:label="-- %%INSERT_APP_NAME%% --"
        android:icon="@mipmap/icon"
        android:roundIcon="@mipmap/icon_round"
-        android:banner="@mipmap/ic_banner"
        android:theme="@style/NoActionBar"
        android:fullBackupContent="@xml/backup_content"
        android:dataExtractionRules="@xml/data_extraction_rules"
-        android:hasFragileUserData="false"
        tools:targetApi="s">

        <activity
@@ -52,7 +47,6 @@
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
            </intent-filter>

            <intent-filter>
--- a/client/android/res/mipmap-anydpi-v26/ic_banner.xml
+++ b/client/android/res/mipmap-anydpi-v26/ic_banner.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_banner_background"/>
-    <foreground android:drawable="@mipmap/ic_banner_foreground"/>
-</adaptive-icon>
--- a/client/android/res/mipmap-xhdpi/ic_banner.png
+++ b/client/android/res/mipmap-xhdpi/ic_banner.png
--- a/client/android/res/mipmap-xhdpi/ic_banner_foreground.png
+++ b/client/android/res/mipmap-xhdpi/ic_banner_foreground.png
--- a/client/android/res/values/ic_banner_background.xml
+++ b/client/android/res/values/ic_banner_background.xml
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_banner_background">#1E1E1F</color>
-</resources>
--- a/client/android/src/org/amnezia/vpn/AmneziaActivity.kt
+++ b/client/android/src/org/amnezia/vpn/AmneziaActivity.kt
@@ -1,7 +1,6 @@
 package org.amnezia.vpn

 import android.Manifest
-import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.app.NotificationManager
 import android.content.BroadcastReceiver
@@ -231,10 +230,7 @@ class AmneziaActivity : QtActivity() {
    override fun onStop() {
        Log.d(TAG, "Stop Amnezia activity")
        doUnbindService()
-        mainScope.launch {
-            qtInitialized.await()
-            QtAndroidController.onServiceDisconnected()
-        }
+        QtAndroidController.onServiceDisconnected()
        super.onStop()
    }

@@ -388,8 +384,7 @@ class AmneziaActivity : QtActivity() {
        getVpnProto(vpnConfig)?.let { proto ->
            Log.d(TAG, "Proto from config: $proto, current proto: $vpnProto")
            if (isServiceConnected) {
-                if (proto.serviceClass == vpnProto?.serviceClass) {
-                    vpnProto = proto
+                if (proto == vpnProto) {
                    connectToVpn(vpnConfig)
                    return
                }
@@ -546,7 +541,7 @@ class AmneziaActivity : QtActivity() {
                }
            }.also {
                startActivityForResult(it, OPEN_FILE_ACTION_CODE, ActivityResultHandler(
-                    onAny = {
+                    onSuccess = {
                        val uri = it?.data?.toString() ?: ""
                        Log.d(TAG, "Open file: $uri")
                        mainScope.launch {
@@ -560,12 +555,8 @@ class AmneziaActivity : QtActivity() {
    }

    @Suppress("unused")
-    @SuppressLint("UnsupportedChromeOsCameraSystemFeature")
    fun isCameraPresent(): Boolean = applicationContext.packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA)

-    @Suppress("unused")
-    fun isOnTv(): Boolean = applicationContext.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
-
    @Suppress("unused")
    fun startQrCodeReader() {
        Log.v(TAG, "Start camera")
--- a/client/android/src/org/amnezia/vpn/VpnProto.kt
+++ b/client/android/src/org/amnezia/vpn/VpnProto.kt
@@ -49,15 +49,7 @@ enum class VpnProto(
        "org.amnezia.vpn:amneziaXrayService",
        XrayService::class.java
    ) {
-        override fun createProtocol(): Protocol = Xray.instance
-    },
-
-    SSXRAY(
-        "SSXRay",
-        "org.amnezia.vpn:amneziaXrayService",
-        XrayService::class.java
-    ) {
-        override fun createProtocol(): Protocol = Xray.instance
+        override fun createProtocol(): Protocol = Xray()
    };

    private var _protocol: Protocol? = null
--- a/client/android/utils/src/main/kotlin/net/NetworkState.kt
+++ b/client/android/utils/src/main/kotlin/net/NetworkState.kt
@@ -88,24 +88,16 @@ class NetworkState(
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
            connectivityManager.registerBestMatchingNetworkCallback(networkRequest, networkCallback, handler)
        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val numberAttempts = 3
-            var attemptCount = 0
-            while(true) {
-                try {
+            try {
+                connectivityManager.requestNetwork(networkRequest, networkCallback, handler)
+            } catch (e: SecurityException) {
+                Log.e(TAG, "Failed to bind network listener: $e")
+                // Android 11 bug: https://issuetracker.google.com/issues/175055271
+                if (e.message?.startsWith("Package android does not belong to") == true) {
+                    delay(1000)
                    connectivityManager.requestNetwork(networkRequest, networkCallback, handler)
-                    break
-                } catch (e: SecurityException) {
-                    Log.e(TAG, "Failed to bind network listener: $e")
-                    // Android 11 bug: https://issuetracker.google.com/issues/175055271
-                    if (e.message?.startsWith("Package android does not belong to") == true) {
-                        if (++attemptCount > numberAttempts) {
-                            throw e
-                        }
-                        delay(1000)
-                        continue
-                    } else {
-                        throw e
-                    }
+                } else {
+                    throw e
                }
            }
        } else {
--- a/client/android/xray/src/main/kotlin/Xray.kt
+++ b/client/android/xray/src/main/kotlin/Xray.kt
@@ -5,7 +5,6 @@ import android.net.VpnService.Builder
 import java.io.File
 import java.io.IOException
 import go.Seq
-import org.amnezia.vpn.protocol.BadConfigException
 import org.amnezia.vpn.protocol.Protocol
 import org.amnezia.vpn.protocol.ProtocolState.CONNECTED
 import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
@@ -115,14 +114,17 @@ class Xray : Protocol() {
            return
        }

-        val xrayJsonConfig = config.optJSONObject("xray_config_data")
-            ?: config.optJSONObject("ssxray_config_data")
-            ?: throw BadConfigException("config_data not found")
+        val xrayJsonConfig = config.getJSONObject("xray_config_data")
        val xrayConfig = parseConfig(config, xrayJsonConfig)

-        (xrayJsonConfig.optJSONObject("log") ?: JSONObject().also { xrayJsonConfig.put("log", it) })
-            .put("loglevel", "warning")
-            .put("access", "none") // disable access log
+        // for debug
+        // xrayJsonConfig.getJSONObject("log").put("loglevel", "debug")
+        xrayJsonConfig.getJSONObject("log").put("loglevel", "warning")
+        // disable access log
+        xrayJsonConfig.getJSONObject("log").put("access", "none")
+
+        // replace socks address
+        // (xrayJsonConfig.getJSONArray("inbounds")[0] as JSONObject).put("listen", "::1")

        start(xrayConfig, xrayJsonConfig.toString(), vpnBuilder, protect)
        state.value = CONNECTED
@@ -226,10 +228,6 @@ class Xray : Protocol() {
            throw VpnStartException("Failed to start tun2socks: $err")
        }
    }
-
-    companion object {
-        val instance: Xray by lazy { Xray() }
-    }
 }

 private fun String?.isNotNullOrBlank(block: (String) -> Unit) {
--- a/client/configurators/openvpn_configurator.cpp
+++ b/client/configurators/openvpn_configurator.cpp
@@ -119,21 +119,18 @@ QString OpenVpnConfigurator::processConfigWithLocalSettings(const QPair<QString,
        
        if (!m_settings->isSitesSplitTunnelingEnabled()) {
            config.append("\nredirect-gateway def1 ipv6 bypass-dhcp\n");
-
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
            // Prevent ipv6 leak
            config.append("ifconfig-ipv6 fd15:53b6:dead::2/64  fd15:53b6:dead::1\n");
-#endif
            config.append("block-ipv6\n");
        } else if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {

            // no redirect-gateway
        } else if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+#ifndef Q_OS_ANDROID
            config.append("\nredirect-gateway ipv6 !ipv4 bypass-dhcp\n");
+#endif
            // Prevent ipv6 leak
            config.append("ifconfig-ipv6 fd15:53b6:dead::2/64  fd15:53b6:dead::1\n");
-#endif
            config.append("block-ipv6\n");
        }
    }
--- a/client/containers/containers_defs.cpp
+++ b/client/containers/containers_defs.cpp
@@ -90,13 +90,13 @@ QMap<DockerContainer, QString> ContainerProps::containerHumanNames()
 {
    return { { DockerContainer::None, "Not installed" },
             { DockerContainer::OpenVpn, "OpenVPN" },
-             { DockerContainer::ShadowSocks, "OpenVPN over SS" },
+             { DockerContainer::ShadowSocks, "ShadowSocks" },
             { DockerContainer::Cloak, "OpenVPN over Cloak" },
             { DockerContainer::WireGuard, "WireGuard" },
             { DockerContainer::Awg, "AmneziaWG" },
             { DockerContainer::Xray, "XRay" },
             { DockerContainer::Ipsec, QObject::tr("IPsec") },
-             { DockerContainer::SSXray, "Shadowsocks"},
+             { DockerContainer::SSXray, "ShadowSocks"},

             { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") },
             { DockerContainer::Dns, QObject::tr("AmneziaDNS") },
@@ -285,9 +285,8 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
    case DockerContainer::WireGuard: return true;
    case DockerContainer::OpenVpn: return true;
    case DockerContainer::Awg: return true;
-    case DockerContainer::Xray: return true;
-    case DockerContainer::Cloak: return true;
-    case DockerContainer::SSXray: return true;
+    case DockerContainer::Cloak:
+        return true;
        //    case DockerContainer::ShadowSocks: return true;
    default: return false;
    }
@@ -306,7 +305,6 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
    case DockerContainer::Awg: return true;
    case DockerContainer::Cloak: return true;
    case DockerContainer::Xray: return true;
-    case DockerContainer::SSXray: return true;
    default: return false;
    }

@@ -390,18 +388,3 @@ QJsonObject ContainerProps::getProtocolConfigFromContainer(const Proto protocol,

    return QJsonDocument::fromJson(protocolConfigString.toUtf8()).object();
 }
-
-int ContainerProps::installPageOrder(DockerContainer container)
-{
-    switch (container) {
-    case DockerContainer::OpenVpn: return 4;
-    case DockerContainer::Cloak: return 5;
-    case DockerContainer::ShadowSocks: return 6;
-    case DockerContainer::WireGuard: return 2;
-    case DockerContainer::Awg: return 1;
-    case DockerContainer::Xray: return 3;
-    case DockerContainer::Ipsec: return 7;
-    case DockerContainer::SSXray: return 8;
-    default: return 0;
-    }
-}
--- a/client/containers/containers_defs.h
+++ b/client/containers/containers_defs.h
@@ -72,8 +72,6 @@ namespace amnezia
        static bool isShareable(amnezia::DockerContainer container);

        static QJsonObject getProtocolConfigFromContainer(const amnezia::Proto protocol, const QJsonObject &containerConfig);
-
-        static int installPageOrder(amnezia::DockerContainer container);
    };

    static void declareQmlContainerEnum()
--- a/client/fonts/Lato-Black.ttf
+++ b/client/fonts/Lato-Black.ttf
--- a/client/fonts/Lato-BlackItalic.ttf
+++ b/client/fonts/Lato-BlackItalic.ttf
--- a/client/fonts/Lato-Bold.ttf
+++ b/client/fonts/Lato-Bold.ttf
--- a/client/fonts/Lato-BoldItalic.ttf
+++ b/client/fonts/Lato-BoldItalic.ttf
--- a/client/fonts/Lato-Hairline.ttf
+++ b/client/fonts/Lato-Hairline.ttf
--- a/client/fonts/Lato-HairlineItalic.ttf
+++ b/client/fonts/Lato-HairlineItalic.ttf
--- a/client/fonts/Lato-Heavy.ttf
+++ b/client/fonts/Lato-Heavy.ttf
--- a/client/fonts/Lato-HeavyItalic.ttf
+++ b/client/fonts/Lato-HeavyItalic.ttf
--- a/client/fonts/Lato-Italic.ttf
+++ b/client/fonts/Lato-Italic.ttf
--- a/client/fonts/Lato-Light.ttf
+++ b/client/fonts/Lato-Light.ttf
--- a/client/fonts/Lato-LightItalic.ttf
+++ b/client/fonts/Lato-LightItalic.ttf
--- a/client/fonts/Lato-Medium.ttf
+++ b/client/fonts/Lato-Medium.ttf
--- a/client/fonts/Lato-MediumItalic.ttf
+++ b/client/fonts/Lato-MediumItalic.ttf
--- a/client/fonts/Lato-Regular.ttf
+++ b/client/fonts/Lato-Regular.ttf
--- a/client/fonts/Lato-Semibold.ttf
+++ b/client/fonts/Lato-Semibold.ttf
--- a/client/fonts/Lato-SemiboldItalic.ttf
+++ b/client/fonts/Lato-SemiboldItalic.ttf
--- a/client/fonts/Lato-Thin.ttf
+++ b/client/fonts/Lato-Thin.ttf
--- a/client/fonts/Lato-ThinItalic.ttf
+++ b/client/fonts/Lato-ThinItalic.ttf
--- a/client/ios/networkextension/CMakeLists.txt
+++ b/client/ios/networkextension/CMakeLists.txt
@@ -50,12 +50,10 @@ set_target_properties("networkextension" PROPERTIES
 find_library(FW_ASSETS_LIBRARY AssetsLibrary)
 find_library(FW_MOBILE_CORE MobileCoreServices)
 find_library(FW_UI_KIT UIKit)
-find_library(FW_LIBRESOLV libresolv.9.tbd)

 target_link_libraries(networkextension PRIVATE ${FW_ASSETS_LIBRARY})
 target_link_libraries(networkextension PRIVATE ${FW_MOBILE_CORE})
 target_link_libraries(networkextension PRIVATE ${FW_UI_KIT})
-target_link_libraries(networkextension PRIVATE ${FW_LIBRESOLV})

 target_compile_options(networkextension PRIVATE -DGROUP_ID=\"${BUILD_IOS_GROUP_IDENTIFIER}\")
 target_compile_options(networkextension PRIVATE -DNETWORK_EXTENSION=1)
@@ -82,16 +80,13 @@ target_sources(networkextension PRIVATE
    ${WG_APPLE_SOURCE_DIR}/WireGuardKit/Array+ConcurrentMap.swift
    ${WG_APPLE_SOURCE_DIR}/WireGuardKit/IPAddress+AddrInfo.swift
    ${WG_APPLE_SOURCE_DIR}/WireGuardKit/PrivateKey.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/HevSocksTunnel.swift
    ${CLIENT_ROOT_DIR}/platforms/ios/NELogController.swift
    ${CLIENT_ROOT_DIR}/platforms/ios/Log.swift
    ${CLIENT_ROOT_DIR}/platforms/ios/LogRecord.swift
    ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider.swift
    ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider+WireGuard.swift
    ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider+OpenVPN.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider+Xray.swift
    ${CLIENT_ROOT_DIR}/platforms/ios/WGConfig.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/XrayConfig.swift
    ${CLIENT_ROOT_DIR}/platforms/ios/iosglue.mm
 )

@@ -119,5 +114,3 @@ target_include_directories(networkextension PRIVATE ${CLIENT_ROOT_DIR})
 target_include_directories(networkextension PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

 target_link_libraries(networkextension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/wireguard/ios/arm64/libwg-go.a)
-
-target_link_libraries(networkextension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/xray/HevSocks5Tunnel.xcframework)
--- a/client/logger.cpp
+++ b/client/logger.cpp
@@ -33,10 +33,6 @@ void debugMessageHandler(QtMsgType type, const QMessageLogContext& context, cons
    }

    // Skip annoying messages from Qt
-    if (msg.contains("OpenType support missing for")) {
-        return;
-    }
-
    if (msg.startsWith("Unknown property") || msg.startsWith("Could not create pixmap") || msg.startsWith("Populating font") || msg.startsWith("stale focus object")) {
        return;
    }
--- a/client/platforms/android/android_controller.cpp
+++ b/client/platforms/android/android_controller.cpp
@@ -179,11 +179,6 @@ bool AndroidController::isCameraPresent()
    return callActivityMethod<jboolean>("isCameraPresent", "()Z");
 }

-bool AndroidController::isOnTv()
-{
-    return callActivityMethod<jboolean>("isOnTv", "()Z");
-}
-
 void AndroidController::startQrReaderActivity()
 {
    callActivityMethod("startQrCodeReader", "()V");
--- a/client/platforms/android/android_controller.h
+++ b/client/platforms/android/android_controller.h
@@ -35,7 +35,6 @@ public:
    void saveFile(const QString &fileName, const QString &data);
    QString openFile(const QString &filter);
    bool isCameraPresent();
-    bool isOnTv();
    void startQrReaderActivity();
    void setSaveLogs(bool enabled);
    void exportLogsFile(const QString &fileName);
--- a/client/platforms/ios/HevSocksTunnel.swift
+++ b/client/platforms/ios/HevSocksTunnel.swift
@@ -1,73 +0,0 @@
-import HevSocks5Tunnel
-
-public enum Socks5Tunnel {
-
-    private static var tunnelFileDescriptor: Int32? {
-        var ctlInfo = ctl_info()
-        withUnsafeMutablePointer(to: &ctlInfo.ctl_name) {
-            $0.withMemoryRebound(to: CChar.self, capacity: MemoryLayout.size(ofValue: $0.pointee)) {
-                _ = strcpy($0, "com.apple.net.utun_control")
-            }
-        }
-        for fd: Int32 in 0...1024 {
-            var addr = sockaddr_ctl()
-            var ret: Int32 = -1
-            var len = socklen_t(MemoryLayout.size(ofValue: addr))
-            withUnsafeMutablePointer(to: &addr) {
-                $0.withMemoryRebound(to: sockaddr.self, capacity: 1) {
-                    ret = getpeername(fd, $0, &len)
-                }
-            }
-            if ret != 0 || addr.sc_family != AF_SYSTEM {
-                continue
-            }
-            if ctlInfo.ctl_id == 0 {
-                ret = ioctl(fd, CTLIOCGINFO, &ctlInfo)
-                if ret != 0 {
-                    continue
-                }
-            }
-            if addr.sc_id == ctlInfo.ctl_id {
-                return fd
-            }
-        }
-        return nil
-    }
-
-    private static var interfaceName: String? {
-        guard let tunnelFileDescriptor = self.tunnelFileDescriptor else {
-            return nil
-        }
-        var buffer = [UInt8](repeating: 0, count: Int(IFNAMSIZ))
-        return buffer.withUnsafeMutableBufferPointer { mutableBufferPointer in
-            guard let baseAddress = mutableBufferPointer.baseAddress else {
-                return nil
-            }
-            var ifnameSize = socklen_t(IFNAMSIZ)
-            let result = getsockopt(
-                tunnelFileDescriptor,
-                2 /* SYSPROTO_CONTROL */,
-                2 /* UTUN_OPT_IFNAME */,
-                baseAddress,
-                &ifnameSize
-            )
-            if result == 0 {
-                return String(cString: baseAddress)
-            } else {
-                return nil
-            }
-        }
-    }
-
-    @discardableResult
-    public static func run(withConfig filePath: String) -> Int32 {
-        guard let fileDescriptor = self.tunnelFileDescriptor else {
-            fatalError("Get tunnel file descriptor failed.")
-        }
-        return hev_socks5_tunnel_main(filePath.cString(using: .utf8), fileDescriptor)
-    }
-
-    public static func quit() {
-        hev_socks5_tunnel_quit()
-    }
-}
--- a/client/platforms/ios/NELogController.swift
+++ b/client/platforms/ios/NELogController.swift
@@ -13,10 +13,6 @@ public func ovpnLog(_ type: OSLogType, title: String = "", message: String) {
    neLog(type, title: "OVPN: \(title)", message: message)
 }

-public func xrayLog(_ type: OSLogType, title: String = "", message: String) {
-    neLog(type, title: "XRAY: \(title)", message: message)
-}
-
 public func neLog(_ type: OSLogType, title: String = "", message: String) {
    Log.log(type, title: "NE: \(title)", message: message)
 }
--- a/client/platforms/ios/PacketTunnelProvider+Xray.swift
+++ b/client/platforms/ios/PacketTunnelProvider+Xray.swift
@@ -1,187 +0,0 @@
-import Foundation
-import NetworkExtension
-import WireGuardKitGo
-
-enum XrayErrors: Error {
-    case noXrayConfig
-    case xrayConfigIsWrong
-    case cantSaveXrayConfig
-    case cantParseListenAndPort
-    case cantSaveHevSocksConfig
-}
-
-extension Constants {
-    static let cachesDirectory: URL = {
-        if let cachesDirectoryURL = FileManager.default.urls(for: .cachesDirectory,
-                                                             in: .userDomainMask).first {
-            return cachesDirectoryURL
-        } else {
-            fatalError("Unable to retrieve caches directory.")
-        }
-    }()
-}
-
-extension PacketTunnelProvider {
-    func startXray(completionHandler: @escaping (Error?) -> Void) {
-
-        // Xray configuration
-        guard let protocolConfiguration = self.protocolConfiguration as? NETunnelProviderProtocol,
-              let providerConfiguration = protocolConfiguration.providerConfiguration,
-              let configData = providerConfiguration[Constants.xrayConfigKey] as? Data else {
-            xrayLog(.error, message: "Can't get xray configuration")
-            completionHandler(XrayErrors.noXrayConfig)
-            return
-        }
-
-        // Tunnel settings
-        let ipv6Enabled = false
-        let hideVPNIcon = false
-
-        let settings = NEPacketTunnelNetworkSettings(tunnelRemoteAddress: "254.1.1.1")
-        settings.mtu = 9000
-
-        settings.ipv4Settings = {
-            let settings = NEIPv4Settings(addresses: ["198.18.0.1"], subnetMasks: ["255.255.0.0"])
-            settings.includedRoutes = [NEIPv4Route.default()]
-            return settings
-        }()
-
-        settings.ipv6Settings = {
-            guard ipv6Enabled else {
-                return nil
-            }
-            let settings = NEIPv6Settings(addresses: ["fd6e:a81b:704f:1211::1"], networkPrefixLengths: [64])
-            settings.includedRoutes = [NEIPv6Route.default()]
-            if hideVPNIcon {
-                settings.excludedRoutes = [NEIPv6Route(destinationAddress: "::", networkPrefixLength: 128)]
-            }
-            return settings
-        }()
-
-        do {
-            let xrayConfig = try JSONDecoder().decode(XrayConfig.self,
-                                                      from: configData)
-
-            var dnsArray = [String]()
-            if let dns1 = xrayConfig.dns1 {
-                dnsArray.append(dns1)
-            }
-            if let dns2 = xrayConfig.dns2 {
-                dnsArray.append(dns2)
-            }
-
-            settings.dnsSettings = !dnsArray.isEmpty
-            ? NEDNSSettings(servers: dnsArray)
-            : NEDNSSettings(servers: ["1.1.1.1"])
-
-            let xrayConfigData = xrayConfig.config.data(using: .utf8)
-
-            guard let xrayConfigData else {
-                xrayLog(.error, message: "Can't encode config to data")
-                completionHandler(XrayErrors.xrayConfigIsWrong)
-                return
-            }
-
-            let jsonDict = try JSONSerialization.jsonObject(with: xrayConfigData,
-                                                            options: []) as? [String: Any]
-
-            guard var jsonDict else {
-                xrayLog(.error, message: "Can't parse address and port for hevSocks")
-                completionHandler(XrayErrors.cantParseListenAndPort)
-                return
-            }
-
-            let port = 10808
-            let address = "::1"
-
-            if var inboundsArray = jsonDict["inbounds"] as? [[String: Any]], !inboundsArray.isEmpty {
-                inboundsArray[0]["port"] = port
-                inboundsArray[0]["listen"] = address
-                jsonDict["inbounds"] = inboundsArray
-            }
-
-            let updatedData = try JSONSerialization.data(withJSONObject: jsonDict, options: [])
-
-            setTunnelNetworkSettings(settings) { [weak self] error in
-                if let error {
-                    completionHandler(error)
-                    return
-                }
-
-                // Launch xray
-                self?.setupAndStartXray(configData: updatedData) { xrayError in
-                    if let xrayError {
-                        completionHandler(xrayError)
-                        return
-                    }
-
-                    // Launch hevSocks
-                    self?.setupAndRunTun2socks(configData: updatedData,
-                                               address: address,
-                                               port: port,
-                                               completionHandler: completionHandler)
-                }
-            }
-        } catch {
-            completionHandler(error)
-            return
-        }
-    }
-
-    func stopXray(completionHandler: () -> Void) {
-        Socks5Tunnel.quit()
-        LibXrayStopXray()
-        completionHandler()
-    }
-
-    private func setupAndStartXray(configData: Data,
-                                   completionHandler: @escaping (Error?) -> Void) {
-        let path = Constants.cachesDirectory.appendingPathComponent("config.json", isDirectory: false).path
-        guard FileManager.default.createFile(atPath: path, contents: configData) else {
-            xrayLog(.error, message: "Can't save xray configuration")
-            completionHandler(XrayErrors.cantSaveXrayConfig)
-            return
-        }
-
-        LibXrayRunXray(nil,
-                       path,
-                       Int64.max)
-
-        completionHandler(nil)
-        xrayLog(.info, message: "Xray started")
-    }
-
-    private func setupAndRunTun2socks(configData: Data,
-                                      address: String,
-                                      port: Int,
-                                      completionHandler: @escaping (Error?) -> Void) {
-        let config = """
-        tunnel:
-          mtu: 9000
-        socks5:
-          port: \(port)
-          address: \(address)
-          udp: 'udp'
-        misc:
-          task-stack-size: 20480
-          connect-timeout: 5000
-          read-write-timeout: 60000
-          log-file: stderr
-          log-level: error
-          limit-nofile: 65535
-        """
-
-        let configurationFilePath = Constants.cachesDirectory.appendingPathComponent("config.yml", isDirectory: false).path
-        guard FileManager.default.createFile(atPath: configurationFilePath, contents: config.data(using: .utf8)!) else {
-            xrayLog(.info, message: "Cant save hevSocks configuration")
-            completionHandler(XrayErrors.cantSaveHevSocksConfig)
-            return
-        }
-
-        DispatchQueue.global().async {
-            xrayLog(.info, message: "Hev socks started")
-            completionHandler(nil)
-            Socks5Tunnel.run(withConfig: configurationFilePath)
-        }
-    }
-}
--- a/client/platforms/ios/PacketTunnelProvider.swift
+++ b/client/platforms/ios/PacketTunnelProvider.swift
@@ -5,8 +5,7 @@ import Darwin
 import OpenVPNAdapter

 enum TunnelProtoType: String {
-  case wireguard, openvpn, xray
-
+  case wireguard, openvpn
 }

 struct Constants {
@@ -14,7 +13,6 @@ struct Constants {
  static let processQueueName = "org.amnezia.process-packets"
  static let kActivationAttemptId = "activationAttemptId"
  static let ovpnConfigKey = "ovpn"
-  static let xrayConfigKey = "xray"
  static let wireGuardConfigKey = "wireguard"
  static let loggerTag = "NET"
  
@@ -93,8 +91,6 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
                protoType = .openvpn
            } else if (providerConfiguration?[Constants.wireGuardConfigKey] as? Data) != nil {
                protoType = .wireguard
-            } else if (providerConfiguration?[Constants.xrayConfigKey] as? Data) != nil {
-                protoType = .xray
            }
        }

@@ -111,9 +107,6 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
                           completionHandler: completionHandler)
        case .openvpn:
            startOpenVPN(completionHandler: completionHandler)
-        case .xray:
-            startXray(completionHandler: completionHandler)
-
        }
    }

@@ -131,8 +124,6 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
        case .openvpn:
            stopOpenVPN(with: reason,
                        completionHandler: completionHandler)
-        case .xray:
-            stopXray(completionHandler: completionHandler)
        }
    }
  
@@ -147,8 +138,6 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
            handleWireguardStatusMessage(messageData, completionHandler: completionHandler)
        case .openvpn:
            handleOpenVPNStatusMessage(messageData, completionHandler: completionHandler)
-        case .xray:
-            break;
        }
    }
  
--- a/client/platforms/ios/WGConfig.swift
+++ b/client/platforms/ios/WGConfig.swift
@@ -13,7 +13,7 @@ struct WGConfig: Decodable {
  let clientIP: String
  let clientPrivateKey: String
  let serverPublicKey: String
-  let presharedKey: String?
+  let presharedKey: String
  var allowedIPs: [String]
  var persistentKeepAlive: String
  let splitTunnelType: Int
@@ -65,7 +65,7 @@ struct WGConfig: Decodable {
    \(settings)
    [Peer]
    PublicKey = \(serverPublicKey)
-    \(presharedKey == nil ? "" : "PresharedKey = \(presharedKey!)")
+    PresharedKey = \(presharedKey)
    AllowedIPs = \(allowedIPs.joined(separator: ", "))
    Endpoint = \(hostName):\(port)
    PersistentKeepalive = \(persistentKeepAlive)
--- a/client/platforms/ios/XrayConfig.swift
+++ b/client/platforms/ios/XrayConfig.swift
@@ -1,7 +0,0 @@
-import Foundation
-
-struct XrayConfig: Decodable {
-    let dns1: String?
-    let dns2: String?
-    let config: String
-}
--- a/client/platforms/ios/ios_controller.h
+++ b/client/platforms/ios/ios_controller.h
@@ -72,12 +72,9 @@ private:
    bool setupCloak();
    bool setupWireGuard();
    bool setupAwg();
-    bool setupXray();
-    bool setupSSXray();

    bool startOpenVPN(const QString &config);
    bool startWireGuard(const QString &jsonConfig);
-    bool startXray(const QString &jsonConfig);

    void startTunnel();

--- a/client/platforms/ios/ios_controller.mm
+++ b/client/platforms/ios/ios_controller.mm
@@ -216,12 +216,6 @@ bool IosController::connectVpn(amnezia::Proto proto, const QJsonObject& configur
    if (proto == amnezia::Proto::Awg) {
        return setupAwg();
    }
-    if (proto == amnezia::Proto::Xray) {
-        return setupXray();
-    }
-    if (proto == amnezia::Proto::SSXray) {
-        return setupSSXray();
-    }

    return false;
 }
@@ -507,42 +501,6 @@ bool IosController::setupWireGuard()
    return startWireGuard(wgConfigDocStr);
 }

-bool IosController::setupXray()
-{
-    QJsonObject config = m_rawConfig[ProtocolProps::key_proto_config_data(amnezia::Proto::Xray)].toObject();
-    QJsonDocument xrayConfigDoc(config);
-
-    QString xrayConfigStr(xrayConfigDoc.toJson(QJsonDocument::Compact));
-
-    QJsonObject finalConfig;
-    finalConfig.insert(config_key::dns1, m_rawConfig[config_key::dns1].toString());
-    finalConfig.insert(config_key::dns2, m_rawConfig[config_key::dns2].toString());
-    finalConfig.insert(config_key::config, xrayConfigStr);
-
-    QJsonDocument finalConfigDoc(finalConfig);
-    QString finalConfigStr(finalConfigDoc.toJson(QJsonDocument::Compact));
-
-    return startXray(finalConfigStr);
-}
-
-bool IosController::setupSSXray()
-{
-    QJsonObject config = m_rawConfig[ProtocolProps::key_proto_config_data(amnezia::Proto::SSXray)].toObject();
-    QJsonDocument ssXrayConfigDoc(config);
-
-    QString ssXrayConfigStr(ssXrayConfigDoc.toJson(QJsonDocument::Compact));
-
-    QJsonObject finalConfig;
-    finalConfig.insert(config_key::dns1, m_rawConfig[config_key::dns1]);
-    finalConfig.insert(config_key::dns2, m_rawConfig[config_key::dns2]);
-    finalConfig.insert(config_key::config, ssXrayConfigStr);
-
-    QJsonDocument finalConfigDoc(finalConfig);
-    QString finalConfigStr(finalConfigDoc.toJson(QJsonDocument::Compact));
-
-    return startXray(finalConfigStr);
-}
-
 bool IosController::setupAwg()
 {
    QJsonObject config = m_rawConfig[ProtocolProps::key_proto_config_data(amnezia::Proto::Awg)].toObject();
@@ -632,20 +590,6 @@ bool IosController::startWireGuard(const QString &config)
    startTunnel();
 }

-bool IosController::startXray(const QString &config)
-{
-    qDebug() << "IosController::startXray";
-
-    NETunnelProviderProtocol *tunnelProtocol = [[NETunnelProviderProtocol alloc] init];
-    tunnelProtocol.providerBundleIdentifier = [NSString stringWithUTF8String:VPN_NE_BUNDLEID];
-    tunnelProtocol.providerConfiguration = @{@"xray": [[NSString stringWithUTF8String:config.toStdString().c_str()] dataUsingEncoding:NSUTF8StringEncoding]};
-    tunnelProtocol.serverAddress = m_serverAddress;
-
-    m_currentTunnel.protocolConfiguration = tunnelProtocol;
-
-    startTunnel();
-}
-
 void IosController::startTunnel()
 {
    NSString *protocolName = @"Unknown";
--- a/client/platforms/linux/daemon/wireguardutilslinux.cpp
+++ b/client/platforms/linux/daemon/wireguardutilslinux.cpp
@@ -139,7 +139,7 @@ bool WireguardUtilsLinux::addInterface(const InterfaceConfig& config) {
        if (config.m_killSwitchEnabled) {
            FirewallParams params { };
            params.dnsServers.append(config.m_dnsServer);
-            if (config.m_allowedIPAddressRanges.contains(IPAddress("0.0.0.0/0"))) {
+            if (config.m_allowedIPAddressRanges.at(0).toString() == "0.0.0.0/0"){
                params.blockAll = true;
                if (config.m_excludedAddresses.size()) {
                    params.allowNets = true;
--- a/client/platforms/macos/daemon/wireguardutilsmacos.cpp
+++ b/client/platforms/macos/daemon/wireguardutilsmacos.cpp
@@ -137,8 +137,7 @@ bool WireguardUtilsMacos::addInterface(const InterfaceConfig& config) {
      if (config.m_killSwitchEnabled) {
        FirewallParams params { };
        params.dnsServers.append(config.m_dnsServer);
-
-        if (config.m_allowedIPAddressRanges.contains(IPAddress("0.0.0.0/0"))) {
+        if (config.m_allowedIPAddressRanges.at(0).toString() == "0.0.0.0/0"){
          params.blockAll = true;
          if (config.m_excludedAddresses.size()) {
            params.allowNets = true;
--- a/client/protocols/protocols_defs.cpp
+++ b/client/protocols/protocols_defs.cpp
@@ -65,14 +65,14 @@ QString ProtocolProps::transportProtoToString(TransportProto proto, Proto p)
 QMap<amnezia::Proto, QString> ProtocolProps::protocolHumanNames()
 {
    return { { Proto::OpenVpn, "OpenVPN" },
-             { Proto::ShadowSocks, "Shadowsocks" },
+             { Proto::ShadowSocks, "ShadowSocks" },
             { Proto::Cloak, "Cloak" },
             { Proto::WireGuard, "WireGuard" },
             { Proto::Awg, "AmneziaWG" },
             { Proto::Ikev2, "IKEv2" },
             { Proto::L2tp, "L2TP" },
             { Proto::Xray, "XRay" },
-             { Proto::SSXray, "Shadowsocks"},
+             { Proto::SSXray, "ShadowSocks"},


             { Proto::TorWebSite, "Website in Tor network" },
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -11,6 +11,16 @@
        <file>images/tray/default.png</file>
        <file>images/tray/error.png</file>
        <file>images/arrow_left.png</file>
+        <file>fonts/Lato-Black.ttf</file>
+        <file>fonts/Lato-BlackItalic.ttf</file>
+        <file>fonts/Lato-Bold.ttf</file>
+        <file>fonts/Lato-BoldItalic.ttf</file>
+        <file>fonts/Lato-Italic.ttf</file>
+        <file>fonts/Lato-Light.ttf</file>
+        <file>fonts/Lato-LightItalic.ttf</file>
+        <file>fonts/Lato-Regular.ttf</file>
+        <file>fonts/Lato-Thin.ttf</file>
+        <file>fonts/Lato-ThinItalic.ttf</file>
        <file>images/AmneziaVPN.png</file>
        <file>images/share.png</file>
        <file>server_scripts/remove_container.sh</file>
@@ -85,6 +95,7 @@
        <file>server_scripts/check_user_in_sudo.sh</file>
        <file>ui/qml/Controls2/BasicButtonType.qml</file>
        <file>ui/qml/Controls2/TextFieldWithHeaderType.qml</file>
+        <file>fonts/pt-root-ui_vf.ttf</file>
        <file>ui/qml/Controls2/LabelWithButtonType.qml</file>
        <file>images/controls/arrow-right.svg</file>
        <file>images/controls/chevron-right.svg</file>
@@ -228,9 +239,6 @@
        <file>images/controls/alert-circle.svg</file>
        <file>images/controls/file-check-2.svg</file>
        <file>ui/qml/Controls2/WarningType.qml</file>
-        <file>fonts/pt-root-ui_vf.ttf</file>
-        <file>ui/qml/Modules/Style/qmldir</file>
-        <file>ui/qml/Modules/Style/AmneziaStyle.qml</file>
        <file>ui/qml/Pages2/PageServiceSocksProxySettings.qml</file>
        <file>server_scripts/socks5_proxy/run_container.sh</file>
        <file>server_scripts/socks5_proxy/Dockerfile</file>
--- a/client/server_scripts/setup_host_firewall.sh
+++ b/client/server_scripts/setup_host_firewall.sh
@@ -1,31 +1,27 @@
-sudo sysctl -w net.ipv4.ip_forward=1
-sudo iptables -C INPUT -p icmp --icmp-type echo-request -j DROP || sudo iptables -A INPUT -p icmp --icmp-type echo-request -j DROP
-
-#sudo iptables -P FORWARD ACCEPT
-sudo iptables -C FORWARD -j DOCKER-USER || sudo iptables -A FORWARD -j DOCKER-USER
-sudo iptables -C FORWARD -j DOCKER-ISOLATION-STAGE-1 || sudo iptables -A FORWARD -j DOCKER-ISOLATION-STAGE-1; \
-sudo iptables -C FORWARD -o docker0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT || sudo iptables -A FORWARD -o docker0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT; \
-sudo iptables -C FORWARD -o docker0 -j DOCKER || sudo iptables -A FORWARD -o docker0 -j DOCKER; \
-sudo iptables -C FORWARD -i docker0 ! -o docker0 -j ACCEPT || sudo iptables -A FORWARD -i docker0 ! -o docker0 -j ACCEPT; \
-sudo iptables -C FORWARD -i docker0 -o docker0 -j ACCEPT || sudo iptables -A FORWARD -i docker0 -o docker0 -j ACCEPT
-
-# Tuning network
-sudo sysctl fs.file-max=51200; \
-sudo sysctl net.core.rmem_max=67108864; \
-sudo sysctl net.core.wmem_max=67108864; \
-sudo sysctl net.core.netdev_max_backlog=250000; \
-sudo sysctl net.core.somaxconn=4096; \
-sudo sysctl net.ipv4.tcp_syncookies=1; \
-sudo sysctl net.ipv4.tcp_tw_reuse=1; \
-sudo sysctl net.ipv4.tcp_tw_recycle=0; \
-sudo sysctl net.ipv4.tcp_fin_timeout=30; \
-sudo sysctl net.ipv4.tcp_keepalive_time=1200; \
-sudo sysctl net.ipv4.ip_local_port_range="10000 65000"; \
-sudo sysctl net.ipv4.tcp_max_syn_backlog=8192; \
-sudo sysctl net.ipv4.tcp_max_tw_buckets=5000; \
-sudo sysctl net.ipv4.tcp_fastopen=3; \
-sudo sysctl net.ipv4.tcp_mem="25600 51200 102400"; \
-sudo sysctl net.ipv4.tcp_rmem="4096 87380 67108864"; \
-sudo sysctl net.ipv4.tcp_wmem="4096 65536 67108864"; \
-sudo sysctl net.ipv4.tcp_mtu_probing=1; \
+sudo sysctl -w net.ipv4.ip_forward=1;\
+sudo iptables -C INPUT -p icmp --icmp-type echo-request -j DROP || sudo iptables -A INPUT -p icmp --icmp-type echo-request -j DROP;\
+sudo iptables -C FORWARD -j DOCKER-USER || sudo iptables -A FORWARD -j DOCKER-USER;\
+sudo iptables -C FORWARD -j DOCKER-ISOLATION-STAGE-1 || sudo iptables -A FORWARD -j DOCKER-ISOLATION-STAGE-1;\
+sudo iptables -C FORWARD -o docker0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT || sudo iptables -A FORWARD -o docker0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT;\
+sudo iptables -C FORWARD -o docker0 -j DOCKER || sudo iptables -A FORWARD -o docker0 -j DOCKER;\
+sudo iptables -C FORWARD -i docker0 ! -o docker0 -j ACCEPT || sudo iptables -A FORWARD -i docker0 ! -o docker0 -j ACCEPT;\
+sudo iptables -C FORWARD -i docker0 -o docker0 -j ACCEPT || sudo iptables -A FORWARD -i docker0 -o docker0 -j ACCEPT;\
+sudo sysctl fs.file-max=51200;\
+sudo sysctl net.core.rmem_max=67108864;\
+sudo sysctl net.core.wmem_max=67108864;\
+sudo sysctl net.core.netdev_max_backlog=250000;\
+sudo sysctl net.core.somaxconn=4096;\
+sudo sysctl net.ipv4.tcp_syncookies=1;\
+sudo sysctl net.ipv4.tcp_tw_reuse=1;\
+sudo sysctl net.ipv4.tcp_tw_recycle=0;\
+sudo sysctl net.ipv4.tcp_fin_timeout=30;\
+sudo sysctl net.ipv4.tcp_keepalive_time=1200;\
+sudo sysctl net.ipv4.ip_local_port_range="10000 65000";\
+sudo sysctl net.ipv4.tcp_max_syn_backlog=8192;\
+sudo sysctl net.ipv4.tcp_max_tw_buckets=5000;\
+sudo sysctl net.ipv4.tcp_fastopen=3;\
+sudo sysctl net.ipv4.tcp_mem="25600 51200 102400";\
+sudo sysctl net.ipv4.tcp_rmem="4096 87380 67108864";\
+sudo sysctl net.ipv4.tcp_wmem="4096 65536 67108864";\
+sudo sysctl net.ipv4.tcp_mtu_probing=1;\
 sudo sysctl net.ipv4.tcp_congestion_control=hybla
--- a/client/translations/amneziavpn_ar_EG.ts
+++ b/client/translations/amneziavpn_ar_EG.ts
--- a/client/translations/amneziavpn_fa_IR.ts
+++ b/client/translations/amneziavpn_fa_IR.ts
--- a/client/translations/amneziavpn_hi_IN.ts
+++ b/client/translations/amneziavpn_hi_IN.ts
--- a/client/translations/amneziavpn_my_MM.ts
+++ b/client/translations/amneziavpn_my_MM.ts
--- a/client/translations/amneziavpn_ru_RU.ts
+++ b/client/translations/amneziavpn_ru_RU.ts
--- a/client/translations/amneziavpn_uk_UA.ts
+++ b/client/translations/amneziavpn_uk_UA.ts
--- a/client/translations/amneziavpn_ur_PK.ts
+++ b/client/translations/amneziavpn_ur_PK.ts
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -41,7 +41,6 @@ QVariant ContainersModel::data(const QModelIndex &index, int role) const
    case IsCurrentlyProcessedRole: return container == static_cast<DockerContainer>(m_processedContainerIndex);
    case IsSupportedRole: return ContainerProps::isSupportedByCurrentPlatform(container);
    case IsShareableRole: return ContainerProps::isShareable(container);
-    case InstallPageOrderRole: return ContainerProps::installPageOrder(container);
    }

    return QVariant();
@@ -113,7 +112,5 @@ QHash<int, QByteArray> ContainersModel::roleNames() const
    roles[IsCurrentlyProcessedRole] = "isCurrentlyProcessed";
    roles[IsSupportedRole] = "isSupported";
    roles[IsShareableRole] = "isShareable";
-
-    roles[InstallPageOrderRole] = "installPageOrder";
    return roles;
 }
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -31,9 +31,7 @@ public:
        IsCurrentlyProcessedRole,
        IsDefaultRole,
        IsSupportedRole,
-        IsShareableRole,
-
-        InstallPageOrderRole
+        IsShareableRole
    };

    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
--- a/client/ui/models/languageModel.cpp
+++ b/client/ui/models/languageModel.cpp
@@ -92,9 +92,9 @@ int LanguageModel::getCurrentLanguageIndex()

 int LanguageModel::getLineHeightAppend()
 {
-    auto language = static_cast<LanguageSettings::AvailableLanguageEnum>(getCurrentLanguageIndex());
-    switch (language) {
-    case LanguageSettings::AvailableLanguageEnum::Burmese: return 10; break;
+    int langIndex = getCurrentLanguageIndex();
+    switch (langIndex) {
+    case 5: return 10; break; // Burmese
    default: return 0; break;
    }
 }
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -6,14 +6,13 @@ import Qt5Compat.GraphicalEffects

 import ConnectionState 1.0
 import PageEnum 1.0
-import Style 1.0

 Button {
    id: root

-    property string defaultButtonColor: AmneziaStyle.color.white
-    property string progressButtonColor: AmneziaStyle.color.white
-    property string connectedButtonColor: AmneziaStyle.color.orange
+    property string defaultButtonColor: "#D7D8DB"
+    property string progressButtonColor: "#D7D8DB"
+    property string connectedButtonColor: "#FBB26A"

    implicitWidth: 190
    implicitHeight: 190
@@ -50,13 +49,13 @@ Button {
                verticalOffset: 0
                radius: 10
                samples: 25
-                color: root.activeFocus ? AmneziaStyle.color.white : AmneziaStyle.color.orange
+                color: root.activeFocus ? "#D7D8DB" : "#FBB26A"
                source: backgroundCircle
            }

            ShapePath {
-                fillColor: AmneziaStyle.color.transparent
-                strokeColor: AmneziaStyle.color.white
+                fillColor: "transparent"
+                strokeColor: "#D7D8DB"
                strokeWidth: root.activeFocus ? 1 : 0
                capStyle: ShapePath.RoundCap

@@ -71,10 +70,10 @@ Button {
            }

            ShapePath {
-                fillColor: AmneziaStyle.color.transparent
+                fillColor: "transparent"
                strokeColor: {
                    if (ConnectionController.isConnectionInProgress) {
-                        return AmneziaStyle.color.connectionInProgress
+                        return "#261E1A"
                    } else if (ConnectionController.isConnected) {
                        return connectedButtonColor
                    } else {
@@ -114,8 +113,8 @@ Button {
            visible: ConnectionController.isConnectionInProgress

            ShapePath {
-                fillColor: AmneziaStyle.color.transparent
-                strokeColor: AmneziaStyle.color.white
+                fillColor: "transparent"
+                strokeColor: "#D7D8DB"
                strokeWidth: 3
                capStyle: ShapePath.RoundCap

--- a/client/ui/qml/Components/HomeSplitTunnelingDrawer.qml
+++ b/client/ui/qml/Components/HomeSplitTunnelingDrawer.qml
@@ -14,7 +14,7 @@ DrawerType2 {
    property bool isAppSplitTinnelingEnabled: Qt.platform.os === "windows" || Qt.platform.os === "android"

    anchors.fill: parent
-    expandedHeight: parent.height * 0.9
+    expandedHeight: parent.height * 0.7

    expandedContent: ColumnLayout {
        id: content
--- a/client/ui/qml/Components/InstalledAppsDrawer.qml
+++ b/client/ui/qml/Components/InstalledAppsDrawer.qml
@@ -8,7 +8,6 @@ import "../Controls2/TextTypes"
 import SortFilterProxyModel 0.2

 import InstalledAppsModel 1.0
-import Style 1.0

 DrawerType2 {
    id: root
@@ -134,7 +133,7 @@ DrawerType2 {
            anchors.rightMargin: 16
            anchors.leftMargin: 16

-            backgroundColor: AmneziaStyle.color.greyDark
+            backgroundColor: "#2C2D30"

            textFieldPlaceholderText: qsTr("application name")
        }
--- a/client/ui/qml/Components/QuestionDrawer.qml
+++ b/client/ui/qml/Components/QuestionDrawer.qml
@@ -2,8 +2,6 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts

-import Style 1.0
-
 import "../Controls2"
 import "../Controls2/TextTypes"

@@ -88,11 +86,11 @@ DrawerType2 {
            Layout.rightMargin: 16
            Layout.leftMargin: 16

-            defaultColor: AmneziaStyle.color.transparent
-            hoveredColor: AmneziaStyle.color.blackHovered
-            pressedColor: AmneziaStyle.color.blackPressed
-            disabledColor: AmneziaStyle.color.grey
-            textColor: AmneziaStyle.color.white
+            defaultColor: "transparent"
+            hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+            pressedColor: Qt.rgba(1, 1, 1, 0.12)
+            disabledColor: "#878B91"
+            textColor: "#D7D8DB"
            borderWidth: 1

            text: noButtonText
--- a/client/ui/qml/Components/SelectLanguageDrawer.qml
+++ b/client/ui/qml/Components/SelectLanguageDrawer.qml
@@ -2,8 +2,6 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts

-import Style 1.0
-
 import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
@@ -147,8 +145,8 @@ DrawerType2 {
                                indicator: Rectangle {
                                    width: parent.width - 1
                                    height: parent.height
-                                    color: radioButton.hovered ? AmneziaStyle.color.greyDark : AmneziaStyle.color.blackLight
-                                    border.color: radioButton.focus ? AmneziaStyle.color.white : AmneziaStyle.color.transparent
+                                    color: radioButton.hovered ? "#2C2D30" : "#1C1D21"
+                                    border.color: radioButton.focus ? "#D7D8DB" : "transparent"
                                    border.width: radioButton.focus ? 1 : 0

                                    Behavior on color {
--- a/client/ui/qml/Components/SettingsContainersListView.qml
+++ b/client/ui/qml/Components/SettingsContainersListView.qml
@@ -93,11 +93,20 @@ ListView {
                            PageController.goToPage(PageEnum.PageProtocolRaw)
                            break
                        }
+                        case ContainerEnum.Sftp: {
+                            SftpConfigModel.updateModel(config)
+                            PageController.goToPage(PageEnum.PageServiceSftpSettings)
+                            break
+                        }
+                        case ContainerEnum.TorWebSite: {
+                            PageController.goToPage(PageEnum.PageServiceTorWebsiteSettings)
+                            break
+                        }
                        case ContainerEnum.Dns: {
                            PageController.goToPage(PageEnum.PageServiceDnsSettings)
                            break
                        }
-                        default: {
+                        default: { // go to the settings page of the container with multiple protocols
                            ProtocolsModel.updateModel(config)
                            PageController.goToPage(PageEnum.PageSettingsServerProtocol)
                        }
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -9,7 +9,6 @@ import SortFilterProxyModel 0.2

 import PageEnum 1.0
 import ContainerProps 1.0
-import Style 1.0

 import "./"
 import "../Controls2"
@@ -112,11 +111,11 @@ DrawerType2 {
                    Layout.fillWidth: true
                    Layout.topMargin: 8

-                    defaultColor: AmneziaStyle.color.transparent
-                    hoveredColor: AmneziaStyle.color.blackHovered
-                    pressedColor: AmneziaStyle.color.blackPressed
-                    disabledColor: AmneziaStyle.color.grey
-                    textColor: AmneziaStyle.color.white
+                    defaultColor: "transparent"
+                    hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                    pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                    disabledColor: "#878B91"
+                    textColor: "#D7D8DB"
                    borderWidth: 1

                    text: qsTr("Copy")
@@ -135,11 +134,11 @@ DrawerType2 {

                    visible: false

-                    defaultColor: AmneziaStyle.color.transparent
-                    hoveredColor: AmneziaStyle.color.blackHovered
-                    pressedColor: AmneziaStyle.color.blackPressed
-                    disabledColor: AmneziaStyle.color.grey
-                    textColor: AmneziaStyle.color.white
+                    defaultColor: "transparent"
+                    hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                    pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                    disabledColor: "#878B91"
+                    textColor: "#D7D8DB"
                    borderWidth: 1

                    text: qsTr("Copy config string")
@@ -154,11 +153,11 @@ DrawerType2 {
                    Layout.fillWidth: true
                    Layout.topMargin: 24

-                    defaultColor: AmneziaStyle.color.transparent
-                    hoveredColor: AmneziaStyle.color.blackHovered
-                    pressedColor: AmneziaStyle.color.blackPressed
-                    disabledColor: AmneziaStyle.color.grey
-                    textColor: AmneziaStyle.color.white
+                    defaultColor: "transparent"
+                    hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                    pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                    disabledColor: "#878B91"
+                    textColor: "#D7D8DB"
                    borderWidth: 1

                    text: qsTr("Show connection settings")
@@ -282,9 +281,9 @@ DrawerType2 {
                                    readOnly: true
                                    activeFocusOnTab: false

-                                    color: AmneziaStyle.color.white
-                                    selectionColor:  AmneziaStyle.color.brown
-                                    selectedTextColor: AmneziaStyle.color.white
+                                    color: "#D7D8DB"
+                                    selectionColor:  "#633303"
+                                    selectedTextColor: "#D7D8DB"

                                    font.pixelSize: 16
                                    font.weight: Font.Medium
@@ -295,7 +294,7 @@ DrawerType2 {
                                    wrapMode: Text.Wrap

                                    background: Rectangle {
-                                        color: AmneziaStyle.color.transparent
+                                        color: "transparent"
                                    }
                                }
                            }
--- a/client/ui/qml/Components/TransportProtoSelector.qml
+++ b/client/ui/qml/Components/TransportProtoSelector.qml
@@ -2,8 +2,6 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts

-import Style 1.0
-
 import "../Controls2"
 import "../Controls2/TextTypes"

@@ -16,7 +14,7 @@ Rectangle {
    implicitWidth: transportProtoButtonGroup.implicitWidth
    implicitHeight: transportProtoButtonGroup.implicitHeight

-    color: AmneziaStyle.color.blackLight
+    color: "#1C1D21"
    radius: 16

    onFocusChanged: {
--- a/client/ui/qml/Controls2/BackButtonType.qml
+++ b/client/ui/qml/Controls2/BackButtonType.qml
@@ -2,8 +2,6 @@ import QtQuick
 import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects

-import Style 1.0
-
 Item {
    id: root

@@ -30,7 +28,7 @@ Item {
        ImageButtonType {
            id: backButton
            image: backButtonImage
-            imageColor: AmneziaStyle.color.white
+            imageColor: "#D7D8DB"

            implicitWidth: 40
            implicitHeight: 40
@@ -48,7 +46,7 @@ Item {
            id: background
            Layout.fillWidth: true

-            color: AmneziaStyle.color.transparent
+            color: "transparent"
        }
    }

--- a/client/ui/qml/Controls2/BasicButtonType.qml
+++ b/client/ui/qml/Controls2/BasicButtonType.qml
@@ -3,22 +3,20 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects

-import Style 1.0
-
 import "TextTypes"

 Button {
    id: root

-    property string hoveredColor: AmneziaStyle.color.whiteHovered
-    property string defaultColor: AmneziaStyle.color.white
-    property string disabledColor: AmneziaStyle.color.greyDisabled
-    property string pressedColor: AmneziaStyle.color.grey
+    property string hoveredColor: "#C1C2C5"
+    property string defaultColor: "#D7D8DB"
+    property string disabledColor: "#494B50"
+    property string pressedColor: "#979799"

-    property string textColor: AmneziaStyle.color.black
+    property string textColor: "#0E0E11"

-    property string borderColor: AmneziaStyle.color.white
-    property string borderFocusedColor: AmneziaStyle.color.white
+    property string borderColor: "#D7D8DB"
+    property string borderFocusedColor: "#D7D8DB"
    property int borderWidth: 0
    property int borderFocusedWidth: 1

@@ -32,8 +30,6 @@ Button {

    property var clickedFunc

-    property alias buttonTextLabel: buttonText
-
    implicitHeight: 56

    hoverEnabled: true
@@ -50,8 +46,8 @@ Button {
    background: Rectangle {
        id: focusBorder

-        color: AmneziaStyle.color.transparent
-        border.color: root.activeFocus ? root.borderFocusedColor : AmneziaStyle.color.transparent
+        color: "transparent"
+        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
        border.width: root.activeFocus ? root.borderFocusedWidth : 0

        anchors.fill: parent
@@ -142,8 +138,6 @@ Button {
            }

            ButtonTextType {
-                id: buttonText
-
                color: textColor
                text: root.text
                visible: root.text === "" ? false : true
--- a/client/ui/qml/Controls2/BusyIndicatorType.qml
+++ b/client/ui/qml/Controls2/BusyIndicatorType.qml
@@ -2,8 +2,6 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Shapes

-import Style 1.0
-
 Popup {
    id: root
    anchors.centerIn: parent
@@ -18,7 +16,7 @@ Popup {
    }

    background: Rectangle {
-        color: AmneziaStyle.color.transparent
+        color: "transparent"
    }

    BusyIndicator {
@@ -42,8 +40,8 @@ Popup {
                layer.samples: 4

                ShapePath {
-                    fillColor: AmneziaStyle.color.transparent
-                    strokeColor: AmneziaStyle.color.greyDisabled
+                    fillColor: "transparent"
+                    strokeColor: "#787878"
                    strokeWidth: 3
                    capStyle: ShapePath.RoundCap

--- a/client/ui/qml/Controls2/CardType.qml
+++ b/client/ui/qml/Controls2/CardType.qml
@@ -2,8 +2,6 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts

-import Style 1.0
-
 RadioButton {
    id: root

@@ -11,17 +9,17 @@ RadioButton {
    property string bodyText
    property string footerText

-    property string hoveredColor: AmneziaStyle.color.blackHovered
-    property string defaultColor: AmneziaStyle.color.transparent
-    property string disabledColor: AmneziaStyle.color.transparent
-    property string pressedColor: AmneziaStyle.color.blackPressed
-    property string selectedColor: AmneziaStyle.color.transparent
+    property string hoveredColor: Qt.rgba(1, 1, 1, 0.05)
+    property string defaultColor: Qt.rgba(1, 1, 1, 0)
+    property string disabledColor: Qt.rgba(1, 1, 1, 0)
+    property string pressedColor: Qt.rgba(1, 1, 1, 0.05)
+    property string selectedColor: Qt.rgba(1, 1, 1, 0)

-    property string textColor: AmneziaStyle.color.black
+    property string textColor: "#0E0E11"

    property string pressedBorderColor: Qt.rgba(251/255, 178/255, 106/255, 0.3)
-    property string selectedBorderColor: AmneziaStyle.color.orange
-    property string defaultBodredColor: AmneziaStyle.color.transparent
+    property string selectedBorderColor: "#FBB26A"
+    property string defaultBodredColor: "transparent"
    property int borderWidth: 0

    implicitWidth: content.implicitWidth
@@ -84,7 +82,7 @@ RadioButton {
        Text {
            text: root.headerText
            wrapMode: Text.WordWrap
-            color: AmneziaStyle.color.white
+            color: "#D7D8DB"
            font.pixelSize: 25
            font.weight: 700
            font.family: "PT Root UI VF"
@@ -99,7 +97,7 @@ RadioButton {
        Text {
            text: root.bodyText
            wrapMode: Text.WordWrap
-            color: AmneziaStyle.color.white
+            color: "#D7D8DB"
            font.pixelSize: 16
            font.weight: 400
            font.family: "PT Root UI VF"
@@ -115,7 +113,7 @@ RadioButton {
            text: root.footerText
            wrapMode: Text.WordWrap
            visible: root.footerText !== ""
-            color: AmneziaStyle.color.grey
+            color: "#878B91"
            font.pixelSize: 13
            font.weight: 400
            font.family: "PT Root UI VF"
--- a/client/ui/qml/Controls2/CheckBoxType.qml
+++ b/client/ui/qml/Controls2/CheckBoxType.qml
@@ -3,34 +3,32 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects

-import Style 1.0
-
 import "TextTypes"

 CheckBox {
    id: root

    property string descriptionText
-    property string descriptionTextColor: AmneziaStyle.color.grey
-    property string descriptionTextDisabledColor: AmneziaStyle.color.greyDisabled
+    property string descriptionTextColor: "#878B91"
+    property string descriptionTextDisabledColor: "#494B50"

-    property string textColor: AmneziaStyle.color.white
-    property string textDisabledColor: AmneziaStyle.color.grey
+    property string textColor:  "#D7D8DB"
+    property string textDisabledColor: "#878B91"

-    property string hoveredColor: AmneziaStyle.color.blackHovered
-    property string defaultColor: AmneziaStyle.color.transparent
-    property string pressedColor: AmneziaStyle.color.blackPressed
+    property string hoveredColor: Qt.rgba(1, 1, 1, 0.05)
+    property string defaultColor: "transparent"
+    property string pressedColor: Qt.rgba(1, 1, 1, 0.05)

-    property string defaultBorderColor: AmneziaStyle.color.white
-    property string checkedBorderColor: AmneziaStyle.color.orange
-    property string checkedBorderDisabledColor: AmneziaStyle.color.brownDark
+    property string defaultBorderColor: "#D7D8DB"
+    property string checkedBorderColor: "#FBB26A"
+    property string checkedBorderDisabledColor: "#402102"

-    property string borderFocusedColor: AmneziaStyle.color.white
+    property string borderFocusedColor: "#D7D8DB"

-    property string checkedImageColor: AmneziaStyle.color.orange
-    property string pressedImageColor: AmneziaStyle.color.orangeDark
-    property string defaultImageColor: AmneziaStyle.color.transparent
-    property string checkedDisabledImageColor: AmneziaStyle.color.brownLight
+    property string checkedImageColor: "#FBB26A"
+    property string pressedImageColor: "#A85809"
+    property string defaultImageColor: "transparent"
+    property string checkedDisabledImageColor: "#84603D"

    property string imageSource: "qrc:/images/controls/check.svg"

@@ -47,8 +45,8 @@ CheckBox {
    focusPolicy: Qt.NoFocus

    background: Rectangle {
-        color: AmneziaStyle.color.transparent
-        border.color: root.focus ? borderFocusedColor : AmneziaStyle.color.transparent
+        color: "transparent"
+        border.color: root.focus ? borderFocusedColor : "transparent"
        border.width: 1
        radius: 16
    }
@@ -79,7 +77,7 @@ CheckBox {
            anchors.centerIn: parent
            width: 24
            height: 24
-            color: AmneziaStyle.color.transparent
+            color: "transparent"
            border.color: root.checked ?
                              (root.enabled ?
                                   checkedBorderColor :
--- a/client/ui/qml/Controls2/ContextMenuType.qml
+++ b/client/ui/qml/Controls2/ContextMenuType.qml
@@ -20,8 +20,7 @@ Menu {
    MenuItem {
        text: qsTr("&Paste")
        shortcut: StandardKey.Paste
-        // Fix calling paste from clipboard when launching app on android
-        enabled: Qt.platform.os === "android" ? true : textObj.canPaste
+        enabled: textObj.canPaste
        onTriggered: textObj.paste()
    }

--- a/client/ui/qml/Controls2/DividerType.qml
+++ b/client/ui/qml/Controls2/DividerType.qml
@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Layouts

-import Style 1.0
-
 Rectangle {
    Layout.fillWidth: true

@@ -10,5 +8,5 @@ Rectangle {
    Layout.rightMargin: 16

    height: 1
-    color: AmneziaStyle.color.greyDark
+    color: "#2C2D30"
 }
--- a/client/ui/qml/Controls2/DrawerType2.qml
+++ b/client/ui/qml/Controls2/DrawerType2.qml
@@ -2,8 +2,6 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts

-import Style 1.0
-
 import "TextTypes"

 Item {
@@ -21,8 +19,8 @@ Item {
    property Component collapsedContent
    property Component expandedContent

-    property string defaultColor: AmneziaStyle.color.blackLight
-    property string borderColor: AmneziaStyle.color.greyDark
+    property string defaultColor: "#1C1D21"
+    property string borderColor: "#2C2D30"

    property real expandedHeight
    property real collapsedHeight: 0
@@ -92,7 +90,7 @@ Item {
        id: background

        anchors.fill: parent
-        color: root.isCollapsed ? AmneziaStyle.color.transparent : Qt.rgba(14/255, 14/255, 17/255, 0.8)
+        color: root.isCollapsed ? "transparent" : Qt.rgba(14/255, 14/255, 17/255, 0.8)

        Behavior on color {
            PropertyAnimation { duration: 200 }
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -2,8 +2,6 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts

-import Style 1.0
-
 import "TextTypes"
 import "../Config"

@@ -11,31 +9,31 @@ Item {
    id: root

    property string text
-    property string textColor: AmneziaStyle.color.white
-    property string textDisabledColor: AmneziaStyle.color.grey
+    property string textColor: "#d7d8db"
+    property string textDisabledColor: "#878B91"
    property int textMaximumLineCount: 2
    property int textElide: Qt.ElideRight

    property string descriptionText
-    property string descriptionTextColor: AmneziaStyle.color.grey
-    property string descriptionTextDisabledColor: AmneziaStyle.color.greyDisabled
+    property string descriptionTextColor: "#878B91"
+    property string descriptionTextDisabledColor: "#494B50"

    property string headerText
    property string headerBackButtonImage

    property var rootButtonClickedFunction
    property string rootButtonImage: "qrc:/images/controls/chevron-down.svg"
-    property string rootButtonImageColor: AmneziaStyle.color.white
-    property string rootButtonBackgroundColor: AmneziaStyle.color.blackLight
-    property string rootButtonBackgroundHoveredColor: AmneziaStyle.color.blackLight
-    property string rootButtonBackgroundPressedColor: AmneziaStyle.color.blackLight
+    property string rootButtonImageColor: "#D7D8DB"
+    property string rootButtonBackgroundColor: "#1C1D21"
+    property string rootButtonBackgroundHoveredColor: "#1C1D21"
+    property string rootButtonBackgroundPressedColor: "#1C1D21"

-    property string borderFocusedColor: AmneziaStyle.color.white
+    property string borderFocusedColor: "#D7D8DB"
    property int borderFocusedWidth: 1

-    property string rootButtonHoveredBorderColor: AmneziaStyle.color.greyDisabled
-    property string rootButtonDefaultBorderColor: AmneziaStyle.color.greyDark
-    property string rootButtonPressedBorderColor: AmneziaStyle.color.white
+    property string rootButtonHoveredBorderColor: "#494B50"
+    property string rootButtonDefaultBorderColor: "#2C2D30"
+    property string rootButtonPressedBorderColor: "#D7D8DB"

    property int rootButtonTextLeftMargins: 16
    property int rootButtonTextTopMargin: 16
@@ -77,8 +75,8 @@ Item {
    Rectangle {
        id: focusBorder

-        color: AmneziaStyle.color.transparent
-        border.color: root.activeFocus ? root.borderFocusedColor : AmneziaStyle.color.transparent
+        color: "transparent"
+        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
        border.width: root.activeFocus ? root.borderFocusedWidth : 0
        anchors.fill: rootButtonContent
        radius: 16
@@ -98,7 +96,7 @@ Item {
                    }
                    return root.hovered ? root.rootButtonBackgroundHoveredColor : root.rootButtonBackgroundColor
                } else {
-                    return AmneziaStyle.color.transparent
+                    return "transparent"
                }
            }

--- a/client/ui/qml/Controls2/Header2Type.qml
+++ b/client/ui/qml/Controls2/Header2Type.qml
@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Layouts

-import Style 1.0
-
 import "TextTypes"

 Item {
@@ -39,7 +37,7 @@ Item {
                implicitHeight: 40

                image: root.actionButtonImage
-                imageColor: AmneziaStyle.color.white
+                imageColor: "#D7D8DB"

                visible: image ? true : false

@@ -59,7 +57,7 @@ Item {

            text: root.descriptionText

-            color: AmneziaStyle.color.grey
+            color: "#878B91"

            visible: root.descriptionText !== ""
        }
--- a/client/ui/qml/Controls2/HeaderType.qml
+++ b/client/ui/qml/Controls2/HeaderType.qml
@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Layouts

-import Style 1.0
-
 import "TextTypes"

 Item {
@@ -48,7 +46,7 @@ Item {
                Layout.alignment: Qt.AlignRight

                image: root.actionButtonImage
-                imageColor: AmneziaStyle.color.white
+                imageColor: "#D7D8DB"

                visible: image ? true : false

@@ -68,7 +66,7 @@ Item {

            text: root.descriptionText

-            color: AmneziaStyle.color.grey
+            color: "#878B91"

            visible: root.descriptionText !== ""
        }
--- a/client/ui/qml/Controls2/HorizontalRadioButton.qml
+++ b/client/ui/qml/Controls2/HorizontalRadioButton.qml
@@ -2,26 +2,24 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts

-import Style 1.0
-
 import "TextTypes"

 RadioButton {
    id: root

-    property string hoveredColor: AmneziaStyle.color.blackHovered
-    property string defaultColor: AmneziaStyle.color.transparent
-    property string checkedColor: AmneziaStyle.color.transparent
-    property string disabledColor: AmneziaStyle.color.transparent
+    property string hoveredColor: Qt.rgba(1, 1, 1, 0.05)
+    property string defaultColor: Qt.rgba(1, 1, 1, 0)
+    property string checkedColor: Qt.rgba(1, 1, 1, 0)
+    property string disabledColor: "transparent"

-    property string textColor: AmneziaStyle.color.white
-    property string textDisabledColor: AmneziaStyle.color.grey
+    property string textColor:  "#D7D8DB"
+    property string textDisabledColor: "#878B91"

-    property string pressedBorderColor: AmneziaStyle.color.greyDisabled
-    property string checkedBorderColor: AmneziaStyle.color.orange
-    property string defaultBodredColor: AmneziaStyle.color.transparent
-    property string checkedDisabledBorderColor: AmneziaStyle.color.brownLight
-    property string borderFocusedColor: AmneziaStyle.color.white
+    property string pressedBorderColor: "#494B50"
+    property string checkedBorderColor: "#FBB26A"
+    property string defaultBodredColor: "transparent"
+    property string checkedDisabledBorderColor: "#84603D"
+    property string borderFocusedColor: "#D7D8DB"
    property int borderWidth: 0

    implicitWidth: content.implicitWidth
--- a/client/ui/qml/Controls2/ImageButtonType.qml
+++ b/client/ui/qml/Controls2/ImageButtonType.qml
@@ -2,25 +2,23 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts

-import Style 1.0
-
 Button {
    id: root

    property string image

-    property string hoveredColor: AmneziaStyle.color.blackHovered
-    property string defaultColor: AmneziaStyle.color.transparent
-    property string pressedColor: AmneziaStyle.color.blackPressed
-    property string disableColor: AmneziaStyle.color.greyDark
+    property string hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+    property string defaultColor: "transparent"
+    property string pressedColor: Qt.rgba(1, 1, 1, 0.12)
+    property string disableColor: "#2C2D30"

-    property string imageColor: AmneziaStyle.color.grey
-    property string disableImageColor: AmneziaStyle.color.greyDark
+    property string imageColor: "#878B91"
+    property string disableImageColor: "#2C2D30"

    property alias backgroundColor: background.color
    property alias backgroundRadius: background.radius

-    property string borderFocusedColor: AmneziaStyle.color.white
+    property string borderFocusedColor: "#D7D8DB"
    property int borderFocusedWidth: 1

    hoverEnabled: true
@@ -48,7 +46,7 @@ Button {
        id: background

        anchors.fill: parent
-        border.color: root.activeFocus ? root.borderFocusedColor : AmneziaStyle.color.transparent
+        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
        border.width: root.activeFocus ? root.borderFocusedWidth : 0

        color: {
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -2,8 +2,6 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts

-import Style 1.0
-
 import "TextTypes"

 Item {
@@ -26,16 +24,16 @@ Item {
    property alias eyeButton: eyeImage
    property FlickableType parentFlickable

-    property string textColor: AmneziaStyle.color.white
-    property string textDisabledColor: AmneziaStyle.color.grey
-    property string descriptionColor: AmneziaStyle.color.grey
-    property string descriptionDisabledColor: AmneziaStyle.color.greyDisabled
+    property string textColor: "#d7d8db"
+    property string textDisabledColor: "#878B91"
+    property string descriptionColor: "#878B91"
+    property string descriptionDisabledColor: "#494B50"
    property real textOpacity: 1.0

-    property string borderFocusedColor: AmneziaStyle.color.white
+    property string borderFocusedColor: "#D7D8DB"
    property int borderFocusedWidth: 1

-    property string rightImageColor: AmneziaStyle.color.white
+    property string rightImageColor: "#d7d8db"

    property bool descriptionOnTop: false
    property bool hideDescription: true
@@ -119,7 +117,7 @@ Item {
            Layout.rightMargin: rightImageSource || !isLeftImageHoverEnabled ? 16 : 0

            radius: 12
-            color: AmneziaStyle.color.transparent
+            color: "transparent"

            Behavior on color {
                PropertyAnimation { duration: 200 }
@@ -222,7 +220,7 @@ Item {
                id: eyeImageBackground
                anchors.fill: parent
                radius: 12
-                color: AmneziaStyle.color.transparent
+                color: "transparent"

                Behavior on color {
                    PropertyAnimation { duration: 200 }
@@ -259,7 +257,7 @@ Item {
                id: rightImageBackground
                anchors.fill: parent
                radius: 12
-                color: AmneziaStyle.color.transparent
+                color: "transparent"

                Behavior on color {
                    PropertyAnimation { duration: 200 }
@@ -276,9 +274,9 @@ Item {
    Rectangle {
        id: background
        anchors.fill: root
-        color: AmneziaStyle.color.transparent
+        color: "transparent"

-        border.color: root.activeFocus ? root.borderFocusedColor : AmneziaStyle.color.transparent
+        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
        border.width: root.activeFocus ? root.borderFocusedWidth : 0


--- a/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml
+++ b/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml
@@ -2,8 +2,6 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts

-import Style 1.0
-
 import "TextTypes"

 ListView {
@@ -105,8 +103,8 @@ ListView {
                indicator: Rectangle {
                    width: parent.width - 1
                    height: parent.height
-                    color: radioButton.hovered ? AmneziaStyle.color.greyDark : AmneziaStyle.color.blackLight
-                    border.color: radioButton.focus ? AmneziaStyle.color.white : AmneziaStyle.color.transparent
+                    color: radioButton.hovered ? "#2C2D30" : "#1C1D21"
+                    border.color: radioButton.focus ? "#D7D8DB" : "transparent"
                    border.width: radioButton.focus ? 1 : 0

                    Behavior on color {
--- a/client/ui/qml/Controls2/PopupType.qml
+++ b/client/ui/qml/Controls2/PopupType.qml
@@ -2,8 +2,6 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts

-import Style 1.0
-
 import "TextTypes"

 Popup {
@@ -84,11 +82,11 @@ Popup {
                implicitHeight: 32

                defaultColor: "white"
-                hoveredColor: AmneziaStyle.color.whiteHovered
-                pressedColor: AmneziaStyle.color.whiteHovered
-                disabledColor: AmneziaStyle.color.greyDisabled
+                hoveredColor: "#C1C2C5"
+                pressedColor: "#AEB0B7"
+                disabledColor: "#494B50"

-                textColor: AmneziaStyle.color.black
+                textColor: "#0E0E11"
                borderWidth: 0

                text: qsTr("Close")
--- a/client/ui/qml/Controls2/ProgressBarType.qml
+++ b/client/ui/qml/Controls2/ProgressBarType.qml
@@ -2,22 +2,20 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts

-import Style 1.0
-
 ProgressBar {
    id: root

    implicitHeight: 4

    background: Rectangle {
-        color: AmneziaStyle.color.brown
+        color: "#633303"
    }

    contentItem: Item {
        Rectangle {
            width: root.visualPosition * parent.width
            height: parent.height
-            color: AmneziaStyle.color.orange
+            color: "#FBB26A"
        }
    }
 }
--- a/client/ui/qml/Controls2/SwitcherType.qml
+++ b/client/ui/qml/Controls2/SwitcherType.qml
@@ -2,38 +2,36 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts

-import Style 1.0
-
 import "TextTypes"

 Switch {
    id: root

    property alias descriptionText: description.text
-    property string descriptionTextColor: AmneziaStyle.color.grey
-    property string descriptionTextDisabledColor: AmneziaStyle.color.greyDisabled
+    property string descriptionTextColor: "#878B91"
+    property string descriptionTextDisabledColor: "#494B50"

-    property string textColor: AmneziaStyle.color.white
-    property string textDisabledColor: AmneziaStyle.color.grey
+    property string textColor:  "#D7D8DB"
+    property string textDisabledColor: "#878B91"

-    property string checkedIndicatorColor: AmneziaStyle.color.brown
-    property string defaultIndicatorColor: AmneziaStyle.color.transparent
-    property string checkedDisabledIndicatorColor: AmneziaStyle.color.brownDark
+    property string checkedIndicatorColor: "#633303"
+    property string defaultIndicatorColor: "transparent"
+    property string checkedDisabledIndicatorColor: "#402102"

-    property string borderFocusedColor: AmneziaStyle.color.white
+    property string borderFocusedColor: "#D7D8DB"
    property int borderFocusedWidth: 1

-    property string checkedIndicatorBorderColor: AmneziaStyle.color.brown
-    property string defaultIndicatorBorderColor: AmneziaStyle.color.greyDisabled
-    property string checkedDisabledIndicatorBorderColor: AmneziaStyle.color.brownDark
+    property string checkedIndicatorBorderColor: "#633303"
+    property string defaultIndicatorBorderColor: "#494B50"
+    property string checkedDisabledIndicatorBorderColor: "#402102"

-    property string checkedInnerCircleColor: AmneziaStyle.color.orange
-    property string defaultInnerCircleColor: AmneziaStyle.color.white
-    property string checkedDisabledInnerCircleColor: AmneziaStyle.color.brownLight
-    property string defaultDisabledInnerCircleColor: AmneziaStyle.color.greyDisabled
+    property string checkedInnerCircleColor: "#FBB26A"
+    property string defaultInnerCircleColor: "#D7D8DB"
+    property string checkedDisabledInnerCircleColor: "#84603D"
+    property string defaultDisabledInnerCircleColor: "#494B50"

-    property string hoveredIndicatorBackgroundColor: AmneziaStyle.color.blackHovered
-    property string defaultIndicatorBackgroundColor: AmneziaStyle.color.transparent
+    property string hoveredIndicatorBackgroundColor: Qt.rgba(1, 1, 1, 0.08)
+    property string defaultIndicatorBackgroundColor: "transparent"

    hoverEnabled: enabled ? true : false
    focusPolicy: Qt.TabFocus
@@ -102,8 +100,7 @@ Switch {
    contentItem: ColumnLayout {
        id: content

-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
+        anchors.verticalCenter: parent.verticalCenter
        anchors.left: parent.left

        ListItemTitleType {
--- a/client/ui/qml/Controls2/TabButtonType.qml
+++ b/client/ui/qml/Controls2/TabButtonType.qml
@@ -1,18 +1,16 @@
 import QtQuick
 import QtQuick.Controls

-import Style 1.0
-
 TabButton {
    id: root

-    property string hoveredColor: AmneziaStyle.color.brown
-    property string defaultColor: AmneziaStyle.color.greyDark
-    property string selectedColor: AmneziaStyle.color.orange
+    property string hoveredColor: "#633303"
+    property string defaultColor: "#2C2D30"
+    property string selectedColor: "#FBB26A"

-    property string textColor: AmneziaStyle.color.white
+    property string textColor: "#D7D8DB"

-    property string borderFocusedColor: AmneziaStyle.color.white
+    property string borderFocusedColor: "#D7D8DB"
    property int borderFocusedWidth: 1

    property bool isSelected: false
@@ -26,9 +24,9 @@ TabButton {
        id: background

        anchors.fill: parent
-        color: AmneziaStyle.color.transparent
+        color: "transparent"

-        border.color: root.activeFocus ? root.borderFocusedColor : AmneziaStyle.color.transparent
+        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
        border.width: root.activeFocus ? root.borderFocusedWidth : 0

        Rectangle {
--- a/client/ui/qml/Controls2/TabImageButtonType.qml
+++ b/client/ui/qml/Controls2/TabImageButtonType.qml
@@ -1,20 +1,18 @@
 import QtQuick
 import QtQuick.Controls

-import Style 1.0
-
 TabButton {
    id: root

-    property string hoveredColor: AmneziaStyle.color.brown
-    property string defaultColor: AmneziaStyle.color.white
-    property string selectedColor: AmneziaStyle.color.orange
+    property string hoveredColor: "#633303"
+    property string defaultColor: "#D7D8DB"
+    property string selectedColor: "#FBB26A"

    property string image

    property bool isSelected: false

-    property string borderFocusedColor: AmneziaStyle.color.white
+    property string borderFocusedColor: "#D7D8DB"
    property int borderFocusedWidth: 1

    property var clickedFunc
@@ -28,10 +26,10 @@ TabButton {
    background: Rectangle {
        id: background
        anchors.fill: parent
-        color: AmneziaStyle.color.transparent
+        color: "transparent"
        radius: 10

-        border.color: root.activeFocus ? root.borderFocusedColor : AmneziaStyle.color.transparent
+        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
        border.width: root.activeFocus ? root.borderFocusedWidth : 0

    }
--- a/client/ui/qml/Controls2/TextAreaType.qml
+++ b/client/ui/qml/Controls2/TextAreaType.qml
@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls

-import Style 1.0
-
 Rectangle {
    id: root

@@ -11,12 +9,12 @@ Rectangle {
    property alias textArea: textArea
    property alias textAreaText: textArea.text

-    property string borderHoveredColor: AmneziaStyle.color.greyDisabled
-    property string borderNormalColor: AmneziaStyle.color.greyDark
-    property string borderFocusedColor: AmneziaStyle.color.white
+    property string borderHoveredColor: "#494B50"
+    property string borderNormalColor: "#2C2D30"
+    property string borderFocusedColor: "#d7d8db"

    height: 148
-    color: AmneziaStyle.color.blackLight
+    color: "#1C1D21"
    border.width: 1
    border.color: getBorderColor(borderNormalColor)
    radius: 16
@@ -54,10 +52,10 @@ Rectangle {
                anchors.topMargin: 16
                anchors.bottomMargin: 16

-                color: AmneziaStyle.color.white
-                selectionColor:  AmneziaStyle.color.brown
-                selectedTextColor: AmneziaStyle.color.white
-                placeholderTextColor: AmneziaStyle.color.grey
+                color: "#D7D8DB"
+                selectionColor:  "#633303"
+                selectedTextColor: "#D7D8DB"
+                placeholderTextColor: "#878B91"

                font.pixelSize: 16
                font.weight: Font.Medium
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -2,16 +2,14 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts

-import Style 1.0
-
 import "TextTypes"

 Item {
    id: root

    property string headerText
-    property string headerTextDisabledColor: AmneziaStyle.color.greyDisabled
-    property string headerTextColor: AmneziaStyle.color.grey
+    property string headerTextDisabledColor: "#494B50"
+    property string headerTextColor: "#878b91"

    property alias errorText: errorField.text
    property bool checkEmptyText: false
@@ -23,18 +21,18 @@ Item {

    property alias textField: textField
    property alias textFieldText: textField.text
-    property string textFieldTextColor: AmneziaStyle.color.white
-    property string textFieldTextDisabledColor: AmneziaStyle.color.grey
+    property string textFieldTextColor: "#d7d8db"
+    property string textFieldTextDisabledColor: "#878B91"

    property string textFieldPlaceholderText
    property bool textFieldEditable: true

-    property string borderColor: AmneziaStyle.color.greyDark
-    property string borderFocusedColor: AmneziaStyle.color.white
+    property string borderColor: "#2C2D30"
+    property string borderFocusedColor: "#d7d8db"

-    property string backgroundColor: AmneziaStyle.color.blackLight
-    property string backgroundDisabledColor: AmneziaStyle.color.transparent
-    property string bgBorderHoveredColor: AmneziaStyle.color.greyDisabled
+    property string backgroundColor: "#1c1d21"
+    property string backgroundDisabledColor: "transparent"
+    property string bgBorderHoveredColor: "#494B50"

    implicitWidth: content.implicitWidth
    implicitHeight: content.implicitHeight
@@ -92,10 +90,10 @@ Item {
                        inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhSensitiveData | Qt.ImhNoPredictiveText

                        placeholderText: root.textFieldPlaceholderText
-                        placeholderTextColor: AmneziaStyle.color.greyDisabled
+                        placeholderTextColor: "#494B50"

-                        selectionColor:  AmneziaStyle.color.brown
-                        selectedTextColor: AmneziaStyle.color.white
+                        selectionColor:  "#633303"
+                        selectedTextColor: "#D7D8DB"

                        font.pixelSize: 16
                        font.weight: 400
@@ -149,7 +147,7 @@ Item {

            text: root.errorText
            visible: root.errorText !== ""
-            color: AmneziaStyle.color.red
+            color: "#EB5757"
        }
    }

--- a/client/ui/qml/Controls2/TextTypes/ButtonTextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/ButtonTextType.qml
@@ -1,12 +1,10 @@
 import QtQuick

-import Style 1.0
-
 Text {
    lineHeight: 24
    lineHeightMode: Text.FixedHeight

-    color: AmneziaStyle.color.white
+    color: "#D7D8DB"
    font.pixelSize: 16
    font.weight: 600
    font.family: "PT Root UI VF"
--- a/client/ui/qml/Controls2/TextTypes/CaptionTextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/CaptionTextType.qml
@@ -1,12 +1,10 @@
 import QtQuick

-import Style 1.0
-
 Text {
    lineHeight: 16 + LanguageModel.getLineHeightAppend()
    lineHeightMode: Text.FixedHeight

-    color: AmneziaStyle.color.black
+    color: "#0E0E11"
    font.pixelSize: 13
    font.weight: 400
    font.family: "PT Root UI VF"
--- a/client/ui/qml/Controls2/TextTypes/Header1TextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/Header1TextType.qml
@@ -1,16 +1,14 @@
 import QtQuick

-import Style 1.0
-
 Text {
    lineHeight: 38 + LanguageModel.getLineHeightAppend()
    lineHeightMode: Text.FixedHeight

-    color: AmneziaStyle.color.white
-    font.pixelSize: 32
+    color: "#D7D8DB"
+    font.pixelSize: 36
    font.weight: 700
    font.family: "PT Root UI VF"
-    font.letterSpacing: -1.0
+    font.letterSpacing: -1.08

    wrapMode: Text.WordWrap
 }
--- a/client/ui/qml/Controls2/TextTypes/Header2TextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/Header2TextType.qml
@@ -1,12 +1,10 @@
 import QtQuick

-import Style 1.0
-
 Text {
    lineHeight: 30 + LanguageModel.getLineHeightAppend()
    lineHeightMode: Text.FixedHeight

-    color: AmneziaStyle.color.white
+    color: "#D7D8DB"
    font.pixelSize: 25
    font.weight: 700
    font.family: "PT Root UI VF"
--- a/client/ui/qml/Controls2/TextTypes/LabelTextType.qml
+++ b/client/ui/qml/Controls2/TextTypes/LabelTextType.qml
@@ -1,12 +1,10 @@
 import QtQuick

-import Style 1.0
-
 Text {
    lineHeight: 16 + LanguageModel.getLineHeightAppend()
    lineHeightMode: Text.FixedHeight

-    color: AmneziaStyle.color.grey
+    color: "#878B91"
    font.pixelSize: 13
    font.weight: 400
    font.family: "PT Root UI VF"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
lunardunno	407350a4b4	deleting comments	2024-06-26 00:16:45 +04:00
lunardunno	c98faf3603	fix_for_setup_host_firewall.sh Correction of the script to avoid problems with an unstable connection when installing a container.	2024-06-25 07:55:19 +04:00