changing stdErr to stdOut

added extended error descriptions
adding error codes
2026-05-17 16:26:08 +03:00 · 2024-10-27 18:18:42 +04:00 · 2024-10-27 17:48:13 +04:00 · 2024-10-27 17:19:15 +04:00 · 2024-10-27 17:17:06 +04:00 · 2024-10-27 16:33:01 +04:00
144 changed files with 4047 additions and 5288 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -1,39 +0,0 @@
-BasedOnStyle: WebKit
-AccessModifierOffset: '-4'
-AlignAfterOpenBracket: Align
-AlignConsecutiveMacros: 'true'
-AlignTrailingComments: 'true'
-AllowAllArgumentsOnNextLine: 'true'
-AllowAllParametersOfDeclarationOnNextLine: 'true'
-AllowShortBlocksOnASingleLine: 'false'
-AllowShortCaseLabelsOnASingleLine: 'true'
-AllowShortEnumsOnASingleLine: 'false'
-AllowShortFunctionsOnASingleLine: None
-AlwaysBreakTemplateDeclarations: 'No'
-BreakBeforeBinaryOperators: NonAssignment
-BreakBeforeBraces: Custom
-BraceWrapping:
-    AfterClass: true
-    AfterControlStatement: false
-    AfterEnum: false
-    AfterFunction: true
-    AfterNamespace: true
-    AfterObjCDeclaration: false
-    AfterStruct: true
-    AfterUnion: false
-    BeforeCatch: false
-    BeforeElse: false
-    IndentBraces: false
-BreakConstructorInitializers: BeforeColon
-ColumnLimit: '120'
-CommentPragmas: '"^!|^:"'
-ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
-ConstructorInitializerIndentWidth: '4'
-ContinuationIndentWidth: '8'
-IndentPPDirectives: BeforeHash
-NamespaceIndentation: All
-PenaltyExcessCharacter: '10'
-PointerAlignment: Right
-SortIncludes: 'true'
-SpaceAfterTemplateKeyword: 'false'
-Standard: Auto
--- a/.clang-format-ignore
+++ b/.clang-format-ignore
@@ -1,20 +0,0 @@
-/client/3rd
-/client/3rd-prebuild
-/client/android
-/client/cmake
-/client/core/serialization
-/client/daemon
-/client/fonts
-/client/images
-/client/ios
-/client/mozilla
-/client/platforms/dummy
-/client/platforms/linux
-/client/platforms/macos
-/client/platforms/windows
-/client/server_scripts
-/client/translations
-/deploy
-/docs
-/metadata
-/service/src
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -217,11 +217,7 @@ jobs:
        export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/ios/bin"
        export QT_MACOS_ROOT_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/macos"
        export PATH=$PATH:~/go/bin
-        sh deploy/build_ios.sh | \
-          sed -e '/-Xcc -DPROD_AGW_PUBLIC_KEY/,/-Xcc/ { /-Xcc/!d; }' -e '/-Xcc -DPROD_AGW_PUBLIC_KEY/d' | \
-          sed -e '/-Xcc -DDEV_AGW_PUBLIC_KEY/,/-Xcc/ { /-Xcc/!d; }' -e '/-Xcc -DDEV_AGW_PUBLIC_KEY/d' | \
-          sed -e '/-DPROD_AGW_PUBLIC_KEY/,/-D/ { /-D/!d; }' -e '/-DPROD_AGW_PUBLIC_KEY/d' | \
-          sed -e '/-DDEV_AGW_PUBLIC_KEY/,/-D/ { /-D/!d; }' -e '/-DDEV_AGW_PUBLIC_KEY/d'
+        sh deploy/build_ios.sh
      env:
        IOS_TRUST_CERT_BASE64: ${{ secrets.IOS_TRUST_CERT_BASE64 }}
        IOS_SIGNING_CERT_BASE64: ${{ secrets.IOS_SIGNING_CERT_BASE64 }}
@@ -260,7 +256,7 @@ jobs:
    - name: 'Setup xcode'
      uses: maxim-lobanov/setup-xcode@v1
      with:
-        xcode-version: '15.4.0'
+        xcode-version: '14.3.1'

    - name: 'Install Qt'
      uses: jurplel/install-qt-action@v3
@@ -335,8 +331,7 @@ jobs:
        arch: 'linux_gcc_64'
        modules: ${{ env.QT_MODULES }}
        dir: ${{ runner.temp }}
-        py7zrversion: '==0.22.*'
-        extra: '--base ${{ env.QT_MIRROR }}'
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'

    - name: 'Install android_x86_64 Qt'
      uses: jurplel/install-qt-action@v4
@@ -347,8 +342,7 @@ jobs:
        arch: 'android_x86_64'
        modules: ${{ env.QT_MODULES }}
        dir: ${{ runner.temp }}
-        py7zrversion: '==0.22.*'
-        extra: '--base ${{ env.QT_MIRROR }}'
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'

    - name: 'Install android_x86 Qt'
      uses: jurplel/install-qt-action@v4
@@ -359,8 +353,7 @@ jobs:
        arch: 'android_x86'
        modules: ${{ env.QT_MODULES }}
        dir: ${{ runner.temp }}
-        py7zrversion: '==0.22.*'
-        extra: '--base ${{ env.QT_MIRROR }}'
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'

    - name: 'Install android_armv7 Qt'
      uses: jurplel/install-qt-action@v4
@@ -371,8 +364,7 @@ jobs:
        arch: 'android_armv7'
        modules: ${{ env.QT_MODULES }}
        dir: ${{ runner.temp }}
-        py7zrversion: '==0.22.*'
-        extra: '--base ${{ env.QT_MIRROR }}'
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'

    - name: 'Install android_arm64_v8a Qt'
      uses: jurplel/install-qt-action@v4
@@ -383,8 +375,7 @@ jobs:
        arch: 'android_arm64_v8a'
        modules: ${{ env.QT_MODULES }}
        dir: ${{ runner.temp }}
-        py7zrversion: '==0.22.*'
-        extra: '--base ${{ env.QT_MIRROR }}'
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'

    - name: 'Grant execute permission for qt-cmake'
      shell: bash
--- 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.8.3.0
+project(${PROJECT} VERSION 4.8.2.3
        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 2072)
+set(APP_ANDROID_VERSION_CODE 2069)

 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
    set(MZ_PLATFORM_NAME "linux")
--- a/README.md
+++ b/README.md
@@ -1,29 +1,24 @@
 # Amnezia VPN
-
-### _The best client for self-hosted VPN_
-
+## _The best client for self-hosted VPN_

 [![Build Status](https://github.com/amnezia-vpn/amnezia-client/actions/workflows/deploy.yml/badge.svg?branch=dev)](https://github.com/amnezia-vpn/amnezia-client/actions/workflows/deploy.yml?query=branch:dev)
 [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/amnezia-vpn/amnezia-client)

-### [English]([https://github.com/amnezia-vpn/amnezia-client/blob/dev/README_RU.md](https://github.com/amnezia-vpn/amnezia-client/tree/dev?tab=readme-ov-file#)) | [Русский](https://github.com/amnezia-vpn/amnezia-client/blob/dev/README_RU.md)
+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)

-[Amnezia](https://amnezia.org) is an open-source VPN client, with a key feature that enables you to deploy your own VPN server on your server.
+<br>

-[![Image](https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/uipic4.png)](https://amnezia.org)
+<a href="https://amnezia.org/downloads"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/download.png" width="150" style="max-width: 100%;"></a>
+<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>

-### [Website](https://amnezia.org) | [Alt website link](https://storage.googleapis.com/kldscp/amnezia.org) | [Documentation](https://docs.amnezia.org) | [Troubleshooting](https://docs.amnezia.org/troubleshooting)
-
-> [!TIP]
-> If the [Amnezia website](https://amnezia.org) is blocked in your region, you can use an [Alternative website link](https://storage.googleapis.com/kldscp/amnezia.org).
-
-<a href="https://amnezia.org/downloads"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/download-website.svg" width="150" style="max-width: 100%; margin-right: 10px"></a>
-<a href="https://storage.googleapis.com/kldscp/amnezia.org/downloads"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/download-alt.svg" width="150" style="max-width: 100%;"></a>
+[Alternative download link (mirror)](https://storage.googleapis.com/kldscp/amnezia.org/downloads)

 [All releases](https://github.com/amnezia-vpn/amnezia-client/releases)

-<br/>
+<br>

 <a href="https://www.testiny.io"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/testiny.png" height="28px"></a>

@@ -38,8 +33,7 @@

 ## Links

- [https://amnezia.org](https://amnezia.org) - Project website | [Alternative link (mirror)](https://storage.googleapis.com/kldscp/amnezia.org)
- [https://docs.amnezia.org](https://docs.amnezia.org) - Documentation
+- [https://amnezia.org](https://amnezia.org) - project website | [Alternative link (mirror)](https://storage.googleapis.com/kldscp/amnezia.org)
 - [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) 
@@ -188,8 +182,8 @@ Patreon: [https://www.patreon.com/amneziavpn](https://www.patreon.com/amneziavpn
 Bitcoin: bc1q26eevjcg9j0wuyywd2e3uc9cs2w58lpkpjxq6p <br>
 USDT BEP20: 0x6abD576765a826f87D1D95183438f9408C901bE4 <br>
 USDT TRC20: TELAitazF1MZGmiNjTcnxDjEiH5oe7LC9d <br>
-XMR: 48spms39jt1L2L5vyw2RQW6CXD6odUd4jFu19GZcDyKKQV9U88wsJVjSbL4CfRys37jVMdoaWVPSvezCQPhHXUW5UKLqUp3 <br> 
-TON: UQDpU1CyKRmg7L8mNScKk9FRc2SlESuI7N-Hby4nX-CcVmns
+XMR: 48spms39jt1L2L5vyw2RQW6CXD6odUd4jFu19GZcDyKKQV9U88wsJVjSbL4CfRys37jVMdoaWVPSvezCQPhHXUW5UKLqUp3  
+
 ## Acknowledgments

 This project is tested with BrowserStack.
--- a/README_RU.md
+++ b/README_RU.md
@@ -1,181 +0,0 @@
-# Amnezia VPN
-
-### _Лучший клиент для создания VPN на собственном сервере_
-
-[![Build Status](https://github.com/amnezia-vpn/amnezia-client/actions/workflows/deploy.yml/badge.svg?branch=dev)](https://github.com/amnezia-vpn/amnezia-client/actions/workflows/deploy.yml?query=branch:dev)
-[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/amnezia-vpn/amnezia-client)
-
-### [English](https://github.com/amnezia-vpn/amnezia-client/blob/dev/README.md) | Русский
-[AmneziaVPN](https://amnezia.org) — это open sourse VPN-клиент, ключевая особенность которого заключается в возможности развернуть собственный VPN на вашем сервере.
-
-[![Image](https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/uipic4.png)](https://amnezia.org)
-
-### [Сайт](https://amnezia.org) | [Зеркало на сайт](https://storage.googleapis.com/kldscp/amnezia.org) | [Документация](https://docs.amnezia.org) | [Решение проблем](https://docs.amnezia.org/troubleshooting)
-
-> [!TIP]
-> Если [сайт Amnezia](https://amnezia.org) заблокирован в вашем регионе, вы можете воспользоваться [ссылкой на зеркало](https://storage.googleapis.com/kldscp/amnezia.org).
-
-<a href="https://storage.googleapis.com/kldscp/amnezia.org/downloads"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/download-website-ru.svg" width="150" style="max-width: 100%; margin-right: 10px"></a>
-
-
-[Все релизы](https://github.com/amnezia-vpn/amnezia-client/releases)
-
-<br/>
-
-<a href="https://www.testiny.io"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/testiny.png" height="28px"></a>
-
-## Особенности
-
- Простой в использовании — введите IP-адрес, SSH-логин и пароль, и Amnezia автоматически установит VPN-контейнеры Docker на ваш сервер и подключится к VPN.
- Классические VPN-протоколы: OpenVPN, WireGuard и IKEv2.
- Протоколы с маскировкой трафика (обфускацией): OpenVPN с плагином [Cloak](https://github.com/cbeuw/Cloak), Shadowsocks (OpenVPN over Shadowsocks), [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) and XRay.
- Поддержка Split Tunneling — добавляйте любые сайты или приложения в список, чтобы включить VPN только для них.
- Поддерживает платформы: Windows, MacOS, Linux, Android, iOS.
- Поддержка конфигурации протокола AmneziaWG на [бета-прошивке Keenetic](https://docs.keenetic.com/ua/air/kn-1611/en/6319-latest-development-release.html#UUID-186c4108-5afd-c10b-f38a-cdff6c17fab3_section-idm33192196168192-improved).
-
-## Ссылки
-
- [https://amnezia.org](https://amnezia.org) - Веб-сайт проекта | [Альтернативная ссылка (зеркало)](https://storage.googleapis.com/kldscp/amnezia.org)
- [https://docs.amnezia.org](https://docs.amnezia.org) - Документация
- [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 (Английский)
- [https://t.me/amnezia_vpn_ir](https://t.me/amnezia_vpn_ir) - Канал поддржки в Telegram (Фарси)
- [https://t.me/amnezia_vpn_mm](https://t.me/amnezia_vpn_mm) - Канал поддржки в Telegram (Мьянма) 
- [https://t.me/amnezia_vpn](https://t.me/amnezia_vpn) - Канал поддржки в Telegram  (Русский)
- [https://vpnpay.io/en/amnezia-premium/](https://vpnpay.io/en/amnezia-premium/) - Amnezia Premium | [Зеркало](https://storage.googleapis.com/kldscp/vpnpay.io/ru/amnezia-premium\)
-
-## Технологии
-
-AmneziaVPN использует несколько проектов с открытым исходным кодом:
-
- [OpenSSL](https://www.openssl.org/)
- [OpenVPN](https://openvpn.net/)
- [Shadowsocks](https://shadowsocks.org/)
- [Qt](https://www.qt.io/)
- [LibSsh](https://libssh.org)
- и другие...
-
-## Проверка исходного кода
-После клонирования репозитория обязательно загрузите все подмодули.
-
-```bash
-git submodule update --init --recursive
-```
-
-
-## Разработка
-Хотите внести свой вклад? Добро пожаловать!
-
-### Помощь с переводами
-
-Загрузите самые актуальные файлы перевода.
-
-Перейдите на [вкладку "Actions"](https://github.com/amnezia-vpn/amnezia-client/actions?query=is%3Asuccess+branch%3Adev), нажмите на первую строку. Затем прокрутите вниз до раздела "Artifacts" и скачайте "AmneziaVPN_translations".
-
-Распакуйте этот файл. Каждый файл с расширением *.ts содержит строки для соответствующего языка.
-
-Переведите или исправьте строки в одном или нескольких файлах *.ts и загрузите их обратно в этот репозиторий в папку ``client/translations``. Это можно сделать через веб-интерфейс или любым другим знакомым вам способом.
-
-### Сборка исходного кода и деплой
-Проверьте папку deploy для скриптов сборки.
-
-### Как собрать iOS-приложение из исходного кода на MacOS
-1. Убедитесь, что у вас установлен XCode версии 14 или выше.
-2. Для генерации проекта XCode используется QT. Требуется версия QT 6.6.2. Установите QT для MacOS здесь или через QT Online Installer. Необходимые модули:
- MacOS
- iOS
- Модуль совместимости с Qt 5
- Qt Shader Tools
- Дополнительные библиотеки:
- - Qt Image Formats
- - Qt Multimedia
- - Qt Remote Objects
-
-   
-3. Установите CMake, если это необходимо. Рекомендуемая версия — 3.25. Скачать CMake можно здесь.
-4. Установите Go версии >= v1.16. Если Go ещё не установлен, скачайте его с  [официального сайта](https://golang.org/dl/) или используйте Homebrew. Установите gomobile:
-
-```bash
-export PATH=$PATH:~/go/bin
-go install golang.org/x/mobile/cmd/gomobile@latest
-gomobile init
-```
-
-5. Соберите проект:
-```bash
-export QT_BIN_DIR="<PATH-TO-QT-FOLDER>/Qt/<QT-VERSION>/ios/bin"
-export QT_MACOS_ROOT_DIR="<PATH-TO-QT-FOLDER>/Qt/<QT-VERSION>/macos"
-export QT_IOS_BIN=$QT_BIN_DIR
-export PATH=$PATH:~/go/bin
-mkdir build-ios
-$QT_IOS_BIN/qt-cmake . -B build-ios -GXcode -DQT_HOST_PATH=$QT_MACOS_ROOT_DIR
-```
-Замените <PATH-TO-QT-FOLDER> и <QT-VERSION> на ваши значения.
-
-Если появляется ошибка gomobile: command not found, убедитесь, что PATH настроен на папку bin, где установлен gomobile:
-```bash
-export PATH=$(PATH):/path/to/GOPATH/bin
-```
-
-6. Откройте проект в XCode. Теперь вы можете тестировать, архивировать или публиковать приложение.
-   
-Если сборка завершится с ошибкой:
-```
-make: *** 
-[$(PROJECTDIR)/client/build/AmneziaVPN.build/Debug-iphoneos/wireguard-go-bridge/goroot/.prepared] 
-Error 1
-```
-Добавьте пользовательскую переменную PATH в настройки сборки для целей AmneziaVPN и WireGuardNetworkExtension с ключом `PATH` и значением `${PATH}/path/to/bin/folder/with/go/executable`, e.g. `${PATH}:/usr/local/go/bin`.
-
-Если ошибка повторяется на Mac с M1, установите версию CMake для архитектуры ARM:
-```
-arch -arm64 brew install cmake
-```
-
- При первой попытке сборка может завершиться с ошибкой source files not found. Это происходит из-за параллельной компиляции зависимостей в XCode. Просто перезапустите сборку.
-
-
-## Как собрать Android-приложение
-Сборка тестировалась на MacOS. Требования:
- JDK 11
- Android SDK 33
- CMake 3.25.0
-  
-Установите QT, QT Creator и Android Studio.
-Настройте QT Creator:
-
- В меню QT Creator перейдите в  `QT Creator` -> `Preferences` -> `Devices` ->`Android`.
- Укажите путь к JDK 11.
- Укажите путь к Android SDK (`$ANDROID_HOME`)
-
-Если вы сталкиваетесь с ошибками, связанными с отсутствием SDK или сообщением «SDK manager not running», их нельзя исправить просто корректировкой путей. Если у вас есть несколько свободных гигабайт на диске, вы можете позволить Qt Creator установить все необходимые компоненты, выбрав пустую папку для расположения Android SDK и нажав кнопку **Set Up SDK**. Учтите: это установит второй Android SDK и NDK на вашем компьютере!
-
-Убедитесь, что настроена правильная версия CMake: перейдите в **Qt Creator -> Preferences** и в боковом меню выберите пункт **Kits**. В центральной части окна, на вкладке **Kits**, найдите запись для инструмента **CMake Tool**. Если выбранная по умолчанию версия CMake ниже 3.25.0, установите на свою систему CMake версии 3.25.0 или выше, а затем выберите опцию **System CMake at <путь>** из выпадающего списка. Если этот пункт отсутствует, это может означать, что вы еще не установили CMake, или Qt Creator не смог найти путь к нему. В таком случае в окне **Preferences** перейдите в боковое меню **CMake**, затем во вкладку **Tools** в центральной части окна и нажмите кнопку **Add**, чтобы указать путь к установленному CMake.
-
-Убедитесь, что для вашего проекта выбрана Android Platform SDK 33: в главном окне на боковой панели выберите пункт **Projects**, и слева вы увидите раздел **Build & Run**, показывающий различные целевые Android-платформы. Вы можете выбрать любую из них, так как настройка проекта Amnezia VPN разработана таким образом, чтобы все Android-цели могли быть собраны. Перейдите в подраздел **Build** и прокрутите центральную часть окна до раздела **Build Steps**. Нажмите **Details** в заголовке **Build Android APK** (кнопка **Details** может быть скрыта, если окно Qt Creator не запущено в полноэкранном режиме!). Вот здесь выберите **android-33** в качестве Android Build Platform SDK.
-
-### Разработка Android-компонентов
-
-После сборки QT Creator копирует проект в отдельную папку, например, `build-amnezia-client-Android_Qt_<version>_Clang_<architecture>-<BuildType>`. Для разработки Android-компонентов откройте сгенерированный проект в Android Studio, указав папку `build-amnezia-client-Android_Qt_<version>_Clang_<architecture>-<BuildType>/client/android-build` в качестве корневой.
-Изменения в сгенерированном проекте нужно вручную перенести в репозиторий. После этого можно коммитить изменения.
-Если возникают проблемы со сборкой в QT Creator после работы в Android Studio, выполните команду `./gradlew clean` в корневой папке сгенерированного проекта (`<path>/client/android-build/.`).
-
-
-## Лицензия
-
-GPL v3.0
-
-## Донаты
-
-Patreon: [https://www.patreon.com/amneziavpn](https://www.patreon.com/amneziavpn)
-
-Bitcoin: bc1q26eevjcg9j0wuyywd2e3uc9cs2w58lpkpjxq6p <br>
-USDT BEP20: 0x6abD576765a826f87D1D95183438f9408C901bE4 <br>
-USDT TRC20: TELAitazF1MZGmiNjTcnxDjEiH5oe7LC9d <br>
-XMR: 48spms39jt1L2L5vyw2RQW6CXD6odUd4jFu19GZcDyKKQV9U88wsJVjSbL4CfRys37jVMdoaWVPSvezCQPhHXUW5UKLqUp3 <br> 
-TON: UQDpU1CyKRmg7L8mNScKk9FRc2SlESuI7N-Hby4nX-CcVmns
-
-## Благодарности
-
-Этот проект тестируется с помощью BrowserStack.
-Мы выражаем благодарность [BrowserStack](https://www.browserstack.com) за поддержку нашего проекта.
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -146,7 +146,6 @@ set(HEADERS ${HEADERS}
    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/transfer.h
    ${CMAKE_CURRENT_LIST_DIR}/core/enums/apiEnums.h
    ${CMAKE_CURRENT_LIST_DIR}/../common/logger/logger.h
-    ${CMAKE_CURRENT_LIST_DIR}/utils/qmlUtils.h
 )

 # Mozilla headres
@@ -198,7 +197,6 @@ set(SOURCES ${SOURCES}
    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/vmess.cpp
    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/vmess_new.cpp
    ${CMAKE_CURRENT_LIST_DIR}/../common/logger/logger.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/utils/qmlUtils.cpp
 )

 # Mozilla sources
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -404,9 +404,6 @@ void AmneziaApplication::initControllers()
    m_pageController.reset(new PageController(m_serversModel, m_settings));
    m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());

-    m_focusController.reset(new FocusController(m_engine, this));
-    m_engine->rootContext()->setContextProperty("FocusController", m_focusController.get());
-
    m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_protocolsModel, m_clientManagementModel,
                                                    m_apiServicesModel, m_settings));
    m_engine->rootContext()->setContextProperty("InstallController", m_installController.get());
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -19,7 +19,6 @@
 #include "ui/controllers/exportController.h"
 #include "ui/controllers/importController.h"
 #include "ui/controllers/installController.h"
-#include "ui/controllers/focusController.h"
 #include "ui/controllers/pageController.h"
 #include "ui/controllers/settingsController.h"
 #include "ui/controllers/sitesController.h"
@@ -125,7 +124,6 @@ private:
 #endif

    QScopedPointer<ConnectionController> m_connectionController;
-    QScopedPointer<FocusController> m_focusController;
    QScopedPointer<PageController> m_pageController;
    QScopedPointer<InstallController> m_installController;
    QScopedPointer<ImportController> m_importController;
--- a/client/android/AndroidManifest.xml
+++ b/client/android/AndroidManifest.xml
@@ -11,7 +11,7 @@
    <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="true" />
+    <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
@@ -20,7 +20,7 @@

    <uses-permission android:name="android.permission.INTERNET" />
    <!-- To request network state -->
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" android:maxSdkVersion="30" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -91,13 +91,6 @@
            android:exported="false"
            android:theme="@style/Translucent" />

-        <activity android:name=".TvFilePicker"
-            android:excludeFromRecents="true"
-            android:launchMode="singleTask"
-            android:taskAffinity=""
-            android:exported="false"
-            android:theme="@style/Translucent" />
-
        <activity
            android:name=".ImportConfigActivity"
            android:excludeFromRecents="true"
--- a/client/android/res/mipmap-anydpi-v26/ic_banner.xml
+++ b/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>
--- a/client/android/res/mipmap-hdpi/ic_banner.png
+++ b/client/android/res/mipmap-hdpi/ic_banner.png
--- a/client/android/res/mipmap-mdpi/ic_banner.png
+++ b/client/android/res/mipmap-mdpi/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-ru/strings.xml
+++ b/client/android/res/values-ru/strings.xml
@@ -23,6 +23,4 @@
    <string name="notificationSettingsDialogTitle">Настройки уведомлений</string>
    <string name="notificationSettingsDialogMessage">Для показа уведомлений необходимо включить уведомления в системных настройках</string>
    <string name="openNotificationSettings">Открыть настройки уведомлений</string>
-
-    <string name="tvNoFileBrowser">Пожалуйста, установите приложение для просмотра файлов</string>
 </resources>
--- a/client/android/res/values/ic_banner_background.xml
+++ b/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>
--- a/client/android/res/values/strings.xml
+++ b/client/android/res/values/strings.xml
@@ -23,6 +23,4 @@
    <string name="notificationSettingsDialogTitle">Notification settings</string>
    <string name="notificationSettingsDialogMessage">To show notifications, you must enable notifications in the system settings</string>
    <string name="openNotificationSettings">Open notification settings</string>
-
-    <string name="tvNoFileBrowser">Please install a file management utility to browse files</string>
 </resources>
--- a/client/android/src/org/amnezia/vpn/AmneziaActivity.kt
+++ b/client/android/src/org/amnezia/vpn/AmneziaActivity.kt
@@ -4,7 +4,6 @@ import android.Manifest
 import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.app.NotificationManager
-import android.content.ActivityNotFoundException
 import android.content.BroadcastReceiver
 import android.content.ComponentName
 import android.content.Intent
@@ -13,7 +12,6 @@ import android.content.Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY
 import android.content.ServiceConnection
 import android.content.pm.PackageManager
 import android.graphics.Bitmap
-import android.net.Uri
 import android.net.VpnService
 import android.os.Build
 import android.os.Bundle
@@ -22,13 +20,8 @@ import android.os.IBinder
 import android.os.Looper
 import android.os.Message
 import android.os.Messenger
-import android.os.ParcelFileDescriptor
-import android.os.SystemClock
-import android.provider.OpenableColumns
 import android.provider.Settings
 import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
 import android.view.WindowManager.LayoutParams
 import android.webkit.MimeTypeMap
 import android.widget.Toast
@@ -37,7 +30,6 @@ import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import java.io.IOException
 import kotlin.LazyThreadSafetyMode.NONE
-import kotlin.coroutines.CoroutineContext
 import kotlin.text.RegexOption.IGNORE_CASE
 import AppListProvider
 import kotlinx.coroutines.CompletableDeferred
@@ -79,7 +71,6 @@ class AmneziaActivity : QtActivity() {
    private var isInBoundState = false
    private var notificationStateReceiver: BroadcastReceiver? = null
    private lateinit var vpnServiceMessenger: IpcMessenger
-    private var pfd: ParcelFileDescriptor? = null

    private val actionResultHandlers = mutableMapOf<Int, ActivityResultHandler>()
    private val permissionRequestHandlers = mutableMapOf<Int, PermissionRequestHandler>()
@@ -523,25 +514,21 @@ class AmneziaActivity : QtActivity() {
                type = "text/*"
                putExtra(Intent.EXTRA_TITLE, fileName)
            }.also {
-                try {
-                    startActivityForResult(it, CREATE_FILE_ACTION_CODE, ActivityResultHandler(
-                        onSuccess = {
-                            it?.data?.let { uri ->
-                                Log.v(TAG, "Save file to $uri")
-                                try {
-                                    contentResolver.openOutputStream(uri)?.use { os ->
-                                        os.bufferedWriter().use { it.write(data) }
-                                    }
-                                } catch (e: IOException) {
-                                    Log.e(TAG, "Failed to save file $uri: $e")
-                                    // todo: send error to Qt
+                startActivityForResult(it, CREATE_FILE_ACTION_CODE, ActivityResultHandler(
+                    onSuccess = {
+                        it?.data?.let { uri ->
+                            Log.v(TAG, "Save file to $uri")
+                            try {
+                                contentResolver.openOutputStream(uri)?.use { os ->
+                                    os.bufferedWriter().use { it.write(data) }
                                }
+                            } catch (e: IOException) {
+                                Log.e(TAG, "Failed to save file $uri: $e")
+                                // todo: send error to Qt
                            }
                        }
-                    ))
-                } catch (_: ActivityNotFoundException) {
-                    Toast.makeText(this@AmneziaActivity, "Unsupported", Toast.LENGTH_LONG).show()
-                }
+                    }
+                ))
            }
        }
    }
@@ -550,46 +537,35 @@ class AmneziaActivity : QtActivity() {
    fun openFile(filter: String?) {
        Log.v(TAG, "Open file with filter: $filter")
        mainScope.launch {
-            val intent = if (!isOnTv()) {
-                val mimeTypes = if (!filter.isNullOrEmpty()) {
-                    val extensionRegex = "\\*\\.([a-z0-9]+)".toRegex(IGNORE_CASE)
-                    val mime = MimeTypeMap.getSingleton()
-                    extensionRegex.findAll(filter).map {
-                        it.groups[1]?.value?.let { mime.getMimeTypeFromExtension(it) } ?: "*/*"
-                    }.toSet()
-                } else emptySet()
+            val mimeTypes = if (!filter.isNullOrEmpty()) {
+                val extensionRegex = "\\*\\.([a-z0-9]+)".toRegex(IGNORE_CASE)
+                val mime = MimeTypeMap.getSingleton()
+                extensionRegex.findAll(filter).map {
+                    it.groups[1]?.value?.let { mime.getMimeTypeFromExtension(it) } ?: "*/*"
+                }.toSet()
+            } else emptySet()

-                Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
-                    addCategory(Intent.CATEGORY_OPENABLE)
-                    Log.v(TAG, "File mimyType filter: $mimeTypes")
-                    if ("*/*" in mimeTypes) {
-                        type = "*/*"
-                    } else {
-                        when (mimeTypes.size) {
-                            1 -> type = mimeTypes.first()
+            Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+                addCategory(Intent.CATEGORY_OPENABLE)
+                Log.v(TAG, "File mimyType filter: $mimeTypes")
+                if ("*/*" in mimeTypes) {
+                    type = "*/*"
+                } else {
+                    when (mimeTypes.size) {
+                        1 -> type = mimeTypes.first()

-                            in 2..Int.MAX_VALUE -> {
-                                type = "*/*"
-                                putExtra(EXTRA_MIME_TYPES, mimeTypes.toTypedArray())
-                            }
-
-                            else -> type = "*/*"
+                        in 2..Int.MAX_VALUE -> {
+                            type = "*/*"
+                            putExtra(EXTRA_MIME_TYPES, mimeTypes.toTypedArray())
                        }
+
+                        else -> type = "*/*"
                    }
                }
-            } else {
-                Intent(this@AmneziaActivity, TvFilePicker::class.java)
-            }
-
-            try {
-                startActivityForResult(intent, OPEN_FILE_ACTION_CODE, ActivityResultHandler(
+            }.also {
+                startActivityForResult(it, OPEN_FILE_ACTION_CODE, ActivityResultHandler(
                    onAny = {
-                        if (isOnTv() && it?.hasExtra("activityNotFound") == true) {
-                            showNoFileBrowserAlertDialog()
-                        }
-                        val uri = it?.data?.apply {
-                            grantUriPermission(packageName, this, Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                        }?.toString() ?: ""
+                        val uri = it?.data?.toString() ?: ""
                        Log.v(TAG, "Open file: $uri")
                        mainScope.launch {
                            qtInitialized.await()
@@ -597,68 +573,10 @@ class AmneziaActivity : QtActivity() {
                        }
                    }
                ))
-            } catch (_: ActivityNotFoundException) {
-                showNoFileBrowserAlertDialog()
-                mainScope.launch {
-                    qtInitialized.await()
-                    QtAndroidController.onFileOpened("")
-                }
            }
        }
    }

-    private fun showNoFileBrowserAlertDialog() {
-        AlertDialog.Builder(this)
-            .setMessage(R.string.tvNoFileBrowser)
-            .setCancelable(false)
-            .setPositiveButton(android.R.string.ok) { _, _ ->
-                try {
-                    startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("market://webstoreredirect")))
-                } catch (_: Throwable) {}
-            }
-            .show()
-    }
-
-    @Suppress("unused")
-    fun getFd(fileName: String): Int {
-        Log.v(TAG, "Get fd for $fileName")
-        return blockingCall {
-            try {
-                pfd = contentResolver.openFileDescriptor(Uri.parse(fileName), "r")
-                pfd?.fd ?: -1
-            } catch (e: Exception) {
-                Log.e(TAG, "Failed to get fd: $e")
-                -1
-            }
-        }
-    }
-
-    @Suppress("unused")
-    fun closeFd() {
-        Log.v(TAG, "Close fd")
-        mainScope.launch {
-            pfd?.close()
-            pfd = null
-        }
-    }
-
-    @Suppress("unused")
-    fun getFileName(uri: String): String {
-        Log.v(TAG, "Get file name for uri: $uri")
-        return blockingCall {
-            try {
-                contentResolver.query(Uri.parse(uri), arrayOf(OpenableColumns.DISPLAY_NAME), null, null, null)?.use { cursor ->
-                    if (cursor.moveToFirst() && !cursor.isNull(0)) {
-                        return@blockingCall cursor.getString(0) ?: ""
-                    }
-                }
-            } catch (e: Exception) {
-                Log.e(TAG, "Failed to get file name: $e")
-            }
-            ""
-        }
-    }
-
    @Suppress("unused")
    @SuppressLint("UnsupportedChromeOsCameraSystemFeature")
    fun isCameraPresent(): Boolean = applicationContext.packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA)
@@ -803,50 +721,6 @@ class AmneziaActivity : QtActivity() {
        }
    }

-    // method to workaround Qt's problem with calling the keyboard on TVs
-    @Suppress("unused")
-    fun sendTouch(x: Float, y: Float) {
-        Log.v(TAG, "Send touch: $x, $y")
-        blockingCall {
-            findQtWindow(window.decorView)?.let {
-                Log.v(TAG, "Send touch to $it")
-                it.dispatchTouchEvent(createEvent(x, y, SystemClock.uptimeMillis(), MotionEvent.ACTION_DOWN))
-                it.dispatchTouchEvent(createEvent(x, y, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP))
-            }
-        }
-    }
-
-    private fun findQtWindow(view: View): View? {
-        Log.v(TAG, "findQtWindow: process $view")
-        if (view::class.simpleName == "QtWindow") return view
-        else if (view is ViewGroup) {
-            for (i in 0 until view.childCount) {
-                val result = findQtWindow(view.getChildAt(i))
-                if (result != null) return result
-            }
-            return null
-        } else return null
-    }
-
-    private fun createEvent(x: Float, y: Float, eventTime: Long, action: Int): MotionEvent =
-        MotionEvent.obtain(
-            eventTime,
-            eventTime,
-            action,
-            1,
-            arrayOf(MotionEvent.PointerProperties().apply {
-                id = 0
-                toolType = MotionEvent.TOOL_TYPE_FINGER
-            }),
-            arrayOf(MotionEvent.PointerCoords().apply {
-                this.x = x
-                this.y = y
-                pressure = 1f
-                size = 1f
-            }),
-            0, 0, 1.0f, 1.0f, 0, 0, 0,0
-        )
-
    // workaround for a bug in Qt that causes the mouse click event not to be handled
    // also disable right-click, as it causes the application to crash
    private var lastButtonState = 0
@@ -896,7 +770,6 @@ class AmneziaActivity : QtActivity() {
    }

    override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
-        Log.v(TAG, "dispatchTouch: $ev")
        if (ev != null && ev.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE) {
            return handleMouseEvent(ev) { super.dispatchTouchEvent(it) }
        }
@@ -911,13 +784,6 @@ class AmneziaActivity : QtActivity() {
    /**
     * Utils methods
     */
-    private fun <T> blockingCall(
-        context: CoroutineContext = Dispatchers.Main.immediate,
-        block: suspend () -> T
-    ) = runBlocking {
-        mainScope.async(context) { block() }.await()
-    }
-
    companion object {
        private fun actionCodeToString(actionCode: Int): String =
            when (actionCode) {
--- a/client/android/src/org/amnezia/vpn/TvFilePicker.kt
+++ b/client/android/src/org/amnezia/vpn/TvFilePicker.kt
@@ -1,45 +0,0 @@
-package org.amnezia.vpn
-
-import android.content.ActivityNotFoundException
-import android.content.Intent
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.result.contract.ActivityResultContracts
-import org.amnezia.vpn.util.Log
-
-private const val TAG = "TvFilePicker"
-
-class TvFilePicker : ComponentActivity() {
-
-    private val fileChooseResultLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) {
-        setResult(RESULT_OK, Intent().apply { data = it })
-        finish()
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        Log.v(TAG, "onCreate")
-        getFile()
-    }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        Log.v(TAG, "onNewIntent")
-        getFile()
-    }
-
-    private fun getFile() {
-        try {
-            Log.v(TAG, "getFile")
-            fileChooseResultLauncher.launch("*/*")
-        } catch (_: ActivityNotFoundException) {
-            Log.w(TAG, "Activity not found")
-            setResult(RESULT_CANCELED, Intent().apply { putExtra("activityNotFound", true) })
-            finish()
-        } catch (e: Exception) {
-            Log.e(TAG, "Failed to get file: $e")
-            setResult(RESULT_CANCELED)
-            finish()
-        }
-    }
-}
--- a/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt
+++ b/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt
@@ -1,12 +1,11 @@
 package org.amnezia.vpn.protocol.wireguard

 import android.net.VpnService.Builder
-import kotlinx.coroutines.CoroutineScope
+import java.io.IOException
+import java.util.Locale
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.amnezia.awg.GoBackend
 import org.amnezia.vpn.protocol.Protocol
 import org.amnezia.vpn.protocol.ProtocolState.CONNECTED
@@ -28,8 +27,6 @@ open class Wireguard : Protocol() {

    private var tunnelHandle: Int = -1
    protected open val ifName: String = "amn0"
-    private lateinit var scope: CoroutineScope
-    private var statusJob: Job? = null

    override val statistics: Statistics
        get() {
@@ -52,17 +49,46 @@ open class Wireguard : Protocol() {

    override fun internalInit() {
        if (!isInitialized) loadSharedLibrary(context, "wg-go")
-        if (this::scope.isInitialized) {
-            scope.cancel()
-        }
-        scope = CoroutineScope(Dispatchers.IO)
    }

    override suspend fun startVpn(config: JSONObject, vpnBuilder: Builder, protect: (Int) -> Boolean) {
        val wireguardConfig = parseConfig(config)
+        val startTime = System.currentTimeMillis()
        start(wireguardConfig, vpnBuilder, protect)
+        waitForConnection(startTime)
+        state.value = CONNECTED
    }

+    private suspend fun waitForConnection(startTime: Long) {
+        Log.d(TAG, "Waiting for connection")
+        withContext(Dispatchers.IO) {
+            val time = String.format(Locale.ROOT,"%.3f", startTime / 1000.0)
+            try {
+                delay(1000)
+                var log = getLogcat(time)
+                Log.v(TAG, "First waiting log: $log")
+                // check that there is a connection log,
+                // to avoid infinite connection
+                if (!log.contains("Attaching to interface")) {
+                    Log.w(TAG, "Logs do not contain a connection log")
+                    return@withContext
+                }
+                while (!log.contains("Received handshake response")) {
+                    delay(1000)
+                    log = getLogcat(time)
+                }
+            } catch (e: IOException) {
+                Log.e(TAG, "Failed to get logcat: $e")
+            }
+        }
+    }
+
+    private fun getLogcat(time: String): String =
+        ProcessBuilder("logcat", "--buffer=main", "--format=raw", "*:S AmneziaWG/awg0", "-t", time)
+            .redirectErrorStream(true)
+            .start()
+            .inputStream.reader().readText()
+
    protected open fun parseConfig(config: JSONObject): WireguardConfig {
        val configData = config.getJSONObject("wireguard_config_data")
        return WireguardConfig.build {
@@ -152,43 +178,6 @@ open class Wireguard : Protocol() {
            tunnelHandle = -1
            throw VpnStartException("Protect VPN interface: permission not granted or revoked")
        }
-        launchStatusJob()
-    }
-
-    private fun launchStatusJob() {
-        Log.d(TAG, "Launch status job")
-        statusJob = scope.launch {
-            while (true) {
-                val lastHandshake = getLastHandshake()
-                Log.v(TAG, "lastHandshake=$lastHandshake")
-                if (lastHandshake == 0L) {
-                    delay(1000)
-                    continue
-                }
-                if (lastHandshake == -2L || lastHandshake > 0L) state.value = CONNECTED
-                else if (lastHandshake == -1L) state.value = DISCONNECTED
-                statusJob = null
-                break
-            }
-        }
-    }
-
-    private fun getLastHandshake(): Long {
-        if (tunnelHandle == -1) {
-            Log.e(TAG, "Trying to get config of a non-existent tunnel")
-            return -1
-        }
-        val config = GoBackend.awgGetConfig(tunnelHandle)
-        if (config == null) {
-            Log.e(TAG, "Failed to get tunnel config")
-            return -2
-        }
-        val lastHandshake = config.lines().find { it.startsWith("last_handshake_time_sec=") }?.substring(24)?.toLong()
-        if (lastHandshake == null) {
-            Log.e(TAG, "Failed to get last_handshake_time_sec")
-            return -2
-        }
-        return lastHandshake
    }

    override fun stopVpn() {
@@ -196,8 +185,6 @@ open class Wireguard : Protocol() {
            Log.w(TAG, "Tunnel already down")
            return
        }
-        statusJob?.cancel()
-        statusJob = null
        val handleToClose = tunnelHandle
        tunnelHandle = -1
        GoBackend.awgTurnOff(handleToClose)
--- a/client/configurators/xray_configurator.cpp
+++ b/client/configurators/xray_configurator.cpp
@@ -3,169 +3,38 @@
 #include <QFile>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QUuid>
-#include "logger.h"

 #include "containers/containers_defs.h"
 #include "core/controllers/serverController.h"
 #include "core/scripts_registry.h"

-namespace {
-Logger logger("XrayConfigurator");
-}
-
 XrayConfigurator::XrayConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent)
    : ConfiguratorBase(settings, serverController, parent)
 {
 }

-QString XrayConfigurator::prepareServerConfig(const ServerCredentials &credentials, DockerContainer container,
-                                               const QJsonObject &containerConfig, ErrorCode &errorCode)
+QString XrayConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig,
+                                       ErrorCode &errorCode)
 {
-    // Generate new UUID for client
-    QString clientId = QUuid::createUuid().toString(QUuid::WithoutBraces);
-    
-    // Get current server config
-    QString currentConfig = m_serverController->getTextFileFromContainer(
-        container, credentials, amnezia::protocols::xray::serverConfigPath, errorCode);
-    
-    if (errorCode != ErrorCode::NoError) {
-        logger.error() << "Failed to get server config file";
-        return "";
-    }
-
-    // Parse current config as JSON
-    QJsonDocument doc = QJsonDocument::fromJson(currentConfig.toUtf8());
-    if (doc.isNull() || !doc.isObject()) {
-        logger.error() << "Failed to parse server config JSON";
-        errorCode = ErrorCode::InternalError;
-        return "";
-    }
-
-    QJsonObject serverConfig = doc.object();
-    
-    // Validate server config structure
-    if (!serverConfig.contains("inbounds")) {
-        logger.error() << "Server config missing 'inbounds' field";
-        errorCode = ErrorCode::InternalError;
-        return "";
-    }
-
-    QJsonArray inbounds = serverConfig["inbounds"].toArray();
-    if (inbounds.isEmpty()) {
-        logger.error() << "Server config has empty 'inbounds' array";
-        errorCode = ErrorCode::InternalError;
-        return "";
-    }
-    
-    QJsonObject inbound = inbounds[0].toObject();
-    if (!inbound.contains("settings")) {
-        logger.error() << "Inbound missing 'settings' field";
-        errorCode = ErrorCode::InternalError;
-        return "";
-    }
-
-    QJsonObject settings = inbound["settings"].toObject();
-    if (!settings.contains("clients")) {
-        logger.error() << "Settings missing 'clients' field";
-        errorCode = ErrorCode::InternalError;
-        return "";
-    }
-
-    QJsonArray clients = settings["clients"].toArray();
-    
-    // Create configuration for new client
-    QJsonObject clientConfig {
-        {"id", clientId},
-        {"flow", "xtls-rprx-vision"}
-    };
-    
-    clients.append(clientConfig);
-    
-    // Update config
-    settings["clients"] = clients;
-    inbound["settings"] = settings;
-    inbounds[0] = inbound;
-    serverConfig["inbounds"] = inbounds;
-    
-    // Save updated config to server
-    QString updatedConfig = QJsonDocument(serverConfig).toJson();
-    errorCode = m_serverController->uploadTextFileToContainer(
-        container, 
-        credentials, 
-        updatedConfig,
-        amnezia::protocols::xray::serverConfigPath,
-        libssh::ScpOverwriteMode::ScpOverwriteExisting
-    );
-    if (errorCode != ErrorCode::NoError) {
-        logger.error() << "Failed to upload updated config";
-        return "";
-    }
-
-    // Restart container
-    QString restartScript = QString("sudo docker restart $CONTAINER_NAME");
-    errorCode = m_serverController->runScript(
-        credentials, 
-        m_serverController->replaceVars(restartScript, m_serverController->genVarsForScript(credentials, container))
-    );
-
-    if (errorCode != ErrorCode::NoError) {
-        logger.error() << "Failed to restart container";
-        return "";
-    }
-
-    return clientId;
-}
-
-QString XrayConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                       const QJsonObject &containerConfig, ErrorCode &errorCode)
-{
-    // Get client ID from prepareServerConfig
-    QString xrayClientId = prepareServerConfig(credentials, container, containerConfig, errorCode);
-    if (errorCode != ErrorCode::NoError || xrayClientId.isEmpty()) {
-        logger.error() << "Failed to prepare server config";
-        errorCode = ErrorCode::InternalError;
-        return "";
-    }
-
    QString config = m_serverController->replaceVars(amnezia::scriptData(ProtocolScriptType::xray_template, container),
                                                     m_serverController->genVarsForScript(credentials, container, containerConfig));
-    
-    if (config.isEmpty()) {
-        logger.error() << "Failed to get config template";
-        errorCode = ErrorCode::InternalError;
-        return "";
-    }

    QString xrayPublicKey =
            m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::xray::PublicKeyPath, errorCode);
-    if (errorCode != ErrorCode::NoError || xrayPublicKey.isEmpty()) {
-        logger.error() << "Failed to get public key";
-        errorCode = ErrorCode::InternalError;
-        return "";
-    }
    xrayPublicKey.replace("\n", "");
-    
+
+    QString xrayUuid = m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::xray::uuidPath, errorCode);
+    xrayUuid.replace("\n", "");
+
    QString xrayShortId =
            m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::xray::shortidPath, errorCode);
-    if (errorCode != ErrorCode::NoError || xrayShortId.isEmpty()) {
-        logger.error() << "Failed to get short ID";
-        errorCode = ErrorCode::InternalError;
-        return "";
-    }
    xrayShortId.replace("\n", "");

-    // Validate all required variables are present
-    if (!config.contains("$XRAY_CLIENT_ID") || !config.contains("$XRAY_PUBLIC_KEY") || !config.contains("$XRAY_SHORT_ID")) {
-        logger.error() << "Config template missing required variables:"
-                      << "XRAY_CLIENT_ID:" << !config.contains("$XRAY_CLIENT_ID")
-                      << "XRAY_PUBLIC_KEY:" << !config.contains("$XRAY_PUBLIC_KEY")
-                      << "XRAY_SHORT_ID:" << !config.contains("$XRAY_SHORT_ID");
-        errorCode = ErrorCode::InternalError;
+    if (errorCode != ErrorCode::NoError) {
        return "";
    }

-    config.replace("$XRAY_CLIENT_ID", xrayClientId);
+    config.replace("$XRAY_CLIENT_ID", xrayUuid);
    config.replace("$XRAY_PUBLIC_KEY", xrayPublicKey);
    config.replace("$XRAY_SHORT_ID", xrayShortId);

--- a/client/configurators/xray_configurator.h
+++ b/client/configurators/xray_configurator.h
@@ -14,10 +14,6 @@ public:

    QString createConfig(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig,
                         ErrorCode &errorCode);
-
-private:
-    QString prepareServerConfig(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig,
-                                ErrorCode &errorCode);
 };

 #endif // XRAY_CONFIGURATOR_H
--- a/client/core/controllers/apiController.cpp
+++ b/client/core/controllers/apiController.cpp
@@ -50,8 +50,6 @@ namespace
        constexpr char authData[] = "auth_data";
    }

-    const int requestTimeoutMsecs = 12 * 1000; // 12 secs
-
    ErrorCode checkErrors(const QList<QSslError> &sslErrors, QNetworkReply *reply)
    {
        if (!sslErrors.empty()) {
@@ -179,7 +177,7 @@ void ApiController::fillServerConfig(const QString &protocol, const ApiControlle
 QStringList ApiController::getProxyUrls()
 {
    QNetworkRequest request;
-    request.setTransferTimeout(requestTimeoutMsecs);
+    request.setTransferTimeout(7000);
    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");

    QEventLoop wait;
@@ -282,7 +280,7 @@ void ApiController::updateServerConfigFromApi(const QString &installationUuid, c

    if (serverConfig.value(config_key::configVersion).toInt()) {
        QNetworkRequest request;
-        request.setTransferTimeout(requestTimeoutMsecs);
+        request.setTransferTimeout(7000);
        request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
        request.setRawHeader("Authorization", "Api-Key " + serverConfig.value(configKey::accessToken).toString().toUtf8());
        QString endpoint = serverConfig.value(configKey::apiEdnpoint).toString();
@@ -338,7 +336,7 @@ ErrorCode ApiController::getServicesList(QByteArray &responseBody)
 #endif

    QNetworkRequest request;
-    request.setTransferTimeout(requestTimeoutMsecs);
+    request.setTransferTimeout(7000);
    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");

    request.setUrl(QString("%1v1/services").arg(m_gatewayEndpoint));
@@ -379,13 +377,6 @@ ErrorCode ApiController::getServicesList(QByteArray &responseBody)

    auto errorCode = checkErrors(sslErrors, reply);
    reply->deleteLater();
-
-    if (errorCode == ErrorCode::NoError) {
-        if (!responseBody.contains("services")) {
-            return ErrorCode::ApiServicesMissingError;
-        }
-    }
-
    return errorCode;
 }

@@ -399,7 +390,7 @@ ErrorCode ApiController::getConfigForService(const QString &installationUuid, co
 #endif

    QNetworkRequest request;
-    request.setTransferTimeout(requestTimeoutMsecs);
+    request.setTransferTimeout(7000);
    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");

    request.setUrl(QString("%1v1/config").arg(m_gatewayEndpoint));
--- a/client/core/controllers/serverController.cpp
+++ b/client/core/controllers/serverController.cpp
@@ -770,6 +770,12 @@ ErrorCode ServerController::isUserInSudo(const ServerCredentials &credentials, D

    if (!stdOut.contains("sudo"))
        return ErrorCode::ServerUserNotInSudo;
+    if (stdOut.contains("command not found"))
+        return ErrorCode::SudoPackageIsNotPreinstalled;
+    if (stdOut.contains("sudoers"))
+        return ErrorCode::ServerUserNotListedInSudoers;
+    if (stdOut.contains("password is required"))
+        return ErrorCode::ServerUserPasswordRequired;

    return error;
 }
--- a/client/core/defs.h
+++ b/client/core/defs.h
@@ -56,6 +56,9 @@ namespace amnezia
        ServerCancelInstallation = 204,
        ServerUserNotInSudo = 205,
        ServerPacketManagerError = 206,
+        SudoPackageIsNotPreinstalled = 207,
+        ServerUserNotListedInSudoers = 208,
+        ServerUserPasswordRequired = 209,

        // Ssh connection errors
        SshRequestDeniedError = 300,
@@ -109,7 +112,6 @@ namespace amnezia
        ApiConfigSslError = 1104,
        ApiMissingAgwPublicKey = 1105,
        ApiConfigDecryptionError = 1106,
-        ApiServicesMissingError = 1107,

        // QFile errors
        OpenError = 1200,
--- a/client/core/errorstrings.cpp
+++ b/client/core/errorstrings.cpp
@@ -21,6 +21,9 @@ QString errorString(ErrorCode code) {
    case(ErrorCode::ServerCancelInstallation): errorMessage = QObject::tr("Installation canceled by user"); break;
    case(ErrorCode::ServerUserNotInSudo): errorMessage = QObject::tr("The user does not have permission to use sudo"); break;
    case(ErrorCode::ServerPacketManagerError): errorMessage = QObject::tr("Server error: Packet manager error"); break;
+    case(ErrorCode::SudoPackageIsNotPreinstalled): errorMessage = QObject::tr("The sudo package is not pre-installed"); break;
+    case(ErrorCode::ServerUserNotListedInSudoers): errorMessage = QObject::tr("The user is not listed in sudoers"); break;
+    case(ErrorCode::ServerUserPasswordRequired): errorMessage = QObject::tr("The user's password is required"); break;

    // Libssh errors
    case(ErrorCode::SshRequestDeniedError): errorMessage = QObject::tr("SSH request was denied"); break;
@@ -63,8 +66,7 @@ QString errorString(ErrorCode code) {
    case (ErrorCode::ApiConfigTimeoutError): errorMessage = QObject::tr("Server response timeout on api request"); break;
    case (ErrorCode::ApiMissingAgwPublicKey): errorMessage = QObject::tr("Missing AGW public key"); break;
    case (ErrorCode::ApiConfigDecryptionError): errorMessage = QObject::tr("Failed to decrypt response payload"); break;
-    case (ErrorCode::ApiServicesMissingError): errorMessage = QObject::tr("Missing list of available services"); break;
-
+      
    // QFile errors
    case(ErrorCode::OpenError): errorMessage = QObject::tr("QFile error: The file could not be opened"); break;
    case(ErrorCode::ReadError): errorMessage = QObject::tr("QFile error: An error occurred when reading from the file"); break;
--- a/client/platforms/android/android_controller.cpp
+++ b/client/platforms/android/android_controller.cpp
@@ -163,7 +163,9 @@ QString AndroidController::openFile(const QString &filter)
    QString fileName;
    connect(this, &AndroidController::fileOpened, this,
            [&fileName, &wait](const QString &uri) {
-                fileName = uri;
+                qDebug() << "Android event: file opened; uri:" << uri;
+                fileName = QQmlFile::urlToLocalFileOrQrc(uri);
+                qDebug() << "Android opened filename:" << fileName;
                wait.quit();
            },
            static_cast<Qt::ConnectionType>(Qt::QueuedConnection | Qt::SingleShotConnection));
@@ -173,25 +175,6 @@ QString AndroidController::openFile(const QString &filter)
    return fileName;
 }

-int AndroidController::getFd(const QString &fileName)
-{
-    return callActivityMethod<jint>("getFd", "(Ljava/lang/String;)I",
-                                    QJniObject::fromString(fileName).object<jstring>());
-}
-
-void AndroidController::closeFd()
-{
-    callActivityMethod("closeFd", "()V");
-}
-
-QString AndroidController::getFileName(const QString &uri)
-{
-    auto fileName = callActivityMethod<jstring, jstring>("getFileName", "(Ljava/lang/String;)Ljava/lang/String;",
-                                                         QJniObject::fromString(uri).object<jstring>());
-    QJniEnvironment env;
-    return AndroidUtils::convertJString(env.jniEnv(), fileName.object<jstring>());
-}
-
 bool AndroidController::isCameraPresent()
 {
    return callActivityMethod<jboolean>("isCameraPresent", "()Z");
@@ -304,11 +287,6 @@ bool AndroidController::requestAuthentication()
    return result;
 }

-void AndroidController::sendTouch(float x, float y)
-{
-    callActivityMethod("sendTouch", "(FF)V", x, y);
-}
-
 // Moving log processing to the Android side
 jclass AndroidController::log;
 jmethodID AndroidController::logDebug;
--- a/client/platforms/android/android_controller.h
+++ b/client/platforms/android/android_controller.h
@@ -34,9 +34,6 @@ public:
    void resetLastServer(int serverIndex);
    void saveFile(const QString &fileName, const QString &data);
    QString openFile(const QString &filter);
-    int getFd(const QString &fileName);
-    void closeFd();
-    QString getFileName(const QString &uri);
    bool isCameraPresent();
    bool isOnTv();
    void startQrReaderActivity();
@@ -51,7 +48,6 @@ public:
    bool isNotificationPermissionGranted();
    void requestNotificationPermission();
    bool requestAuthentication();
-    void sendTouch(float x, float y);

    static bool initLogging();
    static void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message);
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -1,227 +1,225 @@
 <RCC>
    <qresource prefix="/">
-        <file>fonts/pt-root-ui_vf.ttf</file>
-        <file>images/amneziaBigLogo.png</file>
-        <file>images/AmneziaVPN.png</file>
-        <file>images/controls/alert-circle.svg</file>
-        <file>images/controls/amnezia.svg</file>
-        <file>images/controls/app.svg</file>
-        <file>images/controls/archive-restore.svg</file>
-        <file>images/controls/arrow-left.svg</file>
-        <file>images/controls/arrow-right.svg</file>
-        <file>images/controls/bug.svg</file>
-        <file>images/controls/check.svg</file>
-        <file>images/controls/chevron-down.svg</file>
-        <file>images/controls/chevron-right.svg</file>
-        <file>images/controls/chevron-up.svg</file>
-        <file>images/controls/close.svg</file>
-        <file>images/controls/copy.svg</file>
-        <file>images/controls/delete.svg</file>
-        <file>images/controls/download.svg</file>
-        <file>images/controls/edit-3.svg</file>
-        <file>images/controls/eye-off.svg</file>
-        <file>images/controls/eye.svg</file>
-        <file>images/controls/file-check-2.svg</file>
-        <file>images/controls/file-cog-2.svg</file>
-        <file>images/controls/folder-open.svg</file>
-        <file>images/controls/folder-search-2.svg</file>
-        <file>images/controls/gauge.svg</file>
-        <file>images/controls/github.svg</file>
-        <file>images/controls/help-circle.svg</file>
-        <file>images/controls/history.svg</file>
-        <file>images/controls/home.svg</file>
-        <file>images/controls/info.svg</file>
-        <file>images/controls/mail.svg</file>
-        <file>images/controls/map-pin.svg</file>
-        <file>images/controls/more-vertical.svg</file>
-        <file>images/controls/plus.svg</file>
-        <file>images/controls/qr-code.svg</file>
-        <file>images/controls/radio-button-inner-circle-pressed.png</file>
-        <file>images/controls/radio-button-inner-circle.png</file>
-        <file>images/controls/radio-button-pressed.svg</file>
-        <file>images/controls/radio-button.svg</file>
-        <file>images/controls/radio.svg</file>
-        <file>images/controls/refresh-cw.svg</file>
-        <file>images/controls/save.svg</file>
-        <file>images/controls/scan-line.svg</file>
-        <file>images/controls/search.svg</file>
-        <file>images/controls/server.svg</file>
-        <file>images/controls/settings-2.svg</file>
-        <file>images/controls/settings.svg</file>
-        <file>images/controls/share-2.svg</file>
-        <file>images/controls/split-tunneling.svg</file>
-        <file>images/controls/tag.svg</file>
-        <file>images/controls/telegram.svg</file>
-        <file>images/controls/text-cursor.svg</file>
-        <file>images/controls/trash.svg</file>
-        <file>images/controls/x-circle.svg</file>
        <file>images/tray/active.png</file>
        <file>images/tray/default.png</file>
        <file>images/tray/error.png</file>
-        <file>server_scripts/awg/configure_container.sh</file>
-        <file>server_scripts/awg/Dockerfile</file>
-        <file>server_scripts/awg/run_container.sh</file>
-        <file>server_scripts/awg/start.sh</file>
-        <file>server_scripts/awg/template.conf</file>
-        <file>server_scripts/build_container.sh</file>
-        <file>server_scripts/check_connection.sh</file>
-        <file>server_scripts/check_server_is_busy.sh</file>
-        <file>server_scripts/check_user_in_sudo.sh</file>
-        <file>server_scripts/dns/configure_container.sh</file>
-        <file>server_scripts/dns/Dockerfile</file>
-        <file>server_scripts/dns/run_container.sh</file>
-        <file>server_scripts/install_docker.sh</file>
-        <file>server_scripts/ipsec/configure_container.sh</file>
-        <file>server_scripts/ipsec/Dockerfile</file>
-        <file>server_scripts/ipsec/mobileconfig.plist</file>
-        <file>server_scripts/ipsec/run_container.sh</file>
-        <file>server_scripts/ipsec/start.sh</file>
-        <file>server_scripts/ipsec/strongswan.profile</file>
-        <file>server_scripts/openvpn_cloak/configure_container.sh</file>
+        <file>images/AmneziaVPN.png</file>
+        <file>server_scripts/remove_container.sh</file>
+        <file>server_scripts/setup_host_firewall.sh</file>
        <file>server_scripts/openvpn_cloak/Dockerfile</file>
-        <file>server_scripts/openvpn_cloak/run_container.sh</file>
+        <file>server_scripts/openvpn_cloak/configure_container.sh</file>
        <file>server_scripts/openvpn_cloak/start.sh</file>
        <file>server_scripts/openvpn_cloak/template.ovpn</file>
+        <file>server_scripts/install_docker.sh</file>
+        <file>server_scripts/build_container.sh</file>
+        <file>server_scripts/prepare_host.sh</file>
+        <file>server_scripts/check_connection.sh</file>
+        <file>server_scripts/remove_all_containers.sh</file>
+        <file>server_scripts/openvpn_cloak/run_container.sh</file>
+        <file>server_scripts/openvpn/configure_container.sh</file>
+        <file>server_scripts/openvpn/run_container.sh</file>
+        <file>server_scripts/openvpn/template.ovpn</file>
+        <file>server_scripts/openvpn/Dockerfile</file>
+        <file>server_scripts/openvpn/start.sh</file>
        <file>server_scripts/openvpn_shadowsocks/configure_container.sh</file>
        <file>server_scripts/openvpn_shadowsocks/Dockerfile</file>
        <file>server_scripts/openvpn_shadowsocks/run_container.sh</file>
        <file>server_scripts/openvpn_shadowsocks/start.sh</file>
        <file>server_scripts/openvpn_shadowsocks/template.ovpn</file>
-        <file>server_scripts/openvpn/configure_container.sh</file>
-        <file>server_scripts/openvpn/Dockerfile</file>
-        <file>server_scripts/openvpn/run_container.sh</file>
-        <file>server_scripts/openvpn/start.sh</file>
-        <file>server_scripts/openvpn/template.ovpn</file>
-        <file>server_scripts/prepare_host.sh</file>
-        <file>server_scripts/remove_all_containers.sh</file>
-        <file>server_scripts/remove_container.sh</file>
-        <file>server_scripts/setup_host_firewall.sh</file>
-        <file>server_scripts/sftp/configure_container.sh</file>
-        <file>server_scripts/sftp/Dockerfile</file>
-        <file>server_scripts/sftp/run_container.sh</file>
-        <file>server_scripts/socks5_proxy/configure_container.sh</file>
-        <file>server_scripts/socks5_proxy/Dockerfile</file>
-        <file>server_scripts/socks5_proxy/run_container.sh</file>
-        <file>server_scripts/socks5_proxy/start.sh</file>
-        <file>server_scripts/website_tor/configure_container.sh</file>
-        <file>server_scripts/website_tor/Dockerfile</file>
-        <file>server_scripts/website_tor/run_container.sh</file>
        <file>server_scripts/wireguard/configure_container.sh</file>
        <file>server_scripts/wireguard/Dockerfile</file>
        <file>server_scripts/wireguard/run_container.sh</file>
        <file>server_scripts/wireguard/start.sh</file>
        <file>server_scripts/wireguard/template.conf</file>
+        <file>server_scripts/website_tor/configure_container.sh</file>
+        <file>server_scripts/website_tor/run_container.sh</file>
+        <file>ui/qml/Config/GlobalConfig.qml</file>
+        <file>ui/qml/Config/qmldir</file>
+        <file>server_scripts/check_server_is_busy.sh</file>
+        <file>server_scripts/dns/configure_container.sh</file>
+        <file>server_scripts/dns/Dockerfile</file>
+        <file>server_scripts/dns/run_container.sh</file>
+        <file>server_scripts/sftp/configure_container.sh</file>
+        <file>server_scripts/sftp/Dockerfile</file>
+        <file>server_scripts/sftp/run_container.sh</file>
+        <file>server_scripts/ipsec/configure_container.sh</file>
+        <file>server_scripts/ipsec/Dockerfile</file>
+        <file>server_scripts/ipsec/run_container.sh</file>
+        <file>server_scripts/ipsec/start.sh</file>
+        <file>server_scripts/ipsec/mobileconfig.plist</file>
+        <file>server_scripts/ipsec/strongswan.profile</file>
+        <file>server_scripts/website_tor/Dockerfile</file>
+        <file>server_scripts/check_user_in_sudo.sh</file>
+        <file>ui/qml/Controls2/BasicButtonType.qml</file>
+        <file>ui/qml/Controls2/TextFieldWithHeaderType.qml</file>
+        <file>ui/qml/Controls2/LabelWithButtonType.qml</file>
+        <file>images/controls/arrow-right.svg</file>
+        <file>images/controls/chevron-right.svg</file>
+        <file>ui/qml/Controls2/ImageButtonType.qml</file>
+        <file>ui/qml/Controls2/CardType.qml</file>
+        <file>ui/qml/Controls2/CheckBoxType.qml</file>
+        <file>images/controls/check.svg</file>
+        <file>ui/qml/Controls2/DropDownType.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardStart.qml</file>
+        <file>ui/qml/main2.qml</file>
+        <file>images/amneziaBigLogo.png</file>
+        <file>ui/qml/Controls2/FlickableType.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardCredentials.qml</file>
+        <file>ui/qml/Controls2/HeaderType.qml</file>
+        <file>images/controls/arrow-left.svg</file>
+        <file>ui/qml/Pages2/PageSetupWizardProtocols.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardEasy.qml</file>
+        <file>images/controls/chevron-down.svg</file>
+        <file>images/controls/chevron-up.svg</file>
+        <file>ui/qml/Controls2/TextTypes/ParagraphTextType.qml</file>
+        <file>ui/qml/Controls2/TextTypes/Header2TextType.qml</file>
+        <file>ui/qml/Controls2/HorizontalRadioButton.qml</file>
+        <file>ui/qml/Controls2/VerticalRadioButton.qml</file>
+        <file>ui/qml/Controls2/SwitcherType.qml</file>
+        <file>ui/qml/Controls2/TabButtonType.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardProtocolSettings.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardInstalling.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardConfigSource.qml</file>
+        <file>images/controls/folder-open.svg</file>
+        <file>images/controls/qr-code.svg</file>
+        <file>images/controls/text-cursor.svg</file>
+        <file>ui/qml/Pages2/PageSetupWizardTextKey.qml</file>
+        <file>ui/qml/Pages2/PageStart.qml</file>
+        <file>ui/qml/Controls2/TabImageButtonType.qml</file>
+        <file>images/controls/home.svg</file>
+        <file>images/controls/settings-2.svg</file>
+        <file>images/controls/share-2.svg</file>
+        <file>ui/qml/Pages2/PageHome.qml</file>
+        <file>ui/qml/Pages2/PageSettingsServersList.qml</file>
+        <file>ui/qml/Pages2/PageShare.qml</file>
+        <file>ui/qml/Controls2/TextTypes/Header1TextType.qml</file>
+        <file>ui/qml/Controls2/TextTypes/LabelTextType.qml</file>
+        <file>ui/qml/Controls2/TextTypes/ButtonTextType.qml</file>
+        <file>ui/qml/Controls2/Header2Type.qml</file>
+        <file>images/controls/plus.svg</file>
+        <file>ui/qml/Components/ConnectButton.qml</file>
+        <file>images/controls/download.svg</file>
+        <file>ui/qml/Controls2/ProgressBarType.qml</file>
+        <file>ui/qml/Components/ConnectionTypeSelectionDrawer.qml</file>
+        <file>ui/qml/Components/HomeContainersListView.qml</file>
+        <file>ui/qml/Controls2/TextTypes/CaptionTextType.qml</file>
+        <file>images/controls/settings.svg</file>
+        <file>ui/qml/Pages2/PageSettingsServerInfo.qml</file>
+        <file>ui/qml/Controls2/PageType.qml</file>
+        <file>ui/qml/Controls2/PopupType.qml</file>
+        <file>images/controls/edit-3.svg</file>
+        <file>ui/qml/Pages2/PageSettingsServerData.qml</file>
+        <file>ui/qml/Components/SettingsContainersListView.qml</file>
+        <file>ui/qml/Controls2/TextTypes/ListItemTitleType.qml</file>
+        <file>ui/qml/Controls2/DividerType.qml</file>
+        <file>ui/qml/Controls2/StackViewType.qml</file>
+        <file>ui/qml/Pages2/PageSettings.qml</file>
+        <file>images/controls/amnezia.svg</file>
+        <file>images/controls/app.svg</file>
+        <file>images/controls/radio.svg</file>
+        <file>images/controls/save.svg</file>
+        <file>images/controls/server.svg</file>
+        <file>ui/qml/Pages2/PageSettingsServerProtocols.qml</file>
+        <file>ui/qml/Pages2/PageSettingsServerServices.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardViewConfig.qml</file>
+        <file>images/controls/file-cog-2.svg</file>
+        <file>ui/qml/Components/QuestionDrawer.qml</file>
+        <file>ui/qml/Pages2/PageDeinstalling.qml</file>
+        <file>ui/qml/Controls2/BackButtonType.qml</file>
+        <file>ui/qml/Pages2/PageSettingsServerProtocol.qml</file>
+        <file>ui/qml/Components/TransportProtoSelector.qml</file>
+        <file>ui/qml/Controls2/ListViewWithRadioButtonType.qml</file>
+        <file>images/controls/radio-button.svg</file>
+        <file>images/controls/radio-button-inner-circle.png</file>
+        <file>images/controls/radio-button-pressed.svg</file>
+        <file>images/controls/radio-button-inner-circle-pressed.png</file>
+        <file>ui/qml/Components/ShareConnectionDrawer.qml</file>
+        <file>ui/qml/Pages2/PageSettingsConnection.qml</file>
+        <file>ui/qml/Pages2/PageSettingsDns.qml</file>
+        <file>ui/qml/Pages2/PageSettingsApplication.qml</file>
+        <file>ui/qml/Pages2/PageSettingsBackup.qml</file>
+        <file>images/controls/delete.svg</file>
+        <file>ui/qml/Pages2/PageSettingsAbout.qml</file>
+        <file>images/controls/github.svg</file>
+        <file>images/controls/mail.svg</file>
+        <file>images/controls/telegram.svg</file>
+        <file>ui/qml/Controls2/TextTypes/SmallTextType.qml</file>
+        <file>ui/qml/Filters/ContainersModelFilters.qml</file>
+        <file>ui/qml/Components/SelectLanguageDrawer.qml</file>
+        <file>ui/qml/Controls2/BusyIndicatorType.qml</file>
+        <file>ui/qml/Pages2/PageProtocolOpenVpnSettings.qml</file>
+        <file>ui/qml/Pages2/PageProtocolShadowSocksSettings.qml</file>
+        <file>ui/qml/Pages2/PageProtocolCloakSettings.qml</file>
+        <file>ui/qml/Pages2/PageProtocolXraySettings.qml</file>
+        <file>ui/qml/Pages2/PageProtocolRaw.qml</file>
+        <file>ui/qml/Pages2/PageSettingsLogging.qml</file>
+        <file>ui/qml/Pages2/PageServiceSftpSettings.qml</file>
+        <file>images/controls/copy.svg</file>
+        <file>ui/qml/Pages2/PageServiceTorWebsiteSettings.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardQrReader.qml</file>
+        <file>images/controls/eye.svg</file>
+        <file>images/controls/eye-off.svg</file>
+        <file>ui/qml/Pages2/PageSettingsSplitTunneling.qml</file>
+        <file>ui/qml/Controls2/ContextMenuType.qml</file>
+        <file>ui/qml/Controls2/TextAreaType.qml</file>
+        <file>images/controls/trash.svg</file>
+        <file>images/controls/more-vertical.svg</file>
+        <file>ui/qml/Controls2/ListViewWithLabelsType.qml</file>
+        <file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
+        <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
+        <file>images/controls/x-circle.svg</file>
+        <file>ui/qml/Pages2/PageProtocolAwgSettings.qml</file>
+        <file>server_scripts/awg/template.conf</file>
+        <file>server_scripts/awg/start.sh</file>
+        <file>server_scripts/awg/configure_container.sh</file>
+        <file>server_scripts/awg/run_container.sh</file>
+        <file>server_scripts/awg/Dockerfile</file>
+        <file>ui/qml/Pages2/PageShareFullAccess.qml</file>
+        <file>images/controls/close.svg</file>
+        <file>images/controls/search.svg</file>
        <file>server_scripts/xray/configure_container.sh</file>
        <file>server_scripts/xray/Dockerfile</file>
        <file>server_scripts/xray/run_container.sh</file>
        <file>server_scripts/xray/start.sh</file>
        <file>server_scripts/xray/template.json</file>
-        <file>ui/qml/Components/ConnectButton.qml</file>
-        <file>ui/qml/Components/ConnectionTypeSelectionDrawer.qml</file>
-        <file>ui/qml/Components/HomeContainersListView.qml</file>
-        <file>ui/qml/Components/HomeSplitTunnelingDrawer.qml</file>
-        <file>ui/qml/Components/InstalledAppsDrawer.qml</file>
-        <file>ui/qml/Components/QuestionDrawer.qml</file>
-        <file>ui/qml/Components/SelectLanguageDrawer.qml</file>
-        <file>ui/qml/Components/ServersListView.qml</file>
-        <file>ui/qml/Components/SettingsContainersListView.qml</file>
-        <file>ui/qml/Components/ShareConnectionDrawer.qml</file>
-        <file>ui/qml/Components/TransportProtoSelector.qml</file>
-        <file>ui/qml/Config/GlobalConfig.qml</file>
-        <file>ui/qml/Config/qmldir</file>
-        <file>ui/qml/Controls2/BackButtonType.qml</file>
-        <file>ui/qml/Controls2/BasicButtonType.qml</file>
-        <file>ui/qml/Controls2/BusyIndicatorType.qml</file>
-        <file>ui/qml/Controls2/CardType.qml</file>
-        <file>ui/qml/Controls2/CardWithIconsType.qml</file>
-        <file>ui/qml/Controls2/CheckBoxType.qml</file>
-        <file>ui/qml/Controls2/ContextMenuType.qml</file>
-        <file>ui/qml/Controls2/DividerType.qml</file>
-        <file>ui/qml/Controls2/DrawerType2.qml</file>
-        <file>ui/qml/Controls2/DropDownType.qml</file>
-        <file>ui/qml/Controls2/FlickableType.qml</file>
-        <file>ui/qml/Controls2/Header2Type.qml</file>
-        <file>ui/qml/Controls2/HeaderType.qml</file>
-        <file>ui/qml/Controls2/HorizontalRadioButton.qml</file>
-        <file>ui/qml/Controls2/ImageButtonType.qml</file>
-        <file>ui/qml/Controls2/LabelWithButtonType.qml</file>
-        <file>ui/qml/Controls2/LabelWithImageType.qml</file>
-        <file>ui/qml/Controls2/ListViewWithLabelsType.qml</file>
-        <file>ui/qml/Controls2/ListViewWithRadioButtonType.qml</file>
-        <file>ui/qml/Controls2/PageType.qml</file>
-        <file>ui/qml/Controls2/PopupType.qml</file>
-        <file>ui/qml/Controls2/ProgressBarType.qml</file>
-        <file>ui/qml/Controls2/ScrollBarType.qml</file>
-        <file>ui/qml/Controls2/StackViewType.qml</file>
-        <file>ui/qml/Controls2/SwitcherType.qml</file>
-        <file>ui/qml/Controls2/TabButtonType.qml</file>
-        <file>ui/qml/Controls2/TabImageButtonType.qml</file>
-        <file>ui/qml/Controls2/TextAreaType.qml</file>
-        <file>ui/qml/Controls2/TextAreaWithFooterType.qml</file>
-        <file>ui/qml/Controls2/TextFieldWithHeaderType.qml</file>
-        <file>ui/qml/Controls2/TextTypes/ButtonTextType.qml</file>
-        <file>ui/qml/Controls2/TextTypes/CaptionTextType.qml</file>
-        <file>ui/qml/Controls2/TextTypes/Header1TextType.qml</file>
-        <file>ui/qml/Controls2/TextTypes/Header2TextType.qml</file>
-        <file>ui/qml/Controls2/TextTypes/LabelTextType.qml</file>
-        <file>ui/qml/Controls2/TextTypes/ListItemTitleType.qml</file>
-        <file>ui/qml/Controls2/TextTypes/ParagraphTextType.qml</file>
-        <file>ui/qml/Controls2/TextTypes/SmallTextType.qml</file>
-        <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
-        <file>ui/qml/Controls2/VerticalRadioButton.qml</file>
-        <file>ui/qml/Controls2/WarningType.qml</file>
-        <file>ui/qml/Filters/ContainersModelFilters.qml</file>
-        <file>ui/qml/main2.qml</file>
-        <file>ui/qml/Modules/Style/AmneziaStyle.qml</file>
-        <file>ui/qml/Modules/Style/qmldir</file>
-        <file>ui/qml/Pages2/PageDeinstalling.qml</file>
-        <file>ui/qml/Pages2/PageDevMenu.qml</file>
-        <file>ui/qml/Pages2/PageHome.qml</file>
-        <file>ui/qml/Pages2/PageProtocolAwgSettings.qml</file>
-        <file>ui/qml/Pages2/PageProtocolCloakSettings.qml</file>
-        <file>ui/qml/Pages2/PageProtocolOpenVpnSettings.qml</file>
-        <file>ui/qml/Pages2/PageProtocolRaw.qml</file>
-        <file>ui/qml/Pages2/PageProtocolShadowSocksSettings.qml</file>
        <file>ui/qml/Pages2/PageProtocolWireGuardSettings.qml</file>
-        <file>ui/qml/Pages2/PageProtocolXraySettings.qml</file>
-        <file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
-        <file>ui/qml/Pages2/PageServiceSftpSettings.qml</file>
-        <file>ui/qml/Pages2/PageServiceSocksProxySettings.qml</file>
-        <file>ui/qml/Pages2/PageServiceTorWebsiteSettings.qml</file>
-        <file>ui/qml/Pages2/PageSettings.qml</file>
-        <file>ui/qml/Pages2/PageSettingsAbout.qml</file>
-        <file>ui/qml/Pages2/PageSettingsApiLanguageList.qml</file>
-        <file>ui/qml/Pages2/PageSettingsApiServerInfo.qml</file>
-        <file>ui/qml/Pages2/PageSettingsApplication.qml</file>
+        <file>ui/qml/Components/HomeSplitTunnelingDrawer.qml</file>
+        <file>images/controls/split-tunneling.svg</file>
+        <file>ui/qml/Controls2/DrawerType2.qml</file>
        <file>ui/qml/Pages2/PageSettingsAppSplitTunneling.qml</file>
-        <file>ui/qml/Pages2/PageSettingsBackup.qml</file>
-        <file>ui/qml/Pages2/PageSettingsConnection.qml</file>
-        <file>ui/qml/Pages2/PageSettingsDns.qml</file>
-        <file>ui/qml/Pages2/PageSettingsLogging.qml</file>
-        <file>ui/qml/Pages2/PageSettingsServerData.qml</file>
-        <file>ui/qml/Pages2/PageSettingsServerInfo.qml</file>
-        <file>ui/qml/Pages2/PageSettingsServerProtocol.qml</file>
-        <file>ui/qml/Pages2/PageSettingsServerProtocols.qml</file>
-        <file>ui/qml/Pages2/PageSettingsServerServices.qml</file>
-        <file>ui/qml/Pages2/PageSettingsServersList.qml</file>
-        <file>ui/qml/Pages2/PageSettingsSplitTunneling.qml</file>
+        <file>ui/qml/Components/InstalledAppsDrawer.qml</file>
+        <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>
+        <file>server_scripts/socks5_proxy/configure_container.sh</file>
+        <file>server_scripts/socks5_proxy/start.sh</file>
        <file>ui/qml/Pages2/PageProtocolAwgClientSettings.qml</file>
        <file>ui/qml/Pages2/PageProtocolWireGuardClientSettings.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardApiServiceInfo.qml</file>
        <file>ui/qml/Pages2/PageSetupWizardApiServicesList.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardConfigSource.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardCredentials.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardEasy.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardInstalling.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardProtocols.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardProtocolSettings.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardQrReader.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardStart.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardTextKey.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardViewConfig.qml</file>
-        <file>ui/qml/Pages2/PageShare.qml</file>
-        <file>ui/qml/Pages2/PageShareFullAccess.qml</file>
-        <file>ui/qml/Pages2/PageStart.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardApiServiceInfo.qml</file>
+        <file>ui/qml/Controls2/CardWithIconsType.qml</file>
+        <file>images/controls/tag.svg</file>
+        <file>images/controls/history.svg</file>
+        <file>images/controls/gauge.svg</file>
+        <file>images/controls/map-pin.svg</file>
+        <file>ui/qml/Controls2/LabelWithImageType.qml</file>
+        <file>images/controls/info.svg</file>
+        <file>ui/qml/Controls2/TextAreaWithFooterType.qml</file>
+        <file>images/controls/scan-line.svg</file>
+        <file>images/controls/folder-search-2.svg</file>
+        <file>ui/qml/Pages2/PageSettingsApiServerInfo.qml</file>
+        <file>images/controls/bug.svg</file>
+        <file>ui/qml/Pages2/PageDevMenu.qml</file>
+        <file>images/controls/refresh-cw.svg</file>
+        <file>ui/qml/Pages2/PageSettingsApiLanguageList.qml</file>
+        <file>images/controls/archive-restore.svg</file>
+        <file>images/controls/help-circle.svg</file>
    </qresource>
    <qresource prefix="/countriesFlags">
        <file>images/flagKit/ZW.svg</file>
--- a/client/server_scripts/check_user_in_sudo.sh
+++ b/client/server_scripts/check_user_in_sudo.sh
@@ -1,2 +1,3 @@
+echo $LC_MESSAGES | grep -qE "en_US.UTF-8|C.UTF-8" || export LC_MESSAGES=C.UTF-8;\
 CUR_USER=$(whoami);\
-groups $CUR_USER
+groups $CUR_USER | grep sudo && sudo -nu $CUR_USER sudo -n uname > /dev/null
--- a/client/translations/amneziavpn_ru_RU.ts
+++ b/client/translations/amneziavpn_ru_RU.ts
@@ -2679,7 +2679,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
    <message>
        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="154"/>
        <source>Where to get connection data, step-by-step instructions for buying a VPS</source>
-        <translation>Где взять данные для подключения, пошаговые инструкции по покупке VPS</translation>
+        <translation>Где взять данные для подключения, пошаговые инстуркции по покупке VPS</translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="170"/>
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -55,7 +55,7 @@ void ConnectionController::openConnection()
        && !m_serversModel->data(serverIndex, ServersModel::Roles::HasInstalledContainers).toBool()) {
        emit updateApiConfigFromGateway();
    } else if (configVersion && m_serversModel->isApiKeyExpired(serverIndex)) {
-        qDebug() << "attempt to update api config by expires_at event";
+        qDebug() << "attempt to update api config by end_date event";
        if (configVersion == ApiConfigSources::Telegram) {
            emit updateApiConfigFromTelegram();
        } else {
--- a/client/ui/controllers/exportController.cpp
+++ b/client/ui/controllers/exportController.cpp
@@ -121,8 +121,9 @@ ErrorCode ExportController::generateNativeConfig(const DockerContainer container

    jsonNativeConfig = QJsonDocument::fromJson(protocolConfigString.toUtf8()).object();

-    if (protocol == Proto::OpenVpn || protocol == Proto::WireGuard || protocol == Proto::Awg || protocol == Proto::Xray) {
-        errorCode = m_clientManagementModel->appendClient(jsonNativeConfig, clientName, container, credentials, serverController);
+    if (protocol == Proto::OpenVpn || protocol == Proto::WireGuard || protocol == Proto::Awg) {
+        auto clientId = jsonNativeConfig.value(config_key::clientId).toString();
+        errorCode = m_clientManagementModel->appendClient(clientId, clientName, container, credentials, serverController);
    }
    return errorCode;
 }
@@ -247,10 +248,10 @@ void ExportController::generateCloakConfig()
    emit exportConfigChanged();
 }

-void ExportController::generateXrayConfig(const QString &clientName)
+void ExportController::generateXrayConfig()
 {
    QJsonObject nativeConfig;
-    ErrorCode errorCode = generateNativeConfig(DockerContainer::Xray, clientName, Proto::Xray, nativeConfig);
+    ErrorCode errorCode = generateNativeConfig(DockerContainer::Xray, "", Proto::Xray, nativeConfig);
    if (errorCode) {
        emit exportErrorOccurred(errorCode);
        return;
--- a/client/ui/controllers/exportController.h
+++ b/client/ui/controllers/exportController.h
@@ -28,7 +28,7 @@ public slots:
    void generateAwgConfig(const QString &clientName);
    void generateShadowSocksConfig();
    void generateCloakConfig();
-    void generateXrayConfig(const QString &clientName);
+    void generateXrayConfig();

    QString getConfig();
    QString getNativeConfigString();
--- a/client/ui/controllers/focusController.cpp
+++ b/client/ui/controllers/focusController.cpp
@@ -1,210 +0,0 @@
-#include "focusController.h"
-#include "utils/qmlUtils.h"
-
-#include <QQmlApplicationEngine>
-#include <QQuickWindow>
-
-FocusController::FocusController(QQmlApplicationEngine *engine, QObject *parent)
-    : QObject { parent },
-      m_engine { engine },
-      m_focusChain {},
-      m_focusedItem { nullptr },
-      m_rootObjects {},
-      m_defaultFocusItem { QSharedPointer<QQuickItem>() },
-      m_lvfc { nullptr }
-{
-    QObject::connect(m_engine.get(), &QQmlApplicationEngine::objectCreated, this,
-                     [this](QObject *object, const QUrl &url) {
-                         QQuickItem *newDefaultFocusItem = object->findChild<QQuickItem *>("defaultFocusItem");
-                         if (newDefaultFocusItem && m_defaultFocusItem != newDefaultFocusItem) {
-                             m_defaultFocusItem.reset(newDefaultFocusItem);
-                         }
-                     });
-
-    QObject::connect(this, &FocusController::focusedItemChanged, this,
-                     [this]() { m_focusedItem->forceActiveFocus(Qt::TabFocusReason); });
-}
-
-void FocusController::nextKeyTabItem()
-{
-    nextItem(Direction::Forward);
-}
-
-void FocusController::previousKeyTabItem()
-{
-    nextItem(Direction::Backward);
-}
-
-void FocusController::nextKeyUpItem()
-{
-    nextItem(Direction::Backward);
-}
-
-void FocusController::nextKeyDownItem()
-{
-    nextItem(Direction::Forward);
-}
-
-void FocusController::nextKeyLeftItem()
-{
-    nextItem(Direction::Backward);
-}
-
-void FocusController::nextKeyRightItem()
-{
-    nextItem(Direction::Forward);
-}
-
-void FocusController::setFocusItem(QQuickItem *item)
-{
-    if (m_focusedItem != item) {
-        m_focusedItem = item;
-    }
-    emit focusedItemChanged();
-}
-
-void FocusController::setFocusOnDefaultItem()
-{
-    setFocusItem(m_defaultFocusItem.get());
-}
-
-void FocusController::pushRootObject(QObject *object)
-{
-    m_rootObjects.push(object);
-    dropListView();
-    // setFocusOnDefaultItem();
-}
-
-void FocusController::dropRootObject(QObject *object)
-{
-    if (m_rootObjects.empty()) {
-        return;
-    }
-
-    if (m_rootObjects.top() == object) {
-        m_rootObjects.pop();
-        dropListView();
-        setFocusOnDefaultItem();
-    } else {
-        qWarning() << "===>> TRY TO DROP WRONG ROOT OBJECT: " << m_rootObjects.top() << " SHOULD BE: " << object;
-    }
-}
-
-void FocusController::resetRootObject()
-{
-    m_rootObjects.clear();
-}
-
-void FocusController::reload(Direction direction)
-{
-    m_focusChain.clear();
-
-    QObject *rootObject = (m_rootObjects.empty() ? m_engine->rootObjects().value(0) : m_rootObjects.top());
-
-    if (!rootObject) {
-        qCritical() << "No ROOT OBJECT found!";
-        resetRootObject();
-        dropListView();
-        return;
-    }
-
-    m_focusChain.append(FocusControl::getSubChain(rootObject));
-
-    std::sort(m_focusChain.begin(), m_focusChain.end(),
-              direction == Direction::Forward ? FocusControl::isLess : FocusControl::isMore);
-
-    if (m_focusChain.empty()) {
-        qWarning() << "Focus chain is empty!";
-        resetRootObject();
-        dropListView();
-        return;
-    }
-}
-
-void FocusController::nextItem(Direction direction)
-{
-    reload(direction);
-
-    if (m_lvfc && FocusControl::isListView(m_focusedItem)) {
-        direction == Direction::Forward ? focusNextListViewItem() : focusPreviousListViewItem();
-
-        return;
-    }
-
-    if (m_focusChain.empty()) {
-        qWarning() << "There are no items to navigate";
-        setFocusOnDefaultItem();
-        return;
-    }
-
-    auto focusedItemIndex = m_focusChain.indexOf(m_focusedItem);
-
-    if (focusedItemIndex == -1) {
-        focusedItemIndex = 0;
-    } else if (focusedItemIndex == (m_focusChain.size() - 1)) {
-        focusedItemIndex = 0;
-    } else {
-        focusedItemIndex++;
-    }
-
-    const auto focusedItem = qobject_cast<QQuickItem *>(m_focusChain.at(focusedItemIndex));
-
-    if (focusedItem == nullptr) {
-        qWarning() << "Failed to get item to focus on. Setting focus on default";
-        setFocusOnDefaultItem();
-        return;
-    }
-
-    if (FocusControl::isListView(focusedItem)) {
-        m_lvfc = new ListViewFocusController(focusedItem, this);
-        m_focusedItem = focusedItem;
-        if (direction == Direction::Forward) {
-            m_lvfc->nextDelegate();
-            focusNextListViewItem();
-        } else {
-            m_lvfc->previousDelegate();
-            focusPreviousListViewItem();
-        }
-        return;
-    }
-
-    setFocusItem(focusedItem);
-}
-
-void FocusController::focusNextListViewItem()
-{
-    m_lvfc->reloadFocusChain();
-    if (m_lvfc->isLastFocusItemInListView() || m_lvfc->isReturnNeeded()) {
-        dropListView();
-        nextItem(Direction::Forward);
-        return;
-    } else if (m_lvfc->isLastFocusItemInDelegate()) {
-        m_lvfc->resetFocusChain();
-        m_lvfc->nextDelegate();
-    }
-
-    m_lvfc->focusNextItem();
-}
-
-void FocusController::focusPreviousListViewItem()
-{
-    m_lvfc->reloadFocusChain();
-    if (m_lvfc->isFirstFocusItemInListView() || m_lvfc->isReturnNeeded()) {
-        dropListView();
-        nextItem(Direction::Backward);
-        return;
-    } else if (m_lvfc->isFirstFocusItemInDelegate()) {
-        m_lvfc->resetFocusChain();
-        m_lvfc->previousDelegate();
-    }
-
-    m_lvfc->focusPreviousItem();
-}
-
-void FocusController::dropListView()
-{
-    if (m_lvfc) {
-        delete m_lvfc;
-        m_lvfc = nullptr;
-    }
-}
--- a/client/ui/controllers/focusController.h
+++ b/client/ui/controllers/focusController.h
@@ -1,57 +0,0 @@
-#ifndef FOCUSCONTROLLER_H
-#define FOCUSCONTROLLER_H
-
-#include "ui/controllers/listViewFocusController.h"
-
-#include <QQmlApplicationEngine>
-
-/*!
- * \brief The FocusController class makes focus control more straightforward
- * \details Focus is handled only for visible and enabled items which have
- *          `isFocused` property from top left to bottom right.
- * \note There are items handled differently (e.g. ListView)
- */
-class FocusController : public QObject
-{
-    Q_OBJECT
-public:
-    explicit FocusController(QQmlApplicationEngine *engine, QObject *parent = nullptr);
-    ~FocusController() override = default;
-
-    Q_INVOKABLE void nextKeyTabItem();
-    Q_INVOKABLE void previousKeyTabItem();
-    Q_INVOKABLE void nextKeyUpItem();
-    Q_INVOKABLE void nextKeyDownItem();
-    Q_INVOKABLE void nextKeyLeftItem();
-    Q_INVOKABLE void nextKeyRightItem();
-    Q_INVOKABLE void setFocusItem(QQuickItem *item);
-    Q_INVOKABLE void setFocusOnDefaultItem();
-    Q_INVOKABLE void pushRootObject(QObject *object);
-    Q_INVOKABLE void dropRootObject(QObject *object);
-    Q_INVOKABLE void resetRootObject();
-
-private:
-    enum class Direction {
-        Forward,
-        Backward,
-    };
-
-    void reload(Direction direction);
-    void nextItem(Direction direction);
-    void focusNextListViewItem();
-    void focusPreviousListViewItem();
-    void dropListView();
-
-    QSharedPointer<QQmlApplicationEngine> m_engine; // Pointer to engine to get root object
-    QList<QObject *> m_focusChain;                  // List of current objects to be focused
-    QQuickItem *m_focusedItem;                      // Pointer to the active focus item
-    QStack<QObject *> m_rootObjects;
-    QSharedPointer<QQuickItem> m_defaultFocusItem;
-
-    ListViewFocusController *m_lvfc; // ListView focus manager
-
-signals:
-    void focusedItemChanged();
-};
-
-#endif // FOCUSCONTROLLER_H
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -9,7 +9,6 @@

 #include "core/errorstrings.h"
 #include "core/serialization/serialization.h"
-#include "systemController.h"
 #include "utilities.h"

 #ifdef Q_OS_ANDROID
@@ -77,18 +76,17 @@ ImportController::ImportController(const QSharedPointer<ServersModel> &serversMo

 bool ImportController::extractConfigFromFile(const QString &fileName)
 {
-    QString data;
-    if (!SystemController::readFile(fileName, data)) {
-        emit importErrorOccurred(ErrorCode::ImportOpenConfigError, false);
-        return false;
+    QFile file(fileName);
+
+    if (file.open(QIODevice::ReadOnly)) {
+        QString data = file.readAll();
+
+        m_configFileName = QFileInfo(file.fileName()).fileName();
+        return extractConfigFromData(data);
    }
-    m_configFileName = QFileInfo(QFile(fileName).fileName()).fileName();
-#ifdef Q_OS_ANDROID
-    if (m_configFileName.isEmpty()) {
-        m_configFileName = AndroidController::instance()->getFileName(fileName);
-    }
-#endif
-    return extractConfigFromData(data);
+
+    emit importErrorOccurred(ErrorCode::ImportOpenConfigError, false);
+    return false;
 }

 bool ImportController::extractConfigFromData(QString data)
--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -848,6 +848,7 @@ bool InstallController::updateServiceFromApi(const int serverIndex, const QStrin

    newServerConfig.insert(configKey::apiConfig, newApiConfig);
    newServerConfig.insert(configKey::authData, authData);
+    newServerConfig.insert(config_key::crc, serverConfig.value(config_key::crc));
    m_serversModel->editServer(newServerConfig, serverIndex);

    if (reloadServiceConfig) {
--- a/client/ui/controllers/listViewFocusController.cpp
+++ b/client/ui/controllers/listViewFocusController.cpp
@@ -1,309 +0,0 @@
-#include "listViewFocusController.h"
-#include "utils/qmlUtils.h"
-
-#include <QQuickWindow>
-
-ListViewFocusController::ListViewFocusController(QQuickItem *listView, QObject *parent)
-    : QObject { parent },
-      m_listView { listView },
-      m_focusChain {},
-      m_currentSection { Section::Default },
-      m_header { nullptr },
-      m_footer { nullptr },
-      m_focusedItem { nullptr },
-      m_focusedItemIndex { -1 },
-      m_delegateIndex { 0 },
-      m_isReturnNeeded { false },
-      m_currentSectionString { "Default", "Header", "Delegate", "Footer" }
-{
-    QVariant headerItemProperty = m_listView->property("headerItem");
-    m_header = headerItemProperty.canConvert<QQuickItem *>() ? headerItemProperty.value<QQuickItem *>() : nullptr;
-
-    QVariant footerItemProperty = m_listView->property("footerItem");
-    m_footer = footerItemProperty.canConvert<QQuickItem *>() ? footerItemProperty.value<QQuickItem *>() : nullptr;
-}
-
-ListViewFocusController::~ListViewFocusController()
-{
-}
-
-void ListViewFocusController::viewAtCurrentIndex() const
-{
-    switch (m_currentSection) {
-    case Section::Default: [[fallthrough]];
-    case Section::Header: {
-        QMetaObject::invokeMethod(m_listView, "positionViewAtBeginning");
-        break;
-    }
-    case Section::Delegate: {
-        QMetaObject::invokeMethod(m_listView, "positionViewAtIndex", Q_ARG(int, m_delegateIndex), // Index
-                                  Q_ARG(int, 2)); // PositionMode (0 = Visible)
-        break;
-    }
-    case Section::Footer: {
-        QMetaObject::invokeMethod(m_listView, "positionViewAtEnd");
-        break;
-    }
-    }
-}
-
-int ListViewFocusController::size() const
-{
-    return m_listView->property("count").toInt();
-}
-
-int ListViewFocusController::currentIndex() const
-{
-    return m_delegateIndex;
-}
-
-void ListViewFocusController::setDelegateIndex(int index)
-{
-    m_delegateIndex = index;
-    m_listView->setProperty("currentIndex", index);
-}
-
-void ListViewFocusController::nextDelegate()
-{
-    switch (m_currentSection) {
-    case Section::Default: {
-        if (hasHeader()) {
-            m_currentSection = Section::Header;
-            viewAtCurrentIndex();
-            break;
-        }
-        [[fallthrough]];
-    }
-    case Section::Header: {
-        if (size() > 0) {
-            m_currentSection = Section::Delegate;
-            viewAtCurrentIndex();
-            break;
-        }
-        [[fallthrough]];
-    }
-    case Section::Delegate:
-        if (m_delegateIndex < (size() - 1)) {
-            setDelegateIndex(m_delegateIndex + 1);
-            viewAtCurrentIndex();
-            break;
-        } else if (hasFooter()) {
-            m_currentSection = Section::Footer;
-            viewAtCurrentIndex();
-            break;
-        }
-        [[fallthrough]];
-    case Section::Footer: {
-        m_isReturnNeeded = true;
-        m_currentSection = Section::Default;
-        viewAtCurrentIndex();
-        break;
-    }
-    default: {
-        qCritical() << "Current section is invalid!";
-        break;
-    }
-    }
-}
-
-void ListViewFocusController::previousDelegate()
-{
-    switch (m_currentSection) {
-    case Section::Default: {
-        if (hasFooter()) {
-            m_currentSection = Section::Footer;
-            break;
-        }
-        [[fallthrough]];
-    }
-    case Section::Footer: {
-        if (size() > 0) {
-            m_currentSection = Section::Delegate;
-            setDelegateIndex(size() - 1);
-            break;
-        }
-        [[fallthrough]];
-    }
-    case Section::Delegate: {
-        if (m_delegateIndex > 0) {
-            setDelegateIndex(m_delegateIndex - 1);
-            break;
-        } else if (hasHeader()) {
-            m_currentSection = Section::Header;
-            break;
-        }
-        [[fallthrough]];
-    }
-    case Section::Header: {
-        m_isReturnNeeded = true;
-        m_currentSection = Section::Default;
-        break;
-    }
-    default: {
-        qCritical() << "Current section is invalid!";
-        break;
-    }
-    }
-}
-
-void ListViewFocusController::decrementIndex()
-{
-    m_delegateIndex--;
-}
-
-QQuickItem *ListViewFocusController::itemAtIndex(const int index) const
-{
-    QQuickItem *item { nullptr };
-
-    QMetaObject::invokeMethod(m_listView, "itemAtIndex", Q_RETURN_ARG(QQuickItem *, item), Q_ARG(int, index));
-
-    return item;
-}
-
-QQuickItem *ListViewFocusController::currentDelegate() const
-{
-    QQuickItem *result { nullptr };
-
-    switch (m_currentSection) {
-    case Section::Default: {
-        qWarning() << "No elements...";
-        break;
-    }
-    case Section::Header: {
-        result = m_header;
-        break;
-    }
-    case Section::Delegate: {
-        result = itemAtIndex(m_delegateIndex);
-        break;
-    }
-    case Section::Footer: {
-        result = m_footer;
-        break;
-    }
-    }
-    return result;
-}
-
-QQuickItem *ListViewFocusController::focusedItem() const
-{
-    return m_focusedItem;
-}
-
-void ListViewFocusController::focusNextItem()
-{
-    if (m_isReturnNeeded) {
-        return;
-    }
-
-    reloadFocusChain();
-
-    if (m_focusChain.empty()) {
-        qWarning() << "No elements found in the delegate. Going to next delegate...";
-        nextDelegate();
-        focusNextItem();
-        return;
-    }
-    m_focusedItemIndex++;
-    m_focusedItem = qobject_cast<QQuickItem *>(m_focusChain.at(m_focusedItemIndex));
-    m_focusedItem->forceActiveFocus(Qt::TabFocusReason);
-}
-
-void ListViewFocusController::focusPreviousItem()
-{
-    if (m_isReturnNeeded) {
-        return;
-    }
-
-    if (m_focusChain.empty()) {
-        qInfo() << "Empty focusChain with current delegate: " << currentDelegate() << "Scanning for elements...";
-        reloadFocusChain();
-    }
-    if (m_focusChain.empty()) {
-        qWarning() << "No elements found in the delegate. Going to next delegate...";
-        previousDelegate();
-        focusPreviousItem();
-        return;
-    }
-    if (m_focusedItemIndex == -1) {
-        m_focusedItemIndex = m_focusChain.size();
-    }
-    m_focusedItemIndex--;
-    m_focusedItem = qobject_cast<QQuickItem *>(m_focusChain.at(m_focusedItemIndex));
-    m_focusedItem->forceActiveFocus(Qt::TabFocusReason);
-}
-
-void ListViewFocusController::resetFocusChain()
-{
-    m_focusChain.clear();
-    m_focusedItem = nullptr;
-    m_focusedItemIndex = -1;
-}
-
-void ListViewFocusController::reloadFocusChain()
-{
-    m_focusChain = FocusControl::getItemsChain(currentDelegate());
-}
-
-bool ListViewFocusController::isFirstFocusItemInDelegate() const
-{
-    return m_focusedItem && (m_focusedItem == m_focusChain.first());
-}
-
-bool ListViewFocusController::isLastFocusItemInDelegate() const
-{
-    return m_focusedItem && (m_focusedItem == m_focusChain.last());
-}
-
-bool ListViewFocusController::hasHeader() const
-{
-    return m_header && !FocusControl::getItemsChain(m_header).isEmpty();
-}
-
-bool ListViewFocusController::hasFooter() const
-{
-    return m_footer && !FocusControl::getItemsChain(m_footer).isEmpty();
-}
-
-bool ListViewFocusController::isFirstFocusItemInListView() const
-{
-    switch (m_currentSection) {
-    case Section::Footer: {
-        return isFirstFocusItemInDelegate() && !hasHeader() && (size() == 0);
-    }
-    case Section::Delegate: {
-        return isFirstFocusItemInDelegate() && (m_delegateIndex == 0) && !hasHeader();
-    }
-    case Section::Header: {
-        isFirstFocusItemInDelegate();
-    }
-    case Section::Default: {
-        return true;
-    }
-    default: qWarning() << "Wrong section"; return true;
-    }
-}
-
-bool ListViewFocusController::isLastFocusItemInListView() const
-{
-    switch (m_currentSection) {
-    case Section::Default: {
-        return !hasHeader() && (size() == 0) && !hasFooter();
-    }
-    case Section::Header: {
-        return isLastFocusItemInDelegate() && (size() == 0) && !hasFooter();
-    }
-    case Section::Delegate: {
-        return isLastFocusItemInDelegate() && (m_delegateIndex == size() - 1) && !hasFooter();
-    }
-    case Section::Footer: {
-        return isLastFocusItemInDelegate();
-    }
-    default: qWarning() << "Wrong section"; return true;
-    }
-}
-
-bool ListViewFocusController::isReturnNeeded() const
-{
-    return m_isReturnNeeded;
-}
--- a/client/ui/controllers/listViewFocusController.h
+++ b/client/ui/controllers/listViewFocusController.h
@@ -1,70 +0,0 @@
-#ifndef LISTVIEWFOCUSCONTROLLER_H
-#define LISTVIEWFOCUSCONTROLLER_H
-
-#include <QList>
-#include <QObject>
-#include <QQuickItem>
-#include <QSharedPointer>
-#include <QStack>
-
-/*!
- * \brief The ListViewFocusController class manages the focus of elements in ListView
- * \details This class object moving focus to ListView's controls since ListView stores
- *          it's data implicitly and it could be got one by one.
- *
- *          This class was made to store as less as possible data getting it from QML
- *          when it's needed.
- */
-class ListViewFocusController : public QObject
-{
-    Q_OBJECT
-public:
-    explicit ListViewFocusController(QQuickItem *listView, QObject *parent = nullptr);
-    ~ListViewFocusController();
-
-    void nextDelegate();
-    void previousDelegate();
-    void decrementIndex();
-    void focusNextItem();
-    void focusPreviousItem();
-    void resetFocusChain();
-    void reloadFocusChain();
-    bool isFirstFocusItemInListView() const;
-    bool isFirstFocusItemInDelegate() const;
-    bool isLastFocusItemInListView() const;
-    bool isLastFocusItemInDelegate() const;
-    bool isReturnNeeded() const;
-
-private:
-    enum class Section {
-        Default,
-        Header,
-        Delegate,
-        Footer,
-    };
-
-    int size() const;
-    int currentIndex() const;
-    void setDelegateIndex(int index);
-    void viewAtCurrentIndex() const;
-    QQuickItem *itemAtIndex(const int index) const;
-    QQuickItem *currentDelegate() const;
-    QQuickItem *focusedItem() const;
-
-    bool hasHeader() const;
-    bool hasFooter() const;
-
-    QQuickItem *m_listView;
-    QList<QObject *> m_focusChain;
-    Section m_currentSection;
-    QQuickItem *m_header;
-    QQuickItem *m_footer;
-    QQuickItem *m_focusedItem; // Pointer to focused item on Delegate
-    qsizetype m_focusedItemIndex;
-    qsizetype m_delegateIndex;
-    bool m_isReturnNeeded;
-
-    QList<QString> m_currentSectionString;
-};
-
-#endif // LISTVIEWFOCUSCONTROLLER_H
--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@@ -81,7 +81,7 @@ void PageController::keyPressEvent(Qt::Key key)
    case Qt::Key_Escape: {
        if (m_drawerDepth) {
            emit closeTopDrawer();
-            decrementDrawerDepth();
+            setDrawerDepth(getDrawerDepth() - 1);
        } else {
            emit escapePressed();
        }
@@ -142,25 +142,11 @@ void PageController::setDrawerDepth(const int depth)
    }
 }

-int PageController::getDrawerDepth() const
+int PageController::getDrawerDepth()
 {
    return m_drawerDepth;
 }

-int PageController::incrementDrawerDepth()
-{
-    return ++m_drawerDepth;
-}
-
-int PageController::decrementDrawerDepth()
-{
-    if (m_drawerDepth == 0) {
-        return m_drawerDepth;
-    } else {
-        return --m_drawerDepth;
-    }
-}
-
 void PageController::onShowErrorMessage(ErrorCode errorCode)
 {
    const auto fullErrorMessage = errorString(errorCode);
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -100,9 +100,7 @@ public slots:
    void closeApplication();

    void setDrawerDepth(const int depth);
-    int getDrawerDepth() const;
-    int incrementDrawerDepth();
-    int decrementDrawerDepth();
+    int getDrawerDepth();

  private slots:
    void onShowErrorMessage(amnezia::ErrorCode errorCode);
@@ -137,6 +135,9 @@ signals:
    void escapePressed();
    void closeTopDrawer();

+    void forceTabBarActiveFocus();
+    void forceStackActiveFocus();
+
 private:
    QSharedPointer<ServersModel> m_serversModel;

--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -131,8 +131,12 @@ void SettingsController::backupAppConfig(const QString &fileName)

 void SettingsController::restoreAppConfig(const QString &fileName)
 {
-    QByteArray data;
-    SystemController::readFile(fileName, data);
+    QFile file(fileName);
+
+    file.open(QIODevice::ReadOnly);
+
+    QByteArray data = file.readAll();
+
    restoreAppConfigFromData(data);
 }

--- a/client/ui/controllers/sitesController.cpp
+++ b/client/ui/controllers/sitesController.cpp
@@ -82,12 +82,14 @@ void SitesController::removeSite(int index)

 void SitesController::importSites(const QString &fileName, bool replaceExisting)
 {
-    QByteArray jsonData;
-    if (!SystemController::readFile(fileName, jsonData)) {
+    QFile file(fileName);
+
+    if (!file.open(QIODevice::ReadOnly)) {
        emit errorOccurred(tr("Can't open file: %1").arg(fileName));
        return;
    }

+    QByteArray jsonData = file.readAll();
    QJsonDocument jsonDocument = QJsonDocument::fromJson(jsonData);
    if (jsonDocument.isNull()) {
        emit errorOccurred(tr("Failed to parse JSON data from file: %1").arg(fileName));
--- a/client/ui/controllers/systemController.cpp
+++ b/client/ui/controllers/systemController.cpp
@@ -24,7 +24,7 @@ SystemController::SystemController(const std::shared_ptr<Settings> &settings, QO
 {
 }

-void SystemController::saveFile(const QString &fileName, const QString &data)
+void SystemController::saveFile(QString fileName, const QString &data)
 {
 #if defined Q_OS_ANDROID
    AndroidController::instance()->saveFile(fileName, data);
@@ -62,31 +62,6 @@ void SystemController::saveFile(const QString &fileName, const QString &data)
 #endif
 }

-bool SystemController::readFile(const QString &fileName, QByteArray &data)
-{
-#ifdef Q_OS_ANDROID
-    int fd = AndroidController::instance()->getFd(fileName);
-    if (fd == -1) return false;
-    QFile file;
-    if(!file.open(fd, QIODevice::ReadOnly)) return false;
-    data = file.readAll();
-    AndroidController::instance()->closeFd();
-#else
-    QFile file(fileName);
-    if (!file.open(QIODevice::ReadOnly)) return false;
-    data = file.readAll();
-#endif
-    return true;
-}
-
-bool SystemController::readFile(const QString &fileName, QString &data)
-{
-    QByteArray byteArray;
-    if(!readFile(fileName, byteArray)) return false;
-    data = byteArray;
-    return true;
-}
-
 QString SystemController::getFileName(const QString &acceptLabel, const QString &nameFilter,
                                      const QString &selectedFile, const bool isSaveMode, const QString &defaultSuffix)
 {
@@ -159,10 +134,3 @@ bool SystemController::isAuthenticated()
    return true;
 #endif
 }
-
-void SystemController::sendTouch(float x, float y)
-{
-#ifdef Q_OS_ANDROID
-    AndroidController::instance()->sendTouch(x, y);
-#endif
-}
--- a/client/ui/controllers/systemController.h
+++ b/client/ui/controllers/systemController.h
@@ -11,9 +11,7 @@ class SystemController : public QObject
 public:
    explicit SystemController(const std::shared_ptr<Settings> &setting, QObject *parent = nullptr);

-    static void saveFile(const QString &fileName, const QString &data);
-    static bool readFile(const QString &fileName, QByteArray &data);
-    static bool readFile(const QString &fileName, QString &data);
+    static void saveFile(QString fileName, const QString &data);

 public slots:
    QString getFileName(const QString &acceptLabel, const QString &nameFilter, const QString &selectedFile = "",
@@ -22,8 +20,6 @@ public slots:
    void setQmlRoot(QObject *qmlRoot);

    bool isAuthenticated();
-    void sendTouch(float x, float y);
-
 signals:
    void fileDialogClosed(const bool isAccepted);

--- a/client/ui/models/apiServicesModel.cpp
+++ b/client/ui/models/apiServicesModel.cpp
@@ -27,9 +27,6 @@ namespace
        constexpr char storeEndpoint[] = "store_endpoint";

        constexpr char isAvailable[] = "is_available";
-
-        constexpr char subscription[] = "subscription";
-        constexpr char endDate[] = "end_date";
    }

    namespace serviceType
@@ -54,23 +51,23 @@ QVariant ApiServicesModel::data(const QModelIndex &index, int role) const
    if (!index.isValid() || index.row() < 0 || index.row() >= static_cast<int>(rowCount()))
        return QVariant();

-    auto apiServiceData = m_services.at(index.row());
-    auto serviceType = apiServiceData.type;
-    auto isServiceAvailable = apiServiceData.isServiceAvailable;
+    QJsonObject service = m_services.at(index.row()).toObject();
+    QJsonObject serviceInfo = service.value(configKey::serviceInfo).toObject();
+    auto serviceType = service.value(configKey::serviceType).toString();

    switch (role) {
    case NameRole: {
-        return apiServiceData.serviceInfo.name;
+        return serviceInfo.value(configKey::name).toString();
    }
    case CardDescriptionRole: {
-        auto speed = apiServiceData.serviceInfo.speed;
+        auto speed = serviceInfo.value(configKey::speed).toString();
        if (serviceType == serviceType::amneziaPremium) {
            return tr("Classic VPN for comfortable work, downloading large files and watching videos. "
                      "Works for any sites. Speed up to %1 MBit/s")
                    .arg(speed);
        } else if (serviceType == serviceType::amneziaFree){
            QString description = tr("VPN to access blocked sites in regions with high levels of Internet censorship. ");
-            if (isServiceAvailable) {
+            if (service.value(configKey::isAvailable).isBool() && !service.value(configKey::isAvailable).toBool()) {
                description += tr("<p><a style=\"color: #EB5757;\">Not available in your region. If you have VPN enabled, disable it, return to the previous screen, and try again.</a>");
            }
            return description;
@@ -86,24 +83,25 @@ QVariant ApiServicesModel::data(const QModelIndex &index, int role) const
    }
    case IsServiceAvailableRole: {
        if (serviceType == serviceType::amneziaFree) {
-            if (isServiceAvailable) {
+            if (service.value(configKey::isAvailable).isBool() && !service.value(configKey::isAvailable).toBool()) {
                return false;
            }
        }
        return true;
    }
    case SpeedRole: {
-        return tr("%1 MBit/s").arg(apiServiceData.serviceInfo.speed);
+        auto speed = serviceInfo.value(configKey::speed).toString();
+        return tr("%1 MBit/s").arg(speed);
    }
-    case TimeLimitRole: {
-        auto timeLimit = apiServiceData.serviceInfo.timeLimit;
-        if (timeLimit == "0") {
+    case WorkPeriodRole: {
+        auto timelimit = serviceInfo.value(configKey::timelimit).toString();
+        if (timelimit == "0") {
            return "";
        }
-        return tr("%1 days").arg(timeLimit);
+        return tr("%1 days").arg(timelimit);
    }
    case RegionRole: {
-        return apiServiceData.serviceInfo.region;
+        return serviceInfo.value(configKey::region).toString();
    }
    case FeaturesRole: {
        if (serviceType == serviceType::amneziaPremium) {
@@ -115,15 +113,12 @@ QVariant ApiServicesModel::data(const QModelIndex &index, int role) const
        }
    }
    case PriceRole: {
-        auto price = apiServiceData.serviceInfo.price;
+        auto price = serviceInfo.value(configKey::price).toString();
        if (price == "free") {
            return tr("Free");
        }
        return tr("%1 $/month").arg(price);
    }
-    case EndDateRole: {
-        return QDateTime::fromString(apiServiceData.subscription.endDate, Qt::ISODate).toLocalTime().toString("d MMM yyyy");
-    }
    }

    return QVariant();
@@ -133,18 +128,15 @@ void ApiServicesModel::updateModel(const QJsonObject &data)
 {
    beginResetModel();

-    m_services.clear();
-
    m_countryCode = data.value(configKey::userCountryCode).toString();
-    auto services = data.value(configKey::services).toArray();
+    m_services = data.value(configKey::services).toArray();
+    if (m_services.isEmpty()) {
+        QJsonObject service;
+        service.insert(configKey::serviceInfo, data.value(configKey::serviceInfo));
+        service.insert(configKey::serviceType, data.value(configKey::serviceType));

-    if (services.isEmpty()) {
-        m_services.push_back(getApiServicesData(data));
+        m_services.push_back(service);
        m_selectedServiceIndex = 0;
-    } else {
-        for (const auto &service : services) {
-            m_services.push_back(getApiServicesData(service.toObject()));
-        }
    }

    endResetModel();
@@ -157,32 +149,32 @@ void ApiServicesModel::setServiceIndex(const int index)

 QJsonObject ApiServicesModel::getSelectedServiceInfo()
 {
-    auto service = m_services.at(m_selectedServiceIndex);
-    return service.serviceInfo.object;
+    QJsonObject service = m_services.at(m_selectedServiceIndex).toObject();
+    return service.value(configKey::serviceInfo).toObject();
 }

 QString ApiServicesModel::getSelectedServiceType()
 {
-    auto service = m_services.at(m_selectedServiceIndex);
-    return service.type;
+    QJsonObject service = m_services.at(m_selectedServiceIndex).toObject();
+    return service.value(configKey::serviceType).toString();
 }

 QString ApiServicesModel::getSelectedServiceProtocol()
 {
-    auto service = m_services.at(m_selectedServiceIndex);
-    return service.protocol;
+    QJsonObject service = m_services.at(m_selectedServiceIndex).toObject();
+    return service.value(configKey::serviceProtocol).toString();
 }

 QString ApiServicesModel::getSelectedServiceName()
 {
-    auto service = m_services.at(m_selectedServiceIndex);
-    return service.serviceInfo.name;
+    auto modelIndex = index(m_selectedServiceIndex, 0);
+    return data(modelIndex, ApiServicesModel::Roles::NameRole).toString();
 }

 QJsonArray ApiServicesModel::getSelectedServiceCountries()
 {
-    auto service = m_services.at(m_selectedServiceIndex);
-    return service.availableCountries;
+    QJsonObject service = m_services.at(m_selectedServiceIndex).toObject();
+    return service.value(configKey::availableCountries).toArray();
 }

 QString ApiServicesModel::getCountryCode()
@@ -192,8 +184,8 @@ QString ApiServicesModel::getCountryCode()

 QString ApiServicesModel::getStoreEndpoint()
 {
-    auto service = m_services.at(m_selectedServiceIndex);
-    return service.storeEndpoint;
+    QJsonObject service = m_services.at(m_selectedServiceIndex).toObject();
+    return service.value(configKey::storeEndpoint).toString();
 }

 QVariant ApiServicesModel::getSelectedServiceData(const QString roleString)
@@ -217,46 +209,10 @@ QHash<int, QByteArray> ApiServicesModel::roleNames() const
    roles[ServiceDescriptionRole] = "serviceDescription";
    roles[IsServiceAvailableRole] = "isServiceAvailable";
    roles[SpeedRole] = "speed";
-    roles[TimeLimitRole] = "timeLimit";
+    roles[WorkPeriodRole] = "workPeriod";
    roles[RegionRole] = "region";
    roles[FeaturesRole] = "features";
    roles[PriceRole] = "price";
-    roles[EndDateRole] = "endDate";

    return roles;
 }
-
-ApiServicesModel::ApiServicesData ApiServicesModel::getApiServicesData(const QJsonObject &data)
-{
-    auto serviceInfo =  data.value(configKey::serviceInfo).toObject();
-    auto serviceType = data.value(configKey::serviceType).toString();
-    auto serviceProtocol = data.value(configKey::serviceProtocol).toString();
-    auto availableCountries = data.value(configKey::availableCountries).toArray();
-
-    auto subscriptionObject = data.value(configKey::subscription).toObject();
-
-    ApiServicesData serviceData;
-    serviceData.serviceInfo.name = serviceInfo.value(configKey::name).toString();
-    serviceData.serviceInfo.price = serviceInfo.value(configKey::price).toString();
-    serviceData.serviceInfo.region = serviceInfo.value(configKey::region).toString();
-    serviceData.serviceInfo.speed = serviceInfo.value(configKey::speed).toString();
-    serviceData.serviceInfo.timeLimit = serviceInfo.value(configKey::timelimit).toString();
-
-    serviceData.type = serviceType;
-    serviceData.protocol = serviceProtocol;
-
-    serviceData.storeEndpoint = serviceInfo.value(configKey::storeEndpoint).toString();
-
-    if (serviceInfo.value(configKey::isAvailable).isBool()) {
-        serviceData.isServiceAvailable = data.value(configKey::isAvailable).toBool();
-    } else {
-        serviceData.isServiceAvailable = true;
-    }
-
-    serviceData.serviceInfo.object = serviceInfo;
-    serviceData.availableCountries = availableCountries;
-
-    serviceData.subscription.endDate = subscriptionObject.value(configKey::endDate).toString();
-
-    return serviceData;
-}
--- a/client/ui/models/apiServicesModel.h
+++ b/client/ui/models/apiServicesModel.h
@@ -3,7 +3,6 @@

 #include <QAbstractListModel>
 #include <QJsonArray>
-#include <QJsonObject>

 class ApiServicesModel : public QAbstractListModel
 {
@@ -16,11 +15,10 @@ public:
        ServiceDescriptionRole,
        IsServiceAvailableRole,
        SpeedRole,
-        TimeLimitRole,
+        WorkPeriodRole,
        RegionRole,
        FeaturesRole,
-        PriceRole,
-        EndDateRole
+        PriceRole
    };

    explicit ApiServicesModel(QObject *parent = nullptr);
@@ -50,40 +48,8 @@ protected:
    QHash<int, QByteArray> roleNames() const override;

 private:
-    struct ServiceInfo
-    {
-        QString name;
-        QString speed;
-        QString timeLimit;
-        QString region;
-        QString price;
-
-        QJsonObject object;
-    };
-
-    struct Subscription
-    {
-        QString endDate;
-    };
-
-    struct ApiServicesData
-    {
-        bool isServiceAvailable;
-
-        QString type;
-        QString protocol;
-        QString storeEndpoint;
-
-        ServiceInfo serviceInfo;
-        Subscription subscription;
-
-        QJsonArray availableCountries;
-    };
-
-    ApiServicesData getApiServicesData(const QJsonObject &data);
-
    QString m_countryCode;
-    QVector<ApiServicesData> m_services;
+    QJsonArray m_services;

    int m_selectedServiceIndex;
 };
--- a/client/ui/models/clientManagementModel.cpp
+++ b/client/ui/models/clientManagementModel.cpp
@@ -106,8 +106,6 @@ ErrorCode ClientManagementModel::updateModel(const DockerContainer container, co
            error = getOpenVpnClients(container, credentials, serverController, count);
        } else if (container == DockerContainer::WireGuard || container == DockerContainer::Awg) {
            error = getWireGuardClients(container, credentials, serverController, count);
-        } else if (container == DockerContainer::Xray) {
-            error = getXrayClients(container, credentials, serverController, count);
        }
        if (error != ErrorCode::NoError) {
            endResetModel();
@@ -241,68 +239,6 @@ ErrorCode ClientManagementModel::getWireGuardClients(const DockerContainer conta
    }
    return error;
 }
-ErrorCode ClientManagementModel::getXrayClients(const DockerContainer container, const ServerCredentials& credentials,
-                                                const QSharedPointer<ServerController> &serverController, int &count)
-{
-    ErrorCode error = ErrorCode::NoError;
-
-    const QString serverConfigPath = amnezia::protocols::xray::serverConfigPath;
-    const QString configString = serverController->getTextFileFromContainer(container, credentials, serverConfigPath, error);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to get the xray server config file from the server";
-        return error;
-    }
-
-    QJsonDocument serverConfig = QJsonDocument::fromJson(configString.toUtf8());
-    if (serverConfig.isNull()) {
-        logger.error() << "Failed to parse xray server config JSON";
-        return ErrorCode::InternalError;
-    }
-
-    if (!serverConfig.object().contains("inbounds") || serverConfig.object()["inbounds"].toArray().isEmpty()) {
-        logger.error() << "Invalid xray server config structure";
-        return ErrorCode::InternalError;
-    }
-
-    const QJsonObject inbound = serverConfig.object()["inbounds"].toArray()[0].toObject();
-    if (!inbound.contains("settings")) {
-        logger.error() << "Missing settings in xray inbound config";
-        return ErrorCode::InternalError;
-    }
-
-    const QJsonObject settings = inbound["settings"].toObject();
-    if (!settings.contains("clients")) {
-        logger.error() << "Missing clients in xray settings config"; 
-        return ErrorCode::InternalError;
-    }
-
-    const QJsonArray clients = settings["clients"].toArray();
-    for (const auto &clientValue : clients) {
-        const QJsonObject clientObj = clientValue.toObject();
-        if (!clientObj.contains("id")) {
-            logger.error() << "Missing id in xray client config";
-            continue;
-        }
-        QString clientId = clientObj["id"].toString();
-        
-        QString xrayDefaultUuid = serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::xray::uuidPath, error);
-        xrayDefaultUuid.replace("\n", "");
-
-        if (!isClientExists(clientId) && clientId != xrayDefaultUuid) {
-            QJsonObject client;
-            client[configKey::clientId] = clientId;
-
-            QJsonObject userData;
-            userData[configKey::clientName] = QString("Client %1").arg(count);
-            client[configKey::userData] = userData;
-
-            m_clientsTable.push_back(client);
-            count++;
-        }
-    }
-
-    return error;
-}

 ErrorCode ClientManagementModel::wgShow(const DockerContainer container, const ServerCredentials &credentials,
                                        const QSharedPointer<ServerController> &serverController, std::vector<WgShowData> &data)
@@ -390,67 +326,17 @@ ErrorCode ClientManagementModel::appendClient(const DockerContainer container, c
                                              const QSharedPointer<ServerController> &serverController)
 {
    Proto protocol;
-    switch (container) {
-        case DockerContainer::ShadowSocks:
-        case DockerContainer::Cloak:
-            protocol = Proto::OpenVpn;
-            break;
-        case DockerContainer::OpenVpn:
-        case DockerContainer::WireGuard:
-        case DockerContainer::Awg:
-        case DockerContainer::Xray:
-            protocol = ContainerProps::defaultProtocol(container);
-            break;
-        default:
-            return ErrorCode::NoError;
+    if (container == DockerContainer::ShadowSocks || container == DockerContainer::Cloak) {
+        protocol = Proto::OpenVpn;
+    } else if (container == DockerContainer::OpenVpn || container == DockerContainer::WireGuard || container == DockerContainer::Awg) {
+        protocol = ContainerProps::defaultProtocol(container);
+    } else {
+        return ErrorCode::NoError;
    }

    auto protocolConfig = ContainerProps::getProtocolConfigFromContainer(protocol, containerConfig);
-    return appendClient(protocolConfig, clientName, container, credentials, serverController);
-}

-ErrorCode ClientManagementModel::appendClient(QJsonObject &protocolConfig, const QString &clientName, const DockerContainer container,
-                                              const ServerCredentials &credentials, const QSharedPointer<ServerController> &serverController)
-{
-    QString clientId;
-    if (container == DockerContainer::Xray) {
-        if (!protocolConfig.contains("outbounds")) {
-            return ErrorCode::InternalError;
-        }
-        QJsonArray outbounds = protocolConfig.value("outbounds").toArray();
-        if (outbounds.isEmpty()) {
-            return ErrorCode::InternalError;
-        }
-        QJsonObject outbound = outbounds[0].toObject();
-        if (!outbound.contains("settings")) {
-            return ErrorCode::InternalError;
-        }
-        QJsonObject settings = outbound["settings"].toObject();
-        if (!settings.contains("vnext")) {
-            return ErrorCode::InternalError;
-        }
-        QJsonArray vnext = settings["vnext"].toArray();
-        if (vnext.isEmpty()) {
-            return ErrorCode::InternalError;
-        }
-        QJsonObject vnextObj = vnext[0].toObject();
-        if (!vnextObj.contains("users")) {
-            return ErrorCode::InternalError;
-        }
-        QJsonArray users = vnextObj["users"].toArray();
-        if (users.isEmpty()) {
-            return ErrorCode::InternalError;
-        }
-        QJsonObject user = users[0].toObject();
-        if (!user.contains("id")) {
-            return ErrorCode::InternalError;
-        }
-        clientId = user["id"].toString();
-    } else {
-        clientId = protocolConfig.value(config_key::clientId).toString();
-    }
-    
-    return appendClient(clientId, clientName, container, credentials, serverController);
+    return appendClient(protocolConfig.value(config_key::clientId).toString(), clientName, container, credentials, serverController);
 }

 ErrorCode ClientManagementModel::appendClient(const QString &clientId, const QString &clientName, const DockerContainer container,
@@ -536,27 +422,10 @@ ErrorCode ClientManagementModel::revokeClient(const int row, const DockerContain
    auto client = m_clientsTable.at(row).toObject();
    QString clientId = client.value(configKey::clientId).toString();

-    switch(container)
-    {
-        case DockerContainer::OpenVpn:
-        case DockerContainer::ShadowSocks:
-        case DockerContainer::Cloak: {
-            errorCode = revokeOpenVpn(row, container, credentials, serverIndex, serverController);
-            break;
-        }
-        case DockerContainer::WireGuard:
-        case DockerContainer::Awg: {
-            errorCode = revokeWireGuard(row, container, credentials, serverController);
-            break;
-        }
-        case DockerContainer::Xray: {
-            errorCode = revokeXray(row, container, credentials, serverController);
-            break;
-        }
-        default: {
-            logger.error() << "Internal error: received unexpected container type";
-            return ErrorCode::InternalError;
-        }
+    if (container == DockerContainer::OpenVpn || container == DockerContainer::ShadowSocks || container == DockerContainer::Cloak) {
+        errorCode = revokeOpenVpn(row, container, credentials, serverIndex, serverController);
+    } else if (container == DockerContainer::WireGuard || container == DockerContainer::Awg) {
+        errorCode = revokeWireGuard(row, container, credentials, serverController);
    }

    if (errorCode == ErrorCode::NoError) {
@@ -594,69 +463,19 @@ ErrorCode ClientManagementModel::revokeClient(const QJsonObject &containerConfig
    }

    Proto protocol;
-
-    switch(container)
-    {
-        case DockerContainer::ShadowSocks:
-        case DockerContainer::Cloak: {
-            protocol = Proto::OpenVpn;
-            break;
-        }
-        case DockerContainer::OpenVpn:
-        case DockerContainer::WireGuard:
-        case DockerContainer::Awg:
-        case DockerContainer::Xray: {
-            protocol = ContainerProps::defaultProtocol(container);
-            break;
-        }
-        default: {
-            logger.error() << "Internal error: received unexpected container type";
-            return ErrorCode::InternalError;
-        }
+    if (container == DockerContainer::ShadowSocks || container == DockerContainer::Cloak) {
+        protocol = Proto::OpenVpn;
+    } else if (container == DockerContainer::OpenVpn || container == DockerContainer::WireGuard || container == DockerContainer::Awg) {
+        protocol = ContainerProps::defaultProtocol(container);
+    } else {
+        return ErrorCode::NoError;
    }

    auto protocolConfig = ContainerProps::getProtocolConfigFromContainer(protocol, containerConfig);

-    QString clientId;
-    if (container == DockerContainer::Xray) {
-        if (!protocolConfig.contains("outbounds")) {
-            return ErrorCode::InternalError;
-        }
-        QJsonArray outbounds = protocolConfig.value("outbounds").toArray();
-        if (outbounds.isEmpty()) {
-            return ErrorCode::InternalError;
-        }
-        QJsonObject outbound = outbounds[0].toObject();
-        if (!outbound.contains("settings")) {
-            return ErrorCode::InternalError;
-        }
-        QJsonObject settings = outbound["settings"].toObject();
-        if (!settings.contains("vnext")) {
-            return ErrorCode::InternalError;
-        }
-        QJsonArray vnext = settings["vnext"].toArray();
-        if (vnext.isEmpty()) {
-            return ErrorCode::InternalError;
-        }
-        QJsonObject vnextObj = vnext[0].toObject();
-        if (!vnextObj.contains("users")) {
-            return ErrorCode::InternalError;
-        }
-        QJsonArray users = vnextObj["users"].toArray();
-        if (users.isEmpty()) {
-            return ErrorCode::InternalError;
-        }
-        QJsonObject user = users[0].toObject();
-        if (!user.contains("id")) {
-            return ErrorCode::InternalError;
-        }
-        clientId = user["id"].toString();
-    } else {
-        clientId = protocolConfig.value(config_key::clientId).toString();
-    }
-
    int row;
    bool clientExists = false;
+    QString clientId = protocolConfig.value(config_key::clientId).toString();
    for (row = 0; row < rowCount(); row++) {
        auto client = m_clientsTable.at(row).toObject();
        if (clientId == client.value(configKey::clientId).toString()) {
@@ -668,28 +487,11 @@ ErrorCode ClientManagementModel::revokeClient(const QJsonObject &containerConfig
        return errorCode;
    }

-    switch (container)
-    {
-    case DockerContainer::OpenVpn:
-    case DockerContainer::ShadowSocks:
-    case DockerContainer::Cloak: {
+    if (container == DockerContainer::OpenVpn || container == DockerContainer::ShadowSocks || container == DockerContainer::Cloak) {
        errorCode = revokeOpenVpn(row, container, credentials, serverIndex, serverController);
-        break;
-    }
-    case DockerContainer::WireGuard:
-    case DockerContainer::Awg: {
+    } else if (container == DockerContainer::WireGuard || container == DockerContainer::Awg) {
        errorCode = revokeWireGuard(row, container, credentials, serverController);
-        break;
    }
-    case DockerContainer::Xray: {
-        errorCode = revokeXray(row, container, credentials, serverController);
-        break;
-    }
-    default:
-        logger.error() << "Internal error: received unexpected container type";
-        return ErrorCode::InternalError;
-    }
-
    return errorCode;
 }

@@ -792,117 +594,6 @@ ErrorCode ClientManagementModel::revokeWireGuard(const int row, const DockerCont
    return ErrorCode::NoError;
 }

-ErrorCode ClientManagementModel::revokeXray(const int row,
-                                            const DockerContainer container,
-                                            const ServerCredentials &credentials,
-                                            const QSharedPointer<ServerController> &serverController)
-{
-    ErrorCode error = ErrorCode::NoError;
-
-    // Get server config
-    const QString serverConfigPath = amnezia::protocols::xray::serverConfigPath;
-    const QString configString = serverController->getTextFileFromContainer(container, credentials, serverConfigPath, error);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to get the xray server config file";
-        return error;
-    }
-
-    QJsonDocument serverConfig = QJsonDocument::fromJson(configString.toUtf8());
-    if (serverConfig.isNull()) {
-        logger.error() << "Failed to parse xray server config JSON";
-        return ErrorCode::InternalError;
-    }
-
-    // Get client ID to remove
-    auto client = m_clientsTable.at(row).toObject();
-    QString clientId = client.value(configKey::clientId).toString();
-
-    // Remove client from server config
-    QJsonObject configObj = serverConfig.object();
-    if (!configObj.contains("inbounds")) {
-        logger.error() << "Missing inbounds in xray config";
-        return ErrorCode::InternalError;
-    }
-
-    QJsonArray inbounds = configObj["inbounds"].toArray();
-    if (inbounds.isEmpty()) {
-        logger.error() << "Empty inbounds array in xray config";
-        return ErrorCode::InternalError;
-    }
-
-    QJsonObject inbound = inbounds[0].toObject();
-    if (!inbound.contains("settings")) {
-        logger.error() << "Missing settings in xray inbound config";
-        return ErrorCode::InternalError;
-    }
-
-    QJsonObject settings = inbound["settings"].toObject();
-    if (!settings.contains("clients")) {
-        logger.error() << "Missing clients in xray settings";
-        return ErrorCode::InternalError;
-    }
-
-    QJsonArray clients = settings["clients"].toArray();
-    if (clients.isEmpty()) {
-        logger.error() << "Empty clients array in xray config";
-        return ErrorCode::InternalError;
-    }
-
-    for (int i = 0; i < clients.size(); ++i) {
-        QJsonObject clientObj = clients[i].toObject();
-        if (clientObj.contains("id") && clientObj["id"].toString() == clientId) {
-            clients.removeAt(i);
-            break;
-        }
-    }
-
-    // Update server config
-    settings["clients"] = clients;
-    inbound["settings"] = settings;
-    inbounds[0] = inbound;
-    configObj["inbounds"] = inbounds;
-
-    // Upload updated config
-    error = serverController->uploadTextFileToContainer(
-        container, 
-        credentials,
-        QJsonDocument(configObj).toJson(),
-        serverConfigPath
-    );
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to upload updated xray config";
-        return error;
-    }
-
-    // Remove from local table
-    beginRemoveRows(QModelIndex(), row, row);
-    m_clientsTable.removeAt(row);
-    endRemoveRows();
-
-    // Update clients table file on server
-    const QByteArray clientsTableString = QJsonDocument(m_clientsTable).toJson();
-    QString clientsTableFile = QString("/opt/amnezia/%1/clientsTable")
-        .arg(ContainerProps::containerTypeToString(container));
-
-    error = serverController->uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to upload the clientsTable file";
-    }
-
-    // Restart container
-    QString restartScript = QString("sudo docker restart $CONTAINER_NAME");
-    error = serverController->runScript(
-        credentials, 
-        serverController->replaceVars(restartScript, serverController->genVarsForScript(credentials, container))
-    );
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to restart xray container";
-        return error;
-    }
-
-    return error;
-}
-
 QHash<int, QByteArray> ClientManagementModel::roleNames() const
 {
    QHash<int, QByteArray> roles;
@@ -913,4 +604,4 @@ QHash<int, QByteArray> ClientManagementModel::roleNames() const
    roles[DataSentRole] = "dataSent";
    roles[AllowedIpsRole] = "allowedIps";
    return roles;
-}
+}
--- a/client/ui/models/clientManagementModel.h
+++ b/client/ui/models/clientManagementModel.h
@@ -40,8 +40,6 @@ public slots:
                          const QSharedPointer<ServerController> &serverController);
    ErrorCode appendClient(const DockerContainer container, const ServerCredentials &credentials, const QJsonObject &containerConfig,
                           const QString &clientName, const QSharedPointer<ServerController> &serverController);
-    ErrorCode appendClient(QJsonObject &protocolConfig, const QString &clientName,const DockerContainer container,
-                           const ServerCredentials &credentials, const QSharedPointer<ServerController> &serverController);
    ErrorCode appendClient(const QString &clientId, const QString &clientName, const DockerContainer container,
                           const ServerCredentials &credentials, const QSharedPointer<ServerController> &serverController);
    ErrorCode renameClient(const int row, const QString &userName, const DockerContainer container, const ServerCredentials &credentials,
@@ -66,15 +64,11 @@ private:
                            const QSharedPointer<ServerController> &serverController);
    ErrorCode revokeWireGuard(const int row, const DockerContainer container, const ServerCredentials &credentials,
                              const QSharedPointer<ServerController> &serverController);
-    ErrorCode revokeXray(const int row, const DockerContainer container, const ServerCredentials &credentials,
-                         const QSharedPointer<ServerController> &serverController);

    ErrorCode getOpenVpnClients(const DockerContainer container, const ServerCredentials &credentials,
                                const QSharedPointer<ServerController> &serverController, int &count);
    ErrorCode getWireGuardClients(const DockerContainer container, const ServerCredentials &credentials,
                                  const QSharedPointer<ServerController> &serverController, int &count);
-    ErrorCode getXrayClients(const DockerContainer container, const ServerCredentials& credentials,
-                             const QSharedPointer<ServerController> &serverController, int &count);

    ErrorCode wgShow(const DockerContainer container, const ServerCredentials &credentials,
                     const QSharedPointer<ServerController> &serverController, std::vector<WgShowData> &data);
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -22,7 +22,7 @@ namespace
        constexpr char serviceProtocol[] = "service_protocol";

        constexpr char publicKeyInfo[] = "public_key";
-        constexpr char expiresAt[] = "expires_at";
+        constexpr char endDate[] = "end_date";
    }
 }

@@ -39,9 +39,6 @@ ServersModel::ServersModel(std::shared_ptr<Settings> settings, QObject *parent)
        emit ServersModel::defaultServerNameChanged();
        updateDefaultServerContainersModel();
    });
-
-    connect(this, &ServersModel::processedServerIndexChanged, this, &ServersModel::processedServerChanged);
-    connect(this, &ServersModel::dataChanged, this, &ServersModel::processedServerChanged);
 }

 int ServersModel::rowCount(const QModelIndex &parent) const
@@ -82,12 +79,6 @@ bool ServersModel::setData(const QModelIndex &index, const QVariant &value, int
    return true;
 }

-bool ServersModel::setData(const int index, const QVariant &value, int role)
-{
-    QModelIndex modelIndex = this->index(index);
-    return setData(modelIndex, value, role);
-}
-
 QVariant ServersModel::data(const QModelIndex &index, int role) const
 {
    if (!index.isValid() || index.row() < 0 || index.row() >= static_cast<int>(m_servers.size())) {
@@ -688,18 +679,6 @@ QVariant ServersModel::getProcessedServerData(const QString roleString)
    return {};
 }

-bool ServersModel::setProcessedServerData(const QString &roleString, const QVariant &value)
-{
-    const auto roles = roleNames();
-    for (auto it = roles.begin(); it != roles.end(); it++) {
-        if (QString(it.value()) == roleString) {
-            return setData(m_processedServerIndex, value, it.key());
-        }
-    }
-
-    return false;
-}
-
 bool ServersModel::isDefaultServerDefaultContainerHasSplitTunneling()
 {
    auto server = m_servers.at(m_defaultServerIndex).toObject();
@@ -739,9 +718,9 @@ bool ServersModel::isApiKeyExpired(const int serverIndex)
    auto apiConfig = serverConfig.value(configKey::apiConfig).toObject();

    auto publicKeyInfo = apiConfig.value(configKey::publicKeyInfo).toObject();
-    const QString expiresAt = publicKeyInfo.value(configKey::expiresAt).toString();
-    if (expiresAt.isEmpty()) {
-        publicKeyInfo.insert(configKey::expiresAt, QDateTime::currentDateTimeUtc().addDays(1).toString(Qt::ISODate));
+    const QString endDate = publicKeyInfo.value(configKey::endDate).toString();
+    if (endDate.isEmpty()) {
+        publicKeyInfo.insert(configKey::endDate, QDateTime::currentDateTimeUtc().addDays(1).toString(Qt::ISODate));
        apiConfig.insert(configKey::publicKeyInfo, publicKeyInfo);
        serverConfig.insert(configKey::apiConfig, apiConfig);
        editServer(serverConfig, serverIndex);
@@ -749,8 +728,8 @@ bool ServersModel::isApiKeyExpired(const int serverIndex)
        return false;
    }

-    auto expiresAtDateTime = QDateTime::fromString(expiresAt, Qt::ISODate).toUTC();
-    if (expiresAtDateTime < QDateTime::currentDateTimeUtc()) {
+    auto endDateDateTime = QDateTime::fromString(endDate, Qt::ISODate).toUTC();
+    if (endDateDateTime < QDateTime::currentDateTimeUtc()) {
        return true;
    }
    return false;
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -46,7 +46,6 @@ public:
    int rowCount(const QModelIndex &parent = QModelIndex()) const override;

    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
-    bool setData(const int index, const QVariant &value, int role = Qt::EditRole);
    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
    QVariant data(const int index, int role = Qt::DisplayRole) const;

@@ -116,7 +115,6 @@ public slots:
    QVariant getDefaultServerData(const QString roleString);

    QVariant getProcessedServerData(const QString roleString);
-    bool setProcessedServerData(const QString &roleString, const QVariant &value);

    bool isDefaultServerDefaultContainerHasSplitTunneling();

@@ -129,9 +127,6 @@ protected:

 signals:
    void processedServerIndexChanged(const int index);
-    // emitted when the processed server index or processed server data is changed
-    void processedServerChanged();
-
    void defaultServerIndexChanged(const int index);
    void defaultServerNameChanged();
    void defaultServerDescriptionChanged();
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -16,32 +16,6 @@ Button {
    property string connectedButtonColor: AmneziaStyle.color.goldenApricot
    property bool buttonActiveFocus: activeFocus && (Qt.platform.os !== "android" || SettingsController.isOnTv())

-    property bool isFocusable: true
-    
-    Keys.onTabPressed: {
-        FocusController.nextKeyTabItem()
-    }
-
-    Keys.onBacktabPressed: {
-        FocusController.previousKeyTabItem()
-    }
-
-    Keys.onUpPressed: {
-        FocusController.nextKeyUpItem()
-    }
-    
-    Keys.onDownPressed: {
-        FocusController.nextKeyDownItem()
-    }
-    
-    Keys.onLeftPressed: {
-        FocusController.nextKeyLeftItem()
-    }
-
-    Keys.onRightPressed: {
-        FocusController.nextKeyRightItem()
-    }
-        
    implicitWidth: 190
    implicitHeight: 190

--- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
+++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
@@ -14,7 +14,7 @@ DrawerType2 {
    width: parent.width
    height: parent.height

-    expandedStateContent: ColumnLayout {
+    expandedContent: ColumnLayout {
        id: content

        anchors.top: parent.top
@@ -26,6 +26,14 @@ DrawerType2 {
            root.expandedHeight = content.implicitHeight + 32
        }

+        Connections {
+            target: root
+            enabled: !GC.isMobile()
+            function onOpened() {
+                focusItem.forceActiveFocus()
+            }
+        }
+
        Header2Type {
            Layout.fillWidth: true
            Layout.topMargin: 24
@@ -36,6 +44,11 @@ DrawerType2 {
            headerText: qsTr("Add new connection")
        }

+        Item {
+            id: focusItem
+            KeyNavigation.tab: ip.rightButton
+        }
+
        LabelWithButtonType {
            id: ip
            Layout.fillWidth: true
@@ -46,8 +59,10 @@ DrawerType2 {

            clickedFunction: function() {
                PageController.goToPage(PageEnum.PageSetupWizardCredentials)
-                root.closeTriggered()
+                root.close()
            }
+
+            KeyNavigation.tab: qrCode.rightButton
        }

        DividerType {}
@@ -61,8 +76,10 @@ DrawerType2 {

            clickedFunction: function() {
                PageController.goToPage(PageEnum.PageSetupWizardConfigSource)
-                root.closeTriggered()
+                root.close()
            }
+
+            KeyNavigation.tab: focusItem
        }

        DividerType {}
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -17,15 +17,55 @@ ListView {
    property var rootWidth
    property var selectedText

+    property bool a: true
+
    width: rootWidth
-    height: contentItem.height
+    height: menuContent.contentItem.height

    clip: true
-    snapMode: ListView.SnapToItem
+    interactive: false

-    ScrollBar.vertical: ScrollBarType {}
+    property FlickableType parentFlickable
+    property var lastItemTabClicked

-    property bool isFocusable: true
+    property int currentFocusIndex: 0
+
+    activeFocusOnTab: true
+    onActiveFocusChanged: {
+        if (activeFocus) {
+            this.currentFocusIndex = 0
+            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
+        }
+    }
+
+    Keys.onTabPressed: {
+        if (currentFocusIndex < this.count - 1) {
+            currentFocusIndex += 1
+            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
+        } else {
+            currentFocusIndex = 0
+            if (lastItemTabClicked && typeof lastItemTabClicked === "function") {
+                lastItemTabClicked()
+            }
+        }
+    }
+
+    onVisibleChanged: {
+         if (visible) {
+             currentFocusIndex = 0
+             focusItem.forceActiveFocus()
+         }
+     }
+
+    Item {
+        id: focusItem
+    }
+
+    onCurrentFocusIndexChanged: {
+        if (parentFlickable) {
+            parentFlickable.ensureVisible(this.itemAtIndex(currentFocusIndex))
+        }
+    }

    ButtonGroup {
        id: containersRadioButtonGroup
@@ -35,6 +75,12 @@ ListView {
        implicitWidth: rootWidth
        implicitHeight: content.implicitHeight

+        onActiveFocusChanged: {
+            if (activeFocus) {
+                containerRadioButton.forceActiveFocus()
+            }
+        }
+
        ColumnLayout {
            id: content

@@ -65,13 +111,13 @@ ListView {
                    }

                    if (checked) {
-                        containersDropDown.closeTriggered()
+                        containersDropDown.close()
                        ServersModel.setDefaultContainer(ServersModel.defaultIndex, proxyDefaultServerContainersModel.mapToSource(index))
                    } else {
                        ContainersModel.setProcessedContainerIndex(proxyDefaultServerContainersModel.mapToSource(index))
                        InstallController.setShouldCreateServer(false)
                        PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
-                        containersDropDown.closeTriggered()
+                        containersDropDown.close()
                    }
                }

--- a/client/ui/qml/Components/HomeSplitTunnelingDrawer.qml
+++ b/client/ui/qml/Components/HomeSplitTunnelingDrawer.qml
@@ -16,7 +16,7 @@ DrawerType2 {
    anchors.fill: parent
    expandedHeight: parent.height * 0.9

-    expandedStateContent: ColumnLayout {
+    expandedContent: ColumnLayout {
        id: content

        anchors.top: parent.top
@@ -24,6 +24,14 @@ DrawerType2 {
        anchors.right: parent.right
        spacing: 0

+        Connections {
+            target: root
+            enabled: !GC.isMobile()
+            function onOpened() {
+                focusItem.forceActiveFocus()
+            }
+        }
+
        Header2Type {
            Layout.fillWidth: true
            Layout.topMargin: 24
@@ -35,6 +43,11 @@ DrawerType2 {
            descriptionText:  qsTr("Allows you to connect to some sites or applications through a VPN connection and bypass others")
        }

+        Item {
+            id: focusItem
+            KeyNavigation.tab: splitTunnelingSwitch.visible ? splitTunnelingSwitch : siteBasedSplitTunnelingSwitch.rightButton
+        }
+
        LabelWithButtonType {
            id: splitTunnelingSwitch
            Layout.fillWidth: true
@@ -46,9 +59,11 @@ DrawerType2 {
            descriptionText: qsTr("Enabled \nCan't be disabled for current server")
            rightImageSource: "qrc:/images/controls/chevron-right.svg"

+            KeyNavigation.tab: siteBasedSplitTunnelingSwitch.visible ? siteBasedSplitTunnelingSwitch.rightButton : focusItem
+
            clickedFunction: function() {
-               PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
-               root.closeTriggered()
+//                PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
+//                root.close()
            }
        }

@@ -65,9 +80,13 @@ DrawerType2 {
            descriptionText: enabled && SitesModel.isTunnelingEnabled ? qsTr("Enabled") : qsTr("Disabled")
            rightImageSource: "qrc:/images/controls/chevron-right.svg"

+            KeyNavigation.tab: appSplitTunnelingSwitch.visible ?
+                                   appSplitTunnelingSwitch.rightButton :
+                                   focusItem
+
            clickedFunction: function() {
                PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
-                root.closeTriggered()
+                root.close()
            }
        }

@@ -84,9 +103,11 @@ DrawerType2 {
            descriptionText: AppSplitTunnelingModel.isTunnelingEnabled ? qsTr("Enabled") : qsTr("Disabled")
            rightImageSource: "qrc:/images/controls/chevron-right.svg"

+            KeyNavigation.tab: focusItem
+
            clickedFunction: function() {
                PageController.goToPage(PageEnum.PageSettingsAppSplitTunneling)
-                root.closeTriggered()
+                root.close()
            }
        }

--- a/client/ui/qml/Components/InstalledAppsDrawer.qml
+++ b/client/ui/qml/Components/InstalledAppsDrawer.qml
@@ -26,7 +26,7 @@ DrawerType2 {
        id: installedAppsModel
    }

-    expandedStateContent: Item {
+    expandedContent: Item {
        id: container

        implicitHeight: expandedHeight
@@ -43,7 +43,7 @@ DrawerType2 {
            BackButtonType {
                backButtonImage: "qrc:/images/controls/arrow-left.svg"
                backButtonFunction: function() {
-                    root.closeTriggered()
+                    root.close()
                }
            }

@@ -69,8 +69,6 @@ DrawerType2 {
                clip: true
                interactive: true

-                property bool isFocusable: true
-
                model: SortFilterProxyModel {
                    id: proxyInstalledAppsModel
                    sourceModel: installedAppsModel
@@ -81,7 +79,10 @@ DrawerType2 {
                    }
                }

-                ScrollBar.vertical: ScrollBarType {}
+                ScrollBar.vertical: ScrollBar {
+                    id: scrollBar
+                    policy: ScrollBar.AlwaysOn
+                }

                ButtonGroup {
                    id: buttonGroup
@@ -154,7 +155,7 @@ DrawerType2 {
                PageController.showBusyIndicator(true)
                AppSplitTunnelingController.addApps(installedAppsModel.getSelectedAppsInfo())
                PageController.showBusyIndicator(false)
-                root.closeTriggered()
+                root.close()
            }
        }
    }
--- a/client/ui/qml/Components/QuestionDrawer.qml
+++ b/client/ui/qml/Components/QuestionDrawer.qml
@@ -20,7 +20,7 @@ DrawerType2 {
    property var yesButtonFunction
    property var noButtonFunction

-    expandedStateContent: ColumnLayout {
+    expandedContent: ColumnLayout {
        id: content

        anchors.top: parent.top
@@ -33,6 +33,14 @@ DrawerType2 {
            root.expandedHeight = content.implicitHeight + 32
        }

+        Connections {
+            target: root
+            enabled: !GC.isMobile()
+            function onOpened() {
+                focusItem.forceActiveFocus()
+            }
+        }
+
        Header2TextType {
            Layout.fillWidth: true
            Layout.topMargin: 16
@@ -51,6 +59,11 @@ DrawerType2 {
            text: descriptionText
        }

+        Item {
+            id: focusItem
+            KeyNavigation.tab: yesButton
+        }
+
        BasicButtonType {
            id: yesButton
            Layout.fillWidth: true
@@ -65,6 +78,8 @@ DrawerType2 {
                    yesButtonFunction()
                }
            }
+
+            KeyNavigation.tab: noButton
        }

        BasicButtonType {
@@ -87,6 +102,8 @@ DrawerType2 {
                    noButtonFunction()
                }
            }
+
+            KeyNavigation.tab: focusItem
        }
    }
 }
--- a/client/ui/qml/Components/SelectLanguageDrawer.qml
+++ b/client/ui/qml/Components/SelectLanguageDrawer.qml
@@ -11,7 +11,7 @@ import "../Config"
 DrawerType2 {
    id: root

-    expandedStateContent: Item {
+    expandedContent: Item {
        id: container

        implicitHeight: root.height * 0.9
@@ -20,6 +20,19 @@ DrawerType2 {
            root.expandedHeight = container.implicitHeight
        }

+        Connections {
+            target: root
+            enabled: !GC.isMobile()
+            function onOpened() {
+                focusItem.forceActiveFocus()
+            }
+        }
+
+        Item {
+            id: focusItem
+            KeyNavigation.tab: backButton
+        }
+
        ColumnLayout {
            id: backButtonLayout

@@ -30,148 +43,167 @@ DrawerType2 {

            BackButtonType {
                id: backButton
-
-                Layout.fillWidth: true
-
                backButtonImage: "qrc:/images/controls/arrow-left.svg"
-                backButtonFunction: function() { root.closeTriggered() }
-            }
-
-            Header2Type {
-                id: header
-
-                Layout.fillWidth: true
-                Layout.topMargin: 16
-                Layout.rightMargin: 16
-                Layout.leftMargin: 16
-
-                headerText: qsTr("Choose language")
+                backButtonFunction: function() { root.close() }
+                KeyNavigation.tab: listView
            }
        }

-        ListView {
-            id: listView
-
+        FlickableType {
            anchors.top: backButtonLayout.bottom
            anchors.left: parent.left
            anchors.right: parent.right
            anchors.bottom: parent.bottom
+            contentHeight: content.implicitHeight

-            property bool isFocusable: true
-            property int selectedIndex: LanguageModel.currentLanguageIndex
+            ColumnLayout {
+                id: content

-            clip: true
-            reuseItems: true
+                anchors.fill: parent

-            ScrollBar.vertical: ScrollBarType {}
+                Header2Type {
+                    id: header
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
+                    Layout.rightMargin: 16
+                    Layout.leftMargin: 16

-            model: LanguageModel
-
-            ButtonGroup {
-                id: buttonGroup
-            }
-
-            delegate: Item {
-                implicitWidth: root.width
-                implicitHeight: delegateContent.implicitHeight
-
-                ColumnLayout {
-                    id: delegateContent
-
-                    anchors.fill: parent
-
-                    RadioButton {
-                        id: radioButton
-
-                        implicitWidth: parent.width
-                        implicitHeight: radioButtonContent.implicitHeight
-
-                        hoverEnabled: true
-
-                        property bool isFocusable: true
-
-                        Keys.onTabPressed: {
-                            FocusController.nextKeyTabItem()
-                        }
-
-                        Keys.onBacktabPressed: {
-                            FocusController.previousKeyTabItem()
-                        }
-
-                        Keys.onUpPressed: {
-                            FocusController.nextKeyUpItem()
-                        }
-
-                        Keys.onDownPressed: {
-                            FocusController.nextKeyDownItem()
-                        }
-
-                        Keys.onLeftPressed: {
-                            FocusController.nextKeyLeftItem()
-                        }
-
-                        Keys.onRightPressed: {
-                            FocusController.nextKeyRightItem()
-                        }
-
-                        indicator: Rectangle {
-                            width: parent.width - 1
-                            height: parent.height
-                            color: radioButton.hovered ? AmneziaStyle.color.slateGray : AmneziaStyle.color.onyxBlack
-                            border.color: radioButton.focus ? AmneziaStyle.color.paleGray : AmneziaStyle.color.transparent
-                            border.width: radioButton.focus ? 1 : 0
-
-                            Behavior on color {
-                                PropertyAnimation { duration: 200 }
-                            }
-                            Behavior on border.color {
-                                PropertyAnimation { duration: 200 }
-                            }
-                        }
-
-                        RowLayout {
-                            id: radioButtonContent
-                            anchors.fill: parent
-
-                            anchors.rightMargin: 16
-                            anchors.leftMargin: 16
-
-                            spacing: 0
-
-                            z: 1
-
-                            ParagraphTextType {
-                                Layout.fillWidth: true
-                                Layout.topMargin: 20
-                                Layout.bottomMargin: 20
-
-                                text: languageName
-                            }
-
-                            Image {
-                                source: "qrc:/images/controls/check.svg"
-                                visible: radioButton.checked
-
-                                width: 24
-                                height: 24
-
-                                Layout.rightMargin: 8
-                            }
-                        }
-
-                        ButtonGroup.group: buttonGroup
-                        checked: listView.selectedIndex === index
-
-                        onClicked: {
-                            listView.selectedIndex = index
-                            LanguageModel.changeLanguage(languageIndex)
-                            root.closeTriggered()
-                        }
-                    }
+                    headerText: qsTr("Choose language")
                }

-                Keys.onEnterPressed: radioButton.clicked()
-                Keys.onReturnPressed: radioButton.clicked()
+                ListView {
+                    id: listView
+
+                    Layout.fillWidth: true
+                    height: listView.contentItem.height
+
+                    clip: true
+                    interactive: false
+
+                    model: LanguageModel
+                    currentIndex: LanguageModel.currentLanguageIndex
+
+                    ButtonGroup {
+                        id: buttonGroup
+                    }
+
+                    property int currentFocusIndex: 0
+
+                    activeFocusOnTab: true
+                    onActiveFocusChanged: {
+                        if (activeFocus) {
+                            this.currentFocusIndex = 0
+                            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
+                        }
+                    }
+
+                    Keys.onTabPressed: {
+                        if (currentFocusIndex < this.count - 1) {
+                            currentFocusIndex += 1
+                            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
+                        } else {
+                            listViewFocusItem.forceActiveFocus()
+                            focusItem.forceActiveFocus()
+                        }
+                    }
+
+                    Item {
+                        id: listViewFocusItem
+                        Keys.onTabPressed: {
+                            root.forceActiveFocus()
+                        }
+                    }
+
+                    onVisibleChanged: {
+                        if (visible) {
+                            listViewFocusItem.forceActiveFocus()
+                            focusItem.forceActiveFocus()
+                        }
+                    }
+
+                    delegate: Item {
+                        implicitWidth: root.width
+                        implicitHeight: delegateContent.implicitHeight
+
+                        onActiveFocusChanged: {
+                            if (activeFocus) {
+                                radioButton.forceActiveFocus()
+                            }
+                        }
+
+                        ColumnLayout {
+                            id: delegateContent
+
+                            anchors.fill: parent
+
+                            RadioButton {
+                                id: radioButton
+
+                                implicitWidth: parent.width
+                                implicitHeight: radioButtonContent.implicitHeight
+
+                                hoverEnabled: true
+
+                                indicator: Rectangle {
+                                    width: parent.width - 1
+                                    height: parent.height
+                                    color: radioButton.hovered ? AmneziaStyle.color.slateGray : AmneziaStyle.color.onyxBlack
+                                    border.color: radioButton.focus ? AmneziaStyle.color.paleGray : AmneziaStyle.color.transparent
+                                    border.width: radioButton.focus ? 1 : 0
+
+                                    Behavior on color {
+                                        PropertyAnimation { duration: 200 }
+                                    }
+                                    Behavior on border.color {
+                                        PropertyAnimation { duration: 200 }
+                                    }
+                                }
+
+                                RowLayout {
+                                    id: radioButtonContent
+                                    anchors.fill: parent
+
+                                    anchors.rightMargin: 16
+                                    anchors.leftMargin: 16
+
+                                    spacing: 0
+
+                                    z: 1
+
+                                    ParagraphTextType {
+                                        Layout.fillWidth: true
+                                        Layout.topMargin: 20
+                                        Layout.bottomMargin: 20
+
+                                        text: languageName
+                                    }
+
+                                    Image {
+                                        source: "qrc:/images/controls/check.svg"
+                                        visible: radioButton.checked
+
+                                        width: 24
+                                        height: 24
+
+                                        Layout.rightMargin: 8
+                                    }
+                                }
+
+                                ButtonGroup.group: buttonGroup
+                                checked: listView.currentIndex === index
+
+                                onClicked: {
+                                    listView.currentIndex = index
+                                    LanguageModel.changeLanguage(languageIndex)
+                                    root.close()
+                                }
+                            }
+                        }
+
+                        Keys.onEnterPressed: radioButton.clicked()
+                        Keys.onReturnPressed: radioButton.clicked()
+                    }
+                }
            }
        }
    }
--- a/client/ui/qml/Components/ServersListView.qml
+++ b/client/ui/qml/Components/ServersListView.qml
@@ -1,126 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-import SortFilterProxyModel 0.2
-
-import PageEnum 1.0
-import ProtocolEnum 1.0
-import ContainerProps 1.0
-import ContainersModelFilters 1.0
-import Style 1.0
-
-import "./"
-import "../Controls2"
-import "../Controls2/TextTypes"
-import "../Config"
-
-ListView {
-    id: root
-
-    property int selectedIndex: ServersModel.defaultIndex
-
-    anchors.top: serversMenuHeader.bottom
-    anchors.right: parent.right
-    anchors.left: parent.left
-    anchors.bottom: parent.bottom
-    anchors.topMargin: 16
-
-    model: ServersModel
-
-    ScrollBar.vertical: ScrollBarType {}
-
-    property bool isFocusable: true
-
-    Connections {
-        target: ServersModel
-        function onDefaultServerIndexChanged(serverIndex) {
-            root.selectedIndex = serverIndex
-        }
-    }
-
-    clip: true
-    reuseItems: true
-
-    delegate: Item {
-        id: menuContentDelegate
-        objectName: "menuContentDelegate"
-
-        property variant delegateData: model
-        property VerticalRadioButton serverRadioButtonProperty: serverRadioButton
-
-        implicitWidth: root.width
-        implicitHeight: serverRadioButtonContent.implicitHeight
-
-        ColumnLayout {
-            id: serverRadioButtonContent
-            objectName: "serverRadioButtonContent"
-
-            anchors.fill: parent
-            anchors.rightMargin: 16
-            anchors.leftMargin: 16
-
-            spacing: 0
-
-            RowLayout {
-                objectName: "serverRadioButtonRowLayout"
-
-                Layout.fillWidth: true
-
-                VerticalRadioButton {
-                    id: serverRadioButton
-                    objectName: "serverRadioButton"
-
-                    Layout.fillWidth: true
-
-                    text: name
-                    descriptionText: serverDescription
-
-                    checked: index === root.selectedIndex
-                    checkable: !ConnectionController.isConnected
-
-                    ButtonGroup.group: serversRadioButtonGroup
-
-                    onClicked: {
-                        if (ConnectionController.isConnected) {
-                            PageController.showNotificationMessage(qsTr("Unable change server while there is an active connection"))
-                            return
-                        }
-
-                        root.selectedIndex = index
-
-                        ServersModel.defaultIndex = index
-                    }
-
-                    Keys.onEnterPressed: serverRadioButton.clicked()
-                    Keys.onReturnPressed: serverRadioButton.clicked()
-                }
-
-                ImageButtonType {
-                    id: serverInfoButton
-                    objectName: "serverInfoButton"
-
-                    image: "qrc:/images/controls/settings.svg"
-                    imageColor: AmneziaStyle.color.paleGray
-
-                    implicitWidth: 56
-                    implicitHeight: 56
-
-                    z: 1
-
-                    onClicked: function() {
-                        ServersModel.processedIndex = index
-                        PageController.goToPage(PageEnum.PageSettingsServerInfo)
-                        drawer.closeTriggered()
-                    }
-                }
-            }
-
-            DividerType {
-                Layout.fillWidth: true
-                Layout.leftMargin: 0
-                Layout.rightMargin: 0
-            }
-        }
-    }
-}
--- a/client/ui/qml/Components/SettingsContainersListView.qml
+++ b/client/ui/qml/Components/SettingsContainersListView.qml
@@ -20,14 +20,47 @@ ListView {
    height: root.contentItem.height

    clip: true
-    reuseItems: true
+    interactive: false

-    property bool isFocusable: false
+    activeFocusOnTab: true
+    Keys.onTabPressed: {
+        if (currentIndex < this.count - 1) {
+            this.incrementCurrentIndex()
+        } else {
+            currentIndex = 0
+            lastItemTabClickedSignal()
+        }
+    }
+
+    onCurrentIndexChanged: {
+        if (visible) {
+            if (fl.contentHeight > fl.height) {
+                var item = this.currentItem
+                if (item.y < fl.height) {
+                    fl.contentY = item.y
+                } else if (item.y + item.height > fl.contentY + fl.height) {
+                    fl.contentY = item.y + item.height - fl.height
+                }
+            }
+        }
+    }
+
+    onVisibleChanged: {
+        if (visible) {
+            this.currentIndex = 0
+        }
+    }

    delegate: Item {
        implicitWidth: root.width
        implicitHeight: delegateContent.implicitHeight

+        onActiveFocusChanged: {
+            if (activeFocus) {
+                containerRadioButton.rightButton.forceActiveFocus()
+            }
+        }
+
        ColumnLayout {
            id: delegateContent

--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -36,9 +36,17 @@ DrawerType2 {
        configFileName = "amnezia_config"
    }

-    expandedStateContent: Item {
+    expandedContent: Item {
        implicitHeight: root.expandedHeight

+        Connections {
+            target: root
+            enabled: !GC.isMobile()
+            function onOpened() {
+                header.forceActiveFocus()
+            }
+        }
+
        Header2Type {
            id: header
            anchors.top: parent.top
@@ -49,27 +57,24 @@ DrawerType2 {
            anchors.rightMargin: 16

            headerText: root.headerText
+
+            KeyNavigation.tab: shareButton
        }

-        ListView {
-            id: listView
-
+        FlickableType {
            anchors.top: header.bottom
            anchors.bottom: parent.bottom
-            anchors.left: parent.left
-            anchors.right: parent.right
+            contentHeight: content.height + 32

-            property bool isFocusable: true
+            ColumnLayout {
+                id: content

-            ScrollBar.vertical: ScrollBarType {}
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right

-            model: 1
-
-            clip: true
-            reuseItems: true
-
-            header: ColumnLayout {
-                width: listView.width
+                anchors.leftMargin: 16
+                anchors.rightMargin: 16

                visible: root.contentVisible

@@ -77,11 +82,11 @@ DrawerType2 {
                    id: shareButton
                    Layout.fillWidth: true
                    Layout.topMargin: 16
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16

                    text: qsTr("Share")
-                    leftImageSource: "qrc:/images/controls/share-2.svg"
+                    imageSource: "qrc:/images/controls/share-2.svg"
+
+                    KeyNavigation.tab: copyConfigTextButton

                    clickedFunc: function() {
                        var fileName = ""
@@ -106,8 +111,6 @@ DrawerType2 {
                    id: copyConfigTextButton
                    Layout.fillWidth: true
                    Layout.topMargin: 8
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16

                    defaultColor: AmneziaStyle.color.transparent
                    hoveredColor: AmneziaStyle.color.translucentWhite
@@ -117,18 +120,18 @@ DrawerType2 {
                    borderWidth: 1

                    text: qsTr("Copy")
-                    leftImageSource: "qrc:/images/controls/copy.svg"
+                    imageSource: "qrc:/images/controls/copy.svg"

                    Keys.onReturnPressed: { copyConfigTextButton.clicked() }
                    Keys.onEnterPressed: { copyConfigTextButton.clicked() }
+
+                    KeyNavigation.tab: copyNativeConfigStringButton.visible ? copyNativeConfigStringButton : showSettingsButton
                }

                BasicButtonType {
                    id: copyNativeConfigStringButton
                    Layout.fillWidth: true
                    Layout.topMargin: 8
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16

                    visible: false

@@ -140,7 +143,7 @@ DrawerType2 {
                    borderWidth: 1

                    text: qsTr("Copy config string")
-                    leftImageSource: "qrc:/images/controls/copy.svg"
+                    imageSource: "qrc:/images/controls/copy.svg"

                    KeyNavigation.tab: showSettingsButton
                }
@@ -150,8 +153,6 @@ DrawerType2 {

                    Layout.fillWidth: true
                    Layout.topMargin: 24
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16

                    defaultColor: AmneziaStyle.color.transparent
                    hoveredColor: AmneziaStyle.color.translucentWhite
@@ -163,8 +164,10 @@ DrawerType2 {
                    text: qsTr("Show connection settings")

                    clickedFunc: function() {
-                        configContentDrawer.openTriggered()
+                        configContentDrawer.open()
                    }
+
+                    KeyNavigation.tab: header
                }

                DrawerType2 {
@@ -175,11 +178,30 @@ DrawerType2 {
                    anchors.fill: parent
                    expandedHeight: parent.height * 0.9

-                    expandedStateContent: Item {
+                    onClosed: {
+                        if (!GC.isMobile()) {
+                            header.forceActiveFocus()
+                        }
+                    }
+
+                    expandedContent: Item {
                        id: configContentContainer

                        implicitHeight: configContentDrawer.expandedHeight

+                        Connections {
+                            target: configContentDrawer
+                            enabled: !GC.isMobile()
+                            function onOpened() {
+                                focusItem.forceActiveFocus()
+                            }
+                        }
+
+                        Item {
+                            id: focusItem
+                            KeyNavigation.tab: backButton
+                        }
+
                        Connections {
                            target: copyNativeConfigStringButton
                            function onClicked() {
@@ -209,7 +231,9 @@ DrawerType2 {
                            anchors.right: parent.right
                            anchors.topMargin: 16

-                            backButtonFunction: function() { configContentDrawer.closeTriggered() }
+                            backButtonFunction: function() { configContentDrawer.close() }
+
+                            KeyNavigation.tab: focusItem
                        }

                        FlickableType {
@@ -278,10 +302,6 @@ DrawerType2 {
                        }
                    }
                }
-            }
-
-            delegate: ColumnLayout {
-                width: listView.width

                Rectangle {
                    id: qrCodeContainer
@@ -289,8 +309,6 @@ DrawerType2 {
                    Layout.fillWidth: true
                    Layout.preferredHeight: width
                    Layout.topMargin: 20
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16

                    visible: ExportController.qrCodesCount > 0

@@ -302,32 +320,6 @@ DrawerType2 {

                        source: ExportController.qrCodesCount ? ExportController.qrCodes[0] : ""

-                        property bool isFocusable: true
-
-                        Keys.onTabPressed: {
-                            FocusController.nextKeyTabItem()
-                        }
-
-                        Keys.onBacktabPressed: {
-                            FocusController.previousKeyTabItem()
-                        }
-
-                        Keys.onUpPressed: {
-                            FocusController.nextKeyUpItem()
-                        }
-
-                        Keys.onDownPressed: {
-                            FocusController.nextKeyDownItem()
-                        }
-
-                        Keys.onLeftPressed: {
-                            FocusController.nextKeyLeftItem()
-                        }
-
-                        Keys.onRightPressed: {
-                            FocusController.nextKeyRightItem()
-                        }
-
                        Timer {
                            property int index: 0
                            interval: 1000
@@ -354,8 +346,6 @@ DrawerType2 {
                    Layout.fillWidth: true
                    Layout.topMargin: 24
                    Layout.bottomMargin: 32
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16

                    visible: ExportController.qrCodesCount > 0

--- a/client/ui/qml/Components/TransportProtoSelector.qml
+++ b/client/ui/qml/Components/TransportProtoSelector.qml
@@ -39,6 +39,8 @@ Rectangle {
            implicitWidth: (rootWidth - 32) / 2
            text: "UDP"

+            KeyNavigation.tab: tcpButton
+
            onClicked: {
                root.currentIndex = 0
            }
--- a/client/ui/qml/Controls2/BackButtonType.qml
+++ b/client/ui/qml/Controls2/BackButtonType.qml
@@ -4,7 +4,7 @@ import Qt5Compat.GraphicalEffects

 import Style 1.0

-FocusScope {
+Item {
    id: root

    property string backButtonImage: "qrc:/images/controls/arrow-left.svg"
@@ -15,6 +15,12 @@ FocusScope {

    visible: backButtonImage !== ""

+    onActiveFocusChanged: {
+        if (activeFocus) {
+            backButton.forceActiveFocus()
+        }
+    }
+
    RowLayout {
        id: content

--- a/client/ui/qml/Controls2/BasicButtonType.qml
+++ b/client/ui/qml/Controls2/BasicButtonType.qml
@@ -22,10 +22,9 @@ Button {
    property int borderWidth: 0
    property int borderFocusedWidth: 1

-    property string leftImageSource
+    property string imageSource
    property string rightImageSource
    property string leftImageColor: textColor
-    property bool changeLeftImageSize: true

    property bool squareLeftSide: false

@@ -35,35 +34,10 @@ Button {

    property alias buttonTextLabel: buttonText

-    property bool isFocusable: true
-
-    Keys.onTabPressed: {
-        FocusController.nextKeyTabItem()
-    }
-
-    Keys.onBacktabPressed: {
-        FocusController.previousKeyTabItem()
-    }
-
-    Keys.onUpPressed: {
-        FocusController.nextKeyUpItem()
-    }
-    
-    Keys.onDownPressed: {
-        FocusController.nextKeyDownItem()
-    }
-    
-    Keys.onLeftPressed: {
-        FocusController.nextKeyLeftItem()
-    }
-
-    Keys.onRightPressed: {
-        FocusController.nextKeyRightItem()
-    }
-    
    implicitHeight: 56

    hoverEnabled: true
+    focusPolicy: Qt.TabFocus

    onFocusChanged: {
        if (root.activeFocus) {
@@ -153,29 +127,24 @@ Button {
            anchors.centerIn: parent

            Image {
-                id: leftImage
-                source: root.leftImageSource
-                visible: root.leftImageSource === "" ? false : true
+                Layout.preferredHeight: 20
+                Layout.preferredWidth: 20
+
+                source: root.imageSource
+                visible: root.imageSource === "" ? false : true

                layer {
-                    enabled: leftImageColor !== "" ? true : false
+                    enabled: true
                    effect: ColorOverlay {
                        color: leftImageColor
                    }
                }
-
-                Component.onCompleted: {
-                    if (root.changeLeftImageSize) {
-                        leftImage.Layout.preferredHeight = 20
-                        leftImage.Layout.preferredWidth = 20
-                    }
-                }
            }

            ButtonTextType {
                id: buttonText

-                color: root.textColor
+                color: textColor
                text: root.text
                visible: root.text === "" ? false : true

--- a/client/ui/qml/Controls2/BusyIndicatorType.qml
+++ b/client/ui/qml/Controls2/BusyIndicatorType.qml
@@ -14,7 +14,7 @@ Popup {
    visible: false

    Overlay.modal: Rectangle {
-        color: AmneziaStyle.color.translucentMidnightBlack
+        color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
    }

    background: Rectangle {
--- a/client/ui/qml/Controls2/CardType.qml
+++ b/client/ui/qml/Controls2/CardType.qml
@@ -19,10 +19,9 @@ RadioButton {

    property string textColor: AmneziaStyle.color.midnightBlack

-    property string pressedBorderColor: AmneziaStyle.color.softGoldenApricot
+    property string pressedBorderColor: Qt.rgba(251/255, 178/255, 106/255, 0.3)
    property string selectedBorderColor: AmneziaStyle.color.goldenApricot
    property string defaultBodredColor: AmneziaStyle.color.transparent
-    property string focusBorderColor: AmneziaStyle.color.paleGray
    property int borderWidth: 0

    implicitWidth: content.implicitWidth
@@ -30,32 +29,6 @@ RadioButton {

    hoverEnabled: true

-    property bool isFocusable: true
-
-    Keys.onTabPressed: {
-        FocusController.nextKeyTabItem()
-    }
-
-    Keys.onBacktabPressed: {
-        FocusController.previousKeyTabItem()
-    }
-
-    Keys.onUpPressed: {
-        FocusController.nextKeyUpItem()
-    }
-
-    Keys.onDownPressed: {
-        FocusController.nextKeyDownItem()
-    }
-
-    Keys.onLeftPressed: {
-        FocusController.nextKeyLeftItem()
-    }
-
-    Keys.onRightPressed: {
-        FocusController.nextKeyRightItem()
-    }
-
    indicator: Rectangle {
        anchors.fill: parent
        radius: 16
@@ -79,8 +52,6 @@ RadioButton {
                    return pressedBorderColor
                } else if (root.checked) {
                    return selectedBorderColor
-                } else if (root.activeFocus) {
-                    return focusBorderColor
                }
            }
            return defaultBodredColor
@@ -88,7 +59,7 @@ RadioButton {

        border.width: {
            if (root.enabled) {
-                if(root.checked || root.activeFocus) {
+                if(root.checked) {
                    return 1
                }
                return root.pressed ? 1 : 0
--- a/client/ui/qml/Controls2/CardWithIconsType.qml
+++ b/client/ui/qml/Controls2/CardWithIconsType.qml
@@ -25,15 +25,10 @@ Button {

    property real textOpacity: 1.0

-    property alias focusItem: rightImage
-
-    property FlickableType parentFlickable
-
    hoverEnabled: true

    background: Rectangle {
        id: backgroundRect
-
        anchors.fill: parent
        radius: 16

@@ -44,31 +39,13 @@ Button {
        }
    }

-    function ensureVisible(item) {
-        if (item.activeFocus) {
-            if (root.parentFlickable) {
-                root.parentFlickable.ensureVisible(root)
-            }
-        }
-    }
-
-    onFocusChanged: {
-        ensureVisible(root)
-    }
-
-    focusItem.onFocusChanged: {
-        root.ensureVisible(focusItem)
-    }
-
    contentItem: Item {
        anchors.left: parent.left
        anchors.right: parent.right

        implicitHeight: content.implicitHeight
-
        RowLayout {
            id: content
-
            anchors.fill: parent

            Image {
@@ -84,7 +61,6 @@ Button {
            }

            ColumnLayout {
-
                ListItemTitleType {
                    text: root.headerText
                    visible: text !== ""
@@ -147,7 +123,6 @@ Button {

                Rectangle {
                    id: rightImageBackground
-
                    anchors.fill: parent
                    radius: 12
                    color: "transparent"
@@ -156,9 +131,10 @@ Button {
                        PropertyAnimation { duration: 200 }
                    }
                }
-
                onClicked: {
-                    root.clicked()
+                    if (clickedFunction && typeof clickedFunction === "function") {
+                        clickedFunction()
+                    }
                }
            }
        }
@@ -169,7 +145,6 @@ Button {

        cursorShape: Qt.PointingHandCursor
        hoverEnabled: true
-        enabled: root.enabled

        onEntered: {
            backgroundRect.color = root.hoveredColor
--- a/client/ui/qml/Controls2/DrawerType2.qml
+++ b/client/ui/qml/Controls2/DrawerType2.qml
@@ -9,14 +9,17 @@ import "TextTypes"
 Item {
    id: root

-    readonly property string drawerExpandedStateName: "expanded"
-    readonly property string drawerCollapsedStateName: "collapsed"
+    readonly property string drawerExpanded: "expanded"
+    readonly property string drawerCollapsed: "collapsed"

-    readonly property bool isOpened: isExpandedStateActive() || (isCollapsedStateActive && (dragArea.drag.active === true))
-    readonly property bool isClosed: isCollapsedStateActive() && (dragArea.drag.active === false)
+    readonly property bool isOpened: drawerContent.state === root.drawerExpanded || (drawerContent.state === root.drawerCollapsed && dragArea.drag.active === true)
+    readonly property bool isClosed: drawerContent.state === root.drawerCollapsed && dragArea.drag.active === false

-    property Component collapsedStateContent
-    property Component expandedStateContent
+    readonly property bool isExpanded: drawerContent.state === root.drawerExpanded
+    readonly property bool isCollapsed: drawerContent.state === root.drawerCollapsed
+
+    property Component collapsedContent
+    property Component expandedContent

    property string defaultColor: AmneziaStyle.color.onyxBlack
    property string borderColor: AmneziaStyle.color.slateGray
@@ -26,41 +29,29 @@ Item {

    property int depthIndex: 0

-    signal cursorEntered
-    signal cursorExited
+    signal entered
+    signal exited
    signal pressed(bool pressed, bool entered)

    signal aboutToHide
    signal aboutToShow
-    signal closeTriggered
-    signal openTriggered
+    signal close
+    signal open
    signal closed
    signal opened

-    function isExpandedStateActive() {
-        return isStateActive(drawerExpandedStateName)
-    }
-
-    function isCollapsedStateActive() {
-        return isStateActive(drawerCollapsedStateName)
-    }
-
-    function isStateActive(stateName) {
-        return drawerContent.state === stateName
-    }
-
    Connections {
        target: PageController

        function onCloseTopDrawer() {
            if (depthIndex === PageController.getDrawerDepth()) {
-                if (isCollapsedStateActive()) {
+                if (isCollapsed) {
                    return
                }

                aboutToHide()

-                drawerContent.state = root.drawerCollapsedStateName
+                drawerContent.state = root.drawerCollapsed
                depthIndex = 0
                closed()
            }
@@ -70,52 +61,30 @@ Item {
    Connections {
        target: root

-        function onCloseTriggered() {
-            if (isCollapsedStateActive()) {
+        function onClose() {
+            if (isCollapsed) {
                return
            }

            aboutToHide()

+            drawerContent.state = root.drawerCollapsed
+            depthIndex = 0
+            PageController.setDrawerDepth(PageController.getDrawerDepth() - 1)
            closed()
        }

-        function onClosed() {
-            drawerContent.state = root.drawerCollapsedStateName
-            
-            if (root.isCollapsedStateActive()) {
-                var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
-                if (initialPageNavigationBarColor !== 0xFF1C1D21) {
-                    PageController.updateNavigationBarColor(initialPageNavigationBarColor)
-                }
-            }
-
-            depthIndex = 0
-            PageController.decrementDrawerDepth()
-            FocusController.dropRootObject(root)
-        }
-
-        function onOpenTriggered() {
-            if (root.isExpandedStateActive()) {
+        function onOpen() {
+            if (isExpanded) {
                return
            }

-            root.aboutToShow()
+            aboutToShow()

-            root.opened()
-        }
-
-        function onOpened() {
-            drawerContent.state = root.drawerExpandedStateName
-
-            if (isExpandedStateActive()) {
-                if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
-                    PageController.updateNavigationBarColor(0xFF1C1D21)
-                }
-            }
-
-            depthIndex = PageController.incrementDrawerDepth()
-            FocusController.pushRootObject(root)
+            drawerContent.state = root.drawerExpanded
+            depthIndex = PageController.getDrawerDepth() + 1
+            PageController.setDrawerDepth(depthIndex)
+            opened()
        }
    }

@@ -123,7 +92,7 @@ Item {
        id: background

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

        Behavior on color {
            PropertyAnimation { duration: 200 }
@@ -133,17 +102,18 @@ Item {
    MouseArea {
        id: emptyArea
        anchors.fill: parent
-
+        enabled: root.isExpanded
+        visible: enabled
        onClicked: {
-            root.closeTriggered()
+            root.close()
        }
    }

    MouseArea {
        id: dragArea
-        objectName: "dragArea"

        anchors.fill: drawerContentBackground
+        cursorShape: root.isCollapsed ? Qt.PointingHandCursor : Qt.ArrowCursor
        hoverEnabled: true

        enabled: drawerContent.implicitHeight > 0
@@ -155,36 +125,35 @@ Item {

        /** If drag area is released at any point other than min or max y, transition to the other state */
        onReleased: {
-            if (isCollapsedStateActive() && drawerContent.y < dragArea.drag.maximumY) {
-                root.openTriggered()
+            if (root.isCollapsed && drawerContent.y < dragArea.drag.maximumY) {
+                root.open()
                return
            }
-            if (isExpandedStateActive() && drawerContent.y > dragArea.drag.minimumY) {
-                root.closeTriggered()
+            if (root.isExpanded && drawerContent.y > dragArea.drag.minimumY) {
+                root.close()
                return
            }
        }

        onEntered: {
-            root.cursorEntered()
+            root.entered()
        }
        onExited: {
-            root.cursorExited()
+            root.exited()
        }
        onPressedChanged: {
            root.pressed(pressed, entered)
        }

        onClicked: {
-            if (isCollapsedStateActive()) {
-                root.openTriggered()
+            if (root.isCollapsed) {
+                root.open()
            }
        }
    }

    Rectangle {
        id: drawerContentBackground
-        objectName: "drawerContentBackground"

        anchors { left: drawerContent.left; right: drawerContent.right; top: drawerContent.top }
        height: root.height
@@ -205,80 +174,53 @@ Item {

    Item {
        id: drawerContent
-        objectName: "drawerContent"

        Drag.active: dragArea.drag.active
        anchors.right: root.right
        anchors.left: root.left
+        y: root.height - drawerContent.height
+        state: root.drawerCollapsed

-        state: root.drawerCollapsedStateName
+        implicitHeight: root.isCollapsed ? collapsedHeight : expandedHeight
+
+        onStateChanged: {
+            if (root.isCollapsed) {
+                var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
+                if (initialPageNavigationBarColor !== 0xFF1C1D21) {
+                    PageController.updateNavigationBarColor(initialPageNavigationBarColor)
+                }
+                return
+            }
+            if (root.isExpanded) {
+                if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
+                    PageController.updateNavigationBarColor(0xFF1C1D21)
+                }
+                return
+            }
+        }

        states: [
            State {
-                name: root.drawerCollapsedStateName
+                name: root.drawerCollapsed
                PropertyChanges {
                    target: drawerContent
-                    implicitHeight: collapsedHeight
                    y: root.height - root.collapsedHeight
                }
-                PropertyChanges {
-                    target: background
-                    color: AmneziaStyle.color.transparent
-                }
-                PropertyChanges {
-                    target: dragArea
-                    cursorShape: Qt.PointingHandCursor
-                }
-                PropertyChanges {
-                    target: emptyArea
-                    enabled: false
-                    visible: false
-                }
-                PropertyChanges {
-                    target: collapsedLoader
-                    // visible: true
-                }
-                PropertyChanges {
-                    target: expandedLoader
-                    visible: false
-
-                }
            },
            State {
-                name: root.drawerExpandedStateName
+                name: root.drawerExpanded
                PropertyChanges {
                    target: drawerContent
-                    implicitHeight: expandedHeight
                    y: dragArea.drag.minimumY
-                }
-                PropertyChanges {
-                    target: background
-                    color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
-                }
-                PropertyChanges {
-                    target: dragArea
-                    cursorShape: Qt.ArrowCursor
-                }
-                PropertyChanges {
-                    target: emptyArea
-                    enabled: true
-                    visible: true
-                }
-                PropertyChanges {
-                    target: collapsedLoader
-                    // visible: false
-                }
-                PropertyChanges {
-                    target: expandedLoader
-                    visible: true
+
                }
            }
        ]

        transitions: [
            Transition {
-                from: root.drawerCollapsedStateName
-                to: root.drawerExpandedStateName
+                from: root.drawerCollapsed
+                to: root.drawerExpanded
                PropertyAnimation {
                    target: drawerContent
                    properties: "y"
@@ -286,8 +228,8 @@ Item {
                }
            },
            Transition {
-                from: root.drawerExpandedStateName
-                to: root.drawerCollapsedStateName
+                from: root.drawerExpanded
+                to: root.drawerCollapsed
                PropertyAnimation {
                    target: drawerContent
                    properties: "y"
@@ -299,7 +241,7 @@ Item {
        Loader {
            id: collapsedLoader

-            sourceComponent: root.collapsedStateContent
+            sourceComponent: root.collapsedContent

            anchors.right: parent.right
            anchors.left: parent.left
@@ -308,7 +250,8 @@ Item {
        Loader {
            id: expandedLoader

-            sourceComponent: root.expandedStateContent
+            visible: root.isExpanded
+            sourceComponent: root.expandedContent

            anchors.right: parent.right
            anchors.left: parent.left
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -45,56 +45,33 @@ Item {
    property Item drawerParent
    property Component listView

-    signal openTriggered
-    signal closeTriggered
+    signal open
+    signal close

-    readonly property bool isFocusable: true
-
-    Keys.onTabPressed: {
-        FocusController.nextKeyTabItem()
+    function popupClosedFunc() {
+        if (!GC.isMobile()) {
+            this.forceActiveFocus()
+        }
    }

-    Keys.onBacktabPressed: {
-        FocusController.previousKeyTabItem()
-    }
-
-    Keys.onUpPressed: {
-        FocusController.nextKeyUpItem()
-    }
-    
-    Keys.onDownPressed: {
-        FocusController.nextKeyDownItem()
-    }
-    
-    Keys.onLeftPressed: {
-        FocusController.nextKeyLeftItem()
-    }
-
-    Keys.onRightPressed: {
-        FocusController.nextKeyRightItem()
+    property var parentFlickable
+    onFocusChanged: {
+        if (root.activeFocus) {
+            if (root.parentFlickable) {
+                root.parentFlickable.ensureVisible(root)
+            }
+        }
    }

    implicitWidth: rootButtonContent.implicitWidth
    implicitHeight: rootButtonContent.implicitHeight

-    onOpenTriggered: {
-        menu.openTriggered()
+    onOpen: {
+        menu.open()
    }

-    onCloseTriggered: {
-        menu.closeTriggered()
-    }
-
-    Keys.onEnterPressed: {
-        if (menu.isClosed) {
-            menu.openTriggered()
-        }
-    }
-
-    Keys.onReturnPressed: {
-        if (menu.isClosed) {
-            menu.openTriggered()
-        }
+    onClose: {
+        menu.close()
    }

    Rectangle {
@@ -196,7 +173,7 @@ Item {
            if (rootButtonClickedFunction && typeof rootButtonClickedFunction === "function") {
                rootButtonClickedFunction()
            } else {
-                menu.openTriggered()
+                menu.open()
            }
        }
    }
@@ -209,10 +186,27 @@ Item {
        anchors.fill: parent
        expandedHeight: drawerParent.height * drawerHeight

-        expandedStateContent: Item {
+        onClosed: {
+            root.popupClosedFunc()
+        }
+
+        expandedContent: Item {
            id: container
            implicitHeight: menu.expandedHeight

+            Connections {
+                target: menu
+                enabled: !GC.isMobile()
+                function onOpened() {
+                    focusItem.forceActiveFocus()
+                }
+            }
+
+            Item {
+                id: focusItem
+                KeyNavigation.tab: backButton
+            }
+
            ColumnLayout {
                id: header

@@ -224,35 +218,61 @@ Item {
                BackButtonType {
                    id: backButton
                    backButtonImage: root.headerBackButtonImage
-                    backButtonFunction: function() { menu.closeTriggered() }
+                    backButtonFunction: function() { menu.close() }
+                    KeyNavigation.tab: listViewLoader.item
                }
            }

-            Column {
-                id: col
+            FlickableType {
+                id: flickable
                anchors.top: header.bottom
-                anchors.left: parent.left
-                anchors.right: parent.right
                anchors.topMargin: 16
+                contentHeight: col.implicitHeight

-                spacing: 16
-
-                Header2Type {
+                Column {
+                    id: col
+                    anchors.top: parent.top
                    anchors.left: parent.left
                    anchors.right: parent.right
-                    anchors.leftMargin: 16
-                    anchors.rightMargin: 16

-                    headerText: root.headerText
+                    spacing: 16

-                    width: parent.width
-                }
+                    Header2Type {
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+                        anchors.leftMargin: 16
+                        anchors.rightMargin: 16

-                Loader {
-                    id: listViewLoader
-                    sourceComponent: root.listView
+                        headerText: root.headerText
+
+                        width: parent.width
+                    }
+
+                    Loader {
+                        id: listViewLoader
+                        sourceComponent: root.listView
+
+                        onLoaded: {
+                            listViewLoader.item.parentFlickable = flickable
+                            listViewLoader.item.lastItemTabClicked = function() {
+                                focusItem.forceActiveFocus()
+                            }
+                        }
+                    }
                }
            }
        }
    }
+
+    Keys.onEnterPressed: {
+        if (menu.isClosed) {
+            menu.open()
+        }
+    }
+
+    Keys.onReturnPressed: {
+        if (menu.isClosed) {
+            menu.open()
+        }
+    }
 }
--- a/client/ui/qml/Controls2/FlickableType.qml
+++ b/client/ui/qml/Controls2/FlickableType.qml
@@ -7,11 +7,10 @@ Flickable {

    function ensureVisible(item) {
        if (item.y < fl.contentY) {
-            fl.contentY = item.y - 40 // 40 is a top margin
+            fl.contentY = item.y
        } else if (item.y + item.height > fl.contentY + fl.height) {
            fl.contentY = item.y + item.height - fl.height + 40 // 40 is a bottom margin
        }
-        fl.returnToBounds()
    }

    clip: true
@@ -25,7 +24,7 @@ Flickable {
    Keys.onUpPressed: scrollBar.decrease()
    Keys.onDownPressed: scrollBar.increase()

-    ScrollBar.vertical: ScrollBarType {
+    ScrollBar.vertical: ScrollBar {
        id: scrollBar
        policy: fl.height >= fl.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
    }
--- a/client/ui/qml/Controls2/HeaderType.qml
+++ b/client/ui/qml/Controls2/HeaderType.qml
@@ -19,6 +19,8 @@ Item {

    property string descriptionText

+    focus: true
+
    implicitWidth: content.implicitWidth
    implicitHeight: content.implicitHeight

--- a/client/ui/qml/Controls2/HorizontalRadioButton.qml
+++ b/client/ui/qml/Controls2/HorizontalRadioButton.qml
@@ -27,32 +27,6 @@ RadioButton {
    implicitWidth: content.implicitWidth
    implicitHeight: content.implicitHeight

-    property bool isFocusable: true
-
-    Keys.onTabPressed: {
-        FocusController.nextKeyTabItem()
-    }
-
-    Keys.onBacktabPressed: {
-        FocusController.previousKeyTabItem()
-    }
-
-    Keys.onUpPressed: {
-        FocusController.nextKeyUpItem()
-    }
-    
-    Keys.onDownPressed: {
-        FocusController.nextKeyDownItem()
-    }
-    
-    Keys.onLeftPressed: {
-        FocusController.nextKeyLeftItem()
-    }
-
-    Keys.onRightPressed: {
-        FocusController.nextKeyRightItem()
-    }
-
    indicator: Rectangle {
        anchors.fill: parent
        radius: 16
--- a/client/ui/qml/Controls2/ImageButtonType.qml
+++ b/client/ui/qml/Controls2/ImageButtonType.qml
@@ -24,39 +24,22 @@ Button {
    property int borderFocusedWidth: 1

    hoverEnabled: true
+    focus: true
+    focusPolicy: Qt.TabFocus

    icon.source: image
    icon.color: root.enabled ? imageColor : disableImageColor

-    property bool isFocusable: true
+    property Flickable parentFlickable

-    Keys.onTabPressed: {
-        FocusController.nextKeyTabItem()
+    onFocusChanged: {
+        if (root.activeFocus) {
+            if (root.parentFlickable) {
+                root.parentFlickable.ensureVisible(this)
+            }
+        }
    }

-    Keys.onBacktabPressed: {
-        FocusController.previousKeyTabItem()
-    }
-
-    Keys.onUpPressed: {
-        FocusController.nextKeyUpItem()
-    }
-    
-    Keys.onDownPressed: {
-        FocusController.nextKeyDownItem()
-    }
-    
-    Keys.onLeftPressed: {
-        FocusController.nextKeyLeftItem()
-    }
-
-    Keys.onRightPressed: {
-        FocusController.nextKeyRightItem()
-    }
-
-    Keys.onEnterPressed: root.clicked()
-    Keys.onReturnPressed: root.clicked()
-
    Behavior on icon.color {
        PropertyAnimation { duration: 200 }
    }
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -41,32 +41,6 @@ Item {
    property bool descriptionOnTop: false
    property bool hideDescription: true

-    property bool isFocusable: !(eyeImage.visible || rightImage.visible) // TODO: this component already has focusable items
-
-    Keys.onTabPressed: {
-        FocusController.nextKeyTabItem()
-    }
-
-    Keys.onBacktabPressed: {
-        FocusController.previousKeyTabItem()
-    }
-
-    Keys.onUpPressed: {
-        FocusController.nextKeyUpItem()
-    }
-    
-    Keys.onDownPressed: {
-        FocusController.nextKeyDownItem()
-    }
-    
-    Keys.onLeftPressed: {
-        FocusController.nextKeyLeftItem()
-    }
-
-    Keys.onRightPressed: {
-        FocusController.nextKeyRightItem()
-    }
-    
    implicitWidth: content.implicitWidth + content.anchors.topMargin + content.anchors.bottomMargin
    implicitHeight: content.implicitHeight + content.anchors.leftMargin + content.anchors.rightMargin

--- a/client/ui/qml/Controls2/ListViewWithLabelsType.qml
+++ b/client/ui/qml/Controls2/ListViewWithLabelsType.qml
@@ -17,7 +17,7 @@ ListView {

    property bool dividerVisible: false

-    property int selectedIndex: 0
+    currentIndex: 0

    width: rootWidth
    height: menuContent.contentItem.height
@@ -45,7 +45,7 @@ ListView {
                rightImageSource: imageSource

                clickedFunction: function() {
-                    menuContent.selectedIndex = index
+                    menuContent.currentIndex = index
                    menuContent.selectedText = name
                    if (menuContent.clickedFunction && typeof menuContent.clickedFunction === "function") {
                        menuContent.clickedFunction()
@@ -62,7 +62,7 @@ ListView {
        }

        Component.onCompleted: {
-            if (menuContent.selectedIndex === index) {
+            if (menuContent.currentIndex === index) {
                menuContent.selectedText = name
            }
        }
--- a/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml
+++ b/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml
@@ -20,132 +20,155 @@ ListView {

    property var clickedFunction

-    property int selectedIndex: 0
+    currentIndex: 0

    width: rootWidth
    height: root.contentItem.height

    clip: true
-    reuseItems: true
+    interactive: false

-    property bool isFocusable: true
+    property FlickableType parentFlickable
+    property var lastItemTabClicked
+
+    property int currentFocusIndex: 0
+
+    activeFocusOnTab: true
+    onActiveFocusChanged: {
+        if (activeFocus) {
+            this.currentFocusIndex = 0
+            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
+        }
+    }
+
+    Keys.onTabPressed: {
+        if (currentFocusIndex < this.count - 1) {
+            currentFocusIndex += 1
+        } else {
+            currentFocusIndex = 0
+        }
+        this.itemAtIndex(currentFocusIndex).forceActiveFocus()
+    }
+
+    Item {
+        id: focusItem
+        Keys.onTabPressed: {
+            root.forceActiveFocus()
+        }
+    }
+
+    onVisibleChanged: {
+        if (visible) {
+            focusItem.forceActiveFocus()
+        }
+    }
+
+    onCurrentFocusIndexChanged: {
+        if (parentFlickable) {
+            parentFlickable.ensureVisible(this.itemAtIndex(currentFocusIndex))
+        }
+    }

    ButtonGroup {
        id: buttonGroup
    }

    function triggerCurrentItem() {
-        var item = root.itemAtIndex(selectedIndex)
-        item.selectable.clicked()
+        var item = root.itemAtIndex(currentIndex)
+        var radioButton = item.children[0].children[0]
+        radioButton.clicked()
    }

-    delegate: ColumnLayout {
-        id: content
-
-        property alias selectable: radioButton
-
+    delegate: Item {
        implicitWidth: rootWidth
+        implicitHeight: content.implicitHeight

-        RadioButton {
-            id: radioButton
-
-            implicitWidth: parent.width
-            implicitHeight: radioButtonContent.implicitHeight
-
-            hoverEnabled: true
-
-            property bool isFocusable: true
-
-            Keys.onTabPressed: {
-                FocusController.nextKeyTabItem()
+        onActiveFocusChanged: {
+            if (activeFocus) {
+                radioButton.forceActiveFocus()
            }
+        }

-            Keys.onBacktabPressed: {
-                FocusController.previousKeyTabItem()
-            }
+        ColumnLayout {
+            id: content

-            Keys.onUpPressed: {
-                FocusController.nextKeyUpItem()
-            }
+            anchors.fill: parent

-            Keys.onDownPressed: {
-                FocusController.nextKeyDownItem()
-            }
+            RadioButton {
+                id: radioButton

-            Keys.onLeftPressed: {
-                FocusController.nextKeyLeftItem()
-            }
+                implicitWidth: parent.width
+                implicitHeight: radioButtonContent.implicitHeight

-            Keys.onRightPressed: {
-                FocusController.nextKeyRightItem()
-            }
+                hoverEnabled: true

-            indicator: Rectangle {
-                width: parent.width - 1
-                height: parent.height
-                color: radioButton.hovered ? AmneziaStyle.color.slateGray : AmneziaStyle.color.onyxBlack
-                border.color: radioButton.focus ? AmneziaStyle.color.paleGray : AmneziaStyle.color.transparent
-                border.width: radioButton.focus ? 1 : 0
+                indicator: Rectangle {
+                    width: parent.width - 1
+                    height: parent.height
+                    color: radioButton.hovered ? AmneziaStyle.color.slateGray : AmneziaStyle.color.onyxBlack
+                    border.color: radioButton.focus ? AmneziaStyle.color.paleGray : AmneziaStyle.color.transparent
+                    border.width: radioButton.focus ? 1 : 0

-                Behavior on color {
-                    PropertyAnimation { duration: 200 }
-                }
-                Behavior on border.color {
-                    PropertyAnimation { duration: 200 }
+                    Behavior on color {
+                        PropertyAnimation { duration: 200 }
+                    }
+                    Behavior on border.color {
+                        PropertyAnimation { duration: 200 }
+                    }
+
+                    MouseArea {
+                        anchors.fill: parent
+                        cursorShape: Qt.PointingHandCursor
+                        enabled: false
+                    }
                }

-                MouseArea {
+                RowLayout {
+                    id: radioButtonContent
                    anchors.fill: parent
-                    cursorShape: Qt.PointingHandCursor
-                    enabled: false
-                }
-            }

-            RowLayout {
-                id: radioButtonContent
-                anchors.fill: parent
+                    anchors.rightMargin: 16
+                    anchors.leftMargin: 16

-                anchors.rightMargin: 16
-                anchors.leftMargin: 16
+                    z: 1

-                z: 1
+                    ParagraphTextType {
+                        Layout.fillWidth: true
+                        Layout.topMargin: 20
+                        Layout.bottomMargin: 20

-                ParagraphTextType {
-                    Layout.fillWidth: true
-                    Layout.topMargin: 20
-                    Layout.bottomMargin: 20
+                        text: name
+                        maximumLineCount: root.textMaximumLineCount
+                        elide: root.textElide

-                    text: name
-                    maximumLineCount: root.textMaximumLineCount
-                    elide: root.textElide
+                    }

+                    Image {
+                        source: imageSource
+                        visible: radioButton.checked
+
+                        width: 24
+                        height: 24
+
+                        Layout.rightMargin: 8
+                    }
                }

-                Image {
-                    source: imageSource
-                    visible: radioButton.checked
+                ButtonGroup.group: buttonGroup
+                checked: root.currentIndex === index

-                    width: 24
-                    height: 24
-
-                    Layout.rightMargin: 8
-                }
-            }
-
-            ButtonGroup.group: buttonGroup
-            checked: root.selectedIndex === index
-
-            onClicked: {
-                root.selectedIndex = index
-                root.selectedText = name
-                if (clickedFunction && typeof clickedFunction === "function") {
-                    clickedFunction()
+                onClicked: {
+                    root.currentIndex = index
+                    root.selectedText = name
+                    if (clickedFunction && typeof clickedFunction === "function") {
+                        clickedFunction()
+                    }
                }
            }
        }

        Component.onCompleted: {
-            if (root.selectedIndex === index) {
+            if (root.currentIndex === index) {
                root.selectedText = name
            }
        }
--- a/client/ui/qml/Controls2/PageType.qml
+++ b/client/ui/qml/Controls2/PageType.qml
@@ -9,22 +9,53 @@ Item {

    property StackView stackView: StackView.view

+    property var defaultActiveFocusItem: null
+
    onVisibleChanged: {
-        if (visible) {
+        if (visible && !GC.isMobile()) {
            timer.start()
        }
    }

+    function lastItemTabClicked(focusItem) {
+        if (GC.isMobile()) {
+            return
+        }
+
+        if (focusItem) {
+            focusItem.forceActiveFocus()
+            PageController.forceTabBarActiveFocus()
+        } else {
+            if (defaultActiveFocusItem) {
+                defaultActiveFocusItem.forceActiveFocus()
+            }
+            PageController.forceTabBarActiveFocus()
+        }
+    }
+
+//    MouseArea {
+//        id: globalMouseArea
+//        z: 99
+//        anchors.fill: parent
+
+//        enabled: true
+
+//        onPressed: function(mouse) {
+//            forceActiveFocus()
+//            mouse.accepted = false
+//        }
+//    }
+
    // Set a timer to set focus after a short delay
    Timer {
        id: timer
-        interval: 200 // Milliseconds
+        interval: 100 // Milliseconds
        onTriggered: {
-            console.debug(">>> PageType timer triggered")
-            FocusController.resetRootObject()
-            FocusController.setFocusOnDefaultItem()
+            if (defaultActiveFocusItem) {
+                defaultActiveFocusItem.forceActiveFocus()
+            }
        }
        repeat: false // Stop the timer after one trigger
-        running: true // Start the timer
+        running: !GC.isMobile()  // Start the timer
    }
 }
--- a/client/ui/qml/Controls2/PopupType.qml
+++ b/client/ui/qml/Controls2/PopupType.qml
@@ -5,7 +5,6 @@ import QtQuick.Layouts
 import Style 1.0

 import "TextTypes"
-import "../Config"

 Popup {
    id: root
@@ -25,15 +24,15 @@ Popup {

    Overlay.modal: Rectangle {
        visible: root.closeButtonVisible
-        color: AmneziaStyle.color.translucentMidnightBlack
+        color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
    }

    onOpened: {
-        timer.start()
+        focusItem.forceActiveFocus()
    }

    onClosed: {
-        FocusController.dropRootObject(root)
+        PageController.forceStackActiveFocus()
    }

    background: Rectangle {
@@ -43,17 +42,6 @@ Popup {
        radius: 4
    }

-    Timer {
-        id: timer
-        interval: 200 // Milliseconds
-        onTriggered: {
-            FocusController.pushRootObject(root)
-            FocusController.setFocusItem(closeButton)
-        }
-        repeat: false // Stop the timer after one trigger
-        running: true // Start the timer
-    }
-
    contentItem: Item {
        implicitWidth: content.implicitWidth
        implicitHeight: content.implicitHeight
@@ -84,6 +72,11 @@ Popup {
                }
            }

+            Item {
+                id: focusItem
+                KeyNavigation.tab: closeButton
+            }
+
            BasicButtonType {
                id: closeButton
                visible: closeButtonVisible
@@ -99,6 +92,7 @@ Popup {
                borderWidth: 0

                text: qsTr("Close")
+                KeyNavigation.tab: focusItem

                clickedFunc: function() {
                    root.close()
--- a/client/ui/qml/Controls2/ScrollBarType.qml
+++ b/client/ui/qml/Controls2/ScrollBarType.qml
@@ -1,11 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-import "./"
-import "../Controls2"
-
-ScrollBar {
-    id: root
-    
-    policy: parent.height >= parent.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
-}
--- a/client/ui/qml/Controls2/SwitcherType.qml
+++ b/client/ui/qml/Controls2/SwitcherType.qml
@@ -35,37 +35,10 @@ Switch {
    property string hoveredIndicatorBackgroundColor: AmneziaStyle.color.translucentWhite
    property string defaultIndicatorBackgroundColor: AmneziaStyle.color.transparent

-    property bool isFocusable: true
-
-    Keys.onTabPressed: {
-        FocusController.nextKeyTabItem()
-    }
-
-    Keys.onBacktabPressed: {
-        FocusController.previousKeyTabItem()
-    }
-
-    Keys.onUpPressed: {
-        FocusController.nextKeyUpItem()
-    }
-    
-    Keys.onDownPressed: {
-        FocusController.nextKeyDownItem()
-    }
-    
-    Keys.onLeftPressed: {
-        FocusController.nextKeyLeftItem()
-    }
-
-    Keys.onRightPressed: {
-        FocusController.nextKeyRightItem()
-    }
-
    hoverEnabled: enabled ? true : false
    focusPolicy: Qt.TabFocus

    property FlickableType parentFlickable: null
-
    onFocusChanged: {
        if (root.activeFocus) {
            if (root.parentFlickable) {
@@ -158,15 +131,13 @@ Switch {
        enabled: false
    }

-    Keys.onEnterPressed: event => handleSwitch(event)
-    Keys.onReturnPressed: event => handleSwitch(event)
-    Keys.onSpacePressed: event => handleSwitch(event)
+    Keys.onEnterPressed: {
+        root.checked = !root.checked
+        root.checkedChanged()
+    }

-    function handleSwitch(event) {
-        if (!event.isAutoRepeat) {
-            root.checked = !root.checked
-            root.checkedChanged()
-        }
-        event.accepted = true
+    Keys.onReturnPressed: {
+        root.checked = !root.checked
+        root.checkedChanged()
    }
 }
--- a/client/ui/qml/Controls2/TabButtonType.qml
+++ b/client/ui/qml/Controls2/TabButtonType.qml
@@ -17,35 +17,10 @@ TabButton {

    property bool isSelected: false

-    property bool isFocusable: true
-
-    Keys.onTabPressed: {
-        FocusController.nextKeyTabItem()
-    }
-
-    Keys.onBacktabPressed: {
-        FocusController.previousKeyTabItem()
-    }
-
-    Keys.onUpPressed: {
-        FocusController.nextKeyUpItem()
-    }
-    
-    Keys.onDownPressed: {
-        FocusController.nextKeyDownItem()
-    }
-    
-    Keys.onLeftPressed: {
-        FocusController.nextKeyLeftItem()
-    }
-
-    Keys.onRightPressed: {
-        FocusController.nextKeyRightItem()
-    }
-    
    implicitHeight: 48

    hoverEnabled: true
+    focusPolicy: Qt.TabFocus

    background: Rectangle {
        id: background
--- a/client/ui/qml/Controls2/TabImageButtonType.qml
+++ b/client/ui/qml/Controls2/TabImageButtonType.qml
@@ -14,38 +14,13 @@ TabButton {

    property bool isSelected: false

-	property bool isFocusable: true
-
-    Keys.onTabPressed: {
-        FocusController.nextKeyTabItem()
-    }
-
-    Keys.onBacktabPressed: {
-        FocusController.previousKeyTabItem()
-    }
-
-    Keys.onUpPressed: {
-        FocusController.nextKeyUpItem()
-    }
-    
-    Keys.onDownPressed: {
-        FocusController.nextKeyDownItem()
-    }
-    
-    Keys.onLeftPressed: {
-        FocusController.nextKeyLeftItem()
-    }
-
-    Keys.onRightPressed: {
-        FocusController.nextKeyRightItem()
-    }
-    
    property string borderFocusedColor: AmneziaStyle.color.paleGray
    property int borderFocusedWidth: 1

    property var clickedFunc

    hoverEnabled: true
+    focusPolicy: Qt.TabFocus

    icon.source: image
    icon.color: isSelected ? selectedColor : defaultColor
@@ -66,7 +41,7 @@ TabButton {
        cursorShape: Qt.PointingHandCursor
        enabled: false
    }
-    
+
    Keys.onEnterPressed: {
        if (root.clickedFunc && typeof root.clickedFunc === "function") {
            root.clickedFunc()
--- a/client/ui/qml/Controls2/TextAreaWithFooterType.qml
+++ b/client/ui/qml/Controls2/TextAreaWithFooterType.qml
@@ -78,6 +78,9 @@ Rectangle {
                placeholderText: root.placeholderText
                text: root.text

+
+                KeyNavigation.tab: firstButton
+
                onCursorVisibleChanged:  {
                    if (textArea.cursorVisible) {
                        fl.interactive = true
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -40,7 +40,6 @@ Item {
    implicitHeight: content.implicitHeight

    property FlickableType parentFlickable
-
    Connections {
        target: textField
        function onFocusChanged() {
@@ -85,16 +84,7 @@ Item {

                    TextField {
                        id: textField
-
-                        property bool isFocusable: true
-
-                        Keys.onTabPressed: {
-                            FocusController.nextKeyTabItem()
-                        }
-
-                        Keys.onBacktabPressed: {
-                            FocusController.previousKeyTabItem()
-                        }
+                        activeFocusOnTab: false

                        enabled: root.textFieldEditable
                        color: root.enabled ? root.textFieldTextColor : root.textFieldTextDisabledColor
@@ -193,7 +183,7 @@ Item {

        focusPolicy: Qt.NoFocus
        text: root.buttonText
-        leftImageSource: root.buttonImageSource
+        imageSource: root.buttonImageSource

        anchors.top: content.top
        anchors.bottom: content.bottom
@@ -219,9 +209,9 @@ Item {
            clickedFunc()
        }

-        // if (KeyNavigation.tab) {
-        //     KeyNavigation.tab.forceActiveFocus();
-        // }
+        if (KeyNavigation.tab) {
+            KeyNavigation.tab.forceActiveFocus();
+        }
    }

    Keys.onReturnPressed: {
@@ -229,8 +219,8 @@ Item {
            clickedFunc()
        }

-        // if (KeyNavigation.tab) {
-        //     KeyNavigation.tab.forceActiveFocus();
-        // }
+        if (KeyNavigation.tab) {
+            KeyNavigation.tab.forceActiveFocus();
+        }
    }
 }
--- a/client/ui/qml/Controls2/TopCloseButtonType.qml
+++ b/client/ui/qml/Controls2/TopCloseButtonType.qml
@@ -14,7 +14,7 @@ Popup {
    visible: false

    Overlay.modal: Rectangle {
-        color: AmneziaStyle.color.translucentMidnightBlack
+        color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
    }

    background: Rectangle {
--- a/client/ui/qml/Controls2/VerticalRadioButton.qml
+++ b/client/ui/qml/Controls2/VerticalRadioButton.qml
@@ -28,33 +28,8 @@ RadioButton {
    property string imageSource
    property bool showImage

-    property bool isFocusable: true
-
-    Keys.onTabPressed: {
-        FocusController.nextKeyTabItem()
-    }
-
-    Keys.onBacktabPressed: {
-        FocusController.previousKeyTabItem()
-    }
-
-    Keys.onUpPressed: {
-        FocusController.nextKeyUpItem()
-    }
-    
-    Keys.onDownPressed: {
-        FocusController.nextKeyDownItem()
-    }
-    
-    Keys.onLeftPressed: {
-        FocusController.nextKeyLeftItem()
-    }
-
-    Keys.onRightPressed: {
-        FocusController.nextKeyRightItem()
-    }
-
    hoverEnabled: true
+    focusPolicy: Qt.TabFocus

    indicator: Rectangle {
        id: background
--- a/client/ui/qml/Modules/Style/AmneziaStyle.qml
+++ b/client/ui/qml/Modules/Style/AmneziaStyle.qml
@@ -22,9 +22,5 @@ QtObject {
        readonly property color sheerWhite: Qt.rgba(1, 1, 1, 0.12)
        readonly property color translucentWhite: Qt.rgba(1, 1, 1, 0.08)
        readonly property color barelyTranslucentWhite: Qt.rgba(1, 1, 1, 0.05)
-        readonly property color translucentMidnightBlack: Qt.rgba(14/255, 14/255, 17/255, 0.8)
-        readonly property color softGoldenApricot: Qt.rgba(251/255, 178/255, 106/255, 0.3)
-        readonly property color mistyGray: Qt.rgba(215/255, 216/255, 219/255, 0.8)
-        readonly property color cloudyGray: Qt.rgba(215/255, 216/255, 219/255, 0.65)
    }
 }
--- a/client/ui/qml/Pages2/PageDevMenu.qml
+++ b/client/ui/qml/Pages2/PageDevMenu.qml
@@ -16,28 +16,40 @@ import "../Components"
 PageType {
    id: root

-    BackButtonType {
-        id: backButton
+    defaultActiveFocusItem: focusItem
+
+    Item {
+        id: focusItem
+        KeyNavigation.tab: backButton
+    }
+
+    ColumnLayout {
+        id: backButtonLayout

        anchors.top: parent.top
        anchors.left: parent.left
        anchors.right: parent.right
+
        anchors.topMargin: 20
+
+        BackButtonType {
+            id: backButton
+            // KeyNavigation.tab: removeButton
+        }
    }

-    ListView {
-        id: listView
-        anchors.top: backButton.bottom
+    FlickableType {
+        id: fl
+        anchors.top: backButtonLayout.bottom
        anchors.bottom: parent.bottom
-        anchors.right: parent.right
-        anchors.left: parent.left
+        contentHeight: content.implicitHeight

-        property bool isFocusable: true
+        ColumnLayout {
+            id: content

-        ScrollBar.vertical: ScrollBarType {}
-
-        header: ColumnLayout {
-            width: listView.width
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right

            HeaderType {
                id: header
@@ -48,14 +60,7 @@ PageType {

                headerText: "Dev menu"
            }
-        }
-        
-        model: 1
-        clip: true
-        spacing: 16

-        delegate: ColumnLayout {
-            width: listView.width

            TextFieldWithHeaderType {
                id: passwordTextField
@@ -64,6 +69,7 @@ PageType {
                Layout.topMargin: 16
                Layout.rightMargin: 16
                Layout.leftMargin: 16
+                parentFlickable: fl

                headerText: qsTr("Gateway endpoint")
                textFieldText: SettingsController.gatewayEndpoint
@@ -80,19 +86,17 @@ PageType {
                        SettingsController.gatewayEndpoint = textFieldText
                    }
                }
-            }
-        }

-        footer: ColumnLayout {
-            width: listView.width
+                // KeyNavigation.tab: saveButton
+            }

            SwitcherType {
                id: switcher

                Layout.fillWidth: true
-                Layout.topMargin: 24
                Layout.rightMargin: 16
                Layout.leftMargin: 16
+                Layout.topMargin: 16

                text: qsTr("Dev gateway environment")
                checked: SettingsController.isDevGatewayEnv
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -19,13 +19,13 @@ import "../Components"
 PageType {
    id: root

-    Connections {
-        objectName: "pageControllerConnections"
+    defaultActiveFocusItem: focusItem

+    Connections {
        target: PageController

        function onRestorePageHomeState(isContainerInstalled) {
-            drawer.openTriggered()
+            drawer.open()
            if (isContainerInstalled) {
                containersDropDown.rootButtonClickedFunction()
            }
@@ -33,22 +33,23 @@ PageType {
    }

    Item {
-        objectName: "homeColumnItem"
-
        anchors.fill: parent
        anchors.bottomMargin: drawer.collapsedHeight

        ColumnLayout {
-            objectName: "homeColumnLayout"
-
            anchors.fill: parent
            anchors.topMargin: 34
            anchors.bottomMargin: 34

+            Item {
+                id: focusItem
+                KeyNavigation.tab: loggingButton.visible ?
+                                       loggingButton :
+                                       connectButton
+            }
+
            BasicButtonType {
                id: loggingButton
-                objectName: "loggingButton"
-
                property bool isLoggingEnabled: SettingsController.isLoggingEnabled

                Layout.alignment: Qt.AlignHCenter
@@ -68,6 +69,8 @@ PageType {
                Keys.onEnterPressed: loggingButton.clicked()
                Keys.onReturnPressed: loggingButton.clicked()

+                KeyNavigation.tab: connectButton
+
                onClicked: {
                    PageController.goToPage(PageEnum.PageSettingsLogging)
                }
@@ -75,15 +78,13 @@ PageType {

            ConnectButton {
                id: connectButton
-                objectName: "connectButton"
-
                Layout.fillHeight: true
                Layout.alignment: Qt.AlignCenter
+                KeyNavigation.tab: splitTunnelingButton
            }

            BasicButtonType {
                id: splitTunnelingButton
-                objectName: "splitTunnelingButton"

                Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
                Layout.bottomMargin: 34
@@ -97,6 +98,7 @@ PageType {
                pressedColor: AmneziaStyle.color.sheerWhite
                disabledColor: AmneziaStyle.color.mutedGray
                textColor: AmneziaStyle.color.mutedGray
+                leftImageColor: AmneziaStyle.color.transparent
                borderWidth: 0

                buttonTextLabel.lineHeight: 20
@@ -108,48 +110,62 @@ PageType {

                text: isSplitTunnelingEnabled ? qsTr("Split tunneling enabled") : qsTr("Split tunneling disabled")

-                leftImageSource: isSplitTunnelingEnabled ? "qrc:/images/controls/split-tunneling.svg" : ""
-                leftImageColor: ""
+                imageSource: isSplitTunnelingEnabled ? "qrc:/images/controls/split-tunneling.svg" : ""
                rightImageSource: "qrc:/images/controls/chevron-down.svg"

                Keys.onEnterPressed: splitTunnelingButton.clicked()
                Keys.onReturnPressed: splitTunnelingButton.clicked()

+                KeyNavigation.tab: drawer
+
                onClicked: {
-                    homeSplitTunnelingDrawer.openTriggered()
+                    homeSplitTunnelingDrawer.open()
                }

                HomeSplitTunnelingDrawer {
                    id: homeSplitTunnelingDrawer
-                    objectName: "homeSplitTunnelingDrawer"
-
                    parent: root
+
+                    onClosed: {
+                        if (!GC.isMobile()) {
+                            focusItem.forceActiveFocus()
+                        }
+                    }
                }
            }
        }
    }

+
    DrawerType2 {
        id: drawer
-        objectName: "drawerProtocol"
-
        anchors.fill: parent

-        collapsedStateContent: Item {
-            objectName: "ProtocolDrawerCollapsedContent"
+        onClosed: {
+            if (!GC.isMobile()) {
+                focusItem.forceActiveFocus()
+            }
+        }

+        collapsedContent: Item {
            implicitHeight: Qt.platform.os !== "ios" ? root.height * 0.9 : screen.height * 0.77
            Component.onCompleted: {
                drawer.expandedHeight = implicitHeight
            }
-
+            Connections {
+                target: drawer
+                enabled: !GC.isMobile()
+                function onActiveFocusChanged() {
+                    if (drawer.activeFocus && !drawer.isOpened) {
+                        collapsedButtonChevron.forceActiveFocus()
+                    }
+                }
+            }
            ColumnLayout {
                id: collapsed
-                objectName: "collapsedColumnLayout"

                anchors.left: parent.left
                anchors.right: parent.right
-                spacing: 0

                Component.onCompleted: {
                    drawer.collapsedHeight = collapsed.implicitHeight
@@ -164,8 +180,6 @@ PageType {
                }

                RowLayout {
-                    objectName: "rowLayout"
-
                    Layout.topMargin: 14
                    Layout.leftMargin: 24
                    Layout.rightMargin: 24
@@ -174,11 +188,9 @@ PageType {
                    spacing: 0

                    Connections {
-                        objectName: "drawerConnections"
-
                        target: drawer
-                        function onCursorEntered() {
-                            if (drawer.isCollapsedStateActive) {
+                        function onEntered() {
+                            if (drawer.isCollapsed) {
                                collapsedButtonChevron.backgroundColor = collapsedButtonChevron.hoveredColor
                                collapsedButtonHeader.opacity = 0.8
                            } else {
@@ -186,8 +198,8 @@ PageType {
                            }
                        }

-                        function onCursorExited() {
-                            if (drawer.isCollapsedStateActive) {
+                        function onExited() {
+                            if (drawer.isCollapsed) {
                                collapsedButtonChevron.backgroundColor = collapsedButtonChevron.defaultColor
                                collapsedButtonHeader.opacity = 1
                            } else {
@@ -196,7 +208,7 @@ PageType {
                        }

                        function onPressed(pressed, entered) {
-                            if (drawer.isCollapsedStateActive) {
+                            if (drawer.isCollapsed) {
                                collapsedButtonChevron.backgroundColor = pressed ? collapsedButtonChevron.pressedColor : entered ? collapsedButtonChevron.hoveredColor : collapsedButtonChevron.defaultColor
                                collapsedButtonHeader.opacity = 0.7
                            } else {
@@ -207,8 +219,6 @@ PageType {

                    Header1TextType {
                        id: collapsedButtonHeader
-                        objectName: "collapsedButtonHeader"
-
                        Layout.maximumWidth: drawer.width - 48 - 18 - 12

                        maximumLineCount: 2
@@ -217,6 +227,8 @@ PageType {
                        text: ServersModel.defaultServerName
                        horizontalAlignment: Qt.AlignHCenter

+                        KeyNavigation.tab: tabBar
+
                        Behavior on opacity {
                            PropertyAnimation { duration: 200 }
                        }
@@ -224,11 +236,10 @@ PageType {

                    ImageButtonType {
                        id: collapsedButtonChevron
-                        objectName: "collapsedButtonChevron"

                        Layout.leftMargin: 8

-                        visible: drawer.isCollapsedStateActive()
+                        visible: drawer.isCollapsed

                        hoverEnabled: false
                        image: "qrc:/images/controls/chevron-down.svg"
@@ -243,58 +254,47 @@ PageType {

                        Keys.onEnterPressed: collapsedButtonChevron.clicked()
                        Keys.onReturnPressed: collapsedButtonChevron.clicked()
+                        Keys.onTabPressed: lastItemTabClicked()
+

                        onClicked: {
-                            if (drawer.isCollapsedStateActive()) {
-                                drawer.openTriggered()
+                            if (drawer.isCollapsed) {
+                                drawer.open()
                            }
                        }
                    }
                }

                RowLayout {
-                    objectName: "rowLayoutLabel"
                    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-                    Layout.topMargin: 8
-                    Layout.bottomMargin: drawer.isCollapsed ? 44 : ServersModel.isDefaultServerFromApi ? 61 : 16
+                    Layout.bottomMargin: drawer.isCollapsed ? 44 : ServersModel.isDefaultServerFromApi ? 89 : 44
                    spacing: 0

-                    BasicButtonType {
-                        enabled: (ServersModel.defaultServerImagePathCollapsed !== "") && drawer.isCollapsed
-                        hoverEnabled: enabled
-
-                        implicitHeight: 36
-
-                        leftPadding: 16
-                        rightPadding: 16
-
-                        defaultColor: AmneziaStyle.color.transparent
-                        hoveredColor: AmneziaStyle.color.translucentWhite
-                        pressedColor: AmneziaStyle.color.sheerWhite
-                        disabledColor: AmneziaStyle.color.transparent
-                        textColor: AmneziaStyle.color.mutedGray
-
-                        buttonTextLabel.lineHeight: 16
-                        buttonTextLabel.font.pixelSize: 13
-                        buttonTextLabel.font.weight: 400
+                    Image {
+                        Layout.rightMargin: 8
+                        visible: source !== ""
+                        source: ServersModel.defaultServerImagePathCollapsed
+                    }

+                    LabelTextType {
+                        id: collapsedServerMenuDescription
                        text: drawer.isCollapsed ? ServersModel.defaultServerDescriptionCollapsed : ServersModel.defaultServerDescriptionExpanded
-                        leftImageSource: ServersModel.defaultServerImagePathCollapsed
-                        changeLeftImageSize: false
+                    }
+                }
+            }

-                        rightImageSource: hoverEnabled ? "qrc:/images/controls/chevron-down.svg" : ""
-
-                        onClicked: {
-                            ServersModel.processedIndex = ServersModel.defaultIndex
-                            PageController.goToPage(PageEnum.PageSettingsServerInfo)
-                        }
+            Connections {
+                target: drawer
+                enabled: !GC.isMobile()
+                function onIsCollapsedChanged() {
+                    if (!drawer.isCollapsed) {
+                        focusItem1.forceActiveFocus()
                    }
                }
            }

            ColumnLayout {
                id: serversMenuHeader
-                objectName: "serversMenuHeader"

                anchors.top: collapsed.bottom
                anchors.right: parent.right
@@ -306,42 +306,45 @@ PageType {

                    visible: !ServersModel.isDefaultServerFromApi

+                    Item {
+                        id: focusItem1
+                        KeyNavigation.tab: containersDropDown
+                    }
+
                    DropDownType {
                        id: containersDropDown
-                        objectName: "containersDropDown"

                        rootButtonImageColor: AmneziaStyle.color.midnightBlack
                        rootButtonBackgroundColor: AmneziaStyle.color.paleGray
-                        rootButtonBackgroundHoveredColor: AmneziaStyle.color.mistyGray
-                        rootButtonBackgroundPressedColor: AmneziaStyle.color.cloudyGray
+                        rootButtonBackgroundHoveredColor: Qt.rgba(215, 216, 219, 0.8)
+                        rootButtonBackgroundPressedColor: Qt.rgba(215, 216, 219, 0.65)
                        rootButtonHoveredBorderColor: AmneziaStyle.color.transparent
                        rootButtonDefaultBorderColor: AmneziaStyle.color.transparent
                        rootButtonTextTopMargin: 8
                        rootButtonTextBottomMargin: 8

-                        enabled: drawer.isOpened
-
                        text: ServersModel.defaultServerDefaultContainerName
                        textColor: AmneziaStyle.color.midnightBlack
                        headerText: qsTr("VPN protocol")
                        headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"

                        rootButtonClickedFunction: function() {
-                            containersDropDown.openTriggered()
+                            containersDropDown.open()
                        }

                        drawerParent: root
+                        KeyNavigation.tab: serversMenuContent

                        listView: HomeContainersListView {
                            id: containersListView
-                            objectName: "containersListView"
-
                            rootWidth: root.width
-                            height: 500 // TODO: make calculated
+                            onVisibleChanged: {
+                                if (containersDropDown.visible && !GC.isMobile()) {
+                                    focusItem1.forceActiveFocus()
+                                }
+                            }

                            Connections {
-                                objectName: "rowLayoutConnections"
-
                                target: ServersModel

                                function onDefaultServerIndexChanged() {
@@ -383,21 +386,167 @@ PageType {

            ButtonGroup {
                id: serversRadioButtonGroup
-                objectName: "serversRadioButtonGroup"
            }

-            ServersListView {
+            ListView {
                id: serversMenuContent
-                objectName: "serversMenuContent"

-                isFocusable: false
+                anchors.top: serversMenuHeader.bottom
+                anchors.right: parent.right
+                anchors.left: parent.left
+                anchors.bottom: parent.bottom
+                anchors.topMargin: 16
+
+                model: ServersModel
+                currentIndex: ServersModel.defaultIndex
+
+                ScrollBar.vertical: ScrollBar {
+                    id: scrollBar
+                    policy: serversMenuContent.height >= serversMenuContent.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
+                }
+
+
+                activeFocusOnTab: true
+                focus: true
+
+                property int focusItemIndex: 0
+                onActiveFocusChanged: {
+                    if (activeFocus) {
+                        serversMenuContent.focusItemIndex = 0
+                        serversMenuContent.itemAtIndex(focusItemIndex).forceActiveFocus()
+                    }
+                }
+
+                onFocusItemIndexChanged: {
+                    const focusedElement = serversMenuContent.itemAtIndex(focusItemIndex)
+                    if (focusedElement) {
+                        if (focusedElement.y + focusedElement.height > serversMenuContent.height) {
+                            serversMenuContent.contentY = focusedElement.y + focusedElement.height - serversMenuContent.height
+                        } else {
+                            serversMenuContent.contentY = 0
+                        }
+                    }
+                }
+
+                Keys.onUpPressed: scrollBar.decrease()
+                Keys.onDownPressed: scrollBar.increase()

                Connections {
                    target: drawer
+                    enabled: !GC.isMobile()
+                    function onIsCollapsedChanged() {
+                        if (drawer.isCollapsed) {
+                            const item = serversMenuContent.itemAtIndex(serversMenuContent.focusItemIndex)
+                            if (item) { item.serverRadioButtonProperty.focus = false }
+                        }
+                    }
+                }

-                    // this item shouldn't be focused when drawer is closed
-                    function onIsOpenedChanged() {
-                        serversMenuContent.isFocusable = drawer.isOpened
+                Connections {
+                    target: ServersModel
+                    function onDefaultServerIndexChanged(serverIndex) {
+                        serversMenuContent.currentIndex = serverIndex
+                    }
+                }
+
+                clip: true
+
+                delegate: Item {
+                    id: menuContentDelegate
+
+                    property variant delegateData: model
+                    property VerticalRadioButton serverRadioButtonProperty: serverRadioButton
+
+                    implicitWidth: serversMenuContent.width
+                    implicitHeight: serverRadioButtonContent.implicitHeight
+
+                    onActiveFocusChanged: {
+                        if (activeFocus) {
+                            serverRadioButton.forceActiveFocus()
+                        }
+                    }
+
+                    ColumnLayout {
+                        id: serverRadioButtonContent
+
+                        anchors.fill: parent
+                        anchors.rightMargin: 16
+                        anchors.leftMargin: 16
+
+                        spacing: 0
+
+                        RowLayout {
+                            Layout.fillWidth: true
+                            VerticalRadioButton {
+                                id: serverRadioButton
+
+                                Layout.fillWidth: true
+
+                                text: name
+                                descriptionText: serverDescription
+
+                                checked: index === serversMenuContent.currentIndex
+                                checkable: !ConnectionController.isConnected
+
+                                ButtonGroup.group: serversRadioButtonGroup
+
+                                onClicked: {
+                                    if (ConnectionController.isConnected) {
+                                        PageController.showNotificationMessage(qsTr("Unable change server while there is an active connection"))
+                                        return
+                                    }
+
+                                    serversMenuContent.currentIndex = index
+
+                                    ServersModel.defaultIndex = index
+                                }
+
+                                MouseArea {
+                                    anchors.fill: serverRadioButton
+                                    cursorShape: Qt.PointingHandCursor
+                                    enabled: false
+                                }
+
+                                Keys.onTabPressed: serverInfoButton.forceActiveFocus()
+                                Keys.onEnterPressed: serverRadioButton.clicked()
+                                Keys.onReturnPressed: serverRadioButton.clicked()
+                            }
+
+                            ImageButtonType {
+                                id: serverInfoButton
+                                image: "qrc:/images/controls/settings.svg"
+                                imageColor: AmneziaStyle.color.paleGray
+
+                                implicitWidth: 56
+                                implicitHeight: 56
+
+                                z: 1
+
+                                Keys.onTabPressed: {
+                                    if (serversMenuContent.focusItemIndex < serversMenuContent.count - 1) {
+                                        serversMenuContent.focusItemIndex++
+                                        serversMenuContent.itemAtIndex(serversMenuContent.focusItemIndex).forceActiveFocus()
+                                    } else {
+                                        focusItem1.forceActiveFocus()
+                                        serversMenuContent.contentY = 0
+                                    }
+                                }
+                                Keys.onEnterPressed: serverInfoButton.clicked()
+                                Keys.onReturnPressed: serverInfoButton.clicked()
+
+                                onClicked: function() {
+                                    ServersModel.processedIndex = index
+                                    PageController.goToPage(PageEnum.PageSettingsServerInfo)
+                                    drawer.close()
+                                }
+                            }
+                        }
+
+                        DividerType {
+                            Layout.fillWidth: true
+                            Layout.leftMargin: 0
+                            Layout.rightMargin: 0
+                        }
                    }
                }
            }
--- a/client/ui/qml/Pages2/PageProtocolAwgClientSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolAwgClientSettings.qml
@@ -16,6 +16,18 @@ import "../Components"
 PageType {
    id: root

+    defaultActiveFocusItem: listview.currentItem.mtuTextField.textField
+
+    Item {
+        id: focusItem
+        onFocusChanged: {
+            if (activeFocus) {
+                fl.ensureVisible(focusItem)
+            }
+        }
+        KeyNavigation.tab: backButton
+    }
+
    ColumnLayout {
        id: backButtonLayout

@@ -27,235 +39,229 @@ PageType {

        BackButtonType {
            id: backButton
+            KeyNavigation.tab: listview.currentItem.mtuTextField.textField
        }
    }

-    ListView {
-        id: listview
-
+    FlickableType {
+        id: fl
        anchors.top: backButtonLayout.bottom
-        anchors.bottom: saveButton.top
+        anchors.bottom: parent.bottom
+        contentHeight: content.implicitHeight + saveButton.implicitHeight + saveButton.anchors.bottomMargin + saveButton.anchors.topMargin

-        width: parent.width
+        Column {
+            id: content

-        clip: true
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right

-        property bool isFocusable: true
+            ListView {
+                id: listview

-        Keys.onTabPressed: {
-            FocusController.nextKeyTabItem()
-        }
+                width: parent.width
+                height: listview.contentItem.height

-        Keys.onBacktabPressed: {
-            FocusController.previousKeyTabItem()
-        }
+                clip: true
+                interactive: false

-        Keys.onUpPressed: {
-            FocusController.nextKeyUpItem()
-        }
+                model: AwgConfigModel

-        Keys.onDownPressed: {
-            FocusController.nextKeyDownItem()
-        }
+                delegate: Item {
+                    id: delegateItem
+                    implicitWidth: listview.width
+                    implicitHeight: col.implicitHeight

-        Keys.onLeftPressed: {
-            FocusController.nextKeyLeftItem()
-        }
+                    property alias mtuTextField: mtuTextField
+                    property bool isSaveButtonEnabled: mtuTextField.errorText === "" &&
+                                                       junkPacketMaxSizeTextField.errorText === "" &&
+                                                       junkPacketMinSizeTextField.errorText === "" &&
+                                                       junkPacketCountTextField.errorText === ""

-        Keys.onRightPressed: {
-            FocusController.nextKeyRightItem()
-        }
+                    ColumnLayout {
+                        id: col

-        model: AwgConfigModel
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right

-        delegate: Item {
-            id: delegateItem
-            implicitWidth: listview.width
-            implicitHeight: col.implicitHeight
+                        anchors.leftMargin: 16
+                        anchors.rightMargin: 16

-            property alias mtuTextField: mtuTextField
-            property bool isSaveButtonEnabled: mtuTextField.errorText === "" &&
-                                               junkPacketMaxSizeTextField.errorText === "" &&
-                                               junkPacketMinSizeTextField.errorText === "" &&
-                                               junkPacketCountTextField.errorText === ""
+                        spacing: 0

-            ColumnLayout {
-                id: col
+                        HeaderType {
+                            Layout.fillWidth: true

-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.right: parent.right
+                            headerText: qsTr("AmneziaWG settings")
+                        }

-                anchors.leftMargin: 16
-                anchors.rightMargin: 16
+                        TextFieldWithHeaderType {
+                            id: mtuTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 40

-                spacing: 0
+                            headerText: qsTr("MTU")
+                            textFieldText: clientMtu
+                            textField.validator: IntValidator { bottom: 576; top: 65535 }

-                HeaderType {
-                    Layout.fillWidth: true
+                            textField.onEditingFinished: {
+                                if (textFieldText !== clientMtu) {
+                                    clientMtu = textFieldText
+                                }
+                            }
+                            checkEmptyText: true
+                            KeyNavigation.tab: junkPacketCountTextField.textField
+                        }

-                    headerText: qsTr("AmneziaWG settings")
-                }
+                        TextFieldWithHeaderType {
+                            id: junkPacketCountTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16

-                TextFieldWithHeaderType {
-                    id: mtuTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 40
+                            headerText: "Jc - Junk packet count"
+                            textFieldText: clientJunkPacketCount
+                            textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl

-                    headerText: qsTr("MTU")
-                    textFieldText: clientMtu
-                    textField.validator: IntValidator { bottom: 576; top: 65535 }
+                            textField.onEditingFinished: {
+                                if (textFieldText !== clientJunkPacketCount) {
+                                    clientJunkPacketCount = textFieldText
+                                }
+                            }

-                    textField.onEditingFinished: {
-                        if (textFieldText !== clientMtu) {
-                            clientMtu = textFieldText
+                            checkEmptyText: true
+
+                            KeyNavigation.tab: junkPacketMinSizeTextField.textField
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: junkPacketMinSizeTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: "Jmin - Junk packet minimum size"
+                            textFieldText: clientJunkPacketMinSize
+                            textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== clientJunkPacketMinSize) {
+                                    clientJunkPacketMinSize = textFieldText
+                                }
+                            }
+
+                            checkEmptyText: true
+
+                            KeyNavigation.tab: junkPacketMaxSizeTextField.textField
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: junkPacketMaxSizeTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: "Jmax - Junk packet maximum size"
+                            textFieldText: clientJunkPacketMaxSize
+                            textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== clientJunkPacketMaxSize) {
+                                    clientJunkPacketMaxSize = textFieldText
+                                }
+                            }
+
+                            checkEmptyText: true
+
+                            Keys.onTabPressed: saveButton.forceActiveFocus()
+                        }
+
+                        Header2TextType {
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            text: qsTr("Server settings")
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: portTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 8
+
+                            enabled: false
+
+                            headerText: qsTr("Port")
+                            textFieldText: port
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: initPacketJunkSizeTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            enabled: false
+
+                            headerText: "S1 - Init packet junk size"
+                            textFieldText: serverInitPacketJunkSize
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: responsePacketJunkSizeTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            enabled: false
+
+                            headerText: "S2 - Response packet junk size"
+                            textFieldText: serverResponsePacketJunkSize
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: initPacketMagicHeaderTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            enabled: false
+
+                            headerText: "H1 - Init packet magic header"
+                            textFieldText: serverInitPacketMagicHeader
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: responsePacketMagicHeaderTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            enabled: false
+
+                            headerText: "H2 - Response packet magic header"
+                            textFieldText: serverResponsePacketMagicHeader
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: underloadPacketMagicHeaderTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+                            parentFlickable: fl
+
+                            enabled: false
+
+                            headerText: "H3 - Underload packet magic header"
+                            textFieldText: serverUnderloadPacketMagicHeader
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: transportPacketMagicHeaderTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            enabled: false
+
+                            headerText: "H4 - Transport packet magic header"
+                            textFieldText: serverTransportPacketMagicHeader
                        }
                    }
-                    checkEmptyText: true
-                    KeyNavigation.tab: junkPacketCountTextField.textField
-                }
-
-                TextFieldWithHeaderType {
-                    id: junkPacketCountTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    headerText: "Jc - Junk packet count"
-                    textFieldText: clientJunkPacketCount
-                    textField.validator: IntValidator { bottom: 0 }
-
-                    textField.onEditingFinished: {
-                        if (textFieldText !== clientJunkPacketCount) {
-                            clientJunkPacketCount = textFieldText
-                        }
-                    }
-
-                    checkEmptyText: true
-
-                    KeyNavigation.tab: junkPacketMinSizeTextField.textField
-                }
-
-                TextFieldWithHeaderType {
-                    id: junkPacketMinSizeTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    headerText: "Jmin - Junk packet minimum size"
-                    textFieldText: clientJunkPacketMinSize
-                    textField.validator: IntValidator { bottom: 0 }
-
-                    textField.onEditingFinished: {
-                        if (textFieldText !== clientJunkPacketMinSize) {
-                            clientJunkPacketMinSize = textFieldText
-                        }
-                    }
-
-                    checkEmptyText: true
-
-                    KeyNavigation.tab: junkPacketMaxSizeTextField.textField
-                }
-
-                TextFieldWithHeaderType {
-                    id: junkPacketMaxSizeTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    headerText: "Jmax - Junk packet maximum size"
-                    textFieldText: clientJunkPacketMaxSize
-                    textField.validator: IntValidator { bottom: 0 }
-
-                    textField.onEditingFinished: {
-                        if (textFieldText !== clientJunkPacketMaxSize) {
-                            clientJunkPacketMaxSize = textFieldText
-                        }
-                    }
-
-                    checkEmptyText: true
-
-                }
-
-                Header2TextType {
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    text: qsTr("Server settings")
-                }
-
-                TextFieldWithHeaderType {
-                    id: portTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 8
-
-                    enabled: false
-
-                    headerText: qsTr("Port")
-                    textFieldText: port
-                }
-
-                TextFieldWithHeaderType {
-                    id: initPacketJunkSizeTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    enabled: false
-
-                    headerText: "S1 - Init packet junk size"
-                    textFieldText: serverInitPacketJunkSize
-                }
-
-                TextFieldWithHeaderType {
-                    id: responsePacketJunkSizeTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    enabled: false
-
-                    headerText: "S2 - Response packet junk size"
-                    textFieldText: serverResponsePacketJunkSize
-                }
-
-                TextFieldWithHeaderType {
-                    id: initPacketMagicHeaderTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    enabled: false
-
-                    headerText: "H1 - Init packet magic header"
-                    textFieldText: serverInitPacketMagicHeader
-                }
-
-                TextFieldWithHeaderType {
-                    id: responsePacketMagicHeaderTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    enabled: false
-
-                    headerText: "H2 - Response packet magic header"
-                    textFieldText: serverResponsePacketMagicHeader
-                }
-
-                TextFieldWithHeaderType {
-                    id: underloadPacketMagicHeaderTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    enabled: false
-
-                    headerText: "H3 - Underload packet magic header"
-                    textFieldText: serverUnderloadPacketMagicHeader
-                }
-
-                TextFieldWithHeaderType {
-                    id: transportPacketMagicHeaderTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    enabled: false
-
-                    headerText: "H4 - Transport packet magic header"
-                    textFieldText: serverTransportPacketMagicHeader
                }
            }
        }
@@ -277,11 +283,7 @@ PageType {

        text: qsTr("Save")

-        onActiveFocusChanged: {
-            if(activeFocus) {
-                listview.positionViewAtEnd()
-            }
-        }
+        Keys.onTabPressed: lastItemTabClicked(focusItem)

        clickedFunc: function() {
            forceActiveFocus()
--- a/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
@@ -2,8 +2,6 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts

-import QtCore
-
 import SortFilterProxyModel 0.2

 import PageEnum 1.0
@@ -19,6 +17,18 @@ import "../Components"
 PageType {
    id: root

+    defaultActiveFocusItem: listview.currentItem.portTextField.textField
+
+    Item {
+        id: focusItem
+        onFocusChanged: {
+            if (activeFocus) {
+                fl.ensureVisible(focusItem)
+            }
+        }
+        KeyNavigation.tab: backButton
+    }
+
    ColumnLayout {
        id: backButtonLayout

@@ -30,357 +40,341 @@ PageType {

        BackButtonType {
            id: backButton
+            KeyNavigation.tab: listview.currentItem.portTextField.textField
        }
    }

-    ListView {
-        id: listview
-
+    FlickableType {
+        id: fl
        anchors.top: backButtonLayout.bottom
        anchors.bottom: parent.bottom
+        contentHeight: content.implicitHeight

-        width: parent.width
+        Column {
+            id: content

-        property bool isFocusable: true
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right

-        Keys.onTabPressed: {
-            FocusController.nextKeyTabItem()
-        }
+            ListView {
+                id: listview

-        Keys.onBacktabPressed: {
-            FocusController.previousKeyTabItem()
-        }
+                width: parent.width
+                height: listview.contentItem.height

-        Keys.onUpPressed: {
-            FocusController.nextKeyUpItem()
-        }
+                clip: true
+                interactive: false

-        Keys.onDownPressed: {
-            FocusController.nextKeyDownItem()
-        }
+                model: AwgConfigModel

-        Keys.onLeftPressed: {
-            FocusController.nextKeyLeftItem()
-        }
+                delegate: Item {
+                    id: delegateItem
+                    implicitWidth: listview.width
+                    implicitHeight: col.implicitHeight

-        Keys.onRightPressed: {
-            FocusController.nextKeyRightItem()
-        }
+                    property alias portTextField: portTextField
+                    property bool isEnabled: ServersModel.isProcessedServerHasWriteAccess()

-        clip: true
+                    ColumnLayout {
+                        id: col

-        model: AwgConfigModel
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right

-        delegate: Item {
-            id: delegateItem
-            implicitWidth: listview.width
-            implicitHeight: col.implicitHeight
+                        anchors.leftMargin: 16
+                        anchors.rightMargin: 16

-            property alias portTextField: portTextField
-            property bool isEnabled: ServersModel.isProcessedServerHasWriteAccess()
+                        spacing: 0

-            ColumnLayout {
-                id: col
+                        HeaderType {
+                            Layout.fillWidth: true

-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.right: parent.right
-
-                anchors.leftMargin: 16
-                anchors.rightMargin: 16
-
-                spacing: 0
-
-                HeaderType {
-                    Layout.fillWidth: true
-
-                    headerText: qsTr("AmneziaWG settings")
-                }
-
-                TextFieldWithHeaderType {
-                    id: portTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 40
-
-                    enabled: delegateItem.isEnabled
-
-                    headerText: qsTr("Port")
-                    textFieldText: port
-                    textField.maximumLength: 5
-                    textField.validator: IntValidator { bottom: 1; top: 65535 }
-
-                    textField.onEditingFinished: {
-                        if (textFieldText !== port) {
-                            port = textFieldText
-                        }
-                    }
-
-                    checkEmptyText: true
-                }
-
-                TextFieldWithHeaderType {
-                    id: mtuTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    headerText: qsTr("MTU")
-                    textFieldText: mtu
-                    textField.validator: IntValidator { bottom: 576; top: 65535 }
-
-                    textField.onEditingFinished: {
-                        if (textFieldText === "") {
-                            textFieldText = "0"
-                        }
-                        if (textFieldText !== mtu) {
-                            mtu = textFieldText
-                        }
-                    }
-                    checkEmptyText: true
-                }
-
-                TextFieldWithHeaderType {
-                    id: junkPacketCountTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    headerText: qsTr("Jc - Junk packet count")
-                    textFieldText: serverJunkPacketCount
-                    textField.validator: IntValidator { bottom: 0 }
-
-                    textField.onEditingFinished: {
-                        if (textFieldText === "") {
-                            textFieldText = "0"
+                            headerText: qsTr("AmneziaWG settings")
                        }

-                        if (textFieldText !== serverJunkPacketCount) {
-                            serverJunkPacketCount = textFieldText
-                        }
-                    }
+                        TextFieldWithHeaderType {
+                            id: portTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 40

-                    checkEmptyText: true
-                }
+                            enabled: delegateItem.isEnabled

-                TextFieldWithHeaderType {
-                    id: junkPacketMinSizeTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
+                            headerText: qsTr("Port")
+                            textFieldText: port
+                            textField.maximumLength: 5
+                            textField.validator: IntValidator { bottom: 1; top: 65535 }
+                            parentFlickable: fl

-                    headerText: qsTr("Jmin - Junk packet minimum size")
-                    textFieldText: serverJunkPacketMinSize
-                    textField.validator: IntValidator { bottom: 0 }
-
-                    textField.onEditingFinished: {
-                        if (textFieldText !== serverJunkPacketMinSize) {
-                            serverJunkPacketMinSize = textFieldText
-                        }
-                    }
-
-                    checkEmptyText: true
-                }
-
-                TextFieldWithHeaderType {
-                    id: junkPacketMaxSizeTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    headerText: qsTr("Jmax - Junk packet maximum size")
-                    textFieldText: serverJunkPacketMaxSize
-                    textField.validator: IntValidator { bottom: 0 }
-
-                    textField.onEditingFinished: {
-                        if (textFieldText !== serverJunkPacketMaxSize) {
-                            serverJunkPacketMaxSize = textFieldText
-                        }
-                    }
-
-                    checkEmptyText: true
-                }
-
-                TextFieldWithHeaderType {
-                    id: initPacketJunkSizeTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    headerText: qsTr("S1 - Init packet junk size")
-                    textFieldText: serverInitPacketJunkSize
-                    textField.validator: IntValidator { bottom: 0 }
-
-                    textField.onEditingFinished: {
-                        if (textFieldText !== serverInitPacketJunkSize) {
-                            serverInitPacketJunkSize = textFieldText
-                        }
-                    }
-
-                    checkEmptyText: true
-
-                    onActiveFocusChanged: {
-                        if(activeFocus) {
-                            listview.positionViewAtEnd()
-                        }
-                    }
-                }
-
-                TextFieldWithHeaderType {
-                    id: responsePacketJunkSizeTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    headerText: qsTr("S2 - Response packet junk size")
-                    textFieldText: serverResponsePacketJunkSize
-                    textField.validator: IntValidator { bottom: 0 }
-
-                    textField.onEditingFinished: {
-                        if (textFieldText !== serverResponsePacketJunkSize) {
-                            serverResponsePacketJunkSize = textFieldText
-                        }
-                    }
-
-                    checkEmptyText: true
-
-                    onActiveFocusChanged: {
-                        if(activeFocus) {
-                            listview.positionViewAtEnd()
-                        }
-                    }
-                }
-
-                TextFieldWithHeaderType {
-                    id: initPacketMagicHeaderTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    headerText: qsTr("H1 - Init packet magic header")
-                    textFieldText: serverInitPacketMagicHeader
-                    textField.validator: IntValidator { bottom: 0 }
-
-                    textField.onEditingFinished: {
-                        if (textFieldText !== serverInitPacketMagicHeader) {
-                            serverInitPacketMagicHeader = textFieldText
-                        }
-                    }
-
-                    checkEmptyText: true
-                }
-
-                TextFieldWithHeaderType {
-                    id: responsePacketMagicHeaderTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    headerText: qsTr("H2 - Response packet magic header")
-                    textFieldText: serverResponsePacketMagicHeader
-                    textField.validator: IntValidator { bottom: 0 }
-
-                    textField.onEditingFinished: {
-                        if (textFieldText !== serverResponsePacketMagicHeader) {
-                            serverResponsePacketMagicHeader = textFieldText
-                        }
-                    }
-
-                    checkEmptyText: true
-                }
-
-                TextFieldWithHeaderType {
-                    id: transportPacketMagicHeaderTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    headerText: qsTr("H4 - Transport packet magic header")
-                    textFieldText: serverTransportPacketMagicHeader
-                    textField.validator: IntValidator { bottom: 0 }
-
-                    textField.onEditingFinished: {
-                        if (textFieldText !== serverTransportPacketMagicHeader) {
-                            serverTransportPacketMagicHeader = textFieldText
-                        }
-                    }
-
-                    checkEmptyText: true
-                }
-
-                TextFieldWithHeaderType {
-                    id: underloadPacketMagicHeaderTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    headerText: qsTr("H3 - Underload packet magic header")
-                    textFieldText: serverUnderloadPacketMagicHeader
-                    textField.validator: IntValidator { bottom: 0 }
-
-                    textField.onEditingFinished: {
-                        if (textFieldText !== serverUnderloadPacketMagicHeader) {
-                            serverUnderloadPacketMagicHeader = textFieldText
-                        }
-                    }
-
-                    checkEmptyText: true
-                }
-
-                BasicButtonType {
-                    id: saveRestartButton
-
-                    Layout.fillWidth: true
-                    Layout.topMargin: 24
-                    Layout.bottomMargin: 24
-
-                    enabled: underloadPacketMagicHeaderTextField.errorText === "" &&
-                             transportPacketMagicHeaderTextField.errorText === "" &&
-                             responsePacketMagicHeaderTextField.errorText === "" &&
-                             initPacketMagicHeaderTextField.errorText === "" &&
-                             responsePacketJunkSizeTextField.errorText === "" &&
-                             initPacketJunkSizeTextField.errorText === "" &&
-                             junkPacketMaxSizeTextField.errorText === "" &&
-                             junkPacketMinSizeTextField.errorText === "" &&
-                             junkPacketCountTextField.errorText === "" &&
-                             portTextField.errorText === ""
-
-                    text: qsTr("Save")
-
-                    onActiveFocusChanged: {
-                        if(activeFocus) {
-                            listview.positionViewAtEnd()
-                        }
-                    }
-
-                    clickedFunc: function() {
-                        forceActiveFocus()
-
-                        if (delegateItem.isEnabled) {
-                            if (AwgConfigModel.isHeadersEqual(underloadPacketMagicHeaderTextField.textField.text,
-                                                              transportPacketMagicHeaderTextField.textField.text,
-                                                              responsePacketMagicHeaderTextField.textField.text,
-                                                              initPacketMagicHeaderTextField.textField.text)) {
-                                PageController.showErrorMessage(qsTr("The values of the H1-H4 fields must be unique"))
-                                return
+                            textField.onEditingFinished: {
+                                if (textFieldText !== port) {
+                                    port = textFieldText
+                                }
                            }

-                            if (AwgConfigModel.isPacketSizeEqual(parseInt(initPacketJunkSizeTextField.textField.text),
-                                                                 parseInt(responsePacketJunkSizeTextField.textField.text))) {
-                                PageController.showErrorMessage(qsTr("The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)"))
-                                return
-                            }
+                            checkEmptyText: true
+
+                            KeyNavigation.tab: junkPacketCountTextField.textField
                        }

-                        var headerText = qsTr("Save settings?")
-                        var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
-                        var yesButtonText = qsTr("Continue")
-                        var noButtonText = qsTr("Cancel")
+                        TextFieldWithHeaderType {
+                            id: junkPacketCountTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16

-                        var yesButtonFunction = function() {
-                            if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
-                                PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
-                                return
+                            headerText: qsTr("Jc - Junk packet count")
+                            textFieldText: serverJunkPacketCount
+                            textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl
+
+                            textField.onEditingFinished: {
+                                if (textFieldText === "") {
+                                    textFieldText = "0"
+                                }
+
+                                if (textFieldText !== serverJunkPacketCount) {
+                                    serverJunkPacketCount = textFieldText
+                                }
                            }

-                            PageController.goToPage(PageEnum.PageSetupWizardInstalling);
-                            InstallController.updateContainer(AwgConfigModel.getConfig())
+                            checkEmptyText: true
+
+                            KeyNavigation.tab: junkPacketMinSizeTextField.textField
                        }
-                        var noButtonFunction = function() {
-                            if (!GC.isMobile()) {
-                                saveRestartButton.forceActiveFocus()
+
+                        TextFieldWithHeaderType {
+                            id: junkPacketMinSizeTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: qsTr("Jmin - Junk packet minimum size")
+                            textFieldText: serverJunkPacketMinSize
+                            textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== serverJunkPacketMinSize) {
+                                    serverJunkPacketMinSize = textFieldText
+                                }
+                            }
+
+                            checkEmptyText: true
+
+                            KeyNavigation.tab: junkPacketMaxSizeTextField.textField
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: junkPacketMaxSizeTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: qsTr("Jmax - Junk packet maximum size")
+                            textFieldText: serverJunkPacketMaxSize
+                            textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== serverJunkPacketMaxSize) {
+                                    serverJunkPacketMaxSize = textFieldText
+                                }
+                            }
+
+                            checkEmptyText: true
+
+                            KeyNavigation.tab: initPacketJunkSizeTextField.textField
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: initPacketJunkSizeTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: qsTr("S1 - Init packet junk size")
+                            textFieldText: serverInitPacketJunkSize
+                            textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== serverInitPacketJunkSize) {
+                                    serverInitPacketJunkSize = textFieldText
+                                }
+                            }
+
+                            checkEmptyText: true
+
+                            KeyNavigation.tab: responsePacketJunkSizeTextField.textField
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: responsePacketJunkSizeTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: qsTr("S2 - Response packet junk size")
+                            textFieldText: serverResponsePacketJunkSize
+                            textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== serverResponsePacketJunkSize) {
+                                    serverResponsePacketJunkSize = textFieldText
+                                }
+                            }
+
+                            checkEmptyText: true
+
+                            KeyNavigation.tab: initPacketMagicHeaderTextField.textField
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: initPacketMagicHeaderTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: qsTr("H1 - Init packet magic header")
+                            textFieldText: serverInitPacketMagicHeader
+                            textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== serverInitPacketMagicHeader) {
+                                    serverInitPacketMagicHeader = textFieldText
+                                }
+                            }
+
+                            checkEmptyText: true
+
+                            KeyNavigation.tab: responsePacketMagicHeaderTextField.textField
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: responsePacketMagicHeaderTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: qsTr("H2 - Response packet magic header")
+                            textFieldText: serverResponsePacketMagicHeader
+                            textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== serverResponsePacketMagicHeader) {
+                                    serverResponsePacketMagicHeader = textFieldText
+                                }
+                            }
+
+                            checkEmptyText: true
+
+                            KeyNavigation.tab: transportPacketMagicHeaderTextField.textField
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: transportPacketMagicHeaderTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            headerText: qsTr("H4 - Transport packet magic header")
+                            textFieldText: serverTransportPacketMagicHeader
+                            textField.validator: IntValidator { bottom: 0 }
+                            parentFlickable: fl
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== serverTransportPacketMagicHeader) {
+                                    serverTransportPacketMagicHeader = textFieldText
+                                }
+                            }
+
+                            checkEmptyText: true
+
+                            KeyNavigation.tab: underloadPacketMagicHeaderTextField.textField
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: underloadPacketMagicHeaderTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+                            parentFlickable: fl
+
+                            headerText: qsTr("H3 - Underload packet magic header")
+                            textFieldText: serverUnderloadPacketMagicHeader
+                            textField.validator: IntValidator { bottom: 0 }
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== serverUnderloadPacketMagicHeader) {
+                                    serverUnderloadPacketMagicHeader = textFieldText
+                                }
+                            }
+
+                            checkEmptyText: true
+
+                            KeyNavigation.tab: saveRestartButton
+                        }
+
+                        BasicButtonType {
+                            id: saveRestartButton
+                            parentFlickable: fl
+
+                            Layout.fillWidth: true
+                            Layout.topMargin: 24
+                            Layout.bottomMargin: 24
+
+                            enabled: underloadPacketMagicHeaderTextField.errorText === "" &&
+                                     transportPacketMagicHeaderTextField.errorText === "" &&
+                                     responsePacketMagicHeaderTextField.errorText === "" &&
+                                     initPacketMagicHeaderTextField.errorText === "" &&
+                                     responsePacketJunkSizeTextField.errorText === "" &&
+                                     initPacketJunkSizeTextField.errorText === "" &&
+                                     junkPacketMaxSizeTextField.errorText === "" &&
+                                     junkPacketMinSizeTextField.errorText === "" &&
+                                     junkPacketCountTextField.errorText === "" &&
+                                     portTextField.errorText === ""
+
+                            text: qsTr("Save")
+
+                            Keys.onTabPressed: lastItemTabClicked(focusItem)
+
+                            clickedFunc: function() {
+                                forceActiveFocus()
+
+                                if (delegateItem.isEnabled) {
+                                    if (AwgConfigModel.isHeadersEqual(underloadPacketMagicHeaderTextField.textField.text,
+                                                                      transportPacketMagicHeaderTextField.textField.text,
+                                                                      responsePacketMagicHeaderTextField.textField.text,
+                                                                      initPacketMagicHeaderTextField.textField.text)) {
+                                        PageController.showErrorMessage(qsTr("The values of the H1-H4 fields must be unique"))
+                                        return
+                                    }
+
+                                    if (AwgConfigModel.isPacketSizeEqual(parseInt(initPacketJunkSizeTextField.textField.text),
+                                                                         parseInt(responsePacketJunkSizeTextField.textField.text))) {
+                                        PageController.showErrorMessage(qsTr("The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)"))
+                                        return
+                                    }
+                                }
+
+                                var headerText = qsTr("Save settings?")
+                                var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
+                                var yesButtonText = qsTr("Continue")
+                                var noButtonText = qsTr("Cancel")
+
+                                var yesButtonFunction = function() {
+                                    if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
+                                        PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
+                                        return
+                                    }
+
+                                    PageController.goToPage(PageEnum.PageSetupWizardInstalling);
+                                    InstallController.updateContainer(AwgConfigModel.getConfig())
+                                }
+                                var noButtonFunction = function() {
+                                    if (!GC.isMobile()) {
+                                        saveRestartButton.forceActiveFocus()
+                                    }
+                                }
+                                showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                            }
                        }
-                        showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                    }
                }
            }
--- a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -16,6 +16,13 @@ import "../Components"
 PageType {
    id: root

+    defaultActiveFocusItem: listview.currentItem.trafficFromField.textField
+
+    Item {
+        id: focusItem
+        KeyNavigation.tab: backButton
+    }
+
    ColumnLayout {
        id: backButtonLayout

@@ -27,6 +34,7 @@ PageType {

        BackButtonType {
            id: backButton
+            KeyNavigation.tab: listview.currentItem.trafficFromField.textField
        }
    }

@@ -48,13 +56,11 @@ PageType {
            ListView {
                id: listview

-                property int selectedIndex: 0
-
                width: parent.width
                height: listview.contentItem.height

                clip: true
-                reuseItems: true
+                interactive: false

                model: CloakConfigModel

@@ -104,6 +110,8 @@ PageType {
                                    }
                                }
                            }
+
+                            KeyNavigation.tab: portTextField.textField
                        }

                        TextFieldWithHeaderType {
@@ -122,6 +130,8 @@ PageType {
                                    port = textFieldText
                                }
                            }
+
+                            KeyNavigation.tab: cipherDropDown
                        }

                        DropDownType {
@@ -133,6 +143,7 @@ PageType {
                            headerText: qsTr("Cipher")

                            drawerParent: root
+                            KeyNavigation.tab: saveRestartButton

                            listView: ListViewWithRadioButtonType {
                                id: cipherListView
@@ -150,7 +161,7 @@ PageType {
                                clickedFunction: function() {
                                    cipherDropDown.text = selectedText
                                    cipher = cipherDropDown.text
-                                    cipherDropDown.closeTriggered()
+                                    cipherDropDown.close()
                                }

                                Component.onCompleted: {
@@ -158,7 +169,7 @@ PageType {

                                    for (var i = 0; i < cipherListView.model.count; i++) {
                                        if (cipherListView.model.get(i).name === cipherDropDown.text) {
-                                            selectedIndex = i
+                                            currentIndex = i
                                        }
                                    }
                                }
@@ -173,6 +184,7 @@ PageType {
                            Layout.bottomMargin: 24

                            text: qsTr("Save")
+                            Keys.onTabPressed: lastItemTabClicked(focusItem)

                            clickedFunc: function() {
                                forceActiveFocus()
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -17,6 +17,18 @@ import "../Components"
 PageType {
    id: root

+    defaultActiveFocusItem: listview.currentItem.vpnAddressSubnetTextField.textField
+
+    Item {
+        id: focusItem
+        KeyNavigation.tab: backButton
+        onActiveFocusChanged: {
+            if (activeFocus) {
+                fl.ensureVisible(focusItem)
+            }
+        }
+    }
+
    ColumnLayout {
        id: backButtonLayout

@@ -28,6 +40,7 @@ PageType {

        BackButtonType {
            id: backButton
+            KeyNavigation.tab: listview.currentItem.vpnAddressSubnetTextField.textField
        }
    }

@@ -91,6 +104,7 @@ PageType {
                            textFieldText: subnetAddress

                            parentFlickable: fl
+                            KeyNavigation.tab: transportProtoSelector

                            textField.onEditingFinished: {
                                if (textFieldText !== subnetAddress) {
@@ -118,6 +132,8 @@ PageType {
                                return transportProto === "tcp" ? 1 : 0
                            }

+                            KeyNavigation.tab: portTextField.enabled ? portTextField.textField : autoNegotiateEncryprionSwitcher
+
                            onCurrentIndexChanged: {
                                if (transportProto === "tcp" && currentIndex === 0) {
                                    transportProto = "udp"
@@ -146,6 +162,8 @@ PageType {
                                    port = textFieldText
                                }
                            }
+
+                            KeyNavigation.tab: autoNegotiateEncryprionSwitcher
                        }

                        SwitcherType {
@@ -163,6 +181,10 @@ PageType {
                                    autoNegotiateEncryprion = checked
                                }
                            }
+
+                            KeyNavigation.tab: hashDropDown.enabled ?
+                                                   hashDropDown :
+                                                   tlsAuthCheckBox
                        }

                        DropDownType {
@@ -177,6 +199,9 @@ PageType {

                            drawerParent: root
                            parentFlickable: fl
+                            KeyNavigation.tab: cipherDropDown.enabled ?
+                                               cipherDropDown :
+                                               tlsAuthCheckBox

                            listView: ListViewWithRadioButtonType {
                                id: hashListView
@@ -199,7 +224,7 @@ PageType {
                                clickedFunction: function() {
                                    hashDropDown.text = selectedText
                                    hash = hashDropDown.text
-                                    hashDropDown.closeTriggered()
+                                    hashDropDown.close()
                                }

                                Component.onCompleted: {
@@ -227,6 +252,8 @@ PageType {
                            drawerParent: root
                            parentFlickable: fl

+                            KeyNavigation.tab: tlsAuthCheckBox
+
                            listView: ListViewWithRadioButtonType {
                                id: cipherListView

@@ -248,7 +275,7 @@ PageType {
                                clickedFunction: function() {
                                    cipherDropDown.text = selectedText
                                    cipher = cipherDropDown.text
-                                    cipherDropDown.closeTriggered()
+                                    cipherDropDown.close()
                                }

                                Component.onCompleted: {
@@ -293,6 +320,8 @@ PageType {
                                    text: qsTr("TLS auth")
                                    checked: tlsAuth

+                                    KeyNavigation.tab: blockDnsCheckBox
+
                                    onCheckedChanged: {
                                        if (checked !== tlsAuth) {
                                            console.log("tlsAuth changed to: " + checked)
@@ -310,6 +339,8 @@ PageType {
                                    text: qsTr("Block DNS requests outside of VPN")
                                    checked: blockDns

+                                    KeyNavigation.tab: additionalClientCommandsSwitcher
+
                                    onCheckedChanged: {
                                        if (checked !== blockDns) {
                                            blockDns = checked
@@ -324,6 +355,9 @@ PageType {
                            Layout.fillWidth: true
                            Layout.topMargin: 32
                            parentFlickable: fl
+                            KeyNavigation.tab: additionalClientCommandsTextArea.visible ?
+                                               additionalClientCommandsTextArea.textArea :
+                                               additionalServerCommandsSwitcher

                            checked: additionalClientCommands !== ""

@@ -342,7 +376,7 @@ PageType {
                            Layout.topMargin: 16

                            visible: additionalClientCommandsSwitcher.checked
-
+                            KeyNavigation.tab: additionalServerCommandsSwitcher
                            parentFlickable: fl

                            textAreaText: additionalClientCommands
@@ -360,6 +394,9 @@ PageType {
                            Layout.fillWidth: true
                            Layout.topMargin: 16
                            parentFlickable: fl
+                            KeyNavigation.tab: additionalServerCommandsTextArea.visible ?
+                                               additionalServerCommandsTextArea.textArea :
+                                               saveRestartButton

                            checked: additionalServerCommands !== ""

@@ -382,6 +419,7 @@ PageType {
                            textAreaText: additionalServerCommands
                            placeholderText: qsTr("Commands:")
                            parentFlickable: fl
+                            KeyNavigation.tab: saveRestartButton
                            textArea.onEditingFinished: {
                                if (additionalServerCommands !== textAreaText) {
                                    additionalServerCommands = textAreaText
@@ -398,6 +436,7 @@ PageType {

                            text: qsTr("Save")
                            parentFlickable: fl
+                            Keys.onTabPressed: lastItemTabClicked(focusItem)

                            clickedFunc: function() {
                                forceActiveFocus()
--- a/client/ui/qml/Pages2/PageProtocolRaw.qml
+++ b/client/ui/qml/Pages2/PageProtocolRaw.qml
@@ -19,6 +19,13 @@ import "../Components"
 PageType {
    id: root

+    defaultActiveFocusItem: focusItem
+
+    Item {
+        id: focusItem
+        KeyNavigation.tab: backButton
+    }
+
    ColumnLayout {
        id: header

@@ -30,6 +37,7 @@ PageType {

        BackButtonType {
            id: backButton
+            KeyNavigation.tab: listView
        }

        HeaderType {
@@ -67,6 +75,13 @@ PageType {
                activeFocusOnTab: true
                focus: true

+                onActiveFocusChanged: {
+                    if (focus) {
+                        listView.currentIndex = 0
+                        listView.currentItem.focusItem.forceActiveFocus()
+                    }
+                }
+
                delegate: Item {
                    implicitWidth: parent.width
                    implicitHeight: delegateContent.implicitHeight
@@ -86,9 +101,11 @@ PageType {
                            text: qsTr("Show connection options")

                            clickedFunction: function() {
-                                configContentDrawer.openTriggered()
+                                configContentDrawer.open()
                            }

+                            KeyNavigation.tab: removeButton
+
                            MouseArea {
                                anchors.fill: button
                                cursorShape: Qt.PointingHandCursor
@@ -103,12 +120,31 @@ PageType {

                            expandedHeight: root.height * 0.9

+                            onClosed: {
+                                if (!GC.isMobile()) {
+                                    defaultActiveFocusItem.forceActiveFocus()
+                                }
+                            }
+
                            parent: root
                            anchors.fill: parent

-                            expandedStateContent: Item {
+                            expandedContent: Item {
                                implicitHeight: configContentDrawer.expandedHeight

+                                Connections {
+                                    target: configContentDrawer
+                                    enabled: !GC.isMobile()
+                                    function onOpened() {
+                                        focusItem1.forceActiveFocus()
+                                    }
+                                }
+
+                                Item {
+                                    id: focusItem1
+                                    KeyNavigation.tab: backButton1
+                                }
+
                                BackButtonType {
                                    id: backButton1

@@ -118,8 +154,10 @@ PageType {
                                    anchors.topMargin: 16

                                    backButtonFunction: function() {
-                                        configContentDrawer.closeTriggered()
+                                        configContentDrawer.close()
                                    }
+
+                                    KeyNavigation.tab: focusItem1
                                }

                                FlickableType {
@@ -188,6 +226,7 @@ PageType {
                text: qsTr("Remove ") + ContainersModel.getProcessedContainerName()
                textColor: AmneziaStyle.color.vibrantRed

+                Keys.onTabPressed: lastItemTabClicked(focusItem)
                clickedFunction: function() {
                    var headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getProcessedContainerName())
                    var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
--- a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
@@ -16,6 +16,15 @@ import "../Components"
 PageType {
    id: root

+    defaultActiveFocusItem: listview.currentItem.focusItemId.enabled ?
+                                listview.currentItem.focusItemId.textField :
+                                focusItem
+
+    Item {
+        id: focusItem
+        KeyNavigation.tab: backButton
+    }
+
    ColumnLayout {
        id: backButtonLayout

@@ -27,6 +36,9 @@ PageType {

        BackButtonType {
            id: backButton
+            KeyNavigation.tab: listview.currentItem.focusItemId.enabled ?
+                                   listview.currentItem.focusItemId.textField :
+                                   focusItem
        }
    }

@@ -102,6 +114,8 @@ PageType {
                                    port = textFieldText
                                }
                            }
+
+                            KeyNavigation.tab: cipherDropDown
                        }

                        DropDownType {
@@ -115,9 +129,9 @@ PageType {
                            headerText: qsTr("Cipher")

                            drawerParent: root
+                            KeyNavigation.tab: saveRestartButton

                            listView: ListViewWithRadioButtonType {
-
                                id: cipherListView

                                rootWidth: root.width
@@ -133,7 +147,7 @@ PageType {
                                clickedFunction: function() {
                                    cipherDropDown.text = selectedText
                                    cipher = cipherDropDown.text
-                                    cipherDropDown.closeTriggered()
+                                    cipherDropDown.close()
                                }

                                Component.onCompleted: {
@@ -158,6 +172,7 @@ PageType {
                            enabled: isPortEditable | isCipherEditable

                            text: qsTr("Save")
+                            Keys.onTabPressed: lastItemTabClicked(focusItem)

                            clickedFunc: function() {
                                forceActiveFocus()
--- a/client/ui/qml/Pages2/PageProtocolWireGuardClientSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolWireGuardClientSettings.qml
@@ -150,6 +150,8 @@ PageType {

        text: qsTr("Save")

+        Keys.onTabPressed: lastItemTabClicked(focusItem)
+
        clickedFunc: function() {
            forceActiveFocus()
            var headerText = qsTr("Save settings?")
--- a/client/ui/qml/Pages2/PageProtocolWireGuardSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolWireGuardSettings.qml
@@ -16,6 +16,13 @@ import "../Components"
 PageType {
    id: root

+    defaultActiveFocusItem: listview
+
+    Item {
+        id: focusItem
+        KeyNavigation.tab: backButton
+    }
+
    ColumnLayout {
        id: backButtonLayout

@@ -27,6 +34,7 @@ PageType {

        BackButtonType {
            id: backButton
+            KeyNavigation.tab: listview
        }
    }

@@ -56,6 +64,13 @@ PageType {

                model: WireGuardConfigModel

+                activeFocusOnTab: true
+                onActiveFocusChanged: {
+                    if (activeFocus) {
+                        listview.itemAtIndex(0)?.focusItemId.forceActiveFocus()
+                    }
+                }
+
                delegate: Item {
                    id: delegateItem

@@ -94,6 +109,8 @@ PageType {
                            textField.maximumLength: 5
                            textField.validator: IntValidator { bottom: 1; top: 65535 }

+                            KeyNavigation.tab: saveButton
+
                            textField.onEditingFinished: {
                                if (textFieldText !== port) {
                                    port = textFieldText
@@ -103,26 +120,6 @@ PageType {
                            checkEmptyText: true
                        }

-                        TextFieldWithHeaderType {
-                            id: mtuTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-
-                            headerText: qsTr("MTU")
-                            textFieldText: mtu
-                            textField.validator: IntValidator { bottom: 576; top: 65535 }
-
-                            textField.onEditingFinished: {
-                                if (textFieldText === "") {
-                                    textFieldText = "0"
-                                }
-                                if (textFieldText !== mtu) {
-                                    mtu = textFieldText
-                                }
-                            }
-                            checkEmptyText: true
-                        }
-
                        BasicButtonType {
                            id: saveButton
                            Layout.fillWidth: true
@@ -133,6 +130,8 @@ PageType {

                            text: qsTr("Save")

+                            Keys.onTabPressed: lastItemTabClicked(focusItem)
+
                            onClicked: function() {
                                forceActiveFocus()

--- a/client/ui/qml/Pages2/PageProtocolXraySettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolXraySettings.qml
@@ -17,6 +17,13 @@ import "../Components"
 PageType {
    id: root

+    defaultActiveFocusItem: listview
+
+    Item {
+        id: focusItem
+        KeyNavigation.tab: backButton
+    }
+
    ColumnLayout {
        id: backButtonLayout

@@ -28,6 +35,7 @@ PageType {

        BackButtonType {
            id: backButton
+            KeyNavigation.tab: listview
        }
    }

@@ -57,6 +65,13 @@ PageType {

                model: XrayConfigModel

+                activeFocusOnTab: true
+                onActiveFocusChanged: {
+                    if (activeFocus) {
+                        listview.itemAtIndex(0)?.focusItemId.forceActiveFocus()
+                    }
+                }
+
                delegate: Item {
                    property alias focusItemId: textFieldWithHeaderType.textField

@@ -88,6 +103,8 @@ PageType {
                            headerText: qsTr("Disguised as traffic from")
                            textFieldText: site

+                            KeyNavigation.tab: basicButton
+
                            textField.onEditingFinished: {
                                if (textFieldText !== site) {
                                    var tmpText = textFieldText
@@ -111,6 +128,8 @@ PageType {

                            text: qsTr("Save")

+                            Keys.onTabPressed: lastItemTabClicked(focusItem)
+
                            onClicked: {
                                forceActiveFocus()

--- a/client/ui/qml/Pages2/PageServiceDnsSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceDnsSettings.qml
@@ -16,6 +16,13 @@ import "../Components"
 PageType {
    id: root

+    defaultActiveFocusItem: focusItem
+
+    Item {
+        id: focusItem
+        KeyNavigation.tab: backButton
+    }
+
    ColumnLayout {
        id: backButtonLayout

@@ -27,6 +34,7 @@ PageType {

        BackButtonType {
            id: backButton
+            KeyNavigation.tab: removeButton
        }
    }

@@ -64,6 +72,8 @@ PageType {
                text: qsTr("Remove ") + ContainersModel.getProcessedContainerName()
                textColor: AmneziaStyle.color.vibrantRed

+                Keys.onTabPressed: root.lastItemTabClicked()
+
                clickedFunction: function() {
                    var headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getProcessedContainerName())
                    var yesButtonText = qsTr("Continue")
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
lunardunno	d85e4a413a	changing stdErr to stdOut	2024-10-27 18:18:42 +04:00
lunardunno	fbf11c1689	added extended error descriptions	2024-10-27 17:48:13 +04:00
lunardunno	b382257460	adding error codes	2024-10-27 17:19:15 +04:00
lunardunno	8ec4232a96	Renaming one of the errors	2024-10-27 17:17:06 +04:00
lunardunno	43fd9d5d90	Adding error handling Adding error handling in the server controller for: Sudo package is not pre-installed for sudo users. Server user or associated group is not listed in the sudoers file. Server user password required	2024-10-27 16:33:01 +04:00
lunardunno	ae681ad6d2	simplification	2024-10-27 15:33:08 +04:00
lunardunno	6c22a7372d	Checking requirements in script Checking requirements for sudo users in script	2024-10-27 13:09:41 +04:00