Rework themes to easily use light/dark palette, using only different icons

- Renamed themes:
  - "colorful" to "default" and "colorful_dark" to "default_dark"
  - "default" to "monochrome" and "default_dark" to "monochrome_dark"
  - "colorful_midnight_blue" to "qdarkstyle_midnight_blue"
  - "qdarkstyle_midnight_blue" to "qdarkstyle_midnight_blue_monochrome"
  - qdarkstyle is renamed from "Dark" to "Mine Shaft" in the UI
- default and monochrome themes all use the same qss stylesheet
- Remove the ability to select "default_dark" directly
    - Default has better support for light and dark
    - Controller and Keyboard applets icons and style adapt to dark mode
- Add "qdarkstyle_monochrome" theme
- Remove duplicated icon files

.reuse/dep5

@@ -5,10 +5,13 @@ Comment: It is best to use this file to record copyright information about
 Files: dist/english_plurals/*
        dist/icons/controller/*.png
        dist/icons/overlay/*.png
+       dist/icons/overlay_dark/*.png
        dist/languages/*
        dist/qt_themes/*/icons/48x48/sd_card.png
        dist/qt_themes/*/icons/index.theme
        dist/qt_themes/default/style.qss
+       dist/qt_themes/*/icons.qrc
+       dist/qt_themes/*/style.qrc
 Copyright: yuzu Emulator Project
            suyu Emulator Project
 License: GPL-2.0-or-later
@@ -22,8 +25,7 @@ Copyright: suyu Emulator Project
 License: GPL-2.0-or-later
 
 Files: dist/qt_themes/qdarkstyle*/LICENSE.*
-       dist/qt_themes/qdarkstyle*/style.qrc
+       dist/qt_themes/qdarkstyle*/dark.qss
-       dist/qt_themes/qdarkstyle*/style.qss
 Copyright: 2013 Colin Duquesnoy
            2019 Daniel Cosmo Pizetta
 License: MIT
@@ -33,28 +35,28 @@ Copyright: 2013 Colin Duquesnoy
            2019 Daniel Cosmo Pizetta
 License: CC-BY-4.0
 
-Files: dist/qt_themes/default/icons/256x256/plus_folder.png
+Files: dist/qt_themes/monochrome/icons/256x256/plus_folder.png
-       dist/qt_themes/default/icons/48x48/bad_folder.png
+       dist/qt_themes/monochrome/icons/48x48/bad_folder.png
-       dist/qt_themes/default/icons/48x48/chip.png
+       dist/qt_themes/monochrome/icons/48x48/chip.png
-       dist/qt_themes/default/icons/48x48/folder.png
+       dist/qt_themes/monochrome/icons/48x48/folder.png
-       dist/qt_themes/default/icons/48x48/star.png
+       dist/qt_themes/monochrome/icons/48x48/star.png
-       dist/qt_themes/qdarkstyle/icons/256x256/plus_folder.png
+       dist/qt_themes/monochrome_dark/icons/48x48/bad_folder.png
-       dist/qt_themes/qdarkstyle/icons/48x48/bad_folder.png
+       dist/qt_themes/monochrome_dark/icons/48x48/chip.png
-       dist/qt_themes/qdarkstyle/icons/48x48/chip.png
+       dist/qt_themes/monochrome_dark/icons/48x48/folder.png
-       dist/qt_themes/qdarkstyle/icons/48x48/folder.png
+       dist/qt_themes/monochrome_dark/icons/48x48/star.png
-       dist/qt_themes/qdarkstyle/icons/48x48/star.png
+       dist/qt_themes/monochrome_dark/icons/256x256/plus_folder.png
 Copyright: Refactoring UI Inc.
 License: MIT
 Comment: https://github.com/tailwindlabs/heroicons
 
-Files: dist/qt_themes/colorful/icons/16x16/lock.png
+Files: dist/qt_themes/default/icons/16x16/lock.png
-       dist/qt_themes/colorful/icons/256x256/plus_folder.png
+       dist/qt_themes/default/icons/256x256/plus_folder.png
-       dist/qt_themes/colorful/icons/48x48/bad_folder.png
+       dist/qt_themes/default/icons/48x48/bad_folder.png
-       dist/qt_themes/colorful/icons/48x48/chip.png
+       dist/qt_themes/default/icons/48x48/chip.png
-       dist/qt_themes/colorful/icons/48x48/folder.png
+       dist/qt_themes/default/icons/48x48/folder.png
-       dist/qt_themes/colorful_dark/icons/16x16/lock.png
+       dist/qt_themes/default_dark/icons/16x16/lock.png
-       dist/qt_themes/colorful/icons/16x16/info.png
+       dist/qt_themes/default/icons/16x16/info.png
-       dist/qt_themes/colorful/icons/16x16/sync.png
+       dist/qt_themes/default/icons/16x16/sync.png
 Copyright: Icons8
 License: MIT
 Comment: https://github.com/icons8/flat-color-icons
@@ -70,15 +72,15 @@ Files: dist/qt_themes/*/icons/48x48/no_avatar.png
 Copyright: Ionic (http://ionic.io/)
 License: MIT
 
-Files: dist/qt_themes/colorful/icons/48x48/star.png
+Files: dist/qt_themes/default/icons/48x48/star.png
-       dist/qt_themes/colorful/icons/16x16/checked.png
+       dist/qt_themes/default/icons/16x16/checked.png
-       dist/qt_themes/colorful/icons/16x16/failed.png
+       dist/qt_themes/default/icons/16x16/failed.png
 Copyright: SVG Repo
 License: CC0-1.0
 
 Files: dist/qt_themes/*/icons/16x16/view-refresh.png
-       dist/qt_themes/default/icons/16x16/lock.png
+       dist/qt_themes/monochrome/icons/16x16/lock.png
-       dist/qt_themes/qdarkstyle/icons/16x16/lock.png
+       dist/qt_themes/monochrome_dark/icons/16x16/lock.png
 Copyright: Google, Inc.
 License: Apache-2.0
 

dist/icons/overlay/overlay.qrc

@@ -6,64 +6,66 @@ SPDX-License-Identifier: GPL-2.0-or-later
 <RCC>
   <qresource prefix="overlay">
     <file>arrow_left.png</file>
-    <file>arrow_left_dark.png</file>
     <file>arrow_right.png</file>
-    <file>arrow_right_dark.png</file>
     <file>button_minus.png</file>
-    <file>button_minus_dark.png</file>
     <file>button_plus.png</file>
-    <file>button_plus_dark.png</file>
     <file>button_A.png</file>
-    <file>button_A_dark.png</file>
     <file>button_B.png</file>
-    <file>button_B_dark.png</file>
     <file>button_X.png</file>
-    <file>button_X_dark.png</file>
     <file>button_Y.png</file>
-    <file>button_Y_dark.png</file>
     <file>button_L.png</file>
-    <file>button_L_dark.png</file>
     <file>button_R.png</file>
-    <file>button_R_dark.png</file>
     <file>button_press_stick.png</file>
-    <file>button_press_stick_dark.png</file>
     <file>osk_button_B.png</file>
     <file>osk_button_B_disabled.png</file>
-    <file>osk_button_B_dark.png</file>
-    <file>osk_button_B_dark_disabled.png</file>
     <file>osk_button_Y.png</file>
     <file>osk_button_Y_disabled.png</file>
-    <file>osk_button_Y_dark.png</file>
-    <file>osk_button_Y_dark_disabled.png</file>
     <file>osk_button_backspace.png</file>
-    <file>osk_button_backspace_dark.png</file>
     <file>osk_button_plus.png</file>
     <file>osk_button_plus_disabled.png</file>
-    <file>osk_button_plus_dark.png</file>
-    <file>osk_button_plus_dark_disabled.png</file>
     <file>osk_button_shift.png</file>
-    <file>osk_button_shift_dark.png</file>
     <file>osk_button_shift_on.png</file>
-    <file>osk_button_shift_on_dark.png</file>
     <file>osk_button_shift_lock_on.png</file>
     <file>osk_button_shift_lock_off.png</file>
     <file>controller_dual_joycon.png</file>
-    <file>controller_dual_joycon_dark.png</file>
     <file>controller_pro.png</file>
-    <file>controller_pro_dark.png</file>
     <file>controller_handheld.png</file>
-    <file>controller_handheld_dark.png</file>
     <file>controller_single_joycon_left.png</file>
-    <file>controller_single_joycon_left_dark.png</file>
     <file>controller_single_joycon_right.png</file>
-    <file>controller_single_joycon_right_dark.png</file>
     <file>controller_single_joycon_left_a.png</file>
-    <file>controller_single_joycon_left_a_dark.png</file>
     <file>controller_single_joycon_left_b.png</file>
-    <file>controller_single_joycon_left_b_dark.png</file>
     <file>controller_single_joycon_left_x.png</file>
-    <file>controller_single_joycon_left_x_dark.png</file>
     <file>controller_single_joycon_left_y.png</file>
-    <file>controller_single_joycon_left_y_dark.png</file>
+  </qresource>
+  <qresource prefix="overlay_dark">
+    <file alias="arrow_left.png">../overlay_dark/arrow_left.png</file>
+    <file alias="arrow_right.png">../overlay_dark/arrow_right.png</file>
+    <file alias="button_minus.png">../overlay_dark/button_minus.png</file>
+    <file alias="button_plus.png">../overlay_dark/button_plus.png</file>
+    <file alias="button_A.png">../overlay_dark/button_A.png</file>
+    <file alias="button_B.png">../overlay_dark/button_B.png</file>
+    <file alias="button_X.png">../overlay_dark/button_X.png</file>
+    <file alias="button_Y.png">../overlay_dark/button_Y.png</file>
+    <file alias="button_L.png">../overlay_dark/button_L.png</file>
+    <file alias="button_R.png">../overlay_dark/button_R.png</file>
+    <file alias="button_press_stick.png">../overlay_dark/button_press_stick.png</file>
+    <file alias="osk_button_B.png">../overlay_dark/osk_button_B.png</file>
+    <file alias="osk_button_B_disabled.png">../overlay_dark/osk_button_B.png</file>
+    <file alias="osk_button_Y.png">../overlay_dark/osk_button_Y.png</file>
+    <file alias="osk_button_Y_disabled.png">../overlay_dark/osk_button_Y.png</file>
+    <file alias="osk_button_backspace.png">../overlay_dark/osk_button_backspace.png</file>
+    <file alias="osk_button_plus.png">../overlay_dark/osk_button_plus.png</file>
+    <file alias="osk_button_plus_disabled.png">../overlay_dark/osk_button_plus.png</file>
+    <file alias="osk_button_shift.png">../overlay_dark/osk_button_shift.png</file>
+    <file alias="osk_button_shift_on.png">../overlay_dark/osk_button_shift_on.png</file>
+    <file alias="controller_dual_joycon.png">../overlay_dark/controller_dual_joycon.png</file>
+    <file alias="controller_pro.png">../overlay_dark/controller_pro.png</file>
+    <file alias="controller_handheld.png">../overlay_dark/controller_handheld.png</file>
+    <file alias="controller_single_joycon_left.png">../overlay_dark/controller_single_joycon_left.png</file>
+    <file alias="controller_single_joycon_right.png">../overlay_dark/controller_single_joycon_right.png</file>
+    <file alias="controller_single_joycon_left_a.png">../overlay_dark/controller_single_joycon_left_a.png</file>
+    <file alias="controller_single_joycon_left_b.png">../overlay_dark/controller_single_joycon_left_b.png</file>
+    <file alias="controller_single_joycon_left_x.png">../overlay_dark/controller_single_joycon_left_x.png</file>
+    <file alias="controller_single_joycon_left_y.png">../overlay_dark/controller_single_joycon_left_y.png</file>
   </qresource>
 </RCC>

dist/qt_themes/colorful/style.qrc

@@ -1,30 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2019 yuzu Emulator Project
-SPDX-License-Identifier: GPL-2.0-or-later
--->
-
-<RCC>
-    <qresource prefix="icons/colorful">
-        <file alias="index.theme">icons/index.theme</file>
-        <file alias="16x16/checked.png">icons/16x16/checked.png</file>
-        <file alias="16x16/connected.png">icons/16x16/connected.png</file>
-        <file alias="16x16/connected_notification.png">icons/16x16/connected_notification.png</file>
-        <file alias="16x16/disconnected.png">icons/16x16/disconnected.png</file>
-        <file alias="16x16/failed.png">icons/16x16/failed.png</file>
-        <file alias="16x16/info.png">icons/16x16/info.png</file>
-        <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-        <file alias="16x16/sync.png">icons/16x16/sync.png</file>
-        <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
-        <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
-        <file alias="48x48/chip.png">icons/48x48/chip.png</file>
-        <file alias="48x48/folder.png">icons/48x48/folder.png</file>
-        <file alias="48x48/list-add.png">icons/48x48/list-add.png</file>
-        <file alias="48x48/no_avatar.png">icons/48x48/no_avatar.png</file>
-        <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
-        <file alias="48x48/star.png">icons/48x48/star.png</file>
-        <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
-    </qresource>
-    <qresource prefix="colorful">
-        <file alias="style.qss">../default/style.qss</file>
-    </qresource>
-</RCC>

dist/qt_themes/colorful_dark/icons/index.theme

@@ -1,8 +0,0 @@
-[Icon Theme]
-Name=colorful_dark
-Comment=Colorful theme (Dark style)
-Inherits=colorful
-Directories=16x16
-
-[16x16]
-Size=16

dist/qt_themes/colorful_dark/style.qrc

@@ -1,57 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2019 yuzu Emulator Project
-SPDX-License-Identifier: GPL-2.0-or-later
--->
-
-<RCC>
-    <qresource prefix="icons/colorful_dark">
-        <file alias="index.theme">icons/index.theme</file>
-        <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-        <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
-    </qresource>
-
-    <qresource prefix="qss_icons">
-        <file alias="rc/up_arrow_disabled.png">../qdarkstyle/rc/up_arrow_disabled.png</file>
-        <file alias="rc/Hmovetoolbar.png">../qdarkstyle/rc/Hmovetoolbar.png</file>
-        <file alias="rc/stylesheet-branch-end.png">../qdarkstyle/rc/stylesheet-branch-end.png</file>
-        <file alias="rc/branch_closed-on.png">../qdarkstyle/rc/branch_closed-on.png</file>
-        <file alias="rc/stylesheet-vline.png">../qdarkstyle/rc/stylesheet-vline.png</file>
-        <file alias="rc/branch_closed.png">../qdarkstyle/rc/branch_closed.png</file>
-        <file alias="rc/branch_open-on.png">../qdarkstyle/rc/branch_open-on.png</file>
-        <file alias="rc/transparent.png">../qdarkstyle/rc/transparent.png</file>
-        <file alias="rc/right_arrow_disabled.png">../qdarkstyle/rc/right_arrow_disabled.png</file>
-        <file alias="rc/sizegrip.png">../qdarkstyle/rc/sizegrip.png</file>
-        <file alias="rc/close.png">../qdarkstyle/rc/close.png</file>
-        <file alias="rc/close-hover.png">../qdarkstyle/rc/close-hover.png</file>
-        <file alias="rc/close-pressed.png">../qdarkstyle/rc/close-pressed.png</file>
-        <file alias="rc/down_arrow.png">../qdarkstyle/rc/down_arrow.png</file>
-        <file alias="rc/Vmovetoolbar.png">../qdarkstyle/rc/Vmovetoolbar.png</file>
-        <file alias="rc/left_arrow.png">../qdarkstyle/rc/left_arrow.png</file>
-        <file alias="rc/stylesheet-branch-more.png">../qdarkstyle/rc/stylesheet-branch-more.png</file>
-        <file alias="rc/up_arrow.png">../qdarkstyle/rc/up_arrow.png</file>
-        <file alias="rc/right_arrow.png">../qdarkstyle/rc/right_arrow.png</file>
-        <file alias="rc/left_arrow_disabled.png">../qdarkstyle/rc/left_arrow_disabled.png</file>
-        <file alias="rc/Hsepartoolbar.png">../qdarkstyle/rc/Hsepartoolbar.png</file>
-        <file alias="rc/branch_open.png">../qdarkstyle/rc/branch_open.png</file>
-        <file alias="rc/Vsepartoolbar.png">../qdarkstyle/rc/Vsepartoolbar.png</file>
-        <file alias="rc/down_arrow_disabled.png">../qdarkstyle/rc/down_arrow_disabled.png</file>
-        <file alias="rc/undock.png">../qdarkstyle/rc/undock.png</file>
-        <file alias="rc/checkbox_checked_disabled.png">../qdarkstyle/rc/checkbox_checked_disabled.png</file>
-        <file alias="rc/checkbox_checked_focus.png">../qdarkstyle/rc/checkbox_checked_focus.png</file>
-        <file alias="rc/checkbox_checked.png">../qdarkstyle/rc/checkbox_checked.png</file>
-        <file alias="rc/checkbox_indeterminate.png">../qdarkstyle/rc/checkbox_indeterminate.png</file>
-        <file alias="rc/checkbox_indeterminate_focus.png">../qdarkstyle/rc/checkbox_indeterminate_focus.png</file>
-        <file alias="rc/checkbox_unchecked_disabled.png">../qdarkstyle/rc/checkbox_unchecked_disabled.png</file>
-        <file alias="rc/checkbox_unchecked_focus.png">../qdarkstyle/rc/checkbox_unchecked_focus.png</file>
-        <file alias="rc/checkbox_unchecked.png">../qdarkstyle/rc/checkbox_unchecked.png</file>
-        <file alias="rc/radio_checked_disabled.png">../qdarkstyle/rc/radio_checked_disabled.png</file>
-        <file alias="rc/radio_checked_focus.png">../qdarkstyle/rc/radio_checked_focus.png</file>
-        <file alias="rc/radio_checked.png">../qdarkstyle/rc/radio_checked.png</file>
-        <file alias="rc/radio_unchecked_disabled.png">../qdarkstyle/rc/radio_unchecked_disabled.png</file>
-        <file alias="rc/radio_unchecked_focus.png">../qdarkstyle/rc/radio_unchecked_focus.png</file>
-        <file alias="rc/radio_unchecked.png">../qdarkstyle/rc/radio_unchecked.png</file>
-    </qresource>
-    <qresource prefix="colorful_dark">
-        <file alias="style.qss">../qdarkstyle/style.qss</file>
-    </qresource>
-</RCC>

dist/qt_themes/colorful_midnight_blue/icons/index.theme

@@ -1,8 +0,0 @@
-[Icon Theme]
-Name=colorful_midnight_blue
-Comment=Colorful theme (Midnight Blue style)
-Inherits=colorful
-Directories=16x16
-
-[16x16]
-Size=16

dist/qt_themes/colorful_midnight_blue/style.qrc

@@ -1,63 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2020 yuzu Emulator Project
-SPDX-License-Identifier: GPL-2.0-or-later
--->
-
-<RCC>
-    <qresource prefix="icons/colorful_midnight_blue">
-        <file alias="index.theme">icons/index.theme</file>
-        <file alias="16x16/lock.png">../colorful_dark/icons/16x16/lock.png</file>
-        <file alias="16x16/view-refresh.png">../qdarkstyle/icons/16x16/view-refresh.png</file>
-        <file alias="48x48/bad_folder.png">../colorful/icons/48x48/bad_folder.png</file>
-        <file alias="48x48/chip.png">../colorful/icons/48x48/chip.png</file>
-        <file alias="48x48/folder.png">../colorful/icons/48x48/folder.png</file>
-        <file alias="48x48/list-add.png">../colorful/icons/48x48/list-add.png</file>
-        <file alias="48x48/sd_card.png">../colorful/icons/48x48/sd_card.png</file>
-        <file alias="256x256/plus_folder.png">../colorful/icons/256x256/plus_folder.png</file>
-    </qresource>
-
-    <qresource prefix="qss_icons">
-        <file alias="rc/up_arrow_disabled.png">../qdarkstyle_midnight_blue/rc/up_arrow_disabled.png</file>
-        <file alias="rc/Hmovetoolbar.png">../qdarkstyle_midnight_blue/rc/Hmovetoolbar.png</file>
-        <file alias="rc/stylesheet-branch-end.png">../qdarkstyle_midnight_blue/rc/stylesheet-branch-end.png</file>
-        <file alias="rc/branch_closed-on.png">../qdarkstyle_midnight_blue/rc/branch_closed-on.png</file>
-        <file alias="rc/stylesheet-vline.png">../qdarkstyle_midnight_blue/rc/stylesheet-vline.png</file>
-        <file alias="rc/branch_closed.png">../qdarkstyle_midnight_blue/rc/branch_closed.png</file>
-        <file alias="rc/branch_open-on.png">../qdarkstyle_midnight_blue/rc/branch_open-on.png</file>
-        <file alias="rc/transparent.png">../qdarkstyle_midnight_blue/rc/transparent.png</file>
-        <file alias="rc/right_arrow_disabled.png">../qdarkstyle_midnight_blue/rc/right_arrow_disabled.png</file>
-        <file alias="rc/sizegrip.png">../qdarkstyle_midnight_blue/rc/sizegrip.png</file>
-        <file alias="rc/close.png">../qdarkstyle_midnight_blue/rc/close.png</file>
-        <file alias="rc/close-hover.png">../qdarkstyle_midnight_blue/rc/close-hover.png</file>
-        <file alias="rc/close-pressed.png">../qdarkstyle_midnight_blue/rc/close-pressed.png</file>
-        <file alias="rc/down_arrow.png">../qdarkstyle_midnight_blue/rc/down_arrow.png</file>
-        <file alias="rc/Vmovetoolbar.png">../qdarkstyle_midnight_blue/rc/Vmovetoolbar.png</file>
-        <file alias="rc/left_arrow.png">../qdarkstyle_midnight_blue/rc/left_arrow.png</file>
-        <file alias="rc/stylesheet-branch-more.png">../qdarkstyle_midnight_blue/rc/stylesheet-branch-more.png</file>
-        <file alias="rc/up_arrow.png">../qdarkstyle_midnight_blue/rc/up_arrow.png</file>
-        <file alias="rc/right_arrow.png">../qdarkstyle_midnight_blue/rc/right_arrow.png</file>
-        <file alias="rc/left_arrow_disabled.png">../qdarkstyle_midnight_blue/rc/left_arrow_disabled.png</file>
-        <file alias="rc/Hsepartoolbar.png">../qdarkstyle_midnight_blue/rc/Hsepartoolbar.png</file>
-        <file alias="rc/branch_open.png">../qdarkstyle_midnight_blue/rc/branch_open.png</file>
-        <file alias="rc/Vsepartoolbar.png">../qdarkstyle_midnight_blue/rc/Vsepartoolbar.png</file>
-        <file alias="rc/down_arrow_disabled.png">../qdarkstyle_midnight_blue/rc/down_arrow_disabled.png</file>
-        <file alias="rc/undock.png">../qdarkstyle_midnight_blue/rc/undock.png</file>
-        <file alias="rc/checkbox_checked_disabled.png">../qdarkstyle_midnight_blue/rc/checkbox_checked_disabled.png</file>
-        <file alias="rc/checkbox_checked_focus.png">../qdarkstyle_midnight_blue/rc/checkbox_checked_focus.png</file>
-        <file alias="rc/checkbox_checked.png">../qdarkstyle_midnight_blue/rc/checkbox_checked.png</file>
-        <file alias="rc/checkbox_indeterminate.png">../qdarkstyle_midnight_blue/rc/checkbox_indeterminate.png</file>
-        <file alias="rc/checkbox_indeterminate_focus.png">../qdarkstyle_midnight_blue/rc/checkbox_indeterminate_focus.png</file>
-        <file alias="rc/checkbox_unchecked_disabled.png">../qdarkstyle_midnight_blue/rc/checkbox_unchecked_disabled.png</file>
-        <file alias="rc/checkbox_unchecked_focus.png">../qdarkstyle_midnight_blue/rc/checkbox_unchecked_focus.png</file>
-        <file alias="rc/checkbox_unchecked.png">../qdarkstyle_midnight_blue/rc/checkbox_unchecked.png</file>
-        <file alias="rc/radio_checked_disabled.png">../qdarkstyle_midnight_blue/rc/radio_checked_disabled.png</file>
-        <file alias="rc/radio_checked_focus.png">../qdarkstyle_midnight_blue/rc/radio_checked_focus.png</file>
-        <file alias="rc/radio_checked.png">../qdarkstyle_midnight_blue/rc/radio_checked.png</file>
-        <file alias="rc/radio_unchecked_disabled.png">../qdarkstyle_midnight_blue/rc/radio_unchecked_disabled.png</file>
-        <file alias="rc/radio_unchecked_focus.png">../qdarkstyle_midnight_blue/rc/radio_unchecked_focus.png</file>
-        <file alias="rc/radio_unchecked.png">../qdarkstyle_midnight_blue/rc/radio_unchecked.png</file>
-    </qresource>
-    <qresource prefix="colorful_midnight_blue">
-        <file alias="style.qss">../qdarkstyle_midnight_blue/style.qss</file>
-    </qresource>
-</RCC>

dist/qt_themes/default/default.qrc

@@ -4,23 +4,37 @@ SPDX-License-Identifier: GPL-2.0-or-later
 -->
 
 <RCC>
+    <!-- Default style -->
+    <qresource prefix="default">
+        <file>style.qss</file>
+    </qresource>
+
+    <!-- Default icons -->
     <qresource prefix="icons/default">
-        <!-- "colorful" is now the default theme, add new icons there -->
         <file alias="index.theme">icons/index.theme</file>
         <file alias="16x16/connected.png">icons/16x16/connected.png</file>
         <file alias="16x16/connected_notification.png">icons/16x16/connected_notification.png</file>
         <file alias="16x16/disconnected.png">icons/16x16/disconnected.png</file>
+        <file alias="16x16/failed.png">icons/16x16/failed.png</file>
+        <file alias="16x16/info.png">icons/16x16/info.png</file>
         <file alias="16x16/lock.png">icons/16x16/lock.png</file>
+        <file alias="16x16/sync.png">icons/16x16/sync.png</file>
+        <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
         <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
         <file alias="48x48/chip.png">icons/48x48/chip.png</file>
         <file alias="48x48/folder.png">icons/48x48/folder.png</file>
         <file alias="48x48/list-add.png">icons/48x48/list-add.png</file>
+        <file alias="48x48/no_avatar.png">icons/48x48/no_avatar.png</file>
         <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
         <file alias="48x48/star.png">icons/48x48/star.png</file>
         <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
         <file alias="256x256/suyu.png">icons/256x256/suyu.png</file>
     </qresource>
-    <qresource prefix="default">
+
-        <file>style.qss</file>
+    <!-- Dark variant icons -->
+    <qresource prefix="icons/default_dark">
+        <file alias="index.theme">../default_dark/icons/index.theme</file>
+        <file alias="16x16/lock.png">../default_dark/icons/16x16/lock.png</file>
+        <file alias="16x16/view-refresh.png">../default_dark/icons/16x16/view-refresh.png</file>
     </qresource>
 </RCC>

dist/qt_themes/default/icons/index.theme

@@ -1,7 +1,6 @@
 [Icon Theme]
 Name=default
-Comment=default theme
+Comment=Colorful theme
-Inherits=colorful
 Directories=16x16,48x48,256x256
  
 [16x16]

dist/qt_themes/default/style.qss

@@ -22,7 +22,7 @@ QPushButton#TogglableStatusBarButton {
 }
 
 QPushButton#TogglableStatusBarButton:checked {
-    color: #000000;
+    color: palette(text);
 }
 
 QPushButton#TogglableStatusBarButton:hover {
@@ -49,6 +49,10 @@ QPushButton#RendererStatusBarButton:!checked {
     color: #0066ff;
 }
 
+QPushButton#RendererStatusBarButton:!checked[dark=true] {
+    color: #00ccdd;
+}
+
 QPushButton#GPUStatusBarButton {
     color: #656565;
     border: 1px solid transparent;
@@ -65,13 +69,21 @@ QPushButton#GPUStatusBarButton:checked {
     color: #b06020;
 }
 
+QPushButton#GPUStatusBarButton:checked[dark=true] {
+    color: #ff8040;
+}
+
 QPushButton#GPUStatusBarButton:!checked {
     color: #109010;
 }
 
+QPushButton#GPUStatusBarButton:!checked[dark=true] {
+    color: #40dd40;
+}
+
 QPushButton#DockingStatusBarButton {
     min-width: 0px;
-    color: #000000;
+    color: palette(text);
     border: 1px solid transparent;
     background-color: transparent;
     padding: 0px 3px 0px 3px;
@@ -131,10 +143,6 @@ QWidget#connectedControllers {
     background: transparent;
 }
 
-QWidget#closeButtons {
-    background: transparent;
-}
-
 QWidget#playersSupported,
 QWidget#controllersSupported,
 QWidget#controllerSupported1,
@@ -383,7 +391,7 @@ QStackedWidget#stackedDialog QTextBrowser QScrollBar::vertical {
     border-radius: 4px;
 }
 
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::horizoncal {
+QStackedWidget#stackedDialog QTextBrowser QScrollBar::horizontal {
     background: #cdcdcd;
     height: 15px;
     margin: 3px 15px 3px 15px;
@@ -592,42 +600,6 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed {
     border-radius: 6px;
 }
 
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-    image: url(:/overlay/osk_button_B.png);
-    image-position: right;
-    qproperty-icon: url(:/overlay/osk_button_backspace.png);
-    qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-    image: url(:/overlay/osk_button_Y.png);
-    image-position: right;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
-    image: url(:/overlay/osk_button_plus.png);
-    image-position: right;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift {
-    image: url(:/overlay/osk_button_shift_lock_off.png);
-    image-position: left;
-    qproperty-icon: url(:/overlay/osk_button_shift.png);
-    qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift {
-    image: url(:/overlay/osk_button_shift_lock_off.png);
-    image-position: left;
-    qproperty-icon: url(:/overlay/osk_button_shift_on.png);
-    qproperty-iconSize: 36px;
-}
-
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_bracket,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_right_bracket,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_parenthesis,
@@ -640,47 +612,6 @@ QDialog#QtSoftwareKeyboardDialog QWidget#titleOSK QLabel {
     color: #ccc;
 }
 
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_num {
-    image: url(:/overlay/button_L.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_num {
-    image: url(:/overlay/arrow_left.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_num {
-    image: url(:/overlay/button_R.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_num {
-    image: url(:/overlay/arrow_right.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick_shift {
-    image: url(:/overlay/button_press_stick.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_num {
-    image: url(:/overlay/button_X.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_num {
-    image: url(:/overlay/button_A.png);
-}
-
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled,
@@ -711,20 +642,3 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_0:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled {
     color: palette(midlight);
 }
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled {
-    image: url(:/overlay/osk_button_plus_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-    image: url(:/overlay/osk_button_B_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled {
-    image: url(:/overlay/osk_button_Y_disabled.png);
-}

dist/qt_themes/default_dark/icons/index.theme

@@ -1,7 +1,7 @@
 [Icon Theme]
 Name=default_dark
 Comment=Colorful theme (Dark style)
-Inherits=colorful
+Inherits=default
 Directories=16x16
 
 [16x16]

dist/qt_themes/default_dark/style.qrc

@@ -1,25 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2022 yuzu Emulator Project
-SPDX-License-Identifier: GPL-2.0-or-later
--->
-<RCC>
-    <qresource prefix="icons/default_dark">
-        <file alias="16x16/connected.png">../colorful/icons/16x16/connected.png</file>
-        <file alias="16x16/connected_notification.png">../colorful/icons/16x16/connected_notification.png</file>
-        <file alias="16x16/disconnected.png">../colorful/icons/16x16/disconnected.png</file>
-        <file alias="index.theme">icons/index.theme</file>
-        <file alias="16x16/lock.png">../colorful_dark/icons/16x16/lock.png</file>
-        <file alias="16x16/view-refresh.png">../colorful_dark/icons/16x16/view-refresh.png</file>
-        <file alias="48x48/bad_folder.png">../colorful/icons/48x48/bad_folder.png</file>
-        <file alias="48x48/chip.png">../colorful/icons/48x48/chip.png</file>
-        <file alias="48x48/folder.png">../colorful/icons/48x48/folder.png</file>
-        <file alias="48x48/no_avatar.png">../qdarkstyle/icons/48x48/no_avatar.png</file>
-        <file alias="48x48/list-add.png">../colorful/icons/48x48/list-add.png</file>
-        <file alias="48x48/sd_card.png">../colorful/icons/48x48/sd_card.png</file>
-        <file alias="256x256/plus_folder.png">../colorful/icons/256x256/plus_folder.png</file>
-    </qresource>
-
-    <qresource prefix="default_dark">
-        <file>style.qss</file>
-    </qresource>
-</RCC>

dist/qt_themes/default_dark/style.qss

@@ -1,687 +0,0 @@
-/*
-* SPDX-FileCopyrightText: 2018 yuzu Emulator Project
-* SPDX-License-Identifier: GPL-2.0-or-later
-*/
-QAbstractSpinBox {
-    min-height: 19px;
-}
-
-QPushButton#TogglableStatusBarButton {
-    color: #959595;
-    border: 1px solid transparent;
-    background-color: transparent;
-    padding: 0px 3px 0px 3px;
-    text-align: center;
-}
-
-QPushButton#TogglableStatusBarButton:checked {
-    color: palette(text);
-}
-
-QPushButton#TogglableStatusBarButton:hover {
-    border: 1px solid #76797C;
-}
-
-QPushButton#RendererStatusBarButton {
-    color: #656565;
-    border: 1px solid transparent;
-    background-color: transparent;
-    padding: 0px 3px 0px 3px;
-    text-align: center;
-}
-
-QPushButton#RendererStatusBarButton:hover {
-    border: 1px solid #76797C;
-}
-
-QPushButton#RendererStatusBarButton:checked {
-    color: #e85c00;
-}
-
-QPushButton#RendererStatusBarButton:!checked {
-    color: #00ccdd;
-}
-
-QPushButton#GPUStatusBarButton {
-    color: #656565;
-    border: 1px solid transparent;
-    background-color: transparent;
-    padding: 0px 3px 0px 3px;
-    text-align: center;
-}
-
-QPushButton#GPUStatusBarButton:hover {
-    border: 1px solid #76797C;
-}
-
-QPushButton#GPUStatusBarButton:checked {
-    color: #ff8040;
-}
-
-QPushButton#GPUStatusBarButton:!checked {
-    color: #40dd40;
-}
-
-QPushButton#DockingStatusBarButton {
-    min-width: 0px;
-    color: palette(text);
-    border: 1px solid transparent;
-    background-color: transparent;
-    padding: 0px 3px 0px 3px;
-    text-align: center;
-}
-
-QPushButton#DockingStatusBarButton:hover {
-    border: 1px solid #76797C;
-}
-
-QPushButton#buttonRefreshDevices {
-    min-width: 21px;
-    min-height: 21px;
-    max-width: 21px;
-    max-height: 21px;
-}
-
-QWidget#bottomPerGameInput,
-QWidget#topControllerApplet,
-QWidget#bottomControllerApplet,
-QGroupBox#groupPlayer1Connected:checked,
-QGroupBox#groupPlayer2Connected:checked,
-QGroupBox#groupPlayer3Connected:checked,
-QGroupBox#groupPlayer4Connected:checked,
-QGroupBox#groupPlayer5Connected:checked,
-QGroupBox#groupPlayer6Connected:checked,
-QGroupBox#groupPlayer7Connected:checked,
-QGroupBox#groupPlayer8Connected:checked {
-    background-color: #f5f5f5;
-}
-
-QWidget#topControllerApplet {
-    border-bottom: 1px solid #828790
-}
-
-QWidget#bottomPerGameInput,
-QWidget#bottomControllerApplet {
-    border-top: 1px solid #828790
-}
-
-QWidget#topPerGameInput,
-QWidget#middleControllerApplet {
-    background-color: #fff;
-}
-
-QWidget#topPerGameInput QComboBox,
-QWidget#middleControllerApplet QComboBox {
-    width: 120px;
-}
-
-QWidget#connectedControllers {
-    background: transparent;
-}
-
-QWidget#playersSupported,
-QWidget#controllersSupported,
-QWidget#controllerSupported1,
-QWidget#controllerSupported2,
-QWidget#controllerSupported3,
-QWidget#controllerSupported4,
-QWidget#controllerSupported5,
-QWidget#controllerSupported6 {
-    border: none;
-    background: transparent;
-}
-
-QGroupBox#groupPlayer1Connected,
-QGroupBox#groupPlayer2Connected,
-QGroupBox#groupPlayer3Connected,
-QGroupBox#groupPlayer4Connected,
-QGroupBox#groupPlayer5Connected,
-QGroupBox#groupPlayer6Connected,
-QGroupBox#groupPlayer7Connected,
-QGroupBox#groupPlayer8Connected {
-    border: 1px solid #828790;
-    border-radius: 3px;
-    padding: 0px;
-    min-height: 98px;
-    max-height: 98px;
-}
-
-QGroupBox#groupPlayer1Connected:unchecked,
-QGroupBox#groupPlayer2Connected:unchecked,
-QGroupBox#groupPlayer3Connected:unchecked,
-QGroupBox#groupPlayer4Connected:unchecked,
-QGroupBox#groupPlayer5Connected:unchecked,
-QGroupBox#groupPlayer6Connected:unchecked,
-QGroupBox#groupPlayer7Connected:unchecked,
-QGroupBox#groupPlayer8Connected:unchecked {
-    border: 1px solid #d9d9d9;
-}
-
-QGroupBox#groupPlayer1Connected::title,
-QGroupBox#groupPlayer2Connected::title,
-QGroupBox#groupPlayer3Connected::title,
-QGroupBox#groupPlayer4Connected::title,
-QGroupBox#groupPlayer5Connected::title,
-QGroupBox#groupPlayer6Connected::title,
-QGroupBox#groupPlayer7Connected::title,
-QGroupBox#groupPlayer8Connected::title {
-    subcontrol-origin: margin;
-    subcontrol-position: top left;
-    padding-left: 0px;
-    padding-right: 0px;
-    padding-top: 1px;
-    margin-left: 0px;
-    margin-right: -4px;
-    margin-bottom: 4px;
-}
-
-QCheckBox#checkboxPlayer1Connected,
-QCheckBox#checkboxPlayer2Connected,
-QCheckBox#checkboxPlayer3Connected,
-QCheckBox#checkboxPlayer4Connected,
-QCheckBox#checkboxPlayer5Connected,
-QCheckBox#checkboxPlayer6Connected,
-QCheckBox#checkboxPlayer7Connected,
-QCheckBox#checkboxPlayer8Connected {
-    spacing: 0px;
-}
-
-QWidget#Player1LEDs QCheckBox,
-QWidget#Player2LEDs QCheckBox,
-QWidget#Player3LEDs QCheckBox,
-QWidget#Player4LEDs QCheckBox,
-QWidget#Player5LEDs QCheckBox,
-QWidget#Player6LEDs QCheckBox,
-QWidget#Player7LEDs QCheckBox,
-QWidget#Player8LEDs QCheckBox {
-    spacing: 0px;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator,
-QWidget#Player2LEDs QCheckBox::indicator,
-QWidget#Player3LEDs QCheckBox::indicator,
-QWidget#Player4LEDs QCheckBox::indicator,
-QWidget#Player5LEDs QCheckBox::indicator,
-QWidget#Player6LEDs QCheckBox::indicator,
-QWidget#Player7LEDs QCheckBox::indicator,
-QWidget#Player8LEDs QCheckBox::indicator {
-    width: 6px;
-    height: 6px;
-    margin-left: 0px;
-}
-
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer1Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer2Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer3Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer4Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer5Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer6Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer7Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer8Connected::indicator {
-    width: 12px;
-    height: 12px;
-}
-
-QCheckBox#checkboxPlayer1Connected::indicator,
-QCheckBox#checkboxPlayer2Connected::indicator,
-QCheckBox#checkboxPlayer3Connected::indicator,
-QCheckBox#checkboxPlayer4Connected::indicator,
-QCheckBox#checkboxPlayer5Connected::indicator,
-QCheckBox#checkboxPlayer6Connected::indicator,
-QCheckBox#checkboxPlayer7Connected::indicator,
-QCheckBox#checkboxPlayer8Connected::indicator {
-    width: 14px;
-    height: 14px;
-}
-
-QGroupBox#groupPlayer1Connected::indicator,
-QGroupBox#groupPlayer2Connected::indicator,
-QGroupBox#groupPlayer3Connected::indicator,
-QGroupBox#groupPlayer4Connected::indicator,
-QGroupBox#groupPlayer5Connected::indicator,
-QGroupBox#groupPlayer6Connected::indicator,
-QGroupBox#groupPlayer7Connected::indicator,
-QGroupBox#groupPlayer8Connected::indicator {
-    width: 16px;
-    height: 16px;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator:checked,
-QWidget#Player2LEDs QCheckBox::indicator:checked,
-QWidget#Player3LEDs QCheckBox::indicator:checked,
-QWidget#Player4LEDs QCheckBox::indicator:checked,
-QWidget#Player5LEDs QCheckBox::indicator:checked,
-QWidget#Player6LEDs QCheckBox::indicator:checked,
-QWidget#Player7LEDs QCheckBox::indicator:checked,
-QWidget#Player8LEDs QCheckBox::indicator:checked,
-QGroupBox#groupPlayer1Connected::indicator:checked,
-QGroupBox#groupPlayer2Connected::indicator:checked,
-QGroupBox#groupPlayer3Connected::indicator:checked,
-QGroupBox#groupPlayer4Connected::indicator:checked,
-QGroupBox#groupPlayer5Connected::indicator:checked,
-QGroupBox#groupPlayer6Connected::indicator:checked,
-QGroupBox#groupPlayer7Connected::indicator:checked,
-QGroupBox#groupPlayer8Connected::indicator:checked,
-QCheckBox#checkboxPlayer1Connected::indicator:checked,
-QCheckBox#checkboxPlayer2Connected::indicator:checked,
-QCheckBox#checkboxPlayer3Connected::indicator:checked,
-QCheckBox#checkboxPlayer4Connected::indicator:checked,
-QCheckBox#checkboxPlayer5Connected::indicator:checked,
-QCheckBox#checkboxPlayer6Connected::indicator:checked,
-QCheckBox#checkboxPlayer7Connected::indicator:checked,
-QCheckBox#checkboxPlayer8Connected::indicator:checked,
-QGroupBox#groupConnectedController::indicator:checked {
-    border-radius: 2px;
-    border: 1px solid #929192;
-    background: #39ff14;
-    image: none;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator:unchecked,
-QWidget#Player2LEDs QCheckBox::indicator:unchecked,
-QWidget#Player3LEDs QCheckBox::indicator:unchecked,
-QWidget#Player4LEDs QCheckBox::indicator:unchecked,
-QWidget#Player5LEDs QCheckBox::indicator:unchecked,
-QWidget#Player6LEDs QCheckBox::indicator:unchecked,
-QWidget#Player7LEDs QCheckBox::indicator:unchecked,
-QWidget#Player8LEDs QCheckBox::indicator:unchecked,
-QGroupBox#groupPlayer1Connected::indicator:unchecked,
-QGroupBox#groupPlayer2Connected::indicator:unchecked,
-QGroupBox#groupPlayer3Connected::indicator:unchecked,
-QGroupBox#groupPlayer4Connected::indicator:unchecked,
-QGroupBox#groupPlayer5Connected::indicator:unchecked,
-QGroupBox#groupPlayer6Connected::indicator:unchecked,
-QGroupBox#groupPlayer7Connected::indicator:unchecked,
-QGroupBox#groupPlayer8Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer1Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer2Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer3Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer4Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer5Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer6Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer7Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer8Connected::indicator:unchecked,
-QGroupBox#groupConnectedController::indicator:unchecked {
-    border-radius: 2px;
-    border: 1px solid #929192;
-    background: transparent;
-    image: none;
-}
-
-QWidget#controllerPlayer1,
-QWidget#controllerPlayer2,
-QWidget#controllerPlayer3,
-QWidget#controllerPlayer4,
-QWidget#controllerPlayer5,
-QWidget#controllerPlayer6,
-QWidget#controllerPlayer7,
-QWidget#controllerPlayer8 {
-    background: transparent;
-}
-
-QDialog#QtSoftwareKeyboardDialog,
-QStackedWidget#topOSK {
-    background: rgba(51, 51, 51, .9);
-}
-
-
-QDialog#OverlayDialog,
-QStackedWidget#stackedDialog {
-    background: rgba(51, 51, 51, .7);
-}
-
-QWidget#boxOSK,
-QWidget#lineOSK,
-QWidget#richDialog,
-QWidget#lineDialog {
-    background: transparent;
-}
-
-QStackedWidget#bottomOSK,
-QWidget#contentDialog,
-QWidget#contentRichDialog {
-    background: rgba(240, 240, 240, 1);
-}
-
-QWidget#contentDialog,
-QWidget#contentRichDialog {
-    margin: 5px;
-    border-radius: 6px;
-}
-
-QWidget#buttonsDialog,
-QWidget#buttonsRichDialog {
-    margin: 5px;
-    border-top: 2px solid rgba(44, 44, 44, 1);
-}
-
-QWidget#legendOSKnum {
-    border-top: 1px solid rgba(44, 44, 44, 1);
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::vertical {
-    background: #cdcdcd;
-    width: 15px;
-    margin: 15px 3px 15px 3px;
-    border: 1px transparent;
-    border-radius: 4px;
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::horizoncal {
-    background: #cdcdcd;
-    height: 15px;
-    margin: 3px 15px 3px 15px;
-    border: 1px transparent;
-    border-radius: 4px;
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::handle {
-    background: #fff;
-    border-radius: 4px;
-    min-height: 5px;
-    min-width: 5px;
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::add-line,
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::sub-line,
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::add-page,
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::sub-page {
-    background: none;
-}
-
-QWidget#inputOSK {
-    border-bottom: 3px solid rgba(255, 255, 255, .9);
-}
-
-QWidget#inputOSK QLineEdit {
-    background: transparent;
-    border: none;
-    color: #ccc;
-}
-
-QWidget#inputBoxOSK {
-    border: 2px solid rgba(255, 255, 255, .9);
-}
-
-QWidget#inputBoxOSK QTextEdit {
-    background: transparent;
-    border: none;
-    color: #ccc;
-}
-
-QWidget#richDialog QTextBrowser {
-    background: transparent;
-    border: none;
-    padding: 35px 65px;
-}
-
-
-QWidget#lineOSK QLabel#label_header {
-    color: #f0f0f0;
-}
-
-QWidget#lineOSK QLabel#label_sub,
-QWidget#lineOSK QLabel#label_characters,
-QWidget#boxOSK QLabel#label_characters_box {
-    color: #ccc;
-}
-
-QWidget#contentDialog QLabel#label_title,
-QWidget#contentRichDialog QLabel#label_title_rich {
-    color: #888;
-}
-
-QWidget#contentDialog QLabel#label_dialog {
-    padding: 20px 65px;
-}
-
-QWidget#contentDialog QLabel#label_title,
-QWidget#contentRichDialog QLabel#label_title_rich {
-    padding: 0px 65px;
-}
-
-QDialog#OverlayDialog QPushButton {
-    color: rgba(49, 79, 239, 1);
-    background: transparent;
-    border: none;
-    padding: 0px;
-    min-width: 0px;
-}
-
-QDialog#OverlayDialog QPushButton:focus,
-QDialog#OverlayDialog QPushButton:hover {
-    color: rgba(49, 79, 239, 1);
-    background: rgba(255, 255, 255, 1);
-    border: 5px solid rgba(148, 250, 202, 1);
-    border-radius: 6px;
-    outline: none;
-}
-
-QDialog#OverlayDialog QPushButton:pressed {
-    color: rgba(240, 240, 240, 1);
-    background: rgba(150, 150, 150, 1);
-    border: 5px solid rgba(148, 250, 202, 1);
-    border-radius: 6px;
-    outline: none;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton {
-    background: rgba(232, 232, 232, 1);
-    border: 2px solid rgba(240, 240, 240, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-    background: rgba(218, 218, 218, 1);
-    border: 2px solid rgba(240, 240, 240, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-    color: rgba(240, 240, 240, 1);
-    background: rgba(44, 44, 44, 1);
-    border: 2px solid rgba(240, 240, 240, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
-    color: rgba(240, 240, 240, 1);
-    background: rgba(49, 79, 239, 1);
-    border: 2px solid rgba(240, 240, 240, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:focus,
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:hover {
-    color: rgba(0, 0, 0, 1);
-    background: rgba(255, 255, 255, 1);
-    border: 5px solid rgba(148, 250, 202, 1);
-    border-radius: 6px;
-    outline: none;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed {
-    color: rgba(240, 240, 240, 1);
-    background: rgba(150, 150, 150, 1);
-    border: 5px solid rgba(148, 250, 202, 1);
-    border-radius: 6px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-    image: url(:/overlay/osk_button_B.png);
-    image-position: right;
-    qproperty-icon: url(:/overlay/osk_button_backspace.png);
-    qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-    image: url(:/overlay/osk_button_Y.png);
-    image-position: right;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
-    image: url(:/overlay/osk_button_plus.png);
-    image-position: right;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift {
-    image: url(:/overlay/osk_button_shift_lock_off.png);
-    image-position: left;
-    qproperty-icon: url(:/overlay/osk_button_shift.png);
-    qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift {
-    image: url(:/overlay/osk_button_shift_lock_off.png);
-    image-position: left;
-    qproperty-icon: url(:/overlay/osk_button_shift_on.png);
-    qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_bracket,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_right_bracket,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_parenthesis,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_right_parenthesis {
-    padding-bottom: 7px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#titleOSK QLabel {
-    background: transparent;
-    color: #ccc;
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_num {
-    image: url(:/overlay/button_L.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_num {
-    image: url(:/overlay/arrow_left.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_num {
-    image: url(:/overlay/button_R.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_num {
-    image: url(:/overlay/arrow_right.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick_shift {
-    image: url(:/overlay/button_press_stick.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_num {
-    image: url(:/overlay/button_X.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_num {
-    image: url(:/overlay/button_A.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-    color: rgba(164, 164, 164, 1);
-    background-color: rgba(218, 218, 218, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_at:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_slash:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_percent:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_1:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_2:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_3:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_4:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_5:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_6:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_7:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_8:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_9:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_0:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled {
-    color: rgba(164, 164, 164, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled {
-    image: url(:/overlay/osk_button_plus_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-    image: url(:/overlay/osk_button_B_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled {
-    image: url(:/overlay/osk_button_Y_disabled.png);
-}

dist/qt_themes/monochrome/icons.qrc

@@ -0,0 +1,32 @@
+<!--
+SPDX-FileCopyrightText: 2018 yuzu Emulator Project & 2024 suyu Emulator Project
+SPDX-License-Identifier: GPL-2.0-or-later
+-->
+
+<RCC>
+    <qresource prefix="icons/monochrome">
+        <file alias="index.theme">icons/index.theme</file>
+        <file alias="16x16/lock.png">icons/16x16/lock.png</file>
+        <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
+        <file alias="48x48/chip.png">icons/48x48/chip.png</file>
+        <file alias="48x48/folder.png">icons/48x48/folder.png</file>
+        <file alias="48x48/list-add.png">icons/48x48/list-add.png</file>
+        <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
+        <file alias="48x48/star.png">icons/48x48/star.png</file>
+        <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
+    </qresource>
+
+    <!-- Dark variant icons -->
+    <qresource prefix="icons/monochrome_dark">
+        <file alias="index.theme">../monochrome_dark/icons/index.theme</file>
+        <file alias="16x16/lock.png">../monochrome_dark/icons/16x16/lock.png</file>
+        <file alias="48x48/bad_folder.png">../monochrome_dark/icons/48x48/bad_folder.png</file>
+        <file alias="48x48/chip.png">../monochrome_dark/icons/48x48/chip.png</file>
+        <file alias="48x48/folder.png">../monochrome_dark/icons/48x48/folder.png</file>
+        <file alias="48x48/list-add.png">../monochrome_dark/icons/48x48/list-add.png</file>
+        <file alias="48x48/no_avatar.png">../monochrome_dark/icons/48x48/no_avatar.png</file>
+        <file alias="48x48/sd_card.png">../monochrome_dark/icons/48x48/sd_card.png</file>
+        <file alias="48x48/star.png">../monochrome_dark/icons/48x48/star.png</file>
+        <file alias="256x256/plus_folder.png">../monochrome_dark/icons/256x256/plus_folder.png</file>
+    </qresource>
+</RCC>

dist/qt_themes/monochrome/icons/index.theme

@@ -1,6 +1,7 @@
 [Icon Theme]
-Name=colorful
+Name=monochrome
-Comment=Colorful theme
+Comment=Monochrome light icons
+Inherits=default
 Directories=16x16,48x48,256x256
 
 [16x16]

dist/qt_themes/monochrome/style.qrc

@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="monochrome">
+        <file alias="style.qss">../default/style.qss</file>
+    </qresource>
+</RCC>

dist/qt_themes/monochrome_dark/icons/index.theme

@@ -0,0 +1,14 @@
+[Icon Theme]
+Name=monochrome_dark
+Comment=Monochrome dark icons
+Inherits=default_dark
+Directories=16x16,48x48,256x256
+
+[16x16]
+Size=16
+
+[48x48]
+Size=48
+
+[256x256]
+Size=256

dist/qt_themes/qdarkstyle/dark.qss

@@ -1380,10 +1380,6 @@ QWidget#connectedControllers {
     background: transparent;
 }
 
-QWidget#closeButtons {
-    background: transparent;
-}
-
 QWidget#playersSupported,
 QWidget#controllersSupported,
 QWidget#controllerSupported1,
@@ -1843,40 +1839,17 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed {
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-    image: url(:/overlay/osk_button_B_dark.png);
     image-position: right;
-    qproperty-icon: url(:/overlay/osk_button_backspace_dark.png);
     qproperty-iconSize: 36px;
 }
 
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-    image: url(:/overlay/osk_button_Y_dark.png);
-    image-position: right;
-}
-
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
     color: rgba(44, 44, 44, 1);
-    image: url(:/overlay/osk_button_plus_dark.png);
     image-position: right;
 }
 
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift {
-    image: url(:/overlay/osk_button_shift_lock_off.png);
-    image-position: left;
-    qproperty-icon: url(:/overlay/osk_button_shift_dark.png);
-    qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift {
-    image: url(:/overlay/osk_button_shift_lock_off.png);
-    image-position: left;
-    qproperty-icon: url(:/overlay/osk_button_shift_on_dark.png);
-    qproperty-iconSize: 36px;
-}
-
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_bracket,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_right_bracket,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_parenthesis,
@@ -1889,47 +1862,6 @@ QDialog#QtSoftwareKeyboardDialog QWidget#titleOSK QLabel {
     color: #ccc;
 }
 
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_num {
-    image: url(:/overlay/button_L_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_num {
-    image: url(:/overlay/arrow_left_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_num {
-    image: url(:/overlay/button_R_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_num {
-    image: url(:/overlay/arrow_right_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick_shift {
-    image: url(:/overlay/button_press_stick_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_num {
-    image: url(:/overlay/button_X_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_num {
-    image: url(:/overlay/button_A_dark.png);
-}
-
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled,
@@ -1961,23 +1893,6 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled {
     color: rgba(144, 144, 144, 1);
 }
 
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled {
-    image: url(:/overlay/osk_button_plus_dark_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-    image: url(:/overlay/osk_button_B_dark_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled {
-    image: url(:/overlay/osk_button_Y_dark_disabled.png);
-}
-
 QDialog#QtSoftwareKeyboardDialog QFrame,
 QDialog#QtSoftwareKeyboardDialog QFrame[frameShape="0"],
 QDialog#OverlayDialog QFrame,

dist/qt_themes/qdarkstyle/icons.qrc

@@ -0,0 +1,51 @@
+<RCC>
+  <qresource prefix="icons/qdarkstyle">
+    <file alias="index.theme">icons/index.theme</file>
+    <file alias="16x16/lock.png">../default_dark/icons/16x16/lock.png</file>
+  </qresource>
+  <qresource prefix="icons/qdarkstyle_dark">
+    <file alias="index.theme">icons/index.theme</file>
+    <file alias="16x16/lock.png">../default_dark/icons/16x16/lock.png</file>
+  </qresource>
+  <qresource prefix="qss_icons">
+    <file>rc/branch_closed-on.png</file>
+    <file>rc/branch_closed.png</file>
+    <file>rc/branch_open-on.png</file>
+    <file>rc/branch_open.png</file>
+    <file>rc/checkbox_checked.png</file>
+    <file>rc/checkbox_checked_disabled.png</file>
+    <file>rc/checkbox_checked_focus.png</file>
+    <file>rc/checkbox_indeterminate.png</file>
+    <file>rc/checkbox_indeterminate_focus.png</file>
+    <file>rc/checkbox_unchecked.png</file>
+    <file>rc/checkbox_unchecked_disabled.png</file>
+    <file>rc/checkbox_unchecked_focus.png</file>
+    <file>rc/close-hover.png</file>
+    <file>rc/close-pressed.png</file>
+    <file>rc/close.png</file>
+    <file>rc/down_arrow.png</file>
+    <file>rc/down_arrow_disabled.png</file>
+    <file>rc/Hmovetoolbar.png</file>
+    <file>rc/Hsepartoolbar.png</file>
+    <file>rc/left_arrow.png</file>
+    <file>rc/left_arrow_disabled.png</file>
+    <file>rc/radio_checked.png</file>
+    <file>rc/radio_checked_disabled.png</file>
+    <file>rc/radio_checked_focus.png</file>
+    <file>rc/radio_unchecked.png</file>
+    <file>rc/radio_unchecked_disabled.png</file>
+    <file>rc/radio_unchecked_focus.png</file>
+    <file>rc/right_arrow.png</file>
+    <file>rc/right_arrow_disabled.png</file>
+    <file>rc/sizegrip.png</file>
+    <file>rc/stylesheet-branch-end.png</file>
+    <file>rc/stylesheet-branch-more.png</file>
+    <file>rc/stylesheet-vline.png</file>
+    <file>rc/transparent.png</file>
+    <file>rc/undock.png</file>
+    <file>rc/up_arrow.png</file>
+    <file>rc/up_arrow_disabled.png</file>
+    <file>rc/Vmovetoolbar.png</file>
+    <file>rc/Vsepartoolbar.png</file>
+  </qresource>
+</RCC>

dist/qt_themes/qdarkstyle/icons/index.theme

@@ -1,14 +1,4 @@
 [Icon Theme]
 Name=qdarkstyle
-Comment=dark theme
+Comment=Dark theme (Mine Shaft style)
-Inherits=colorful
+Inherits=default_dark
-Directories=16x16,48x48,256x256
- 
-[16x16]
-Size=16
-
-[48x48]
-Size=48
-
-[256x256]
-Size=256

dist/qt_themes/qdarkstyle/style.qrc

@@ -1,62 +1,5 @@
 <RCC>
-  <qresource prefix="icons/qdarkstyle">
-    <file alias="index.theme">icons/index.theme</file>
-    <file alias="16x16/connected.png">icons/16x16/connected.png</file>
-    <file alias="16x16/disconnected.png">icons/16x16/disconnected.png</file>
-    <file alias="16x16/connected_notification.png">icons/16x16/connected_notification.png</file>
-    <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-    <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
-    <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
-    <file alias="48x48/chip.png">icons/48x48/chip.png</file>
-    <file alias="48x48/folder.png">icons/48x48/folder.png</file>
-    <file alias="48x48/no_avatar.png">icons/48x48/no_avatar.png</file>
-    <file alias="48x48/list-add.png">icons/48x48/list-add.png</file>
-    <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
-    <file alias="48x48/star.png">icons/48x48/star.png</file>
-    <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
-  </qresource>
-  <qresource prefix="qss_icons">
-    <file>rc/up_arrow_disabled.png</file>
-    <file>rc/Hmovetoolbar.png</file>
-    <file>rc/stylesheet-branch-end.png</file>
-    <file>rc/branch_closed-on.png</file>
-    <file>rc/stylesheet-vline.png</file>
-    <file>rc/branch_closed.png</file>
-    <file>rc/branch_open-on.png</file>
-    <file>rc/transparent.png</file>
-    <file>rc/right_arrow_disabled.png</file>
-    <file>rc/sizegrip.png</file>
-    <file>rc/close.png</file>
-    <file>rc/close-hover.png</file>
-    <file>rc/close-pressed.png</file>
-    <file>rc/down_arrow.png</file>
-    <file>rc/Vmovetoolbar.png</file>
-    <file>rc/left_arrow.png</file>
-    <file>rc/stylesheet-branch-more.png</file>
-    <file>rc/up_arrow.png</file>
-    <file>rc/right_arrow.png</file>
-    <file>rc/left_arrow_disabled.png</file>
-    <file>rc/Hsepartoolbar.png</file>
-    <file>rc/branch_open.png</file>
-    <file>rc/Vsepartoolbar.png</file>
-    <file>rc/down_arrow_disabled.png</file>
-    <file>rc/undock.png</file>
-    <file>rc/checkbox_checked_disabled.png</file>
-    <file>rc/checkbox_checked_focus.png</file>
-    <file>rc/checkbox_checked.png</file>
-    <file>rc/checkbox_indeterminate.png</file>
-    <file>rc/checkbox_indeterminate_focus.png</file>
-    <file>rc/checkbox_unchecked_disabled.png</file>
-    <file>rc/checkbox_unchecked_focus.png</file>
-    <file>rc/checkbox_unchecked.png</file>
-    <file>rc/radio_checked_disabled.png</file>
-    <file>rc/radio_checked_focus.png</file>
-    <file>rc/radio_checked.png</file>
-    <file>rc/radio_unchecked_disabled.png</file>
-    <file>rc/radio_unchecked_focus.png</file>
-    <file>rc/radio_unchecked.png</file>
-  </qresource>
     <qresource prefix="qdarkstyle">
-    <file>style.qss</file>
+        <file>dark.qss</file>
     </qresource>
 </RCC>

dist/qt_themes/qdarkstyle_midnight_blue/dark.qss

@@ -2779,41 +2779,10 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed {
   border-radius: 6px;
 }
 
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-  image: url(:/overlay/osk_button_B_dark.png);
-  image-position: right;
-  qproperty-icon: url(:/overlay/osk_button_backspace_dark.png);
-  qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-  image: url(:/overlay/osk_button_Y_dark.png);
-  image-position: right;
-}
-
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
   color: rgba(44, 44, 44, 1);
-  image: url(:/overlay/osk_button_plus_dark.png);
-  image-position: right;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift {
-  image: url(:/overlay/osk_button_shift_lock_off.png);
-  image-position: left;
-  qproperty-icon: url(:/overlay/osk_button_shift_dark.png);
-  qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift {
-  image: url(:/overlay/osk_button_shift_lock_off.png);
-  image-position: left;
-  qproperty-icon: url(:/overlay/osk_button_shift_on_dark.png);
-  qproperty-iconSize: 36px;
 }
 
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_bracket,
@@ -2828,47 +2797,6 @@ QDialog#QtSoftwareKeyboardDialog QWidget#titleOSK QLabel {
   color: #ccc;
 }
 
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_num {
-  image: url(:/overlay/button_L_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_num {
-  image: url(:/overlay/arrow_left_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_num {
-  image: url(:/overlay/button_R_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_num {
-  image: url(:/overlay/arrow_right_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick_shift {
-  image: url(:/overlay/button_press_stick_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_num {
-  image: url(:/overlay/button_X_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_num {
-  image: url(:/overlay/button_A_dark.png);
-}
-
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled,
@@ -2899,20 +2827,3 @@ QDialog#QtSoftwareKeyboardDialog QPushButton#button_0:disabled,
 QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled {
   color: rgba(144, 144, 144, 1);
 }
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled {
-  image: url(:/overlay/osk_button_plus_dark_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-  image: url(:/overlay/osk_button_B_dark_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled {
-  image: url(:/overlay/osk_button_Y_dark_disabled.png);
-}