diff --git a/assets/qml/Panes/Console.qml b/assets/qml/Panes/Console.qml
index f164e474..9e6ffda2 100644
--- a/assets/qml/Panes/Console.qml
+++ b/assets/qml/Panes/Console.qml
@@ -169,12 +169,12 @@ Item {
             }
 
             MenuSeparator {
-                visible: mainWindow.menuBar != null
+                visible: mainWindow.menuBar !== null
             }
 
             MenuItem {
                 enabled: visible
-                visible: mainWindow.menuBar != null
+                visible: mainWindow.menuBar !== null
                 height: visible ? implicitHeight : 0
                 onTriggered: mainWindow.menubarEnabled = !mainWindow.menubarEnabled
                 text: visible && mainWindow.menuBar.visible ? qsTr("Hide menubar") :
diff --git a/assets/qml/Panes/SetupPanes/MQTT.qml b/assets/qml/Panes/SetupPanes/MQTT.qml
index e3582ccb..09c1dce7 100644
--- a/assets/qml/Panes/SetupPanes/MQTT.qml
+++ b/assets/qml/Panes/SetupPanes/MQTT.qml
@@ -274,10 +274,6 @@ Control {
                              qsTr("Connect")) + "  "
             icon.source: checked ? "qrc:/icons/disconnect.svg" :
                                    "qrc:/icons/connect.svg"
-            icon.color: checked ? Cpp_ThemeManager.connectButtonChecked :
-                                  Cpp_ThemeManager.connectButtonUnchecked
-            palette.buttonText: checked ? Cpp_ThemeManager.connectButtonChecked :
-                                          Cpp_ThemeManager.connectButtonUnchecked
         }
 
         //
diff --git a/assets/qml/Panes/Toolbar.qml b/assets/qml/Panes/Toolbar.qml
index 2bc86a99..713f9f41 100644
--- a/assets/qml/Panes/Toolbar.qml
+++ b/assets/qml/Panes/Toolbar.qml
@@ -76,15 +76,25 @@ Control {
     //
     Rectangle {
         id: bg
-        border.width: 1
-        border.color: Cpp_ThemeManager.toolbarGradient1
 
         Rectangle {
-            height: parent.border.width
-            visible: Qt.platform.os === "osx"
+            height: 1
+            color: Cpp_ThemeManager.toolbarGradient1
+
+            anchors {
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+            }
+        }
+
+        Rectangle {
+            height: 1
+            visible: mainWindow.menuBar !== null
             color: Cpp_ThemeManager.toolbarGradient2
 
             anchors {
+                topMargin: -1
                 top: parent.top
                 left: parent.left
                 right: parent.right
diff --git a/assets/qml/PlatformDependent/DecentMenuItem.qml b/assets/qml/PlatformDependent/DecentMenuItem.qml
index 59516d4d..7559c439 100644
--- a/assets/qml/PlatformDependent/DecentMenuItem.qml
+++ b/assets/qml/PlatformDependent/DecentMenuItem.qml
@@ -51,7 +51,7 @@ MenuItem {
             Layout.fillWidth: true
             elide: Label.ElideRight
             verticalAlignment: Qt.AlignVCenter
-            color: root.highlighted ? Cpp_ThemeManager.highlightedText : Cpp_ThemeManager.menubarText
+            color: root.highlighted ? Cpp_ThemeManager.highlightedText : palette.text
         }
 
         Item {
@@ -63,7 +63,7 @@ MenuItem {
             opacity: 0.8
             text: _shortcut.nativeText
             verticalAlignment: Qt.AlignVCenter
-            color: root.highlighted ? Cpp_ThemeManager.highlightedText : Cpp_ThemeManager.menubarText
+            color: root.highlighted ? Cpp_ThemeManager.highlightedText : palette.text
         }
     }
 }
diff --git a/assets/qml/PlatformDependent/Menubar.qml b/assets/qml/PlatformDependent/Menubar.qml
index 8b20660c..9b7541f7 100644
--- a/assets/qml/PlatformDependent/Menubar.qml
+++ b/assets/qml/PlatformDependent/Menubar.qml
@@ -44,6 +44,14 @@ MenuBar {
         }
     }
 
+    //
+    // Palette
+    //
+    palette.text: Cpp_ThemeManager.menubarText
+    palette.base: Cpp_ThemeManager.menubarGradient2
+    palette.window: Cpp_ThemeManager.menubarGradient1
+    palette.highlightedText: Cpp_ThemeManager.highlightedText
+
     //
     // File menu
     //
diff --git a/assets/themes/0_Dark.json b/assets/themes/0_Dark.json
index c62c208b..7ef66e85 100644
--- a/assets/themes/0_Dark.json
+++ b/assets/themes/0_Dark.json
@@ -1,5 +1,5 @@
 {
-   "name":"Dark",
+   "name":"Classic",
    "author":"Alex Spataru",
    "colors":{
       "base":"#21373f",
diff --git a/assets/themes/1_Light.json b/assets/themes/1_Light.json
index 05e485d5..bbbaca76 100644
--- a/assets/themes/1_Light.json
+++ b/assets/themes/1_Light.json
@@ -1,5 +1,5 @@
 {
-   "name":"Light",
+   "name":"MathWorks",
    "author":"Alex Spataru",
    "colors":{
       "base":"#fafafa",
diff --git a/assets/themes/2_Noir.json b/assets/themes/2_Noir.json
index cee6a768..584408e8 100644
--- a/assets/themes/2_Noir.json
+++ b/assets/themes/2_Noir.json
@@ -17,14 +17,14 @@
       "highlightedText":"#ffffff",
       "highlightedTextAlternative":"#666666",
       "placeholderText":"#666666",
-      "toolbarGradient2":"#323030",
-      "toolbarGradient1":"#292929",
+      "toolbarGradient1":"#323030",
+      "toolbarGradient2":"#292929",
       "menubarGradient1":"#323030",
       "menubarGradient2":"#323030",
       "menubarText":"#ffffff",
       "dialogBackground":"#f2f2f2",
-      "consoleText":"#657a83",
-      "consoleBase":"#fdf6e3",
+      "consoleText":"#424242",
+      "consoleBase":"#f2f2f2",
       "consoleButton":"#fafafa",
       "consoleWindow":"#1c1c1c",
       "consoleHighlight":"#1e7cf3",