diff --git a/client/3rd/qzxing b/client/3rd/qzxing
new file mode 160000
index 00000000..2fd4dd60
--- /dev/null
+++ b/client/3rd/qzxing
@@ -0,0 +1 @@
+Subproject commit 2fd4dd60c04a29c6d1271fdd9ae25378b8f61ec8
diff --git a/client/ui/qml/Config/GlobalConfig.qml b/client/ui/qml/Config/GlobalConfig.qml
index 333b95ed..2cc62557 100644
--- a/client/ui/qml/Config/GlobalConfig.qml
+++ b/client/ui/qml/Config/GlobalConfig.qml
@@ -1,5 +1,5 @@
 pragma Singleton
-import QtQuick 2.12
+import QtQuick
 
 Item {
     readonly property string screenHome: "qrc:/ScreenHome.qml"
diff --git a/client/ui/qml/Controls/BackButton.qml b/client/ui/qml/Controls/BackButton.qml
index 5395a21e..47f0970c 100644
--- a/client/ui/qml/Controls/BackButton.qml
+++ b/client/ui/qml/Controls/BackButton.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 
 Button {
     id: root
diff --git a/client/ui/qml/Controls/BasicButtonType.qml b/client/ui/qml/Controls/BasicButtonType.qml
index ce72509f..f59ed329 100644
--- a/client/ui/qml/Controls/BasicButtonType.qml
+++ b/client/ui/qml/Controls/BasicButtonType.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 
 Button {
     id: root
diff --git a/client/ui/qml/Controls/BlueButtonType.qml b/client/ui/qml/Controls/BlueButtonType.qml
index c19f1256..83a4879c 100644
--- a/client/ui/qml/Controls/BlueButtonType.qml
+++ b/client/ui/qml/Controls/BlueButtonType.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 
 
 BasicButtonType {
diff --git a/client/ui/qml/Controls/Caption.qml b/client/ui/qml/Controls/Caption.qml
index 41090e91..50fc9aca 100644
--- a/client/ui/qml/Controls/Caption.qml
+++ b/client/ui/qml/Controls/Caption.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 
 Text {
     font.family: "Lato"
diff --git a/client/ui/qml/Controls/CheckBoxType.qml b/client/ui/qml/Controls/CheckBoxType.qml
index 07fad529..0331706c 100644
--- a/client/ui/qml/Controls/CheckBoxType.qml
+++ b/client/ui/qml/Controls/CheckBoxType.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 
 CheckBox {
     id: root
diff --git a/client/ui/qml/Controls/ComboBoxType.qml b/client/ui/qml/Controls/ComboBoxType.qml
index cdfdaf3e..090ca9de 100644
--- a/client/ui/qml/Controls/ComboBoxType.qml
+++ b/client/ui/qml/Controls/ComboBoxType.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 
 ComboBox {
     id: root
diff --git a/client/ui/qml/Controls/ContextMenu.qml b/client/ui/qml/Controls/ContextMenu.qml
index a0d0202d..867fcb10 100644
--- a/client/ui/qml/Controls/ContextMenu.qml
+++ b/client/ui/qml/Controls/ContextMenu.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import Qt.labs.platform 1.0
+import QtQuick
+import QtQuick.Controls
+import Qt.labs.platform
 
 Menu {
     property var textObj
diff --git a/client/ui/qml/Controls/FadeBehavior.qml b/client/ui/qml/Controls/FadeBehavior.qml
index d40a2ddc..e523061f 100644
--- a/client/ui/qml/Controls/FadeBehavior.qml
+++ b/client/ui/qml/Controls/FadeBehavior.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.15
-import QtQml 2.15
+import QtQuick
+import QtQml
 
 Behavior {
     id: root
@@ -32,4 +32,4 @@ Behavior {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/client/ui/qml/Controls/ImageButtonType.qml b/client/ui/qml/Controls/ImageButtonType.qml
index 8bf3c398..74b90c6e 100644
--- a/client/ui/qml/Controls/ImageButtonType.qml
+++ b/client/ui/qml/Controls/ImageButtonType.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 
 BasicButtonType {
     id: root
diff --git a/client/ui/qml/Controls/LabelType.qml b/client/ui/qml/Controls/LabelType.qml
index cfef0d2c..0f04a277 100644
--- a/client/ui/qml/Controls/LabelType.qml
+++ b/client/ui/qml/Controls/LabelType.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
+import QtQuick
 
 Text {
     id: root
diff --git a/client/ui/qml/Controls/Logo.qml b/client/ui/qml/Controls/Logo.qml
index 9368002c..74d82872 100644
--- a/client/ui/qml/Controls/Logo.qml
+++ b/client/ui/qml/Controls/Logo.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 
 Image {
     anchors.horizontalCenter: parent.horizontalCenter
diff --git a/client/ui/qml/Controls/RadioButtonType.qml b/client/ui/qml/Controls/RadioButtonType.qml
index e31525fe..cda28ea5 100644
--- a/client/ui/qml/Controls/RadioButtonType.qml
+++ b/client/ui/qml/Controls/RadioButtonType.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 
 RadioButton {
     id: root
diff --git a/client/ui/qml/Controls/RichLabelType.qml b/client/ui/qml/Controls/RichLabelType.qml
index f7dfdeed..f354f974 100644
--- a/client/ui/qml/Controls/RichLabelType.qml
+++ b/client/ui/qml/Controls/RichLabelType.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
+import QtQuick
 
 LabelType {
     id: label_connection_code
diff --git a/client/ui/qml/Controls/SettingButtonType.qml b/client/ui/qml/Controls/SettingButtonType.qml
index d1e91735..65148c6d 100644
--- a/client/ui/qml/Controls/SettingButtonType.qml
+++ b/client/ui/qml/Controls/SettingButtonType.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 
 BasicButtonType {
     id: root
diff --git a/client/ui/qml/Controls/ShareConnectionButtonCopyType.qml b/client/ui/qml/Controls/ShareConnectionButtonCopyType.qml
index eccf1bb5..31b3591e 100644
--- a/client/ui/qml/Controls/ShareConnectionButtonCopyType.qml
+++ b/client/ui/qml/Controls/ShareConnectionButtonCopyType.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 
 ShareConnectionButtonType {
     property string start_text: qsTr("Copy")
diff --git a/client/ui/qml/Controls/ShareConnectionButtonType.qml b/client/ui/qml/Controls/ShareConnectionButtonType.qml
index 5609a29d..77ebbac0 100644
--- a/client/ui/qml/Controls/ShareConnectionButtonType.qml
+++ b/client/ui/qml/Controls/ShareConnectionButtonType.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 
 
 BasicButtonType {
diff --git a/client/ui/qml/Controls/ShareConnectionContent.qml b/client/ui/qml/Controls/ShareConnectionContent.qml
index 22b274b0..09c3bfe2 100644
--- a/client/ui/qml/Controls/ShareConnectionContent.qml
+++ b/client/ui/qml/Controls/ShareConnectionContent.qml
@@ -1,6 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtGraphicalEffects 1.12
+import QtQuick
+import QtQuick.Controls
+//import QtGraphicalEffects 1.12
+import QtQuick.Shapes 1.4
 
 Item {
     id: root
@@ -17,16 +18,15 @@ Item {
         color: "transparent"
         clip: true
         radius: 2
-        LinearGradient {
-            anchors.fill: parent
-            start: Qt.point(0, 0)
-            end: Qt.point(0, height)
-            gradient: Gradient {
-                GradientStop { position: 0.0; color: "#E1E1E1" }
-                GradientStop { position: 0.4; color: "#DDDDDD" }
-                GradientStop { position: 0.5; color: "#D8D8D8" }
+        gradient: LinearGradient {
+            x1: 0 ; y1: 0
+            x2: 0 ; y2: height
+            stops: [
+                GradientStop { position: 0.0; color: "#E1E1E1" },
+                GradientStop { position: 0.4; color: "#DDDDDD" },
+                GradientStop { position: 0.5; color: "#D8D8D8" },
                 GradientStop { position: 1.0; color: "#D3D3D3" }
-            }
+            ]
         }
         Image {
             anchors.verticalCenter: parent.verticalCenter
diff --git a/client/ui/qml/Controls/SvgButtonType.qml b/client/ui/qml/Controls/SvgButtonType.qml
index af55939c..e6f78c87 100644
--- a/client/ui/qml/Controls/SvgButtonType.qml
+++ b/client/ui/qml/Controls/SvgButtonType.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 import "."
 
 BasicButtonType {
diff --git a/client/ui/qml/Controls/SvgImageType.qml b/client/ui/qml/Controls/SvgImageType.qml
index 651b7330..2022ee32 100644
--- a/client/ui/qml/Controls/SvgImageType.qml
+++ b/client/ui/qml/Controls/SvgImageType.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtGraphicalEffects 1.15
+import QtQuick
+import QtQuick.Controls
+import Qt5Compat.GraphicalEffects
 
 Item {
     id: root
diff --git a/client/ui/qml/Controls/TextAreaType.qml b/client/ui/qml/Controls/TextAreaType.qml
index 5e83e787..2f6e0843 100644
--- a/client/ui/qml/Controls/TextAreaType.qml
+++ b/client/ui/qml/Controls/TextAreaType.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import Qt.labs.platform 1.0
+import QtQuick
+import QtQuick.Controls
+import Qt.labs.platform
 
 import "../Config"
 
diff --git a/client/ui/qml/Controls/TextFieldType.qml b/client/ui/qml/Controls/TextFieldType.qml
index 836a233c..1c2cd9d0 100644
--- a/client/ui/qml/Controls/TextFieldType.qml
+++ b/client/ui/qml/Controls/TextFieldType.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import Qt.labs.platform 1.0
+import QtQuick
+import QtQuick.Controls
+import Qt.labs.platform
 
 TextField {
     id: root
diff --git a/client/ui/qml/Pages/InstallSettings/InstallSettingsBase.qml b/client/ui/qml/Pages/InstallSettings/InstallSettingsBase.qml
index 69fee7f3..8e04c605 100644
--- a/client/ui/qml/Pages/InstallSettings/InstallSettingsBase.qml
+++ b/client/ui/qml/Pages/InstallSettings/InstallSettingsBase.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 import "./"
 import "../../Controls"
 import "../../Config"
diff --git a/client/ui/qml/Pages/InstallSettings/SelectContainer.qml b/client/ui/qml/Pages/InstallSettings/SelectContainer.qml
index 83efaec1..d48e223e 100644
--- a/client/ui/qml/Pages/InstallSettings/SelectContainer.qml
+++ b/client/ui/qml/Pages/InstallSettings/SelectContainer.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 import SortFilterProxyModel 0.2
 import ProtocolEnum 1.0
 import "./"
diff --git a/client/ui/qml/Pages/PageAbout.qml b/client/ui/qml/Pages/PageAbout.qml
index 4910243f..ab25c23e 100644
--- a/client/ui/qml/Pages/PageAbout.qml
+++ b/client/ui/qml/Pages/PageAbout.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 import PageEnum 1.0
 import "./"
 import "../Controls"
diff --git a/client/ui/qml/Pages/PageAppSetting.qml b/client/ui/qml/Pages/PageAppSetting.qml
index 7e8d415a..c2ccdd63 100644
--- a/client/ui/qml/Pages/PageAppSetting.qml
+++ b/client/ui/qml/Pages/PageAppSetting.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import PageEnum 1.0
 import "./"
 import "../Controls"
diff --git a/client/ui/qml/Pages/PageBase.qml b/client/ui/qml/Pages/PageBase.qml
index 69d975ba..425b3065 100644
--- a/client/ui/qml/Pages/PageBase.qml
+++ b/client/ui/qml/Pages/PageBase.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 import PageEnum 1.0
 import "./"
 import "../Controls"
diff --git a/client/ui/qml/Pages/PageGeneralSettings.qml b/client/ui/qml/Pages/PageGeneralSettings.qml
index 04bf4472..9ae285ff 100644
--- a/client/ui/qml/Pages/PageGeneralSettings.qml
+++ b/client/ui/qml/Pages/PageGeneralSettings.qml
@@ -1,7 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
-import QtGraphicalEffects 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import PageEnum 1.0
 import "./"
 import "../Controls"
@@ -163,6 +162,4 @@ PageBase {
             }
         }
     }
-
-
 }
diff --git a/client/ui/qml/Pages/PageNetworkSetting.qml b/client/ui/qml/Pages/PageNetworkSetting.qml
index 0e890446..d8a73563 100644
--- a/client/ui/qml/Pages/PageNetworkSetting.qml
+++ b/client/ui/qml/Pages/PageNetworkSetting.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 import PageEnum 1.0
 import "./"
 import "../Controls"
@@ -62,8 +62,8 @@ If AmneziaDNS service is not installed on the same server, or this option is unc
             NetworkSettingsLogic.onLineEditDns1EditFinished(text)
             UiLogic.onUpdateAllPages()
         }
-        validator: RegExpValidator {
-            regExp: NetworkSettingsLogic.ipAddressRegex
+        validator: RegularExpressionValidator {
+            regularExpression: NetworkSettingsLogic.ipAddressRegex
         }
     }
     SvgButtonType {
@@ -101,8 +101,8 @@ If AmneziaDNS service is not installed on the same server, or this option is unc
             NetworkSettingsLogic.onLineEditDns2EditFinished(text)
             UiLogic.onUpdateAllPages()
         }
-        validator: RegExpValidator {
-            regExp: NetworkSettingsLogic.ipAddressRegex
+        validator: RegularExpressionValidator {
+            regularExpression: NetworkSettingsLogic.ipAddressRegex
         }
     }
     SvgButtonType {
diff --git a/client/ui/qml/Pages/PageNewServer.qml b/client/ui/qml/Pages/PageNewServer.qml
index fad2d14d..430c0dd8 100644
--- a/client/ui/qml/Pages/PageNewServer.qml
+++ b/client/ui/qml/Pages/PageNewServer.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 import PageEnum 1.0
 import "./"
 import "../Controls"
diff --git a/client/ui/qml/Pages/PageNewServerProtocols.qml b/client/ui/qml/Pages/PageNewServerProtocols.qml
index e05b2644..aa7c3c23 100644
--- a/client/ui/qml/Pages/PageNewServerProtocols.qml
+++ b/client/ui/qml/Pages/PageNewServerProtocols.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import ContainerProps 1.0
 import ProtocolProps 1.0
 import PageEnum 1.0
diff --git a/client/ui/qml/Pages/PageQrDecoder.qml b/client/ui/qml/Pages/PageQrDecoder.qml
index f432b742..0e38edbe 100644
--- a/client/ui/qml/Pages/PageQrDecoder.qml
+++ b/client/ui/qml/Pages/PageQrDecoder.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
+import QtMultimedia
 import PageEnum 1.0
-import QtMultimedia 5.5
 import QZXing 3.2
 
 import "./"
diff --git a/client/ui/qml/Pages/PageQrDecoderIos.qml b/client/ui/qml/Pages/PageQrDecoderIos.qml
index 7dd077dd..c5838e35 100644
--- a/client/ui/qml/Pages/PageQrDecoderIos.qml
+++ b/client/ui/qml/Pages/PageQrDecoderIos.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 import PageEnum 1.0
 import QRCodeReader 1.0
 
@@ -25,7 +25,7 @@ PageBase {
     }
 
     Connections {
-        target: Qt.platform.os == "ios" ? QrDecoderLogic : nil
+        target: Qt.platform.os == "ios" ? QrDecoderLogic : null
         function onStartDecode() {
             console.debug("Starting QR decoder")
             loader.sourceComponent = component
diff --git a/client/ui/qml/Pages/PageServerConfiguringProgress.qml b/client/ui/qml/Pages/PageServerConfiguringProgress.qml
index e731ee08..1cd154ca 100644
--- a/client/ui/qml/Pages/PageServerConfiguringProgress.qml
+++ b/client/ui/qml/Pages/PageServerConfiguringProgress.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 import PageEnum 1.0
 import "./"
 import "../Controls"
diff --git a/client/ui/qml/Pages/PageServerContainers.qml b/client/ui/qml/Pages/PageServerContainers.qml
index 4b05568a..5245554d 100644
--- a/client/ui/qml/Pages/PageServerContainers.qml
+++ b/client/ui/qml/Pages/PageServerContainers.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.1
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import Qt.labs.platform
+import QtQuick.Layouts
 import SortFilterProxyModel 0.2
 import ContainerProps 1.0
 import ProtocolProps 1.0
@@ -304,7 +304,7 @@ PageBase {
 
                                 MessageDialog {
                                     id: dialogRemove
-                                    standardButtons: StandardButton.Yes | StandardButton.Cancel
+                                    buttons: StandardButton.Yes | StandardButton.Cancel
                                     title: "AmneziaVPN"
                                     text: qsTr("Remove container") + " " + name_role + "?" + "\n" + qsTr("This action will erase all data of this container on the server.")
                                     onAccepted: {
diff --git a/client/ui/qml/Pages/PageServerList.qml b/client/ui/qml/Pages/PageServerList.qml
index 583de4b3..7214f492 100644
--- a/client/ui/qml/Pages/PageServerList.qml
+++ b/client/ui/qml/Pages/PageServerList.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtGraphicalEffects 1.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Shapes 1.4
 import PageEnum 1.0
 import "../Controls"
 import "./"
@@ -70,26 +70,29 @@ PageBase {
                     mouseExitAni.start()
                 }
             }
-            LinearGradient {
-                visible: !ms.containsMouse
+            Rectangle {
                 anchors.fill: parent
-                start: Qt.point(0, 0)
-                end: Qt.point(0, height)
-                gradient: Gradient {
-                    GradientStop { position: 0.0; color: "#FAFBFE" }
-                    GradientStop { position: 1.0; color: "#ECEEFF" }
-                }
-            }
-            LinearGradient {
-                visible: ms.containsMouse
-                anchors.fill: parent
-                start: Qt.point(0, 0)
-                end: Qt.point(0, height)
-                gradient: Gradient {
-                    GradientStop { position: 0.0; color: "#FAFBFE" }
-                    GradientStop { position: 1.0; color: "#DCDEDF" }
+                gradient: ms.containsMouse ? gradient_containsMouse : gradient_notContainsMouse
+                LinearGradient {
+                    id: gradient_notContainsMouse
+                    x1: 0 ; y1:0
+                    x2: 0 ; y2: height
+                    stops: [
+                        GradientStop { position: 0.0; color: "#FAFBFE" },
+                        GradientStop { position: 1.0; color: "#ECEEFF" }
+                    ]
+                }
+                LinearGradient {
+                    id: gradient_containsMouse
+                    x1: 0 ; y1:0
+                    x2: 0 ; y2: height
+                    stops: [
+                        GradientStop { position: 0.0; color: "#FAFBFE" },
+                        GradientStop { position: 1.0; color: "#DCDEDF" }
+                    ]
                 }
             }
+
             LabelType {
                 id: label_address
                 x: 20
diff --git a/client/ui/qml/Pages/PageServerSettings.qml b/client/ui/qml/Pages/PageServerSettings.qml
index 143f5374..2be04d5a 100644
--- a/client/ui/qml/Pages/PageServerSettings.qml
+++ b/client/ui/qml/Pages/PageServerSettings.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 import PageEnum 1.0
 import "./"
 import "../Controls"
diff --git a/client/ui/qml/Pages/PageSetupWizard.qml b/client/ui/qml/Pages/PageSetupWizard.qml
index 8a13d667..496dda17 100644
--- a/client/ui/qml/Pages/PageSetupWizard.qml
+++ b/client/ui/qml/Pages/PageSetupWizard.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import PageEnum 1.0
 import "./"
 import "../Controls"
diff --git a/client/ui/qml/Pages/PageSetupWizardHighLevel.qml b/client/ui/qml/Pages/PageSetupWizardHighLevel.qml
index 1729aff0..dc00ce62 100644
--- a/client/ui/qml/Pages/PageSetupWizardHighLevel.qml
+++ b/client/ui/qml/Pages/PageSetupWizardHighLevel.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import PageEnum 1.0
 import "./"
 import "../Controls"
diff --git a/client/ui/qml/Pages/PageSetupWizardLowLevel.qml b/client/ui/qml/Pages/PageSetupWizardLowLevel.qml
index 8b7ee744..d176a214 100644
--- a/client/ui/qml/Pages/PageSetupWizardLowLevel.qml
+++ b/client/ui/qml/Pages/PageSetupWizardLowLevel.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import PageEnum 1.0
 import "./"
 import "../Controls"
diff --git a/client/ui/qml/Pages/PageSetupWizardMediumLevel.qml b/client/ui/qml/Pages/PageSetupWizardMediumLevel.qml
index 01721cdc..ca83106d 100644
--- a/client/ui/qml/Pages/PageSetupWizardMediumLevel.qml
+++ b/client/ui/qml/Pages/PageSetupWizardMediumLevel.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import PageEnum 1.0
 import "./"
 import "../Controls"
diff --git a/client/ui/qml/Pages/PageSetupWizardVPNMode.qml b/client/ui/qml/Pages/PageSetupWizardVPNMode.qml
index 2445819e..5e6c8aaf 100644
--- a/client/ui/qml/Pages/PageSetupWizardVPNMode.qml
+++ b/client/ui/qml/Pages/PageSetupWizardVPNMode.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import PageEnum 1.0
 import "./"
 import "../Controls"
diff --git a/client/ui/qml/Pages/PageShareConnection.qml b/client/ui/qml/Pages/PageShareConnection.qml
index 9bd84bdd..7e83964b 100644
--- a/client/ui/qml/Pages/PageShareConnection.qml
+++ b/client/ui/qml/Pages/PageShareConnection.qml
@@ -1,8 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.1
-import QtQuick.Layouts 1.15
-import QtGraphicalEffects 1.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Dialogs
+import QtQuick.Layouts
 import SortFilterProxyModel 0.2
 import ContainerProps 1.0
 import ProtocolProps 1.0
diff --git a/client/ui/qml/Pages/PageSites.qml b/client/ui/qml/Pages/PageSites.qml
index f558586b..673e7e7a 100644
--- a/client/ui/qml/Pages/PageSites.qml
+++ b/client/ui/qml/Pages/PageSites.qml
@@ -1,8 +1,8 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQml.Models 2.15
-import Qt.labs.platform 1.0
-import QtQuick.Dialogs 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQml.Models
+import Qt.labs.platform
+import QtQuick.Dialogs
 import PageEnum 1.0
 import "./"
 import "../Controls"
@@ -101,7 +101,7 @@ PageBase {
         id: fileDialog
         title: qsTr("Import IP addresses")
         visible: false
-        folder: StandardPaths.writableLocation(StandardPaths.DocumentsLocation)
+        currentFolder: StandardPaths.writableLocation(StandardPaths.DocumentsLocation)
         onAccepted: {
             SitesLogic.onPushButtonSitesImportClicked(fileUrl)
         }
diff --git a/client/ui/qml/Pages/PageStart.qml b/client/ui/qml/Pages/PageStart.qml
index d7f2a49c..423eaf27 100644
--- a/client/ui/qml/Pages/PageStart.qml
+++ b/client/ui/qml/Pages/PageStart.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 import PageEnum 1.0
 import "./"
 import "../Controls"
@@ -134,7 +134,7 @@ PageBase {
 
             text: qsTr("Scan QR code")
             onClicked: {
-                if (Qt.platform.os == "ios") {
+                if (Qt.platform.os === "ios") {
                     UiLogic.goToPage(PageEnum.QrDecoderIos)
                 } else {
                     UiLogic.goToPage(PageEnum.QrDecoder)
@@ -148,7 +148,7 @@ PageBase {
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.top: qr_code_import.bottom
             anchors.topMargin: 30
-            visible: UiLogic.pagesStackDepth == 1
+            visible: UiLogic.pagesStackDepth === 1
             enabled: StartPageLogic.pushButtonConnectEnabled
 
             text: qsTr("Restore app config")
@@ -212,8 +212,8 @@ PageBase {
                 StartPageLogic.lineEditIpText = text
             }
 
-            validator: RegExpValidator {
-                regExp: StartPageLogic.ipAddressPortRegex
+            validator: RegularExpressionValidator {
+                regularExpression: StartPageLogic.ipAddressPortRegex
             }
         }
 
diff --git a/client/ui/qml/Pages/PageVPN.qml b/client/ui/qml/Pages/PageVPN.qml
index 7d19015a..6bf375a5 100644
--- a/client/ui/qml/Pages/PageVPN.qml
+++ b/client/ui/qml/Pages/PageVPN.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import PageEnum 1.0
 import "./"
 import "../Controls"
diff --git a/client/ui/qml/Pages/PageViewConfig.qml b/client/ui/qml/Pages/PageViewConfig.qml
index acefb9b3..024743c8 100644
--- a/client/ui/qml/Pages/PageViewConfig.qml
+++ b/client/ui/qml/Pages/PageViewConfig.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import PageEnum 1.0
 import "./"
 import "../Controls"
diff --git a/client/ui/qml/Pages/Protocols/PageProtoCloak.qml b/client/ui/qml/Pages/Protocols/PageProtoCloak.qml
index c98aa6e7..01ad4f81 100644
--- a/client/ui/qml/Pages/Protocols/PageProtoCloak.qml
+++ b/client/ui/qml/Pages/Protocols/PageProtoCloak.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import ProtocolEnum 1.0
 import "../"
 import "../../Controls"
diff --git a/client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml b/client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml
index 42ef1e59..e214836f 100644
--- a/client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml
+++ b/client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import ProtocolEnum 1.0
 import "../"
 import "../../Controls"
diff --git a/client/ui/qml/Pages/Protocols/PageProtoSftp.qml b/client/ui/qml/Pages/Protocols/PageProtoSftp.qml
index 2ad5436b..c6a0602f 100644
--- a/client/ui/qml/Pages/Protocols/PageProtoSftp.qml
+++ b/client/ui/qml/Pages/Protocols/PageProtoSftp.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 import ProtocolEnum 1.0
 import "../"
 import "../../Controls"
diff --git a/client/ui/qml/Pages/Protocols/PageProtoShadowSocks.qml b/client/ui/qml/Pages/Protocols/PageProtoShadowSocks.qml
index be198ec5..e2726106 100644
--- a/client/ui/qml/Pages/Protocols/PageProtoShadowSocks.qml
+++ b/client/ui/qml/Pages/Protocols/PageProtoShadowSocks.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import ProtocolEnum 1.0
 import "../"
 import "../../Controls"
diff --git a/client/ui/qml/Pages/Protocols/PageProtoTorWebSite.qml b/client/ui/qml/Pages/Protocols/PageProtoTorWebSite.qml
index 1285e8bb..a2284e56 100644
--- a/client/ui/qml/Pages/Protocols/PageProtoTorWebSite.qml
+++ b/client/ui/qml/Pages/Protocols/PageProtoTorWebSite.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import ProtocolEnum 1.0
 import "../"
 import "../../Controls"
diff --git a/client/ui/qml/Pages/Protocols/PageProtocolBase.qml b/client/ui/qml/Pages/Protocols/PageProtocolBase.qml
index 3ab95af6..97a0f1eb 100644
--- a/client/ui/qml/Pages/Protocols/PageProtocolBase.qml
+++ b/client/ui/qml/Pages/Protocols/PageProtocolBase.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 import PageEnum 1.0
 import ProtocolEnum 1.0
 import "./.."
diff --git a/client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml b/client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml
index e4b0ff83..af6962e6 100644
--- a/client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml
+++ b/client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import ProtocolEnum 1.0
 import "../"
 import "../../Controls"
diff --git a/client/ui/qml/Pages/Share/PageShareProtoCloak.qml b/client/ui/qml/Pages/Share/PageShareProtoCloak.qml
index bd415c95..8687d427 100644
--- a/client/ui/qml/Pages/Share/PageShareProtoCloak.qml
+++ b/client/ui/qml/Pages/Share/PageShareProtoCloak.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import ProtocolEnum 1.0
 import "../"
 import "../../Controls"
diff --git a/client/ui/qml/Pages/Share/PageShareProtoIkev2.qml b/client/ui/qml/Pages/Share/PageShareProtoIkev2.qml
index ffa300aa..c5392f1a 100644
--- a/client/ui/qml/Pages/Share/PageShareProtoIkev2.qml
+++ b/client/ui/qml/Pages/Share/PageShareProtoIkev2.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import ProtocolEnum 1.0
 import "../"
 import "../../Controls"
diff --git a/client/ui/qml/Pages/Share/PageShareProtoOpenVPN.qml b/client/ui/qml/Pages/Share/PageShareProtoOpenVPN.qml
index 5ca587b7..31368aaa 100644
--- a/client/ui/qml/Pages/Share/PageShareProtoOpenVPN.qml
+++ b/client/ui/qml/Pages/Share/PageShareProtoOpenVPN.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import ProtocolEnum 1.0
 import "../"
 import "../../Controls"
diff --git a/client/ui/qml/Pages/Share/PageShareProtoSftp.qml b/client/ui/qml/Pages/Share/PageShareProtoSftp.qml
index 5cb137f9..2c2c97cc 100644
--- a/client/ui/qml/Pages/Share/PageShareProtoSftp.qml
+++ b/client/ui/qml/Pages/Share/PageShareProtoSftp.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 import ProtocolEnum 1.0
 import "../"
 import "../../Controls"
diff --git a/client/ui/qml/Pages/Share/PageShareProtoShadowSocks.qml b/client/ui/qml/Pages/Share/PageShareProtoShadowSocks.qml
index f8d83ae3..4c105de4 100644
--- a/client/ui/qml/Pages/Share/PageShareProtoShadowSocks.qml
+++ b/client/ui/qml/Pages/Share/PageShareProtoShadowSocks.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import ProtocolEnum 1.0
 import "../"
 import "../../Controls"
diff --git a/client/ui/qml/Pages/Share/PageShareProtoTorWebSite.qml b/client/ui/qml/Pages/Share/PageShareProtoTorWebSite.qml
index 35caf05b..1c68f6cb 100644
--- a/client/ui/qml/Pages/Share/PageShareProtoTorWebSite.qml
+++ b/client/ui/qml/Pages/Share/PageShareProtoTorWebSite.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 import ProtocolEnum 1.0
 import "../"
 import "../../Controls"
diff --git a/client/ui/qml/Pages/Share/PageShareProtoWireGuard.qml b/client/ui/qml/Pages/Share/PageShareProtoWireGuard.qml
index f5746e20..02a66701 100644
--- a/client/ui/qml/Pages/Share/PageShareProtoWireGuard.qml
+++ b/client/ui/qml/Pages/Share/PageShareProtoWireGuard.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import ProtocolEnum 1.0
 import "../"
 import "../../Controls"
diff --git a/client/ui/qml/Pages/Share/PageShareProtocolBase.qml b/client/ui/qml/Pages/Share/PageShareProtocolBase.qml
index 92659b58..603abdfa 100644
--- a/client/ui/qml/Pages/Share/PageShareProtocolBase.qml
+++ b/client/ui/qml/Pages/Share/PageShareProtocolBase.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 import PageEnum 1.0
 import ProtocolEnum 1.0
 import "./.."
diff --git a/client/ui/qml/TitleBar.qml b/client/ui/qml/TitleBar.qml
index deb9e1a0..cf6aed8a 100644
--- a/client/ui/qml/TitleBar.qml
+++ b/client/ui/qml/TitleBar.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
 import "./"
 import "Config"
 
diff --git a/client/ui/qml/main.qml b/client/ui/qml/main.qml
index 50bc9c21..a23c39aa 100644
--- a/client/ui/qml/main.qml
+++ b/client/ui/qml/main.qml
@@ -1,12 +1,12 @@
-import QtQuick 2.14
-import QtQuick.Window 2.14
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
-import QtQuick.Controls.Material 2.12
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Controls.Material
 import PageEnum 1.0
 import PageType 1.0
-import Qt.labs.platform 1.1
-import Qt.labs.folderlistmodel 2.12
+import Qt.labs.platform
+import Qt.labs.folderlistmodel
 import QtQuick.Dialogs
 import "./"
 import "Controls"
@@ -199,7 +199,7 @@ Window  {
                         sharePages[obj.protocol] = obj
                     }
 
-                    //console.debug("Created compenent " + component.url + " for " + type);
+//                    console.debug("Created compenent " + component.url + " for " + type);
                 }
             } else if (component.status === Component.Error) {
                 console.debug("Error loading component:", component.errorString());
@@ -209,7 +209,7 @@ Window  {
         if (c.status === Component.Ready)
             finishCreation(c);
         else {
-            console.debug("Warning: Pages components are not ready");
+            console.debug("Warning: " + file + " page components are not ready " + c.errorString());
         }
     }