change wmic to powershell

Fix calling paste from clipboard when launching app on android

.github/workflows/deploy.yml

@@ -65,6 +65,13 @@ 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:

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.6.0.1
+project(${PROJECT} VERSION 4.6.1.0
         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 54)
+set(APP_ANDROID_VERSION_CODE 56)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     set(MZ_PLATFORM_NAME "linux")

README.md

@@ -6,6 +6,26 @@
 
 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.
@@ -16,10 +36,12 @@ 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://amnezia.org](https://amnezia.org) - project website  
-[https://www.reddit.com/r/AmneziaVPN](https://www.reddit.com/r/AmneziaVPN) - Reddit  
+- [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_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)  
+- [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)  
 
 ## Tech
 
@@ -44,6 +66,19 @@ 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. 
@@ -52,7 +87,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.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:
+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:
    - MacOS
    - iOS
    - Qt 5 Compatibility Module
@@ -119,9 +154,11 @@ The Android app has the following requirements:
 * Android platform SDK 33
 * CMake 3.25.0
 
-After you have installed QT, QT Creator, and Android Studio, you need to configure QT Creator correctly. Click in the top menu bar on `QT Creator` -> `Preferences` -> `Devices` and select the tab `Android`. 
+After you have installed QT, QT Creator, and Android Studio, you need to configure QT Creator correctly.
-    * set path to JDK 11
+
-    * set path to Android SDK ($ANDROID_HOME)
+- Click in the top menu bar on `QT Creator` -> `Preferences` -> `Devices` and select the tab `Android`.
+- Set path to JDK 11
+- Set path to Android SDK (`$ANDROID_HOME`)
 
 In case you get errors regarding missing SDK or 'SDK manager not running', you cannot fix them by correcting the paths. If you have some spare GBs on your disk, you can let QT Creator install all requirements by choosing an empty folder for `Android SDK location` and clicking on `Set Up SDK`. Be aware: This will install a second Android SDK and NDK on your machine! 
 Double-check that the right CMake version is configured:  Click on `QT Creator` -> `Preferences` and click on the side menu on `Kits`. Under the center content view's `Kits` tab, you'll find an entry for `CMake Tool`. If the default selected CMake version is lower than 3.25.0, install on your system CMake >= 3.25.0 and choose `System CMake at <path>` from the drop-down list. If this entry is missing, you either have not installed CMake yet or QT Creator hasn't found the path to it. In that case, click in the preferences window on the side menu item `CMake`, then on the tab `Tools` in the center content view, and finally on the button `Add` to set the path to your installed CMake. 
@@ -142,10 +179,11 @@ GPL v3.0
 
 ## Donate
 
-Bitcoin: bc1qn9rhsffuxwnhcuuu4qzrwp4upkrq94xnh8r26u  
+Patreon: [https://www.patreon.com/amneziavpn](https://www.patreon.com/amneziavpn)
+
+USDT BEP20: 0x6abD576765a826f87D1D95183438f9408C901bE4 <br>
+USDT TRC20: TELAitazF1MZGmiNjTcnxDjEiH5oe7LC9d <br>
 XMR: 48spms39jt1L2L5vyw2RQW6CXD6odUd4jFu19GZcDyKKQV9U88wsJVjSbL4CfRys37jVMdoaWVPSvezCQPhHXUW5UKLqUp3  
-payeer.com: P2561305  
-ko-fi.com: [https://ko-fi.com/amnezia_vpn](https://ko-fi.com/amnezia_vpn)  
 
 ## Acknowledgments
 

client/amnezia_application.cpp

@@ -157,16 +157,19 @@ 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));
 
+    bool enabled = m_settings->isSaveLogs();
 #ifndef Q_OS_ANDROID
-    if (m_settings->isSaveLogs()) {
+    if (enabled) {
         if (!Logger::init()) {
             qWarning() << "Initialization of debug subsystem failed";
         }
     }
 #endif
+    Logger::setServiceLogsEnabled(enabled);
 
 #ifdef Q_OS_WIN
     if (m_parser.isSet("a"))

client/android/AndroidManifest.xml

@@ -11,6 +11,9 @@
     <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. -->
@@ -31,9 +34,11 @@
         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
@@ -47,6 +52,7 @@
             <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>

client/android/res/mipmap-anydpi-v26/ic_banner.xml

@@ -0,0 +1,5 @@
+<?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>

client/android/res/values/ic_banner_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_banner_background">#1E1E1F</color>
+</resources>

client/android/src/org/amnezia/vpn/AmneziaActivity.kt

@@ -1,6 +1,7 @@
 package org.amnezia.vpn
 
 import android.Manifest
+import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.app.NotificationManager
 import android.content.BroadcastReceiver
@@ -230,7 +231,10 @@ class AmneziaActivity : QtActivity() {
     override fun onStop() {
         Log.d(TAG, "Stop Amnezia activity")
         doUnbindService()
+        mainScope.launch {
+            qtInitialized.await()
             QtAndroidController.onServiceDisconnected()
+        }
         super.onStop()
     }
 
@@ -384,7 +388,8 @@ class AmneziaActivity : QtActivity() {
         getVpnProto(vpnConfig)?.let { proto ->
             Log.d(TAG, "Proto from config: $proto, current proto: $vpnProto")
             if (isServiceConnected) {
-                if (proto == vpnProto) {
+                if (proto.serviceClass == vpnProto?.serviceClass) {
+                    vpnProto = proto
                     connectToVpn(vpnConfig)
                     return
                 }
@@ -541,7 +546,7 @@ class AmneziaActivity : QtActivity() {
                 }
             }.also {
                 startActivityForResult(it, OPEN_FILE_ACTION_CODE, ActivityResultHandler(
-                    onSuccess = {
+                    onAny = {
                         val uri = it?.data?.toString() ?: ""
                         Log.d(TAG, "Open file: $uri")
                         mainScope.launch {
@@ -555,8 +560,12 @@ 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")

client/android/src/org/amnezia/vpn/VpnProto.kt

@@ -49,7 +49,15 @@ enum class VpnProto(
         "org.amnezia.vpn:amneziaXrayService",
         XrayService::class.java
     ) {
-        override fun createProtocol(): Protocol = Xray()
+        override fun createProtocol(): Protocol = Xray.instance
+    },
+
+    SSXRAY(
+        "SSXRay",
+        "org.amnezia.vpn:amneziaXrayService",
+        XrayService::class.java
+    ) {
+        override fun createProtocol(): Protocol = Xray.instance
     };
 
     private var _protocol: Protocol? = null

client/android/utils/src/main/kotlin/net/NetworkState.kt

@@ -88,18 +88,26 @@ 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 {
                     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)
-                    connectivityManager.requestNetwork(networkRequest, networkCallback, handler)
+                        continue
                     } else {
                         throw e
                     }
                 }
+            }
         } else {
             connectivityManager.requestNetwork(networkRequest, networkCallback)
         }

client/android/xray/src/main/kotlin/Xray.kt

@@ -5,6 +5,7 @@ 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
@@ -114,17 +115,14 @@ class Xray : Protocol() {
             return
         }
 
-        val xrayJsonConfig = config.getJSONObject("xray_config_data")
+        val xrayJsonConfig = config.optJSONObject("xray_config_data")
+            ?: config.optJSONObject("ssxray_config_data")
+            ?: throw BadConfigException("config_data not found")
         val xrayConfig = parseConfig(config, xrayJsonConfig)
 
-        // for debug
+        (xrayJsonConfig.optJSONObject("log") ?: JSONObject().also { xrayJsonConfig.put("log", it) })
-        // xrayJsonConfig.getJSONObject("log").put("loglevel", "debug")
+            .put("loglevel", "warning")
-        xrayJsonConfig.getJSONObject("log").put("loglevel", "warning")
+            .put("access", "none") // disable access log
-        // 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
@@ -228,6 +226,10 @@ 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) {

client/configurators/openvpn_configurator.cpp

@@ -119,18 +119,21 @@ 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) {
-#ifndef Q_OS_ANDROID
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
             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");
         }
     }

client/containers/containers_defs.cpp

@@ -90,13 +90,13 @@ QMap<DockerContainer, QString> ContainerProps::containerHumanNames()
 {
     return { { DockerContainer::None, "Not installed" },
              { DockerContainer::OpenVpn, "OpenVPN" },
-             { DockerContainer::ShadowSocks, "ShadowSocks" },
+             { DockerContainer::ShadowSocks, "OpenVPN over SS" },
              { 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") },
@@ -286,8 +286,8 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
     case DockerContainer::OpenVpn: return true;
     case DockerContainer::Awg: return true;
     case DockerContainer::Xray: return true;
-    case DockerContainer::Cloak:
+    case DockerContainer::Cloak: return true;
-        return true;
+    case DockerContainer::SSXray: return true;
         //    case DockerContainer::ShadowSocks: return true;
     default: return false;
     }
@@ -306,6 +306,7 @@ 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;
     }
 

client/ios/networkextension/CMakeLists.txt

@@ -91,6 +91,7 @@ target_sources(networkextension PRIVATE
     ${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
 )
 

client/logger.cpp

@@ -33,6 +33,10 @@ 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;
     }
@@ -95,6 +99,29 @@ void Logger::deInit()
     m_file.close();
 }
 
+bool Logger::setServiceLogsEnabled(bool enabled) {
+#ifdef AMNEZIA_DESKTOP
+    IpcClient *m_IpcClient = new IpcClient;
+
+    if (!m_IpcClient->isSocketConnected()) {
+        if (!IpcClient::init(m_IpcClient)) {
+            qWarning() << "Error occurred when init IPC client";
+            return false;
+        }
+    }
+
+    if (m_IpcClient->Interface()) {
+        m_IpcClient->Interface()->setLogsEnabled(enabled);
+    }
+    else {
+        qWarning() << "Error occurred setting up service logs";
+        return false;
+    }
+#endif
+
+    return true;
+}
+
 QString Logger::userLogsDir()
 {
     return QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/log";
@@ -137,7 +164,9 @@ bool Logger::openLogsFolder()
 bool Logger::openServiceLogsFolder()
 {
     QString path = Utils::systemLogPath();
+#ifdef Q_OS_WIN
     path = "file:///" + path;
+#endif
     QDesktopServices::openUrl(QUrl::fromLocalFile(path));
     return true;
 }
@@ -180,8 +209,7 @@ void Logger::clearServiceLogs()
     }
 
     if (m_IpcClient->Interface()) {
-        m_IpcClient->Interface()->setLogsEnabled(false);
+        m_IpcClient->Interface()->clearLogs();
-        m_IpcClient->Interface()->cleanUp();
     }
     else {
         qWarning() << "Error occurred cleaning up service logs";

client/logger.h

@@ -26,6 +26,7 @@ public:
 
     static bool init();
     static void deInit();
+    static bool setServiceLogsEnabled(bool enabled);
     static bool openLogsFolder();
     static bool openServiceLogsFolder();
     static QString appLogFileNamePath();

client/platforms/android/android_controller.cpp

@@ -179,6 +179,11 @@ bool AndroidController::isCameraPresent()
     return callActivityMethod<jboolean>("isCameraPresent", "()Z");
 }
 
+bool AndroidController::isOnTv()
+{
+    return callActivityMethod<jboolean>("isOnTv", "()Z");
+}
+
 void AndroidController::startQrReaderActivity()
 {
     callActivityMethod("startQrCodeReader", "()V");

client/platforms/android/android_controller.h

@@ -35,6 +35,7 @@ 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);

client/platforms/ios/PacketTunnelProvider+Xray.swift

@@ -4,6 +4,7 @@ import WireGuardKitGo
 
 enum XrayErrors: Error {
     case noXrayConfig
+    case xrayConfigIsWrong
     case cantSaveXrayConfig
     case cantParseListenAndPort
     case cantSaveHevSocksConfig
@@ -26,14 +27,14 @@ extension PacketTunnelProvider {
         // Xray configuration
         guard let protocolConfiguration = self.protocolConfiguration as? NETunnelProviderProtocol,
               let providerConfiguration = protocolConfiguration.providerConfiguration,
-              let xrayConfigData = providerConfiguration[Constants.xrayConfigKey] as? Data else {
+              let configData = providerConfiguration[Constants.xrayConfigKey] as? Data else {
             xrayLog(.error, message: "Can't get xray configuration")
             completionHandler(XrayErrors.noXrayConfig)
             return
         }
 
         // Tunnel settings
-        let ipv6Enabled = true
+        let ipv6Enabled = false
         let hideVPNIcon = false
 
         let settings = NEPacketTunnelNetworkSettings(tunnelRemoteAddress: "254.1.1.1")
@@ -57,12 +58,29 @@ extension PacketTunnelProvider {
             return settings
         }()
 
-        let dns = ["8.8.4.4","1.1.1.1"]
-        settings.dnsSettings = NEDNSSettings(servers: dns)
-
         do {
-            let port = 10808
+            let xrayConfig = try JSONDecoder().decode(XrayConfig.self,
-            let address = "::1"
+                                                      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]
@@ -73,6 +91,9 @@ extension PacketTunnelProvider {
                 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

client/platforms/ios/XrayConfig.swift

@@ -0,0 +1,7 @@
+import Foundation
+
+struct XrayConfig: Decodable {
+    let dns1: String?
+    let dns2: String?
+    let config: String
+}

client/platforms/ios/ios_controller.h

@@ -73,6 +73,7 @@ private:
     bool setupWireGuard();
     bool setupAwg();
     bool setupXray();
+    bool setupSSXray();
 
     bool startOpenVPN(const QString &config);
     bool startWireGuard(const QString &jsonConfig);

client/platforms/ios/ios_controller.mm

@@ -219,6 +219,9 @@ bool IosController::connectVpn(amnezia::Proto proto, const QJsonObject& configur
     if (proto == amnezia::Proto::Xray) {
         return setupXray();
     }
+    if (proto == amnezia::Proto::SSXray) {
+        return setupSSXray();
+    }
 
     return false;
 }
@@ -508,9 +511,36 @@ 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));
 
-    return startXray(xrayConfigStr);
+    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()

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.at(0).toString() == "0.0.0.0/0"){
+            if (config.m_allowedIPAddressRanges.contains(IPAddress("0.0.0.0/0"))) {
                 params.blockAll = true;
                 if (config.m_excludedAddresses.size()) {
                     params.allowNets = true;

client/platforms/macos/daemon/wireguardutilsmacos.cpp

@@ -137,7 +137,8 @@ bool WireguardUtilsMacos::addInterface(const InterfaceConfig& config) {
       if (config.m_killSwitchEnabled) {
         FirewallParams params { };
         params.dnsServers.append(config.m_dnsServer);
-        if (config.m_allowedIPAddressRanges.at(0).toString() == "0.0.0.0/0"){
+
+        if (config.m_allowedIPAddressRanges.contains(IPAddress("0.0.0.0/0"))) {
           params.blockAll = true;
           if (config.m_excludedAddresses.size()) {
             params.allowNets = true;

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" },

client/resources.qrc

@@ -11,16 +11,6 @@
         <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>
@@ -95,7 +85,6 @@
         <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>
@@ -239,6 +228,9 @@
         <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>

client/settings.cpp

@@ -226,6 +226,8 @@ void Settings::setSaveLogs(bool enabled)
         }
     }
 #endif
+    Logger::setServiceLogsEnabled(enabled);
+
     if (enabled) {
         setLogEnableDate(QDateTime::currentDateTime());
     }

client/ui/controllers/importController.cpp

@@ -240,9 +240,9 @@ void ImportController::processNativeWireGuardConfig()
         auto containerConfig = container.value(ContainerProps::containerTypeToString(DockerContainer::WireGuard)).toObject();
         auto protocolConfig = QJsonDocument::fromJson(containerConfig.value(config_key::last_config).toString().toUtf8()).object();
 
-        QString junkPacketCount = QString::number(QRandomGenerator::global()->bounded(3, 10));
+        QString junkPacketCount = QString::number(QRandomGenerator::global()->bounded(2, 5));
-        QString junkPacketMinSize = QString::number(50);
+        QString junkPacketMinSize = QString::number(10);
-        QString junkPacketMaxSize = QString::number(1000);
+        QString junkPacketMaxSize = QString::number(50);
         protocolConfig[config_key::junkPacketCount] = junkPacketCount;
         protocolConfig[config_key::junkPacketMinSize] = junkPacketMinSize;
         protocolConfig[config_key::junkPacketMaxSize] = junkPacketMaxSize;

client/ui/controllers/installController.cpp

@@ -85,9 +85,9 @@ void InstallController::install(DockerContainer container, int port, TransportPr
             containerConfig.insert(config_key::transport_proto, ProtocolProps::transportProtoToString(transportProto, protocol));
 
             if (container == DockerContainer::Awg) {
-                QString junkPacketCount = QString::number(QRandomGenerator::global()->bounded(3, 10));
+                QString junkPacketCount = QString::number(QRandomGenerator::global()->bounded(2, 5));
-                QString junkPacketMinSize = QString::number(50);
+                QString junkPacketMinSize = QString::number(10);
-                QString junkPacketMaxSize = QString::number(1000);
+                QString junkPacketMaxSize = QString::number(50);
 
                 int s1 = QRandomGenerator::global()->bounded(15, 150);
                 int s2 = QRandomGenerator::global()->bounded(15, 150);

client/ui/models/languageModel.cpp

@@ -92,9 +92,9 @@ int LanguageModel::getCurrentLanguageIndex()
 
 int LanguageModel::getLineHeightAppend()
 {
-    int langIndex = getCurrentLanguageIndex();
+    auto language = static_cast<LanguageSettings::AvailableLanguageEnum>(getCurrentLanguageIndex());
-    switch (langIndex) {
+    switch (language) {
-    case 5: return 10; break; // Burmese
+    case LanguageSettings::AvailableLanguageEnum::Burmese: return 10; break;
     default: return 0; break;
     }
 }

client/ui/qml/Components/ConnectButton.qml

@@ -6,13 +6,14 @@ import Qt5Compat.GraphicalEffects
 
 import ConnectionState 1.0
 import PageEnum 1.0
+import Style 1.0
 
 Button {
     id: root
 
-    property string defaultButtonColor: "#D7D8DB"
+    property string defaultButtonColor: AmneziaStyle.color.white
-    property string progressButtonColor: "#D7D8DB"
+    property string progressButtonColor: AmneziaStyle.color.white
-    property string connectedButtonColor: "#FBB26A"
+    property string connectedButtonColor: AmneziaStyle.color.orange
 
     implicitWidth: 190
     implicitHeight: 190
@@ -49,13 +50,13 @@ Button {
                 verticalOffset: 0
                 radius: 10
                 samples: 25
-                color: root.activeFocus ? "#D7D8DB" : "#FBB26A"
+                color: root.activeFocus ? AmneziaStyle.color.white : AmneziaStyle.color.orange
                 source: backgroundCircle
             }
 
             ShapePath {
-                fillColor: "transparent"
+                fillColor: AmneziaStyle.color.transparent
-                strokeColor: "#D7D8DB"
+                strokeColor: AmneziaStyle.color.white
                 strokeWidth: root.activeFocus ? 1 : 0
                 capStyle: ShapePath.RoundCap
 
@@ -70,10 +71,10 @@ Button {
             }
 
             ShapePath {
-                fillColor: "transparent"
+                fillColor: AmneziaStyle.color.transparent
                 strokeColor: {
                     if (ConnectionController.isConnectionInProgress) {
-                        return "#261E1A"
+                        return AmneziaStyle.color.connectionInProgress
                     } else if (ConnectionController.isConnected) {
                         return connectedButtonColor
                     } else {
@@ -113,8 +114,8 @@ Button {
             visible: ConnectionController.isConnectionInProgress
 
             ShapePath {
-                fillColor: "transparent"
+                fillColor: AmneziaStyle.color.transparent
-                strokeColor: "#D7D8DB"
+                strokeColor: AmneziaStyle.color.white
                 strokeWidth: 3
                 capStyle: ShapePath.RoundCap
 

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.7
+    expandedHeight: parent.height * 0.9
 
     expandedContent: ColumnLayout {
         id: content

client/ui/qml/Components/InstalledAppsDrawer.qml

@@ -8,6 +8,7 @@ import "../Controls2/TextTypes"
 import SortFilterProxyModel 0.2
 
 import InstalledAppsModel 1.0
+import Style 1.0
 
 DrawerType2 {
     id: root
@@ -133,7 +134,7 @@ DrawerType2 {
             anchors.rightMargin: 16
             anchors.leftMargin: 16
 
-            backgroundColor: "#2C2D30"
+            backgroundColor: AmneziaStyle.color.greyDark
 
             textFieldPlaceholderText: qsTr("application name")
         }

client/ui/qml/Components/QuestionDrawer.qml

@@ -2,6 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import Style 1.0
+
 import "../Controls2"
 import "../Controls2/TextTypes"
 
@@ -86,11 +88,11 @@ DrawerType2 {
             Layout.rightMargin: 16
             Layout.leftMargin: 16
 
-            defaultColor: "transparent"
+            defaultColor: AmneziaStyle.color.transparent
-            hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+            hoveredColor: AmneziaStyle.color.blackHovered
-            pressedColor: Qt.rgba(1, 1, 1, 0.12)
+            pressedColor: AmneziaStyle.color.blackPressed
-            disabledColor: "#878B91"
+            disabledColor: AmneziaStyle.color.grey
-            textColor: "#D7D8DB"
+            textColor: AmneziaStyle.color.white
             borderWidth: 1
 
             text: noButtonText

client/ui/qml/Components/SelectLanguageDrawer.qml

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

client/ui/qml/Components/SettingsContainersListView.qml

@@ -93,20 +93,11 @@ 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: { // go to the settings page of the container with multiple protocols
+                        default: {
                             ProtocolsModel.updateModel(config)
                             PageController.goToPage(PageEnum.PageSettingsServerProtocol)
                         }

client/ui/qml/Components/ShareConnectionDrawer.qml

@@ -9,6 +9,7 @@ import SortFilterProxyModel 0.2
 
 import PageEnum 1.0
 import ContainerProps 1.0
+import Style 1.0
 
 import "./"
 import "../Controls2"
@@ -111,11 +112,11 @@ DrawerType2 {
                     Layout.fillWidth: true
                     Layout.topMargin: 8
 
-                    defaultColor: "transparent"
+                    defaultColor: AmneziaStyle.color.transparent
-                    hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                    hoveredColor: AmneziaStyle.color.blackHovered
-                    pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                    pressedColor: AmneziaStyle.color.blackPressed
-                    disabledColor: "#878B91"
+                    disabledColor: AmneziaStyle.color.grey
-                    textColor: "#D7D8DB"
+                    textColor: AmneziaStyle.color.white
                     borderWidth: 1
 
                     text: qsTr("Copy")
@@ -134,11 +135,11 @@ DrawerType2 {
 
                     visible: false
 
-                    defaultColor: "transparent"
+                    defaultColor: AmneziaStyle.color.transparent
-                    hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                    hoveredColor: AmneziaStyle.color.blackHovered
-                    pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                    pressedColor: AmneziaStyle.color.blackPressed
-                    disabledColor: "#878B91"
+                    disabledColor: AmneziaStyle.color.grey
-                    textColor: "#D7D8DB"
+                    textColor: AmneziaStyle.color.white
                     borderWidth: 1
 
                     text: qsTr("Copy config string")
@@ -153,11 +154,11 @@ DrawerType2 {
                     Layout.fillWidth: true
                     Layout.topMargin: 24
 
-                    defaultColor: "transparent"
+                    defaultColor: AmneziaStyle.color.transparent
-                    hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                    hoveredColor: AmneziaStyle.color.blackHovered
-                    pressedColor: Qt.rgba(1, 1, 1, 0.12)
+                    pressedColor: AmneziaStyle.color.blackPressed
-                    disabledColor: "#878B91"
+                    disabledColor: AmneziaStyle.color.grey
-                    textColor: "#D7D8DB"
+                    textColor: AmneziaStyle.color.white
                     borderWidth: 1
 
                     text: qsTr("Show connection settings")
@@ -281,9 +282,9 @@ DrawerType2 {
                                     readOnly: true
                                     activeFocusOnTab: false
 
-                                    color: "#D7D8DB"
+                                    color: AmneziaStyle.color.white
-                                    selectionColor:  "#633303"
+                                    selectionColor:  AmneziaStyle.color.brown
-                                    selectedTextColor: "#D7D8DB"
+                                    selectedTextColor: AmneziaStyle.color.white
 
                                     font.pixelSize: 16
                                     font.weight: Font.Medium
@@ -294,7 +295,7 @@ DrawerType2 {
                                     wrapMode: Text.Wrap
 
                                     background: Rectangle {
-                                        color: "transparent"
+                                        color: AmneziaStyle.color.transparent
                                     }
                                 }
                             }

client/ui/qml/Components/TransportProtoSelector.qml

@@ -2,6 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import Style 1.0
+
 import "../Controls2"
 import "../Controls2/TextTypes"
 
@@ -14,7 +16,7 @@ Rectangle {
     implicitWidth: transportProtoButtonGroup.implicitWidth
     implicitHeight: transportProtoButtonGroup.implicitHeight
 
-    color: "#1C1D21"
+    color: AmneziaStyle.color.blackLight
     radius: 16
 
     onFocusChanged: {

client/ui/qml/Controls2/BackButtonType.qml

@@ -2,6 +2,8 @@ import QtQuick
 import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 
+import Style 1.0
+
 Item {
     id: root
 
@@ -28,7 +30,7 @@ Item {
         ImageButtonType {
             id: backButton
             image: backButtonImage
-            imageColor: "#D7D8DB"
+            imageColor: AmneziaStyle.color.white
 
             implicitWidth: 40
             implicitHeight: 40
@@ -46,7 +48,7 @@ Item {
             id: background
             Layout.fillWidth: true
 
-            color: "transparent"
+            color: AmneziaStyle.color.transparent
         }
     }
 

client/ui/qml/Controls2/BasicButtonType.qml

@@ -3,20 +3,22 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 
+import Style 1.0
+
 import "TextTypes"
 
 Button {
     id: root
 
-    property string hoveredColor: "#C1C2C5"
+    property string hoveredColor: AmneziaStyle.color.whiteHovered
-    property string defaultColor: "#D7D8DB"
+    property string defaultColor: AmneziaStyle.color.white
-    property string disabledColor: "#494B50"
+    property string disabledColor: AmneziaStyle.color.greyDisabled
-    property string pressedColor: "#979799"
+    property string pressedColor: AmneziaStyle.color.grey
 
-    property string textColor: "#0E0E11"
+    property string textColor: AmneziaStyle.color.black
 
-    property string borderColor: "#D7D8DB"
+    property string borderColor: AmneziaStyle.color.white
-    property string borderFocusedColor: "#D7D8DB"
+    property string borderFocusedColor: AmneziaStyle.color.white
     property int borderWidth: 0
     property int borderFocusedWidth: 1
 
@@ -30,6 +32,8 @@ Button {
 
     property var clickedFunc
 
+    property alias buttonTextLabel: buttonText
+
     implicitHeight: 56
 
     hoverEnabled: true
@@ -46,8 +50,8 @@ Button {
     background: Rectangle {
         id: focusBorder
 
-        color: "transparent"
+        color: AmneziaStyle.color.transparent
-        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
+        border.color: root.activeFocus ? root.borderFocusedColor : AmneziaStyle.color.transparent
         border.width: root.activeFocus ? root.borderFocusedWidth : 0
 
         anchors.fill: parent
@@ -138,6 +142,8 @@ Button {
             }
 
             ButtonTextType {
+                id: buttonText
+
                 color: textColor
                 text: root.text
                 visible: root.text === "" ? false : true

client/ui/qml/Controls2/BusyIndicatorType.qml

@@ -2,6 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Shapes
 
+import Style 1.0
+
 Popup {
     id: root
     anchors.centerIn: parent
@@ -16,7 +18,7 @@ Popup {
     }
 
     background: Rectangle {
-        color: "transparent"
+        color: AmneziaStyle.color.transparent
     }
 
     BusyIndicator {
@@ -40,8 +42,8 @@ Popup {
                 layer.samples: 4
 
                 ShapePath {
-                    fillColor: "transparent"
+                    fillColor: AmneziaStyle.color.transparent
-                    strokeColor: "#787878"
+                    strokeColor: AmneziaStyle.color.greyDisabled
                     strokeWidth: 3
                     capStyle: ShapePath.RoundCap
 

client/ui/qml/Controls2/CardType.qml

@@ -2,6 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import Style 1.0
+
 RadioButton {
     id: root
 
@@ -9,17 +11,17 @@ RadioButton {
     property string bodyText
     property string footerText
 
-    property string hoveredColor: Qt.rgba(1, 1, 1, 0.05)
+    property string hoveredColor: AmneziaStyle.color.blackHovered
-    property string defaultColor: Qt.rgba(1, 1, 1, 0)
+    property string defaultColor: AmneziaStyle.color.transparent
-    property string disabledColor: Qt.rgba(1, 1, 1, 0)
+    property string disabledColor: AmneziaStyle.color.transparent
-    property string pressedColor: Qt.rgba(1, 1, 1, 0.05)
+    property string pressedColor: AmneziaStyle.color.blackPressed
-    property string selectedColor: Qt.rgba(1, 1, 1, 0)
+    property string selectedColor: AmneziaStyle.color.transparent
 
-    property string textColor: "#0E0E11"
+    property string textColor: AmneziaStyle.color.black
 
     property string pressedBorderColor: Qt.rgba(251/255, 178/255, 106/255, 0.3)
-    property string selectedBorderColor: "#FBB26A"
+    property string selectedBorderColor: AmneziaStyle.color.orange
-    property string defaultBodredColor: "transparent"
+    property string defaultBodredColor: AmneziaStyle.color.transparent
     property int borderWidth: 0
 
     implicitWidth: content.implicitWidth
@@ -82,7 +84,7 @@ RadioButton {
         Text {
             text: root.headerText
             wrapMode: Text.WordWrap
-            color: "#D7D8DB"
+            color: AmneziaStyle.color.white
             font.pixelSize: 25
             font.weight: 700
             font.family: "PT Root UI VF"
@@ -97,7 +99,7 @@ RadioButton {
         Text {
             text: root.bodyText
             wrapMode: Text.WordWrap
-            color: "#D7D8DB"
+            color: AmneziaStyle.color.white
             font.pixelSize: 16
             font.weight: 400
             font.family: "PT Root UI VF"
@@ -113,7 +115,7 @@ RadioButton {
             text: root.footerText
             wrapMode: Text.WordWrap
             visible: root.footerText !== ""
-            color: "#878B91"
+            color: AmneziaStyle.color.grey
             font.pixelSize: 13
             font.weight: 400
             font.family: "PT Root UI VF"

client/ui/qml/Controls2/CheckBoxType.qml

@@ -3,32 +3,34 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 
+import Style 1.0
+
 import "TextTypes"
 
 CheckBox {
     id: root
 
     property string descriptionText
-    property string descriptionTextColor: "#878B91"
+    property string descriptionTextColor: AmneziaStyle.color.grey
-    property string descriptionTextDisabledColor: "#494B50"
+    property string descriptionTextDisabledColor: AmneziaStyle.color.greyDisabled
 
-    property string textColor:  "#D7D8DB"
+    property string textColor: AmneziaStyle.color.white
-    property string textDisabledColor: "#878B91"
+    property string textDisabledColor: AmneziaStyle.color.grey
 
-    property string hoveredColor: Qt.rgba(1, 1, 1, 0.05)
+    property string hoveredColor: AmneziaStyle.color.blackHovered
-    property string defaultColor: "transparent"
+    property string defaultColor: AmneziaStyle.color.transparent
-    property string pressedColor: Qt.rgba(1, 1, 1, 0.05)
+    property string pressedColor: AmneziaStyle.color.blackPressed
 
-    property string defaultBorderColor: "#D7D8DB"
+    property string defaultBorderColor: AmneziaStyle.color.white
-    property string checkedBorderColor: "#FBB26A"
+    property string checkedBorderColor: AmneziaStyle.color.orange
-    property string checkedBorderDisabledColor: "#402102"
+    property string checkedBorderDisabledColor: AmneziaStyle.color.brownDark
 
-    property string borderFocusedColor: "#D7D8DB"
+    property string borderFocusedColor: AmneziaStyle.color.white
 
-    property string checkedImageColor: "#FBB26A"
+    property string checkedImageColor: AmneziaStyle.color.orange
-    property string pressedImageColor: "#A85809"
+    property string pressedImageColor: AmneziaStyle.color.orangeDark
-    property string defaultImageColor: "transparent"
+    property string defaultImageColor: AmneziaStyle.color.transparent
-    property string checkedDisabledImageColor: "#84603D"
+    property string checkedDisabledImageColor: AmneziaStyle.color.brownLight
 
     property string imageSource: "qrc:/images/controls/check.svg"
 
@@ -45,8 +47,8 @@ CheckBox {
     focusPolicy: Qt.NoFocus
 
     background: Rectangle {
-        color: "transparent"
+        color: AmneziaStyle.color.transparent
-        border.color: root.focus ? borderFocusedColor : "transparent"
+        border.color: root.focus ? borderFocusedColor : AmneziaStyle.color.transparent
         border.width: 1
         radius: 16
     }
@@ -77,7 +79,7 @@ CheckBox {
             anchors.centerIn: parent
             width: 24
             height: 24
-            color: "transparent"
+            color: AmneziaStyle.color.transparent
             border.color: root.checked ?
                               (root.enabled ?
                                    checkedBorderColor :

client/ui/qml/Controls2/ContextMenuType.qml

@@ -20,7 +20,8 @@ Menu {
     MenuItem {
         text: qsTr("&Paste")
         shortcut: StandardKey.Paste
-        enabled: textObj.canPaste
+        // Fix calling paste from clipboard when launching app on android
+        enabled: Qt.platform.os === "android" ? true : textObj.canPaste
         onTriggered: textObj.paste()
     }
 

client/ui/qml/Controls2/DividerType.qml

@@ -1,6 +1,8 @@
 import QtQuick
 import QtQuick.Layouts
 
+import Style 1.0
+
 Rectangle {
     Layout.fillWidth: true
 
@@ -8,5 +10,5 @@ Rectangle {
     Layout.rightMargin: 16
 
     height: 1
-    color: "#2C2D30"
+    color: AmneziaStyle.color.greyDark
 }

client/ui/qml/Controls2/DrawerType2.qml

@@ -2,6 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import Style 1.0
+
 import "TextTypes"
 
 Item {
@@ -19,8 +21,8 @@ Item {
     property Component collapsedContent
     property Component expandedContent
 
-    property string defaultColor: "#1C1D21"
+    property string defaultColor: AmneziaStyle.color.blackLight
-    property string borderColor: "#2C2D30"
+    property string borderColor: AmneziaStyle.color.greyDark
 
     property real expandedHeight
     property real collapsedHeight: 0
@@ -90,7 +92,7 @@ Item {
         id: background
 
         anchors.fill: parent
-        color: root.isCollapsed ? "transparent" : Qt.rgba(14/255, 14/255, 17/255, 0.8)
+        color: root.isCollapsed ? AmneziaStyle.color.transparent : Qt.rgba(14/255, 14/255, 17/255, 0.8)
 
         Behavior on color {
             PropertyAnimation { duration: 200 }

client/ui/qml/Controls2/DropDownType.qml

@@ -2,6 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import Style 1.0
+
 import "TextTypes"
 import "../Config"
 
@@ -9,31 +11,31 @@ Item {
     id: root
 
     property string text
-    property string textColor: "#d7d8db"
+    property string textColor: AmneziaStyle.color.white
-    property string textDisabledColor: "#878B91"
+    property string textDisabledColor: AmneziaStyle.color.grey
     property int textMaximumLineCount: 2
     property int textElide: Qt.ElideRight
 
     property string descriptionText
-    property string descriptionTextColor: "#878B91"
+    property string descriptionTextColor: AmneziaStyle.color.grey
-    property string descriptionTextDisabledColor: "#494B50"
+    property string descriptionTextDisabledColor: AmneziaStyle.color.greyDisabled
 
     property string headerText
     property string headerBackButtonImage
 
     property var rootButtonClickedFunction
     property string rootButtonImage: "qrc:/images/controls/chevron-down.svg"
-    property string rootButtonImageColor: "#D7D8DB"
+    property string rootButtonImageColor: AmneziaStyle.color.white
-    property string rootButtonBackgroundColor: "#1C1D21"
+    property string rootButtonBackgroundColor: AmneziaStyle.color.blackLight
-    property string rootButtonBackgroundHoveredColor: "#1C1D21"
+    property string rootButtonBackgroundHoveredColor: AmneziaStyle.color.blackLight
-    property string rootButtonBackgroundPressedColor: "#1C1D21"
+    property string rootButtonBackgroundPressedColor: AmneziaStyle.color.blackLight
 
-    property string borderFocusedColor: "#D7D8DB"
+    property string borderFocusedColor: AmneziaStyle.color.white
     property int borderFocusedWidth: 1
 
-    property string rootButtonHoveredBorderColor: "#494B50"
+    property string rootButtonHoveredBorderColor: AmneziaStyle.color.greyDisabled
-    property string rootButtonDefaultBorderColor: "#2C2D30"
+    property string rootButtonDefaultBorderColor: AmneziaStyle.color.greyDark
-    property string rootButtonPressedBorderColor: "#D7D8DB"
+    property string rootButtonPressedBorderColor: AmneziaStyle.color.white
 
     property int rootButtonTextLeftMargins: 16
     property int rootButtonTextTopMargin: 16
@@ -75,8 +77,8 @@ Item {
     Rectangle {
         id: focusBorder
 
-        color: "transparent"
+        color: AmneziaStyle.color.transparent
-        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
+        border.color: root.activeFocus ? root.borderFocusedColor : AmneziaStyle.color.transparent
         border.width: root.activeFocus ? root.borderFocusedWidth : 0
         anchors.fill: rootButtonContent
         radius: 16
@@ -96,7 +98,7 @@ Item {
                     }
                     return root.hovered ? root.rootButtonBackgroundHoveredColor : root.rootButtonBackgroundColor
                 } else {
-                    return "transparent"
+                    return AmneziaStyle.color.transparent
                 }
             }
 

client/ui/qml/Controls2/Header2Type.qml

@@ -1,6 +1,8 @@
 import QtQuick
 import QtQuick.Layouts
 
+import Style 1.0
+
 import "TextTypes"
 
 Item {
@@ -37,7 +39,7 @@ Item {
                 implicitHeight: 40
 
                 image: root.actionButtonImage
-                imageColor: "#D7D8DB"
+                imageColor: AmneziaStyle.color.white
 
                 visible: image ? true : false
 
@@ -57,7 +59,7 @@ Item {
 
             text: root.descriptionText
 
-            color: "#878B91"
+            color: AmneziaStyle.color.grey
 
             visible: root.descriptionText !== ""
         }

client/ui/qml/Controls2/HeaderType.qml

@@ -1,6 +1,8 @@
 import QtQuick
 import QtQuick.Layouts
 
+import Style 1.0
+
 import "TextTypes"
 
 Item {
@@ -46,7 +48,7 @@ Item {
                 Layout.alignment: Qt.AlignRight
 
                 image: root.actionButtonImage
-                imageColor: "#D7D8DB"
+                imageColor: AmneziaStyle.color.white
 
                 visible: image ? true : false
 
@@ -66,7 +68,7 @@ Item {
 
             text: root.descriptionText
 
-            color: "#878B91"
+            color: AmneziaStyle.color.grey
 
             visible: root.descriptionText !== ""
         }

client/ui/qml/Controls2/HorizontalRadioButton.qml

@@ -2,24 +2,26 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import Style 1.0
+
 import "TextTypes"
 
 RadioButton {
     id: root
 
-    property string hoveredColor: Qt.rgba(1, 1, 1, 0.05)
+    property string hoveredColor: AmneziaStyle.color.blackHovered
-    property string defaultColor: Qt.rgba(1, 1, 1, 0)
+    property string defaultColor: AmneziaStyle.color.transparent
-    property string checkedColor: Qt.rgba(1, 1, 1, 0)
+    property string checkedColor: AmneziaStyle.color.transparent
-    property string disabledColor: "transparent"
+    property string disabledColor: AmneziaStyle.color.transparent
 
-    property string textColor:  "#D7D8DB"
+    property string textColor: AmneziaStyle.color.white
-    property string textDisabledColor: "#878B91"
+    property string textDisabledColor: AmneziaStyle.color.grey
 
-    property string pressedBorderColor: "#494B50"
+    property string pressedBorderColor: AmneziaStyle.color.greyDisabled
-    property string checkedBorderColor: "#FBB26A"
+    property string checkedBorderColor: AmneziaStyle.color.orange
-    property string defaultBodredColor: "transparent"
+    property string defaultBodredColor: AmneziaStyle.color.transparent
-    property string checkedDisabledBorderColor: "#84603D"
+    property string checkedDisabledBorderColor: AmneziaStyle.color.brownLight
-    property string borderFocusedColor: "#D7D8DB"
+    property string borderFocusedColor: AmneziaStyle.color.white
     property int borderWidth: 0
 
     implicitWidth: content.implicitWidth

client/ui/qml/Controls2/ImageButtonType.qml

@@ -2,23 +2,25 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import Style 1.0
+
 Button {
     id: root
 
     property string image
 
-    property string hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+    property string hoveredColor: AmneziaStyle.color.blackHovered
-    property string defaultColor: "transparent"
+    property string defaultColor: AmneziaStyle.color.transparent
-    property string pressedColor: Qt.rgba(1, 1, 1, 0.12)
+    property string pressedColor: AmneziaStyle.color.blackPressed
-    property string disableColor: "#2C2D30"
+    property string disableColor: AmneziaStyle.color.greyDark
 
-    property string imageColor: "#878B91"
+    property string imageColor: AmneziaStyle.color.grey
-    property string disableImageColor: "#2C2D30"
+    property string disableImageColor: AmneziaStyle.color.greyDark
 
     property alias backgroundColor: background.color
     property alias backgroundRadius: background.radius
 
-    property string borderFocusedColor: "#D7D8DB"
+    property string borderFocusedColor: AmneziaStyle.color.white
     property int borderFocusedWidth: 1
 
     hoverEnabled: true
@@ -46,7 +48,7 @@ Button {
         id: background
 
         anchors.fill: parent
-        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
+        border.color: root.activeFocus ? root.borderFocusedColor : AmneziaStyle.color.transparent
         border.width: root.activeFocus ? root.borderFocusedWidth : 0
 
         color: {

client/ui/qml/Controls2/LabelWithButtonType.qml

@@ -2,6 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import Style 1.0
+
 import "TextTypes"
 
 Item {
@@ -24,16 +26,16 @@ Item {
     property alias eyeButton: eyeImage
     property FlickableType parentFlickable
 
-    property string textColor: "#d7d8db"
+    property string textColor: AmneziaStyle.color.white
-    property string textDisabledColor: "#878B91"
+    property string textDisabledColor: AmneziaStyle.color.grey
-    property string descriptionColor: "#878B91"
+    property string descriptionColor: AmneziaStyle.color.grey
-    property string descriptionDisabledColor: "#494B50"
+    property string descriptionDisabledColor: AmneziaStyle.color.greyDisabled
     property real textOpacity: 1.0
 
-    property string borderFocusedColor: "#D7D8DB"
+    property string borderFocusedColor: AmneziaStyle.color.white
     property int borderFocusedWidth: 1
 
-    property string rightImageColor: "#d7d8db"
+    property string rightImageColor: AmneziaStyle.color.white
 
     property bool descriptionOnTop: false
     property bool hideDescription: true
@@ -117,7 +119,7 @@ Item {
             Layout.rightMargin: rightImageSource || !isLeftImageHoverEnabled ? 16 : 0
 
             radius: 12
-            color: "transparent"
+            color: AmneziaStyle.color.transparent
 
             Behavior on color {
                 PropertyAnimation { duration: 200 }
@@ -220,7 +222,7 @@ Item {
                 id: eyeImageBackground
                 anchors.fill: parent
                 radius: 12
-                color: "transparent"
+                color: AmneziaStyle.color.transparent
 
                 Behavior on color {
                     PropertyAnimation { duration: 200 }
@@ -257,7 +259,7 @@ Item {
                 id: rightImageBackground
                 anchors.fill: parent
                 radius: 12
-                color: "transparent"
+                color: AmneziaStyle.color.transparent
 
                 Behavior on color {
                     PropertyAnimation { duration: 200 }
@@ -274,9 +276,9 @@ Item {
     Rectangle {
         id: background
         anchors.fill: root
-        color: "transparent"
+        color: AmneziaStyle.color.transparent
 
-        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
+        border.color: root.activeFocus ? root.borderFocusedColor : AmneziaStyle.color.transparent
         border.width: root.activeFocus ? root.borderFocusedWidth : 0
 
 

client/ui/qml/Controls2/ListViewWithRadioButtonType.qml

@@ -2,6 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import Style 1.0
+
 import "TextTypes"
 
 ListView {
@@ -103,8 +105,8 @@ ListView {
                 indicator: Rectangle {
                     width: parent.width - 1
                     height: parent.height
-                    color: radioButton.hovered ? "#2C2D30" : "#1C1D21"
+                    color: radioButton.hovered ? AmneziaStyle.color.greyDark : AmneziaStyle.color.blackLight
-                    border.color: radioButton.focus ? "#D7D8DB" : "transparent"
+                    border.color: radioButton.focus ? AmneziaStyle.color.white : AmneziaStyle.color.transparent
                     border.width: radioButton.focus ? 1 : 0
 
                     Behavior on color {

client/ui/qml/Controls2/PopupType.qml

@@ -2,6 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import Style 1.0
+
 import "TextTypes"
 
 Popup {
@@ -82,11 +84,11 @@ Popup {
                 implicitHeight: 32
 
                 defaultColor: "white"
-                hoveredColor: "#C1C2C5"
+                hoveredColor: AmneziaStyle.color.whiteHovered
-                pressedColor: "#AEB0B7"
+                pressedColor: AmneziaStyle.color.whiteHovered
-                disabledColor: "#494B50"
+                disabledColor: AmneziaStyle.color.greyDisabled
 
-                textColor: "#0E0E11"
+                textColor: AmneziaStyle.color.black
                 borderWidth: 0
 
                 text: qsTr("Close")

client/ui/qml/Controls2/ProgressBarType.qml

@@ -2,20 +2,22 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import Style 1.0
+
 ProgressBar {
     id: root
 
     implicitHeight: 4
 
     background: Rectangle {
-        color: "#633303"
+        color: AmneziaStyle.color.brown
     }
 
     contentItem: Item {
         Rectangle {
             width: root.visualPosition * parent.width
             height: parent.height
-            color: "#FBB26A"
+            color: AmneziaStyle.color.orange
         }
     }
 }

client/ui/qml/Controls2/SwitcherType.qml

@@ -2,36 +2,38 @@ 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: "#878B91"
+    property string descriptionTextColor: AmneziaStyle.color.grey
-    property string descriptionTextDisabledColor: "#494B50"
+    property string descriptionTextDisabledColor: AmneziaStyle.color.greyDisabled
 
-    property string textColor:  "#D7D8DB"
+    property string textColor: AmneziaStyle.color.white
-    property string textDisabledColor: "#878B91"
+    property string textDisabledColor: AmneziaStyle.color.grey
 
-    property string checkedIndicatorColor: "#633303"
+    property string checkedIndicatorColor: AmneziaStyle.color.brown
-    property string defaultIndicatorColor: "transparent"
+    property string defaultIndicatorColor: AmneziaStyle.color.transparent
-    property string checkedDisabledIndicatorColor: "#402102"
+    property string checkedDisabledIndicatorColor: AmneziaStyle.color.brownDark
 
-    property string borderFocusedColor: "#D7D8DB"
+    property string borderFocusedColor: AmneziaStyle.color.white
     property int borderFocusedWidth: 1
 
-    property string checkedIndicatorBorderColor: "#633303"
+    property string checkedIndicatorBorderColor: AmneziaStyle.color.brown
-    property string defaultIndicatorBorderColor: "#494B50"
+    property string defaultIndicatorBorderColor: AmneziaStyle.color.greyDisabled
-    property string checkedDisabledIndicatorBorderColor: "#402102"
+    property string checkedDisabledIndicatorBorderColor: AmneziaStyle.color.brownDark
 
-    property string checkedInnerCircleColor: "#FBB26A"
+    property string checkedInnerCircleColor: AmneziaStyle.color.orange
-    property string defaultInnerCircleColor: "#D7D8DB"
+    property string defaultInnerCircleColor: AmneziaStyle.color.white
-    property string checkedDisabledInnerCircleColor: "#84603D"
+    property string checkedDisabledInnerCircleColor: AmneziaStyle.color.brownLight
-    property string defaultDisabledInnerCircleColor: "#494B50"
+    property string defaultDisabledInnerCircleColor: AmneziaStyle.color.greyDisabled
 
-    property string hoveredIndicatorBackgroundColor: Qt.rgba(1, 1, 1, 0.08)
+    property string hoveredIndicatorBackgroundColor: AmneziaStyle.color.blackHovered
-    property string defaultIndicatorBackgroundColor: "transparent"
+    property string defaultIndicatorBackgroundColor: AmneziaStyle.color.transparent
 
     hoverEnabled: enabled ? true : false
     focusPolicy: Qt.TabFocus
@@ -100,7 +102,8 @@ Switch {
     contentItem: ColumnLayout {
         id: content
 
-        anchors.verticalCenter: parent.verticalCenter
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
         anchors.left: parent.left
 
         ListItemTitleType {

client/ui/qml/Controls2/TabButtonType.qml

@@ -1,16 +1,18 @@
 import QtQuick
 import QtQuick.Controls
 
+import Style 1.0
+
 TabButton {
     id: root
 
-    property string hoveredColor: "#633303"
+    property string hoveredColor: AmneziaStyle.color.brown
-    property string defaultColor: "#2C2D30"
+    property string defaultColor: AmneziaStyle.color.greyDark
-    property string selectedColor: "#FBB26A"
+    property string selectedColor: AmneziaStyle.color.orange
 
-    property string textColor: "#D7D8DB"
+    property string textColor: AmneziaStyle.color.white
 
-    property string borderFocusedColor: "#D7D8DB"
+    property string borderFocusedColor: AmneziaStyle.color.white
     property int borderFocusedWidth: 1
 
     property bool isSelected: false
@@ -24,9 +26,9 @@ TabButton {
         id: background
 
         anchors.fill: parent
-        color: "transparent"
+        color: AmneziaStyle.color.transparent
 
-        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
+        border.color: root.activeFocus ? root.borderFocusedColor : AmneziaStyle.color.transparent
         border.width: root.activeFocus ? root.borderFocusedWidth : 0
 
         Rectangle {

client/ui/qml/Controls2/TabImageButtonType.qml

@@ -1,18 +1,20 @@
 import QtQuick
 import QtQuick.Controls
 
+import Style 1.0
+
 TabButton {
     id: root
 
-    property string hoveredColor: "#633303"
+    property string hoveredColor: AmneziaStyle.color.brown
-    property string defaultColor: "#D7D8DB"
+    property string defaultColor: AmneziaStyle.color.white
-    property string selectedColor: "#FBB26A"
+    property string selectedColor: AmneziaStyle.color.orange
 
     property string image
 
     property bool isSelected: false
 
-    property string borderFocusedColor: "#D7D8DB"
+    property string borderFocusedColor: AmneziaStyle.color.white
     property int borderFocusedWidth: 1
 
     property var clickedFunc
@@ -26,10 +28,10 @@ TabButton {
     background: Rectangle {
         id: background
         anchors.fill: parent
-        color: "transparent"
+        color: AmneziaStyle.color.transparent
         radius: 10
 
-        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
+        border.color: root.activeFocus ? root.borderFocusedColor : AmneziaStyle.color.transparent
         border.width: root.activeFocus ? root.borderFocusedWidth : 0
 
     }

client/ui/qml/Controls2/TextAreaType.qml

@@ -1,6 +1,8 @@
 import QtQuick
 import QtQuick.Controls
 
+import Style 1.0
+
 Rectangle {
     id: root
 
@@ -9,12 +11,12 @@ Rectangle {
     property alias textArea: textArea
     property alias textAreaText: textArea.text
 
-    property string borderHoveredColor: "#494B50"
+    property string borderHoveredColor: AmneziaStyle.color.greyDisabled
-    property string borderNormalColor: "#2C2D30"
+    property string borderNormalColor: AmneziaStyle.color.greyDark
-    property string borderFocusedColor: "#d7d8db"
+    property string borderFocusedColor: AmneziaStyle.color.white
 
     height: 148
-    color: "#1C1D21"
+    color: AmneziaStyle.color.blackLight
     border.width: 1
     border.color: getBorderColor(borderNormalColor)
     radius: 16
@@ -52,10 +54,10 @@ Rectangle {
                 anchors.topMargin: 16
                 anchors.bottomMargin: 16
 
-                color: "#D7D8DB"
+                color: AmneziaStyle.color.white
-                selectionColor:  "#633303"
+                selectionColor:  AmneziaStyle.color.brown
-                selectedTextColor: "#D7D8DB"
+                selectedTextColor: AmneziaStyle.color.white
-                placeholderTextColor: "#878B91"
+                placeholderTextColor: AmneziaStyle.color.grey
 
                 font.pixelSize: 16
                 font.weight: Font.Medium

client/ui/qml/Controls2/TextFieldWithHeaderType.qml

@@ -2,14 +2,16 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import Style 1.0
+
 import "TextTypes"
 
 Item {
     id: root
 
     property string headerText
-    property string headerTextDisabledColor: "#494B50"
+    property string headerTextDisabledColor: AmneziaStyle.color.greyDisabled
-    property string headerTextColor: "#878b91"
+    property string headerTextColor: AmneziaStyle.color.grey
 
     property alias errorText: errorField.text
     property bool checkEmptyText: false
@@ -21,18 +23,18 @@ Item {
 
     property alias textField: textField
     property alias textFieldText: textField.text
-    property string textFieldTextColor: "#d7d8db"
+    property string textFieldTextColor: AmneziaStyle.color.white
-    property string textFieldTextDisabledColor: "#878B91"
+    property string textFieldTextDisabledColor: AmneziaStyle.color.grey
 
     property string textFieldPlaceholderText
     property bool textFieldEditable: true
 
-    property string borderColor: "#2C2D30"
+    property string borderColor: AmneziaStyle.color.greyDark
-    property string borderFocusedColor: "#d7d8db"
+    property string borderFocusedColor: AmneziaStyle.color.white
 
-    property string backgroundColor: "#1c1d21"
+    property string backgroundColor: AmneziaStyle.color.blackLight
-    property string backgroundDisabledColor: "transparent"
+    property string backgroundDisabledColor: AmneziaStyle.color.transparent
-    property string bgBorderHoveredColor: "#494B50"
+    property string bgBorderHoveredColor: AmneziaStyle.color.greyDisabled
 
     implicitWidth: content.implicitWidth
     implicitHeight: content.implicitHeight
@@ -90,10 +92,10 @@ Item {
                         inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhSensitiveData | Qt.ImhNoPredictiveText
 
                         placeholderText: root.textFieldPlaceholderText
-                        placeholderTextColor: "#494B50"
+                        placeholderTextColor: AmneziaStyle.color.greyDisabled
 
-                        selectionColor:  "#633303"
+                        selectionColor:  AmneziaStyle.color.brown
-                        selectedTextColor: "#D7D8DB"
+                        selectedTextColor: AmneziaStyle.color.white
 
                         font.pixelSize: 16
                         font.weight: 400
@@ -147,7 +149,7 @@ Item {
 
             text: root.errorText
             visible: root.errorText !== ""
-            color: "#EB5757"
+            color: AmneziaStyle.color.red
         }
     }
 

client/ui/qml/Controls2/TextTypes/ButtonTextType.qml

@@ -1,10 +1,12 @@
 import QtQuick
 
+import Style 1.0
+
 Text {
     lineHeight: 24
     lineHeightMode: Text.FixedHeight
 
-    color: "#D7D8DB"
+    color: AmneziaStyle.color.white
     font.pixelSize: 16
     font.weight: 600
     font.family: "PT Root UI VF"

client/ui/qml/Controls2/TextTypes/CaptionTextType.qml

@@ -1,10 +1,12 @@
 import QtQuick
 
+import Style 1.0
+
 Text {
     lineHeight: 16 + LanguageModel.getLineHeightAppend()
     lineHeightMode: Text.FixedHeight
 
-    color: "#0E0E11"
+    color: AmneziaStyle.color.black
     font.pixelSize: 13
     font.weight: 400
     font.family: "PT Root UI VF"

client/ui/qml/Controls2/TextTypes/Header1TextType.qml

@@ -1,14 +1,16 @@
 import QtQuick
 
+import Style 1.0
+
 Text {
     lineHeight: 38 + LanguageModel.getLineHeightAppend()
     lineHeightMode: Text.FixedHeight
 
-    color: "#D7D8DB"
+    color: AmneziaStyle.color.white
-    font.pixelSize: 36
+    font.pixelSize: 32
     font.weight: 700
     font.family: "PT Root UI VF"
-    font.letterSpacing: -1.08
+    font.letterSpacing: -1.0
 
     wrapMode: Text.WordWrap
 }

client/ui/qml/Controls2/TextTypes/Header2TextType.qml

@@ -1,10 +1,12 @@
 import QtQuick
 
+import Style 1.0
+
 Text {
     lineHeight: 30 + LanguageModel.getLineHeightAppend()
     lineHeightMode: Text.FixedHeight
 
-    color: "#D7D8DB"
+    color: AmneziaStyle.color.white
     font.pixelSize: 25
     font.weight: 700
     font.family: "PT Root UI VF"

client/ui/qml/Controls2/TextTypes/LabelTextType.qml

@@ -1,10 +1,12 @@
 import QtQuick
 
+import Style 1.0
+
 Text {
     lineHeight: 16 + LanguageModel.getLineHeightAppend()
     lineHeightMode: Text.FixedHeight
 
-    color: "#878B91"
+    color: AmneziaStyle.color.grey
     font.pixelSize: 13
     font.weight: 400
     font.family: "PT Root UI VF"

client/ui/qml/Controls2/TextTypes/ListItemTitleType.qml

@@ -1,10 +1,12 @@
 import QtQuick
 
+import Style 1.0
+
 Text {
     lineHeight: 21.6 + LanguageModel.getLineHeightAppend()
     lineHeightMode: Text.FixedHeight
 
-    color: "#D7D8DB"
+    color: AmneziaStyle.color.white
     font.pixelSize: 18
     font.weight: 400
     font.family: "PT Root UI VF"

client/ui/qml/Controls2/TextTypes/ParagraphTextType.qml

@@ -1,10 +1,11 @@
 import QtQuick
+import Style 1.0
 
 Text {
     lineHeight: 24 + LanguageModel.getLineHeightAppend()
     lineHeightMode: Text.FixedHeight
 
-    color: "#D7D8DB"
+    color: AmneziaStyle.color.white
     font.pixelSize: 16
     font.weight: 400
     font.family: "PT Root UI VF"

client/ui/qml/Controls2/TextTypes/SmallTextType.qml

@@ -1,10 +1,12 @@
 import QtQuick
 
+import Style 1.0
+
 Text {
     lineHeight: 20 + LanguageModel.getLineHeightAppend()
     lineHeightMode: Text.FixedHeight
 
-    color: "#D7D8DB"
+    color: AmneziaStyle.color.white
     font.pixelSize: 14
     font.weight: 400
     font.family: "PT Root UI VF"

client/ui/qml/Controls2/TopCloseButtonType.qml

@@ -18,14 +18,14 @@ Popup {
     }
 
     background: Rectangle {
-        color: "transparent"
+        color: AmneziaStyle.color.transparent
     }
 
     ImageButtonType {
         id: button
 
         image: "qrc:/images/svg/close_black_24dp.svg"
-        imageColor: "#D7D8DB"
+        imageColor: AmneziaStyle.color.white
 
         implicitWidth: 40
         implicitHeight: 40

client/ui/qml/Controls2/VerticalRadioButton.qml

@@ -3,6 +3,8 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 
+import Style 1.0
+
 import "TextTypes"
 
 RadioButton {
@@ -12,15 +14,15 @@ RadioButton {
     property int textElide: Qt.ElideRight
     property string descriptionText
 
-    property string hoveredColor: Qt.rgba(1, 1, 1, 0.05)
+    property string hoveredColor: AmneziaStyle.color.blackHovered
-    property string defaultColor: Qt.rgba(1, 1, 1, 0)
+    property string defaultColor: AmneziaStyle.color.transparent
-    property string disabledColor: Qt.rgba(1, 1, 1, 0)
+    property string disabledColor: AmneziaStyle.color.transparent
-    property string selectedColor: Qt.rgba(1, 1, 1, 0)
+    property string selectedColor: AmneziaStyle.color.transparent
 
-    property string textColor: "#D7D8DB"
+    property string textColor: AmneziaStyle.color.white
-    property string selectedTextColor: "#FBB26A"
+    property string selectedTextColor: AmneziaStyle.color.orange
 
-    property string borderFocusedColor: "#D7D8DB"
+    property string borderFocusedColor: AmneziaStyle.color.white
     property int borderFocusedWidth: 1
 
     property string imageSource
@@ -34,7 +36,7 @@ RadioButton {
 
         anchors.verticalCenter: parent.verticalCenter
 
-        border.color: root.focus ? root.borderFocusedColor : "transparent"
+        border.color: root.focus ? root.borderFocusedColor : AmneziaStyle.color.transparent
         border.width: root.focus ? root.borderFocusedWidth : 0
 
         implicitWidth: 56
@@ -137,7 +139,7 @@ RadioButton {
             CaptionTextType {
                 id: description
 
-                color: "#878B91"
+                color: AmneziaStyle.color.grey
                 text: root.descriptionText
 
                 visible: root.descriptionText !== ""