diff --git a/ScreenPlay/qml/Common/FileSelector.qml b/ScreenPlay/qml/Common/FileSelector.qml
index 18a02472..db0592b7 100644
--- a/ScreenPlay/qml/Common/FileSelector.qml
+++ b/ScreenPlay/qml/Common/FileSelector.qml
@@ -30,7 +30,7 @@ Item {
     property alias placeHolderText: txtPlaceholder.text
     property alias fileDialog: fileDialog
 
-    height: 70
+    height: 65
     implicitWidth: 300
     state: "nothingSelected"
     onFileChanged: {
@@ -59,7 +59,6 @@ Item {
 
             clip: true
             font.pointSize: 12
-            font.capitalization: Font.Capitalize
             font.family: ScreenPlay.settings.font
             wrapMode: Text.WordWrap
             color: Material.secondaryTextColor
diff --git a/ScreenPlay/qml/Common/TagSelector.qml b/ScreenPlay/qml/Common/TagSelector.qml
index 4411e79f..395538c6 100644
--- a/ScreenPlay/qml/Common/TagSelector.qml
+++ b/ScreenPlay/qml/Common/TagSelector.qml
@@ -8,28 +8,29 @@ Item {
     id: root
 
     function getTags() {
-        var array = [];
+        var array = []
         for (var i = 0; i < listModel.count; i++) {
-            array.push(listModel.get(i)._name);
+            array.push(listModel.get(i)._name)
         }
-        return array;
+        return array
     }
 
     height: 70
     implicitWidth: 200
     onStateChanged: {
         if (root.state === "add") {
-            btnAdd.text = qsTr("Save");
-            textField.focus = true;
+            btnAdd.text = qsTr("Save")
+            textField.focus = true
         } else {
-            btnAdd.text = qsTr("Add tag");
+            btnAdd.text = qsTr("Add tag")
         }
     }
 
     Rectangle {
         id: rectangle
 
-        color: Material.theme === Material.Light ? Material.background : Qt.darker(Material.background)
+        color: Material.theme === Material.Light ? Material.background : Qt.darker(
+                                                       Material.background)
         radius: 3
         clip: true
 
@@ -59,14 +60,12 @@ Item {
 
                 Connections {
                     function onRemoveThis() {
-                        listModel.remove(itemIndex);
+                        listModel.remove(itemIndex)
                     }
 
                     target: delegate
                 }
-
             }
-
         }
 
         ListModel {
@@ -83,7 +82,9 @@ Item {
             radius: 3
             height: parent.height - 20
             width: 200
-            color: Material.theme === Material.Light ? Qt.lighter(Material.background) : Material.background
+            color: Material.theme
+                   === Material.Light ? Qt.lighter(
+                                            Material.background) : Material.background
 
             anchors {
                 top: parent.top
@@ -102,7 +103,6 @@ Item {
                     position: 1
                     color: "#FF000000"
                 }
-
             }
 
             TextField {
@@ -112,8 +112,7 @@ Item {
                 color: Material.primaryTextColor
                 onTextChanged: {
                     if (textField.length >= 10)
-                        textField.text = textField.text;
-
+                        textField.text = textField.text
                 }
 
                 anchors {
@@ -121,9 +120,7 @@ Item {
                     rightMargin: 15
                     leftMargin: 15
                 }
-
             }
-
         }
 
         Button {
@@ -133,12 +130,12 @@ Item {
             opacity: 0
             height: parent.height - 20
             enabled: false
-            Material.background: Material.Red
-            Material.foreground: "white"
+            Material.accent: Material.color(Material.Red)
+            highlighted: true
             font.family: ScreenPlay.settings.font
             onClicked: {
-                root.state = "";
-                textField.clear();
+                root.state = ""
+                textField.clear()
             }
 
             anchors {
@@ -146,7 +143,6 @@ Item {
                 rightMargin: 10
                 verticalCenter: parent.verticalCenter
             }
-
         }
 
         Button {
@@ -154,18 +150,18 @@ Item {
 
             text: qsTr("Add Tag")
             height: parent.height - 20
-            Material.background: Material.LightGreen
-            Material.foreground: "white"
+            Material.accent: Material.color(Material.LightGreen)
+            highlighted: true
             font.family: ScreenPlay.settings.font
             onClicked: {
                 if (root.state === "add") {
                     listModel.append({
-                        "_name": textField.text
-                    });
-                    textField.clear();
-                    root.state = "";
+                                         "_name": textField.text
+                                     })
+                    textField.clear()
+                    root.state = ""
                 } else {
-                    root.state = "add";
+                    root.state = "add"
                 }
             }
 
@@ -174,9 +170,7 @@ Item {
                 rightMargin: 10
                 verticalCenter: parent.verticalCenter
             }
-
         }
-
     }
 
     states: [
@@ -195,7 +189,6 @@ Item {
                 opacity: 1
                 enabled: true
             }
-
         }
     ]
     transitions: [
@@ -209,7 +202,6 @@ Item {
                 duration: 200
                 easing.type: Easing.OutQuart
             }
-
         }
     ]
 }
diff --git a/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperInit.qml b/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperInit.qml
index 5e9fc533..4deb4266 100644
--- a/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperInit.qml
+++ b/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperInit.qml
@@ -111,8 +111,8 @@ Item {
 
     Button {
         text: qsTr("Open Documentation")
-        Material.background: Material.LightGreen
-        Material.foreground: "white"
+        Material.accent: Material.color(Material.LightGreen)
+        highlighted: true
         icon.source: "qrc:/assets/icons/icon_document.svg"
         icon.color: "white"
         icon.width: 16
diff --git a/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperVideoImportConvert.qml b/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperVideoImportConvert.qml
index cbd7bb1b..cbdd5f9f 100644
--- a/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperVideoImportConvert.qml
+++ b/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperVideoImportConvert.qml
@@ -326,8 +326,8 @@ Item {
                 id: btnExit
 
                 text: qsTr("Abort")
-                Material.background: Material.Red
-                Material.foreground: "white"
+                Material.accent: Material.color(Material.Red)
+                highlighted: true
                 font.family: ScreenPlay.settings.font
                 onClicked: {
                     root.abort()
diff --git a/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmConvert.qml b/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmConvert.qml
index a70fb39b..9455e7be 100644
--- a/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmConvert.qml
+++ b/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmConvert.qml
@@ -327,8 +327,8 @@ Item {
                 id: btnExit
 
                 text: qsTr("Abort")
-                Material.background: Material.Red
-                Material.foreground: "white"
+                Material.accent: Material.color(Material.Red)
+                highlighted: true
                 font.family: ScreenPlay.settings.font
                 onClicked: {
                     root.exit();
diff --git a/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmInit.qml b/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmInit.qml
index c1e1fe6c..20b18ba9 100644
--- a/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmInit.qml
+++ b/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmInit.qml
@@ -138,8 +138,8 @@ Item {
         id: btnOpenDocs
 
         text: qsTr("Open Documentation")
-        Material.background: Material.LightGreen
-        Material.foreground: "white"
+        Material.accent: Material.color(Material.LightGreen)
+        highlighted: true
         icon.source: "qrc:/assets/icons/icon_document.svg"
         icon.color: "white"
         icon.width: 16
diff --git a/ScreenPlay/qml/Workshop/SteamWorkshopStartPage.qml b/ScreenPlay/qml/Workshop/SteamWorkshopStartPage.qml
index 440d061f..05aa874a 100644
--- a/ScreenPlay/qml/Workshop/SteamWorkshopStartPage.qml
+++ b/ScreenPlay/qml/Workshop/SteamWorkshopStartPage.qml
@@ -148,8 +148,8 @@ Item {
 
                         Button {
                             text: qsTr("Download now!")
-                            Material.background: Material.accent
-                            Material.foreground: "white"
+                            Material.accent: Material.color(Material.Orange)
+                            highlighted: true
                             icon.source: "qrc:/assets/icons/icon_download.svg"
                             onClicked: {
                                 text = qsTr("Downloading...")
@@ -161,8 +161,8 @@ Item {
 
                         Button {
                             text: qsTr("Details")
-                            Material.background: Material.accent
-                            Material.foreground: "white"
+                            Material.accent: Material.color(Material.Orange)
+                            highlighted: true
                             icon.source: "qrc:/assets/icons/icon_info.svg"
                             visible: false
                             onClicked: {
diff --git a/ScreenPlay/qml/Workshop/upload/PopupSteamWorkshopAgreement.qml b/ScreenPlay/qml/Workshop/upload/PopupSteamWorkshopAgreement.qml
index e48eb754..6a3aa04e 100644
--- a/ScreenPlay/qml/Workshop/upload/PopupSteamWorkshopAgreement.qml
+++ b/ScreenPlay/qml/Workshop/upload/PopupSteamWorkshopAgreement.qml
@@ -54,9 +54,8 @@ Popup {
                 id: btnAgree
 
                 text: qsTr("Accept Steam Workshop Agreement")
+                Material.accent: Material.color(Material.Orange)
                 highlighted: true
-                Material.background: Material.accent
-                Material.foreground: "white"
                 onClicked: {
                     Qt.openUrlExternally("https://steamcommunity.com/sharedfiles/workshoplegalagreement");
                     root.close();