diff --git a/assets/qml/Dashboard/WidgetDelegate.qml b/assets/qml/Dashboard/WidgetDelegate.qml
index c10e7a9f..81fbcc78 100644
--- a/assets/qml/Dashboard/WidgetDelegate.qml
+++ b/assets/qml/Dashboard/WidgetDelegate.qml
@@ -72,11 +72,11 @@ Item {
             minimumWidth: 640 + shadowMargin
             minimumHeight: 480 + shadowMargin
             title: externalWidget.widgetTitle
-            extraFlags: Qt.WindowStaysOnTopHint
             titlebarText: Cpp_ThemeManager.text
             titlebarColor: Cpp_ThemeManager.widgetWindowBackground
             backgroundColor: Cpp_ThemeManager.widgetWindowBackground
             borderColor: isMaximized ? backgroundColor : Cpp_ThemeManager.highlight
+            extraFlags: Qt.WindowStaysOnTopHint | Qt.Dialog | Qt.WindowCloseButtonHint | Qt.WindowTitleHint
 
             Timer {
                 id: timer
diff --git a/assets/qml/FramelessWindow/CustomWindow.qml b/assets/qml/FramelessWindow/CustomWindow.qml
index 63588322..fe6b225f 100644
--- a/assets/qml/FramelessWindow/CustomWindow.qml
+++ b/assets/qml/FramelessWindow/CustomWindow.qml
@@ -49,6 +49,10 @@ QtWindow.Window {
                 root.flags = root.customFlags | root.extraFlags
             else
                 root.flags = Qt.Window | root.extraFlags
+
+            var prevVisible = root.visible
+            root.visible = false
+            root.visible = prevVisible
         }
     }
 
diff --git a/assets/qml/Panes/Console.qml b/assets/qml/Panes/Console.qml
index 0b8bfe5c..7297bd1c 100644
--- a/assets/qml/Panes/Console.qml
+++ b/assets/qml/Panes/Console.qml
@@ -65,14 +65,6 @@ Item {
         }
     }
 
-    //
-    // Remove selection
-    //
-    Shortcut {
-        sequence: "escape"
-        onActivated: textEdit.clearSelection()
-    }
-
     //
     // Window shadow (must go before window declaration
     // to avoid blurry artifacts & glitches).
diff --git a/assets/qml/Windows/About.qml b/assets/qml/Windows/About.qml
index 65048c82..95a8f7b3 100644
--- a/assets/qml/Windows/About.qml
+++ b/assets/qml/Windows/About.qml
@@ -41,11 +41,11 @@ FramelessWindow.CustomWindow {
     title: qsTr("About")
     width: minimumWidth
     height: minimumHeight
-    extraFlags: Qt.WindowStaysOnTopHint
     x: (Screen.desktopAvailableWidth - width) / 2
     y: (Screen.desktopAvailableHeight - height) / 2
     minimumWidth: column.implicitWidth + 4 * app.spacing + 2 * root.shadowMargin
     maximumWidth: column.implicitWidth + 4 * app.spacing + 2 * root.shadowMargin
+    extraFlags: Qt.WindowStaysOnTopHint | Qt.Dialog | Qt.WindowCloseButtonHint | Qt.WindowTitleHint
     minimumHeight: column.implicitHeight + 4 * app.spacing + titlebar.height + 2 * root.shadowMargin
     maximumHeight: column.implicitHeight + 4 * app.spacing + titlebar.height + 2 * root.shadowMargin
 
diff --git a/assets/qml/Windows/Acknowledgements.qml b/assets/qml/Windows/Acknowledgements.qml
index 16e30a80..cab0e567 100644
--- a/assets/qml/Windows/Acknowledgements.qml
+++ b/assets/qml/Windows/Acknowledgements.qml
@@ -38,7 +38,6 @@ FramelessWindow.CustomWindow {
     minimizeEnabled: false
     maximizeEnabled: false
     title: qsTr("Acknowledgements")
-    extraFlags: Qt.WindowStaysOnTopHint
     titlebarText: Cpp_ThemeManager.text
     x: (Screen.desktopAvailableWidth - width) / 2
     y: (Screen.desktopAvailableHeight - height) / 2
@@ -46,6 +45,7 @@ FramelessWindow.CustomWindow {
     backgroundColor: Cpp_ThemeManager.dialogBackground
     minimumWidth: column.implicitWidth + 4 * app.spacing + 2 * root.shadowMargin
     maximumWidth: column.implicitWidth + 4 * app.spacing + 2 * root.shadowMargin
+    extraFlags: Qt.WindowStaysOnTopHint | Qt.Dialog | Qt.WindowCloseButtonHint | Qt.WindowTitleHint
     minimumHeight: column.implicitHeight + 4 * app.spacing + titlebar.height + 2 * root.shadowMargin
     maximumHeight: column.implicitHeight + 4 * app.spacing + titlebar.height + 2 * root.shadowMargin
 
diff --git a/assets/qml/Windows/CsvPlayer.qml b/assets/qml/Windows/CsvPlayer.qml
index db972796..c7686208 100644
--- a/assets/qml/Windows/CsvPlayer.qml
+++ b/assets/qml/Windows/CsvPlayer.qml
@@ -38,7 +38,6 @@ FramelessWindow.CustomWindow {
     minimizeEnabled: false
     maximizeEnabled: false
     title: qsTr("CSV Player")
-    extraFlags: Qt.WindowStaysOnTopHint
     titlebarText: Cpp_ThemeManager.text
     x: (Screen.desktopAvailableWidth - width) / 2
     y: (Screen.desktopAvailableHeight - height) / 2
@@ -46,6 +45,7 @@ FramelessWindow.CustomWindow {
     backgroundColor: Cpp_ThemeManager.dialogBackground
     minimumWidth: column.implicitWidth + 4 * app.spacing + 2 * root.shadowMargin
     maximumWidth: column.implicitWidth + 4 * app.spacing + 2 * root.shadowMargin
+    extraFlags: Qt.WindowStaysOnTopHint | Qt.Dialog | Qt.WindowCloseButtonHint | Qt.WindowTitleHint
     minimumHeight: column.implicitHeight + 4 * app.spacing + titlebar.height + 2 * root.shadowMargin
     maximumHeight: column.implicitHeight + 4 * app.spacing + titlebar.height + 2 * root.shadowMargin
 
diff --git a/assets/qml/Windows/Donate.qml b/assets/qml/Windows/Donate.qml
index 3cc279f0..65c7de25 100644
--- a/assets/qml/Windows/Donate.qml
+++ b/assets/qml/Windows/Donate.qml
@@ -39,7 +39,6 @@ FramelessWindow.CustomWindow {
     height: minimumHeight
     minimizeEnabled: false
     maximizeEnabled: false
-    extraFlags: Qt.WindowStaysOnTopHint
     titlebarText: Cpp_ThemeManager.text
     x: (Screen.desktopAvailableWidth - width) / 2
     y: (Screen.desktopAvailableHeight - height) / 2
@@ -47,6 +46,7 @@ FramelessWindow.CustomWindow {
     backgroundColor: Cpp_ThemeManager.dialogBackground
     minimumWidth: column.implicitWidth + 4 * app.spacing + 2 * root.shadowMargin
     maximumWidth: column.implicitWidth + 4 * app.spacing + 2 * root.shadowMargin
+    extraFlags: Qt.WindowStaysOnTopHint | Qt.Dialog | Qt.WindowCloseButtonHint | Qt.WindowTitleHint
     minimumHeight: column.implicitHeight + 4 * app.spacing + titlebar.height + 2 * root.shadowMargin
     maximumHeight: column.implicitHeight + 4 * app.spacing + titlebar.height + 2 * root.shadowMargin
 
diff --git a/assets/qml/Windows/MQTTConfiguration.qml b/assets/qml/Windows/MQTTConfiguration.qml
index a325c07e..fafa9358 100644
--- a/assets/qml/Windows/MQTTConfiguration.qml
+++ b/assets/qml/Windows/MQTTConfiguration.qml
@@ -43,11 +43,11 @@ FramelessWindow.CustomWindow {
     width: minimumWidth
     height: minimumHeight
     title: qsTr("MQTT Configuration")
-    extraFlags: Qt.WindowStaysOnTopHint
     x: (Screen.desktopAvailableWidth - width) / 2
     y: (Screen.desktopAvailableHeight - height) / 2
     minimumWidth: column.implicitWidth + 4 * app.spacing + 2 * root.shadowMargin
     maximumWidth: column.implicitWidth + 4 * app.spacing + 2 * root.shadowMargin
+    extraFlags: Qt.WindowStaysOnTopHint | Qt.Dialog | Qt.WindowCloseButtonHint | Qt.WindowTitleHint
     minimumHeight: column.implicitHeight + 4 * app.spacing + titlebar.height + 2 * root.shadowMargin
     maximumHeight: column.implicitHeight + 4 * app.spacing + titlebar.height + 2 * root.shadowMargin
 
diff --git a/assets/themes/3_Mainframe.json b/assets/themes/3_Mainframe.json
index 0d9eed20..a8c1e47c 100644
--- a/assets/themes/3_Mainframe.json
+++ b/assets/themes/3_Mainframe.json
@@ -1,5 +1,5 @@
 {
-   "name":"Mainframe",
+   "name":"Midnight",
    "author":"Alex Spataru",
    "titlebarSeparator":false,
    "colors":{
@@ -41,26 +41,24 @@
       "connectButtonChecked":"#fc5142",
       "connectButtonUnchecked":"#2eed5c",
       "mqttButton":"#eda870",
-      "widgetTextPrimary":"#24476a",
-      "widgetTextSecondary":"#666666",
+      "widgetTextPrimary":"#f1bd92",
+      "widgetTextSecondary":"#517497",
       "widgetWindowBackground":"#484f62",
       "widgetWindowBorder":"#b7878d",
-      "widgetForegroundPrimary":"#f94144",
-      "widgetForegroundSecondary":"#666666",
-      "widgetIndicator":"#444444",
-      "widgetControlBackground":"#666666",
+      "widgetForegroundPrimary":"#f1bd92",
+      "widgetForegroundSecondary":"#517497",
+      "widgetIndicator":"#ffffff",
       "widgetColors":[
-         "#1f76b4",
-         "#ff7f0f",
-         "#2aa02b",
-         "#d62628",
-         "#9467bd",
-         "#8c564c",
-         "#e377c1",
-         "#7f7f7f",
-         "#bcbd21",
-         "#19bdcf",
-         "#1955fe"
+         "#fa8174",
+         "#bfbbd9",
+         "#80b1d2",
+         "#fdffb4",
+         "#fdb462",
+         "#8dd3c7",
+         "#b3dd69",
+         "#feed6f",
+         "#bc81bc",
+         "#cceac4"
       ]
    }
 }