White theme

26 files changed, 131 insertions, 125 deletions

diff --git a/wizard/WizardAskPassword.qml b/wizard/WizardAskPassword.qml
index 7455baf4..0b73ac7a 100644
--- a/wizard/WizardAskPassword.qml
+++ b/wizard/WizardAskPassword.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
 
@@ -113,7 +113,7 @@ ColumnLayout {
             font.pixelSize: 13 * scaleRatio
             font.bold: true
             color: MoneroComponents.Style.defaultFontColor
-            height:18 * scaleRatio
+            height: 18 * scaleRatio
             passwordCharacter: "*"
         }
 
@@ -123,7 +123,7 @@ ColumnLayout {
             Layout.preferredHeight: 8
 
             radius: 8 * scaleRatio
-            color: "#333333" // progressbar bg
+            color: MoneroComponents.Style.progressBarBackgroundColor
 
             Rectangle {
                 id: fillRect
@@ -134,17 +134,16 @@ ColumnLayout {
                 property int maxWidth: bar.width * scaleRatio
                 width: (maxWidth * root.passwordFill) / 100
                 radius: 8
-                color: "#FA6800"
+                color: MoneroComponents.Style.orange
             }
 
             Rectangle {
-                color:"#333"
+                color: MoneroComponents.Style.defaultFontColor
                 anchors.bottom: parent.bottom
                 anchors.left: parent.left
                 anchors.leftMargin: 8 * scaleRatio
             }
         }
-
     }
 
     ColumnLayout {
@@ -179,21 +178,21 @@ ColumnLayout {
             font.family: MoneroComponents.Style.fontLight.name
             font.pixelSize: 15 * scaleRatio
             color: MoneroComponents.Style.defaultFontColor
-            selectionColor: MoneroComponents.Style.dimmedFontColor
-            selectedTextColor: MoneroComponents.Style.defaultFontColor
+            selectionColor: MoneroComponents.Style.textSelectionColor
+            selectedTextColor: MoneroComponents.Style.textSelectedColor
 
             text: walletOptionsPassword
 
             background: Rectangle {
                 radius: 4
-                border.color: Qt.rgba(255, 255, 255, 0.35)
+                border.color: MoneroComponents.Style.inputBorderColorActive
                 border.width: 1
                 color: "transparent"
 
                 Image {
                     width: 12 * scaleRatio
                     height: 16 * scaleRatio
-                    source: "../images/lockIcon.png"
+                    source: "qrc:///images/lockIcon.png"
                     anchors.verticalCenter: parent.verticalCenter
                     anchors.right: parent.right
                     anchors.rightMargin: 20
@@ -234,21 +233,21 @@ ColumnLayout {
             font.family: MoneroComponents.Style.fontLight.name
             font.pixelSize: 15 * scaleRatio
             color: MoneroComponents.Style.defaultFontColor
-            selectionColor: MoneroComponents.Style.dimmedFontColor
-            selectedTextColor: MoneroComponents.Style.defaultFontColor
+            selectionColor: MoneroComponents.Style.textSelectionColor
+            selectedTextColor: MoneroComponents.Style.textSelectedColor
 
             text: walletOptionsPassword
 
             background: Rectangle {
                 radius: 4
-                border.color: Qt.rgba(255, 255, 255, 0.35)
+                border.color: MoneroComponents.Style.inputBorderColorActive
                 border.width: 1
                 color: "transparent"
 
                 Image {
                     width: 12
                     height: 16
-                    source: "../images/lockIcon.png"
+                    source: "qrc:///images/lockIcon.png"
                     anchors.verticalCenter: parent.verticalCenter
                     anchors.right: parent.right
                     anchors.rightMargin: 20
diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml
index 1bb76a25..76b9d923 100644
--- a/wizard/WizardController.qml
+++ b/wizard/WizardController.qml
@@ -27,18 +27,20 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import QtQml 2.0
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Controls 2.0
 import QtQuick.Controls 1.4
-import QtQuick.Layouts 1.1
-import QtQuick.Dialogs 1.2
 import QtGraphicalEffects 1.0
+import QtQuick.Controls.Styles 1.4
+import QtQuick.Layouts 1.2
+import QtQuick.Dialogs 1.2
 import moneroComponents.Wallet 1.0
 
 import "../js/Wizard.js" as Wizard
 import "../js/Windows.js" as Windows
 import "../js/Utils.js" as Utils
 import "../components" as MoneroComponents
+import "../components/effects/" as MoneroEffects
 import "../pages"
 
 Rectangle {
@@ -119,11 +121,6 @@ Rectangle {
         }
     }
 
-    Image {
-        opacity: 1.0
-        anchors.fill: parent
-        source: "../images/middlePanelBg.jpg"
-    }
 
     Rectangle {
         id: wizardStateView
@@ -247,6 +244,19 @@ Rectangle {
             }
         ]
 
+        MoneroEffects.GradientBackground {
+            anchors.fill: parent
+            fallBackColor: MoneroComponents.Style.middlePanelBackgroundColor
+            initialStartColor: MoneroComponents.Style.wizardBackgroundGradientStart
+            initialStopColor: MoneroComponents.Style.middlePanelBackgroundGradientStop
+            blackColorStart: MoneroComponents.Style._b_wizardBackgroundGradientStart
+            blackColorStop: MoneroComponents.Style._b_middlePanelBackgroundGradientStop
+            whiteColorStart: MoneroComponents.Style._w_wizardBackgroundGradientStart
+            whiteColorStop: MoneroComponents.Style._w_middlePanelBackgroundGradientStop
+            start: Qt.point(0, 0)
+            end: Qt.point(height, width)
+        }
+
         Flickable {
             id: wizardFlickable
             anchors.fill: parent
diff --git a/wizard/WizardCreateDevice1.qml b/wizard/WizardCreateDevice1.qml
index ce2a6c4a..b8ec9f7c 100644
--- a/wizard/WizardCreateDevice1.qml
+++ b/wizard/WizardCreateDevice1.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
@@ -156,8 +156,6 @@ Rectangle {
                         dataModel: deviceNameModel
                         Layout.fillWidth: true
                         Layout.topMargin: 6 * scaleRatio
-                        releasedColor: "#363636"
-                        pressedColor: "#202020"
                     }
                 }
             }
@@ -171,8 +169,8 @@ Rectangle {
                 color: MoneroComponents.Style.errorColor
                 font.pixelSize: 16 * scaleRatio
 
-                selectionColor: MoneroComponents.Style.dimmedFontColor
-                selectedTextColor: MoneroComponents.Style.defaultFontColor
+                selectionColor: MoneroComponents.Style.textSelectionColor
+                selectedTextColor: MoneroComponents.Style.textSelectedColor
 
                 selectByMouse: true
                 wrapMode: Text.WordWrap
diff --git a/wizard/WizardCreateWallet1.qml b/wizard/WizardCreateWallet1.qml
index 4906f954..c67f2101 100644
--- a/wizard/WizardCreateWallet1.qml
+++ b/wizard/WizardCreateWallet1.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
diff --git a/wizard/WizardCreateWallet2.qml b/wizard/WizardCreateWallet2.qml
index 6a3d3284..f3dd60bc 100644
--- a/wizard/WizardCreateWallet2.qml
+++ b/wizard/WizardCreateWallet2.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
 
diff --git a/wizard/WizardCreateWallet3.qml b/wizard/WizardCreateWallet3.qml
index 0c3a8e99..f6113ecf 100644
--- a/wizard/WizardCreateWallet3.qml
+++ b/wizard/WizardCreateWallet3.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
 
diff --git a/wizard/WizardCreateWallet4.qml b/wizard/WizardCreateWallet4.qml
index 15269703..3d0f1958 100644
--- a/wizard/WizardCreateWallet4.qml
+++ b/wizard/WizardCreateWallet4.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
 
diff --git a/wizard/WizardDaemonSettings.qml b/wizard/WizardDaemonSettings.qml
index 3d672747..74290aac 100644
--- a/wizard/WizardDaemonSettings.qml
+++ b/wizard/WizardDaemonSettings.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
@@ -105,8 +105,8 @@ ColumnLayout {
                     }
                 }
 
-                selectionColor: MoneroComponents.Style.dimmedFontColor
-                selectedTextColor: MoneroComponents.Style.defaultFontColor
+                selectionColor: MoneroComponents.Style.textSelectionColor
+                selectedTextColor: MoneroComponents.Style.textSelectedColor
 
                 selectByMouse: true
                 wrapMode: Text.WordWrap
@@ -133,8 +133,8 @@ ColumnLayout {
                     }
                 }
 
-                selectionColor: MoneroComponents.Style.dimmedFontColor
-                selectedTextColor: MoneroComponents.Style.defaultFontColor
+                selectionColor: MoneroComponents.Style.textSelectionColor
+                selectedTextColor: MoneroComponents.Style.textSelectedColor
 
                 selectByMouse: true
                 wrapMode: Text.WordWrap
@@ -153,16 +153,8 @@ ColumnLayout {
             MoneroComponents.RemoteNodeEdit {
                 id: bootstrapNodeEdit
                 Layout.minimumWidth: 300 * scaleRatio
-
                 //labelText: qsTr("Bootstrap node (leave blank if not wanted)") + translationManager.emptyString
 
-                lineEditBackgroundColor: "transparent"
-                lineEditFontColor: MoneroComponents.Style.defaultFontColor
-                lineEditFontBold: false
-                lineEditBorderColor: Qt.rgba(255, 255, 255, 0.35)
-                labelFontSize: 14 * scaleRatio
-                placeholderFontSize: 15 * scaleRatio
-
                 daemonAddrText: persistentSettings.bootstrapNodeAddress.split(":")[0].trim()
                 daemonPortText: {
                     var node_split = persistentSettings.bootstrapNodeAddress.split(":");
@@ -203,13 +195,6 @@ ColumnLayout {
             property var rna: persistentSettings.remoteNodeAddress
             daemonAddrText: rna.search(":") != -1 ? rna.split(":")[0].trim() : ""
             daemonPortText: rna.search(":") != -1 ? (rna.split(":")[1].trim() == "") ? appWindow.getDefaultDaemonRpcPort(persistentSettings.nettype) : persistentSettings.remoteNodeAddress.split(":")[1] : ""
-
-            lineEditBackgroundColor: "transparent"
-            lineEditFontColor: MoneroComponents.Style.defaultFontColor
-            lineEditFontBold: false
-            lineEditBorderColor: Qt.rgba(255, 255, 255, 0.35)
-            labelFontSize: 14 * scaleRatio
-            placeholderFontSize: 15 * scaleRatio
         }
     }
 }
diff --git a/wizard/WizardHeader.qml b/wizard/WizardHeader.qml
index 7c27413f..6e984812 100644
--- a/wizard/WizardHeader.qml
+++ b/wizard/WizardHeader.qml
@@ -30,7 +30,7 @@ import "../js/Wizard.js" as Wizard
 import "../components"
 import "../components" as MoneroComponents
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
 
@@ -46,6 +46,7 @@ ColumnLayout {
         Layout.fillWidth: true
         font.family: MoneroComponents.Style.fontRegular.name
         color: MoneroComponents.Style.defaultFontColor
+        opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.8
         font.pixelSize: {
             if(wizardController.layoutScale === 2 ){
                 return 34 * scaleRatio;
@@ -54,8 +55,8 @@ ColumnLayout {
             }
         }
 
-        selectionColor: MoneroComponents.Style.dimmedFontColor
-        selectedTextColor: MoneroComponents.Style.defaultFontColor
+        selectionColor: MoneroComponents.Style.textSelectionColor
+        selectedTextColor: MoneroComponents.Style.textSelectedColor
 
         selectByMouse: true
         wrapMode: Text.WordWrap
@@ -83,8 +84,8 @@ ColumnLayout {
             }
         }
 
-        selectionColor: MoneroComponents.Style.dimmedFontColor
-        selectedTextColor: MoneroComponents.Style.defaultFontColor
+        selectionColor: MoneroComponents.Style.textSelectionColor
+        selectedTextColor: MoneroComponents.Style.textSelectedColor
 
         selectByMouse: true
         wrapMode: Text.WordWrap
diff --git a/wizard/WizardHome.qml b/wizard/WizardHome.qml
index 655a53e2..3243a5eb 100644
--- a/wizard/WizardHome.qml
+++ b/wizard/WizardHome.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
@@ -64,7 +64,7 @@ Rectangle {
             WizardMenuItem {
                 headerText: qsTr("Create a new wallet") + translationManager.emptyString
                 bodyText: qsTr("Choose this option if this is your first time using Monero.") + translationManager.emptyString
-                imageIcon: "../images/create-wallet.png"
+                imageIcon: "qrc:///images/create-wallet.png"
 
                 onMenuClicked: {
                     wizardController.restart();
@@ -85,7 +85,7 @@ Rectangle {
             WizardMenuItem {
                 headerText: qsTr("Create a new wallet from hardware") + translationManager.emptyString
                 bodyText: qsTr("Connect your hardware wallet to create a new Monero wallet.") + translationManager.emptyString
-                imageIcon: "../images/restore-wallet-from-hardware.png"
+                imageIcon: "qrc:///images/restore-wallet-from-hardware.png"
 
                 onMenuClicked: {
                     wizardController.restart();
@@ -105,7 +105,7 @@ Rectangle {
             WizardMenuItem {
                 headerText: qsTr("Open a wallet from file") + translationManager.emptyString
                 bodyText: qsTr("Import an existing .keys wallet file from your computer.") + translationManager.emptyString
-                imageIcon: "../images/open-wallet-from-file.png"
+                imageIcon: "qrc:///images/open-wallet-from-file.png"
 
                 onMenuClicked: {
                     wizardStateView.state = "wizardOpenWallet1"
@@ -124,7 +124,7 @@ Rectangle {
             WizardMenuItem {
                 headerText: qsTr("Restore wallet from keys or mnemonic seed") + translationManager.emptyString
                 bodyText: qsTr("Enter your private keys or 25-word mnemonic seed to restore your wallet.") + translationManager.emptyString
-                imageIcon: "../images/restore-wallet.png"
+                imageIcon: "qrc:///images/restore-wallet.png"
 
                 onMenuClicked: {
                     wizardController.restart();
@@ -185,10 +185,6 @@ Rectangle {
                     dataModel: networkTypeModel
                     Layout.fillWidth: true
                     Layout.topMargin: 41
-                    shadowReleasedColor: "#FF4304"
-                    shadowPressedColor: "#B32D00"
-                    releasedColor: "#363636"
-                    pressedColor: "#202020"
 
                     onChanged: {
                         var item = dataModel.get(currentIndex).nettype.toLowerCase();
diff --git a/wizard/WizardLang.qml b/wizard/WizardLang.qml
index 44bcb187..ad42bd71 100644
--- a/wizard/WizardLang.qml
+++ b/wizard/WizardLang.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.2
 import QtQuick.XmlListModel 2.0
@@ -34,6 +34,7 @@ import QtQuick.Controls 2.0
 
 import "../js/Wizard.js" as Wizard
 import "../components" as MoneroComponents
+import "../components/effects/" as MoneroEffects
 
 Rectangle {
     id: langScreen
@@ -49,9 +50,17 @@ Rectangle {
         }
     }
 
-    Image {
+    MoneroEffects.GradientBackground {
         anchors.fill: parent
-        source: "../images/middlePanelBg.jpg"
+        fallBackColor: MoneroComponents.Style.middlePanelBackgroundColor
+        initialStartColor: MoneroComponents.Style.wizardBackgroundGradientStart
+        initialStopColor: MoneroComponents.Style.middlePanelBackgroundGradientStop
+        blackColorStart: MoneroComponents.Style._b_wizardBackgroundGradientStart
+        blackColorStop: MoneroComponents.Style._b_middlePanelBackgroundGradientStop
+        whiteColorStart: MoneroComponents.Style._w_wizardBackgroundGradientStart
+        whiteColorStop: MoneroComponents.Style._w_middlePanelBackgroundGradientStop
+        start: Qt.point(0, 0)
+        end: Qt.point(height, width)
     }
 
     ColumnLayout {
@@ -73,8 +82,8 @@ Rectangle {
                 }
             }
 
-            selectionColor: MoneroComponents.Style.dimmedFontColor
-            selectedTextColor: MoneroComponents.Style.defaultFontColor
+            selectionColor: MoneroComponents.Style.textSelectionColor
+            selectedTextColor: MoneroComponents.Style.textSelectedColor
 
             selectByMouse: true
             wrapMode: Text.WordWrap
@@ -101,8 +110,8 @@ Rectangle {
                 }
             }
 
-            selectionColor: MoneroComponents.Style.dimmedFontColor
-            selectedTextColor: MoneroComponents.Style.defaultFontColor
+            selectionColor: MoneroComponents.Style.textSelectionColor
+            selectedTextColor: MoneroComponents.Style.textSelectedColor
 
             selectByMouse: true
             wrapMode: Text.WordWrap
@@ -159,7 +168,7 @@ Rectangle {
                         height: parent.height
                         width: langText.width + 22 * scaleRatio
 
-                        Text {
+                        MoneroComponents.TextPlain {
                             id: langText
                             font.bold: true
                             font.pixelSize: 14 * scaleRatio
diff --git a/wizard/WizardLanguage.qml b/wizard/WizardLanguage.qml
index 49319a15..f6db921d 100644
--- a/wizard/WizardLanguage.qml
+++ b/wizard/WizardLanguage.qml
@@ -26,25 +26,21 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
 
 import "../components"
 import "../components" as MoneroComponents
+import "../components/effects/" as MoneroEffects
 import "../version.js" as Version
 
 Rectangle {
     Layout.fillWidth: true
-    color: "black"
+    color: "transparent"
 
     property string viewName: "wizardLanguage"
 
-    Image {
-        anchors.fill: parent
-        source: "../images/middlePanelBg.jpg"
-    }
-
     ColumnLayout {
         id: root
         anchors.top: parent.top
@@ -89,7 +85,7 @@ Rectangle {
 
         Image {
             id: globe
-            source: "../images/world-flags-globe.png"
+            source: "qrc:///images/world-flags-globe.png"
             opacity: 0
             property bool small: appWindow.width < 700 ? true : false
             property int size: {
@@ -190,7 +186,7 @@ Rectangle {
             }
         }
 
-        Text {
+        MoneroComponents.TextPlain {
             id: versionText
             opacity: 0
             anchors.horizontalCenter: parent.horizontalCenter
diff --git a/wizard/WizardMenuItem.qml b/wizard/WizardMenuItem.qml
index 1ca2e1fb..1649c8aa 100644
--- a/wizard/WizardMenuItem.qml
+++ b/wizard/WizardMenuItem.qml
@@ -26,9 +26,10 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.2
+import QtGraphicalEffects 1.0
 import QtQuick.Controls 2.0
 
 import "../components" as MoneroComponents
@@ -49,11 +50,24 @@ RowLayout {
 
         Image {
             id: icon
+            visible: !isOpenGL || MoneroComponents.Style.blackTheme
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.verticalCenter: parent.verticalCenter
             source: ""
         }
 
+        DropShadow {
+            visible: isOpenGL && !MoneroComponents.Style.blackTheme
+            anchors.fill: icon
+            horizontalOffset: 3
+            verticalOffset: 3
+            radius: 10.0
+            samples: 15
+            color: "#1E000000"
+            source: icon
+            cached: true
+        }
+
         MouseArea {
             cursorShape: Qt.PointingHandCursor
             anchors.fill: parent
@@ -68,12 +82,13 @@ RowLayout {
         Layout.fillWidth: true
         spacing: 0
 
-        Text {
+        MoneroComponents.TextPlain {
             id: header
             Layout.fillWidth: true
             leftPadding: parent.leftPadding
             topPadding: 0
             color: MoneroComponents.Style.defaultFontColor
+            opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.8
             font.bold: true
             font.family: MoneroComponents.Style.fontRegular.name
             font.pixelSize: {
@@ -93,7 +108,7 @@ RowLayout {
             }
         }
 
-        Text {
+        MoneroComponents.TextPlain {
             id: body
             Layout.fillWidth: true
             color: MoneroComponents.Style.dimmedFontColor
@@ -106,7 +121,8 @@ RowLayout {
                 }
             }
             topPadding: 4 * scaleRatio
-            wrapMode: Text.WordWrap;
+            wrapMode: Text.WordWrap
+            themeTransition: false
 
             MouseArea {
                 cursorShape: Qt.PointingHandCursor
diff --git a/wizard/WizardModeBootstrap.qml b/wizard/WizardModeBootstrap.qml
index 5f9c70b9..11c07ae8 100644
--- a/wizard/WizardModeBootstrap.qml
+++ b/wizard/WizardModeBootstrap.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
 
@@ -66,7 +66,7 @@ Rectangle {
                 Layout.topMargin: 10 * scaleRatio
                 Layout.fillWidth: true
 
-                Text {
+                MoneroComponents.TextPlain {
                     text: qsTr("This mode will use a remote node whilst also syncing the blockchain. This is different from the first menu option (Simple mode), since it will only use the remote node until the blockchain is fully synced locally. It is a reasonable tradeoff for most people who care about privacy but also want the convenience of an automatic fallback option.") + translationManager.emptyString
                     wrapMode: Text.Wrap
                     Layout.topMargin: 14 * scaleRatio
@@ -77,7 +77,7 @@ Rectangle {
                     color: MoneroComponents.Style.lightGreyFontColor
                 }
 
-                Text {
+                MoneroComponents.TextPlain {
                     text: qsTr("Temporary use of remote nodes is useful in order to use Monero immediately (hence the name <i>bootstrap</i>), however be aware that when using remote nodes (including with the bootstrap setting), nodes could track your IP address, track your \"restore height\" and associated block request data, and send you inaccurate information to learn more about transactions you make.") + translationManager.emptyString
                     wrapMode: Text.Wrap
                     Layout.topMargin: 8 * scaleRatio
@@ -94,7 +94,7 @@ Rectangle {
                     text: qsTr("Remain aware of these limitations. <b>Users who prioritize privacy and decentralization must use a full node instead</b>.") + translationManager.emptyString
                 }
 
-                Text {
+                MoneroComponents.TextPlain {
                     text: qsTr("For enhanced node performance you may specify your region:") + translationManager.emptyString
                     wrapMode: Text.Wrap
                     Layout.topMargin: 8 * scaleRatio
@@ -117,10 +117,6 @@ Rectangle {
                             id: regionDropdown
                             Layout.fillWidth: true
                             dataModel: regionModel
-                            shadowReleasedColor: "#FF4304"
-                            shadowPressedColor: "#B32D00"
-                            releasedColor: "#363636"
-                            pressedColor: "#202020"
                             currentIndex: 0
 
                             onChanged: {
diff --git a/wizard/WizardModeRemoteNodeWarning.qml b/wizard/WizardModeRemoteNodeWarning.qml
index b578d480..2f84b227 100644
--- a/wizard/WizardModeRemoteNodeWarning.qml
+++ b/wizard/WizardModeRemoteNodeWarning.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
 
@@ -66,8 +66,10 @@ Rectangle {
                 Layout.topMargin: 10 * scaleRatio
                 Layout.fillWidth: true
 
-                Text {
+                MoneroComponents.TextPlain {
                     text: qsTr("This mode is ideal for managing small amounts of Monero. You have access to basic features for making and managing transactions. It will automatically connect to the Monero network so you can start using Monero immediately.") + translationManager.emptyString
+                    themeTransitionBlackColor: MoneroComponents.Style._b_lightGreyFontColor
+                    themeTransitionWhiteColor: MoneroComponents.Style._w_lightGreyFontColor
                     wrapMode: Text.Wrap
                     Layout.topMargin: 14 * scaleRatio
                     Layout.fillWidth: true
@@ -77,8 +79,10 @@ Rectangle {
                     color: MoneroComponents.Style.lightGreyFontColor
                 }
 
-                Text {
+                MoneroComponents.TextPlain {
                     text: qsTr("Remote nodes are useful if you are not able/don't want to download the whole blockchain, but be advised that malicious remote nodes could compromise some privacy. They could track your IP address, track your \"restore height\" and associated block request data, and send you inaccurate information to learn more about transactions you make.") + translationManager.emptyString
+                    themeTransitionBlackColor: MoneroComponents.Style._b_lightGreyFontColor
+                    themeTransitionWhiteColor: MoneroComponents.Style._w_lightGreyFontColor
                     wrapMode: Text.Wrap
                     Layout.topMargin: 8 * scaleRatio
                     Layout.fillWidth: true
@@ -88,13 +92,13 @@ Rectangle {
                     color: MoneroComponents.Style.lightGreyFontColor
                 }
 
-                MoneroComponents.WarningBox{
+                MoneroComponents.WarningBox {
                     Layout.topMargin: 14 * scaleRatio
                     Layout.bottomMargin: 6 * scaleRatio
                     text: qsTr("Remain aware of these limitations. <b>Users who prioritize privacy and decentralization must use a full node instead</b>.") + translationManager.emptyString
                 }
 
-                Text {
+                MoneroComponents.TextPlain {
                     text: qsTr("For enhanced node performance you may specify your region:") + translationManager.emptyString
                     wrapMode: Text.Wrap
                     Layout.topMargin: 8 * scaleRatio
@@ -117,10 +121,6 @@ Rectangle {
                             id: regionDropdown
                             Layout.fillWidth: true
                             dataModel: regionModel
-                            shadowReleasedColor: "#FF4304"
-                            shadowPressedColor: "#B32D00"
-                            releasedColor: "#363636"
-                            pressedColor: "#202020"
                             currentIndex: 0
 
                             onChanged: {
diff --git a/wizard/WizardModeSelection.qml b/wizard/WizardModeSelection.qml
index dddc4b9b..4f6176f4 100644
--- a/wizard/WizardModeSelection.qml
+++ b/wizard/WizardModeSelection.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
@@ -72,7 +72,7 @@ Rectangle {
                     }
                 }
 
-                imageIcon: "../images/remote-node.png"
+                imageIcon: "qrc:///images/remote-node.png"
 
                 onMenuClicked: {
                     if(appWindow.persistentSettings.nettype == 0){
@@ -101,7 +101,7 @@ Rectangle {
                         return "Available on mainnet.";
                     }
                 }
-                imageIcon: "../images/local-node.png"
+                imageIcon: "qrc:///images/local-node.png"
 
                 onMenuClicked: {
                     if(appWindow.persistentSettings.nettype == 0){
@@ -123,7 +123,7 @@ Rectangle {
             WizardMenuItem {
                 headerText: qsTr("Advanced mode") + translationManager.emptyString
                 bodyText: qsTr("Includes extra features like mining and message verification. The blockchain is downloaded to your computer.") + translationManager.emptyString
-                imageIcon: "../images/local-node-full.png"
+                imageIcon: "qrc:///images/local-node-full.png"
 
                 onMenuClicked: {
                     appWindow.changeWalletMode(2);
diff --git a/wizard/WizardNav.qml b/wizard/WizardNav.qml
index ac84ee36..f30098b8 100644
--- a/wizard/WizardNav.qml
+++ b/wizard/WizardNav.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
 
diff --git a/wizard/WizardNavProgressDot.qml b/wizard/WizardNavProgressDot.qml
index 464429d5..3444a373 100644
--- a/wizard/WizardNavProgressDot.qml
+++ b/wizard/WizardNavProgressDot.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
 
@@ -37,7 +37,7 @@ Rectangle {
     Layout.preferredWidth: 30 * scaleRatio
     Layout.fillHeight: true
     property string activeColor: MoneroComponents.Style.defaultFontColor
-    property string inactiveColor: "#333333"
+    property string inactiveColor: MoneroComponents.Style.progressBarBackgroundColor
     color: "transparent"
 
     Rectangle {
diff --git a/wizard/WizardOpenWallet1.qml b/wizard/WizardOpenWallet1.qml
index d0b8d092..625a6cec 100644
--- a/wizard/WizardOpenWallet1.qml
+++ b/wizard/WizardOpenWallet1.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
@@ -92,7 +92,7 @@ Rectangle {
                 columnSpacing: 20 * scaleRatio
                 columns: 2
 
-                Text {
+                MoneroComponents.TextPlain {
                     text: qsTr("Most recent wallets") + translationManager.emptyString
                     font.family: MoneroComponents.Style.fontLight.name
                     font.pixelSize: 16 * scaleRatio
@@ -145,7 +145,7 @@ Rectangle {
                                     anchors.horizontalCenter: parent.horizontalCenter
                                     anchors.verticalCenter: parent.verticalCenter
                                     fillMode: Image.PreserveAspectFit
-                                    source: "../images/open-wallet-from-file.png"
+                                    source: "qrc:///images/open-wallet-from-file.png"
                                 }
                             }
 
@@ -161,8 +161,8 @@ Rectangle {
                                     color: MoneroComponents.Style.defaultFontColor
                                     font.pixelSize: 18 * scaleRatio
 
-                                    selectionColor: MoneroComponents.Style.dimmedFontColor
-                                    selectedTextColor: MoneroComponents.Style.defaultFontColor
+                                    selectionColor: MoneroComponents.Style.textSelectionColor
+                                    selectedTextColor: MoneroComponents.Style.textSelectedColor
 
                                     selectByMouse: false
                                     wrapMode: Text.WordWrap
diff --git a/wizard/WizardRestoreWallet1.qml b/wizard/WizardRestoreWallet1.qml
index 7919cb32..3dc356c1 100644
--- a/wizard/WizardRestoreWallet1.qml
+++ b/wizard/WizardRestoreWallet1.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
 
@@ -183,13 +183,13 @@ Rectangle {
 
                         font.family: MoneroComponents.Style.fontRegular.name
                         font.pixelSize: 16 * scaleRatio
-                        selectionColor: MoneroComponents.Style.dimmedFontColor
-                        selectedTextColor: MoneroComponents.Style.defaultFontColor
+                        selectionColor: MoneroComponents.Style.textSelectionColor
+                        selectedTextColor: MoneroComponents.Style.textSelectedColor
                         wrapMode: TextInput.Wrap
 
                         selectByMouse: true
 
-                        Text {
+                        MoneroComponents.TextPlain {
                             id: memoTextPlaceholder
                             opacity: 0.35
                             anchors.fill:parent
diff --git a/wizard/WizardRestoreWallet2.qml b/wizard/WizardRestoreWallet2.qml
index bf569cdf..80784665 100644
--- a/wizard/WizardRestoreWallet2.qml
+++ b/wizard/WizardRestoreWallet2.qml
@@ -29,7 +29,7 @@
 import "../js/Wizard.js" as Wizard
 import "../components" as MoneroComponents
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
 
diff --git a/wizard/WizardRestoreWallet3.qml b/wizard/WizardRestoreWallet3.qml
index 26c10c6d..6acb0249 100644
--- a/wizard/WizardRestoreWallet3.qml
+++ b/wizard/WizardRestoreWallet3.qml
@@ -29,7 +29,7 @@
 import "../js/Wizard.js" as Wizard
 import "../components" as MoneroComponents
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
 
diff --git a/wizard/WizardRestoreWallet4.qml b/wizard/WizardRestoreWallet4.qml
index d141bf04..136c6ddd 100644
--- a/wizard/WizardRestoreWallet4.qml
+++ b/wizard/WizardRestoreWallet4.qml
@@ -28,7 +28,7 @@
 
 import "../components" as MoneroComponents
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
 
diff --git a/wizard/WizardSummary.qml b/wizard/WizardSummary.qml
index e3e576e4..8ee5ae77 100644
--- a/wizard/WizardSummary.qml
+++ b/wizard/WizardSummary.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
 import moneroComponents.NetworkType 1.0
diff --git a/wizard/WizardSummaryItem.qml b/wizard/WizardSummaryItem.qml
index 4da30a40..4e3f3510 100644
--- a/wizard/WizardSummaryItem.qml
+++ b/wizard/WizardSummaryItem.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
 
diff --git a/wizard/WizardWalletInput.qml b/wizard/WizardWalletInput.qml
index 895dec00..d67dfcd1 100644
--- a/wizard/WizardWalletInput.qml
+++ b/wizard/WizardWalletInput.qml
@@ -26,7 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0