From 93b711f6273a7d23590bf90e92bcd7478bff9e44 Mon Sep 17 00:00:00 2001
From: Pablo Gil <pgilfernandez@gmail.com>
Date: Fri, 10 Jan 2020 10:09:40 +0100
Subject: [PATCH] fixed QGroupBox checkboxes and minor other fixes. Updated to
 v2.21

---
 src/Gui/Stylesheets/Dark-blue.qss     | 42 ++++++++++++++++++---------
 src/Gui/Stylesheets/Dark-green.qss    | 42 ++++++++++++++++++---------
 src/Gui/Stylesheets/Dark-orange.qss   | 42 ++++++++++++++++++---------
 src/Gui/Stylesheets/Darker-blue.qss   | 35 +++++++++++++++++-----
 src/Gui/Stylesheets/Darker-green.qss  | 35 +++++++++++++++++-----
 src/Gui/Stylesheets/Darker-orange.qss | 35 +++++++++++++++++-----
 src/Gui/Stylesheets/Light-blue.qss    | 37 +++++++++++++++++------
 src/Gui/Stylesheets/Light-green.qss   | 37 +++++++++++++++++------
 src/Gui/Stylesheets/Light-orange.qss  | 37 +++++++++++++++++------
 9 files changed, 249 insertions(+), 93 deletions(-)

diff --git a/src/Gui/Stylesheets/Dark-blue.qss b/src/Gui/Stylesheets/Dark-blue.qss
index bca338d694..a82713f77d 100644
--- a/src/Gui/Stylesheets/Dark-blue.qss
+++ b/src/Gui/Stylesheets/Dark-blue.qss
@@ -1,8 +1,8 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.20
-Qt theme (stylesheet) specially developed for FreeCAD (https://www.freecadweb.org/).
+version 2.21
+Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
 It might work with other software that uses Qt styling.
 
 
@@ -57,7 +57,8 @@ If you would like to change the overall look/style of the theme, just find and r
 
 KNOWN BUGS and TO DO
 ============================================================================================================
-- please, follow the link to get updated information: https://forum.freecadweb.org/viewtopic.php?f=10&t=12417
+Please, follow the link to get updated information: http://forum.freecadweb.org/viewtopic.php?f=10&t=12417
+
 */
 
 
@@ -243,11 +244,21 @@ QGroupBox {
     background-color: rgba(255, 255, 255, 15);
 }
 
-QGroupBox:title {
+QGroupBox::title {
     top: -8px;
     left: 12px;
 }
 
+/* NOTE: QGroupBox checkboxes are styles with regular ones so that the all get the same style */
+/* QGroupBox::indicator {
+    width: 13px;
+    height: 13px;
+}
+
+QGroupBox::indicator:unchecked {
+    image: url(:/images/checkbox_unchecked.png);
+} */
+
 
 /*==================================================================================================
 Tooltip
@@ -1622,7 +1633,8 @@ QCheckBox:disabled {
     background-color: transparent;
 }
 
-QCheckBox::indicator {
+QCheckBox::indicator,
+QGroupBox::indicator {
     color: black;
     background-color: rgba(255,255,255,20);
     border: 1px solid #5a5a5a;
@@ -1634,11 +1646,16 @@ QCheckBox::indicator {
 QCheckBox::indicator:pressed,
 QCheckBox::indicator:non-exclusive:checked:pressed,
 QCheckBox::indicator:indeterminate:pressed,
-QCheckBox::indicator:checked:pressed {
+QCheckBox::indicator:checked:pressed,
+QGroupBox::indicator:pressed,
+QGroupBox::indicator:non-exclusive:checked:pressed,
+QGroupBox::indicator:indeterminate:pressed,
+QGroupBox::indicator:checked:pressed {
     border-color: #adc5ed;
 }
 
-QCheckBox::indicator:checked {
+QCheckBox::indicator:checked,
+QGroupBox::indicator:checked {
     background-color: #5e90fa; /* QRadioButton has the same color */
     border: 1px solid #3874f2; /* QRadioButton has the same color */
     image:url(qss:images_dark-light/checkbox_light.svg);
@@ -1649,12 +1666,14 @@ QCheckBox:disabled {
     background-color: transparent;
 }
 
-QCheckBox::indicator:disabled {
+QCheckBox::indicator:disabled,
+QGroupBox::indicator:disabled {
     background-color: rgba(255,255,255,20);
     border: 1px solid rgba(255,255,255,20);
 }
 
-QCheckBox::indicator:indeterminate {
+QCheckBox::indicator:indeterminate,
+QGroupBox::indicator:indeterminate {
     background-color: #5e90fa;
     border: 1px solid #3874f2;
     image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
@@ -2181,8 +2200,3 @@ QPushButton#NavigationIndicator::menu-indicator {
     image: none;
     width: 0px;
 }
-
-QToolBar QToolButton[popupMode="1"] {
-    width: 100px;
-    background: red;
-}
diff --git a/src/Gui/Stylesheets/Dark-green.qss b/src/Gui/Stylesheets/Dark-green.qss
index fc755eec0d..c2536d8c64 100644
--- a/src/Gui/Stylesheets/Dark-green.qss
+++ b/src/Gui/Stylesheets/Dark-green.qss
@@ -1,8 +1,8 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.20
-Qt theme (stylesheet) specially developed for FreeCAD (https://www.freecadweb.org/).
+version 2.21
+Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
 It might work with other software that uses Qt styling.
 
 
@@ -57,7 +57,8 @@ If you would like to change the overall look/style of the theme, just find and r
 
 KNOWN BUGS and TO DO
 ============================================================================================================
-- please, follow the link to get updated information: https://forum.freecadweb.org/viewtopic.php?f=10&t=12417
+Please, follow the link to get updated information: http://forum.freecadweb.org/viewtopic.php?f=10&t=12417
+
 */
 
 
@@ -243,11 +244,21 @@ QGroupBox {
     background-color: rgba(255, 255, 255, 15);
 }
 
-QGroupBox:title {
+QGroupBox::title {
     top: -8px;
     left: 12px;
 }
 
+/* NOTE: QGroupBox checkboxes are styles with regular ones so that the all get the same style */
+/* QGroupBox::indicator {
+    width: 13px;
+    height: 13px;
+}
+
+QGroupBox::indicator:unchecked {
+    image: url(:/images/checkbox_unchecked.png);
+} */
+
 
 /*==================================================================================================
 Tooltip
@@ -1622,7 +1633,8 @@ QCheckBox:disabled {
     background-color: transparent;
 }
 
-QCheckBox::indicator {
+QCheckBox::indicator,
+QGroupBox::indicator {
     color: black;
     background-color: rgba(255,255,255,20);
     border: 1px solid #5a5a5a;
@@ -1634,11 +1646,16 @@ QCheckBox::indicator {
 QCheckBox::indicator:pressed,
 QCheckBox::indicator:non-exclusive:checked:pressed,
 QCheckBox::indicator:indeterminate:pressed,
-QCheckBox::indicator:checked:pressed {
+QCheckBox::indicator:checked:pressed,
+QGroupBox::indicator:pressed,
+QGroupBox::indicator:non-exclusive:checked:pressed,
+QGroupBox::indicator:indeterminate:pressed,
+QGroupBox::indicator:checked:pressed {
     border-color: #c5d675;
 }
 
-QCheckBox::indicator:checked {
+QCheckBox::indicator:checked,
+QGroupBox::indicator:checked {
     background-color: #94b30f; /* QRadioButton has the same color */
     border: 1px solid #819c0c; /* QRadioButton has the same color */
     image:url(qss:images_dark-light/checkbox_light.svg);
@@ -1649,12 +1666,14 @@ QCheckBox:disabled {
     background-color: transparent;
 }
 
-QCheckBox::indicator:disabled {
+QCheckBox::indicator:disabled,
+QGroupBox::indicator:disabled {
     background-color: rgba(255,255,255,20);
     border: 1px solid rgba(255,255,255,20);
 }
 
-QCheckBox::indicator:indeterminate {
+QCheckBox::indicator:indeterminate,
+QGroupBox::indicator:indeterminate {
     background-color: #94b30f;
     border: 1px solid #819c0c;
     image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
@@ -2181,8 +2200,3 @@ QPushButton#NavigationIndicator::menu-indicator {
     image: none;
     width: 0px;
 }
-
-QToolBar QToolButton[popupMode="1"] {
-    width: 100px;
-    background: red;
-}
diff --git a/src/Gui/Stylesheets/Dark-orange.qss b/src/Gui/Stylesheets/Dark-orange.qss
index eb1fd0cde1..0a39c4a8a5 100644
--- a/src/Gui/Stylesheets/Dark-orange.qss
+++ b/src/Gui/Stylesheets/Dark-orange.qss
@@ -1,8 +1,8 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.20
-Qt theme (stylesheet) specially developed for FreeCAD (https://www.freecadweb.org/).
+version 2.21
+Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
 It might work with other software that uses Qt styling.
 
 
@@ -57,7 +57,8 @@ If you would like to change the overall look/style of the theme, just find and r
 
 KNOWN BUGS and TO DO
 ============================================================================================================
-- please, follow the link to get updated information: https://forum.freecadweb.org/viewtopic.php?f=10&t=12417
+Please, follow the link to get updated information: http://forum.freecadweb.org/viewtopic.php?f=10&t=12417
+
 */
 
 
@@ -243,11 +244,21 @@ QGroupBox {
     background-color: rgba(255, 255, 255, 15);
 }
 
-QGroupBox:title {
+QGroupBox::title {
     top: -8px;
     left: 12px;
 }
 
+/* NOTE: QGroupBox checkboxes are styles with regular ones so that the all get the same style */
+/* QGroupBox::indicator {
+    width: 13px;
+    height: 13px;
+}
+
+QGroupBox::indicator:unchecked {
+    image: url(:/images/checkbox_unchecked.png);
+} */
+
 
 /*==================================================================================================
 Tooltip
@@ -1622,7 +1633,8 @@ QCheckBox:disabled {
     background-color: transparent;
 }
 
-QCheckBox::indicator {
+QCheckBox::indicator,
+QGroupBox::indicator {
     color: black;
     background-color: rgba(255,255,255,20);
     border: 1px solid #5a5a5a;
@@ -1634,11 +1646,16 @@ QCheckBox::indicator {
 QCheckBox::indicator:pressed,
 QCheckBox::indicator:non-exclusive:checked:pressed,
 QCheckBox::indicator:indeterminate:pressed,
-QCheckBox::indicator:checked:pressed {
+QCheckBox::indicator:checked:pressed,
+QGroupBox::indicator:pressed,
+QGroupBox::indicator:non-exclusive:checked:pressed,
+QGroupBox::indicator:indeterminate:pressed,
+QGroupBox::indicator:checked:pressed {
     border-color: #e0c992;
 }
 
-QCheckBox::indicator:checked {
+QCheckBox::indicator:checked,
+QGroupBox::indicator:checked {
     background-color: #daa116; /* QRadioButton has the same color */
     border: 1px solid #d0970c; /* QRadioButton has the same color */
     image:url(qss:images_dark-light/checkbox_light.svg);
@@ -1649,12 +1666,14 @@ QCheckBox:disabled {
     background-color: transparent;
 }
 
-QCheckBox::indicator:disabled {
+QCheckBox::indicator:disabled,
+QGroupBox::indicator:disabled {
     background-color: rgba(255,255,255,20);
     border: 1px solid rgba(255,255,255,20);
 }
 
-QCheckBox::indicator:indeterminate {
+QCheckBox::indicator:indeterminate,
+QGroupBox::indicator:indeterminate {
     background-color: #daa116;
     border: 1px solid #d0970c;
     image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
@@ -2181,8 +2200,3 @@ QPushButton#NavigationIndicator::menu-indicator {
     image: none;
     width: 0px;
 }
-
-QToolBar QToolButton[popupMode="1"] {
-    width: 100px;
-    background: red;
-}
diff --git a/src/Gui/Stylesheets/Darker-blue.qss b/src/Gui/Stylesheets/Darker-blue.qss
index f6e702263d..d737ecb59b 100644
--- a/src/Gui/Stylesheets/Darker-blue.qss
+++ b/src/Gui/Stylesheets/Darker-blue.qss
@@ -1,8 +1,8 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.20
-Qt theme (stylesheet) specially developed for FreeCAD (https://www.freecadweb.org/).
+version 2.21
+Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
 It might work with other software that uses Qt styling.
 
 
@@ -57,7 +57,8 @@ If you would like to change the overall look/style of the theme, just find and r
 
 KNOWN BUGS and TO DO
 ============================================================================================================
-- please, follow the link to get updated information: https://forum.freecadweb.org/viewtopic.php?f=10&t=12417
+Please, follow the link to get updated information: http://forum.freecadweb.org/viewtopic.php?f=10&t=12417
+
 */
 
 
@@ -247,6 +248,16 @@ QGroupBox:title {
     left: 12px;
 }
 
+/* NOTE: QGroupBox checkboxes are styles with regular ones so that the all get the same style */
+/* QGroupBox::indicator {
+    width: 13px;
+    height: 13px;
+}
+
+QGroupBox::indicator:unchecked {
+    image: url(:/images/checkbox_unchecked.png);
+} */
+
 
 /*==================================================================================================
 Tooltip
@@ -1643,7 +1654,8 @@ QCheckBox:disabled {
     background-color: transparent;
 }
 
-QCheckBox::indicator {
+QCheckBox::indicator,
+QGroupBox::indicator {
     color: black;
     background-color: rgba(0,0,0,40);
     border: 1px solid #787878;
@@ -1655,11 +1667,16 @@ QCheckBox::indicator {
 QCheckBox::indicator:pressed,
 QCheckBox::indicator:non-exclusive:checked:pressed,
 QCheckBox::indicator:indeterminate:pressed,
-QCheckBox::indicator:checked:pressed {
+QCheckBox::indicator:checked:pressed,
+QGroupBox::indicator:pressed,
+QGroupBox::indicator:non-exclusive:checked:pressed,
+QGroupBox::indicator:indeterminate:pressed,
+QGroupBox::indicator:checked:pressed {
     border-color: #cbd8e6;
 }
 
-QCheckBox::indicator:checked {
+QCheckBox::indicator:checked,
+QGroupBox::indicator:checked {
     background-color: #2053c0; /* QRadioButton has the same color */
     border: 1px solid #2053c0; /* QRadioButton has the same color */
     image:url(qss:images_dark-light/checkbox_light.svg);
@@ -1670,12 +1687,14 @@ QCheckBox:disabled {
     background-color: transparent;
 }
 
-QCheckBox::indicator:disabled {
+QCheckBox::indicator:disabled,
+QGroupBox::indicator:disabled {
     background-color: rgba(0,0,0,0);
     border: 1px solid rgba(0,0,0,20);
 }
 
-QCheckBox::indicator:indeterminate {
+QCheckBox::indicator:indeterminate,
+QGroupBox::indicator:indeterminate {
     background-color: #2053c0;
     border: 1px solid #2053c0;
     image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
diff --git a/src/Gui/Stylesheets/Darker-green.qss b/src/Gui/Stylesheets/Darker-green.qss
index b3a57c0411..113ea3db64 100644
--- a/src/Gui/Stylesheets/Darker-green.qss
+++ b/src/Gui/Stylesheets/Darker-green.qss
@@ -1,8 +1,8 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.20
-Qt theme (stylesheet) specially developed for FreeCAD (https://www.freecadweb.org/).
+version 2.21
+Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
 It might work with other software that uses Qt styling.
 
 
@@ -57,7 +57,8 @@ If you would like to change the overall look/style of the theme, just find and r
 
 KNOWN BUGS and TO DO
 ============================================================================================================
-- please, follow the link to get updated information: https://forum.freecadweb.org/viewtopic.php?f=10&t=12417
+Please, follow the link to get updated information: http://forum.freecadweb.org/viewtopic.php?f=10&t=12417
+
 */
 
 
@@ -247,6 +248,16 @@ QGroupBox:title {
     left: 12px;
 }
 
+/* NOTE: QGroupBox checkboxes are styles with regular ones so that the all get the same style */
+/* QGroupBox::indicator {
+    width: 13px;
+    height: 13px;
+}
+
+QGroupBox::indicator:unchecked {
+    image: url(:/images/checkbox_unchecked.png);
+} */
+
 
 /*==================================================================================================
 Tooltip
@@ -1643,7 +1654,8 @@ QCheckBox:disabled {
     background-color: transparent;
 }
 
-QCheckBox::indicator {
+QCheckBox::indicator,
+QGroupBox::indicator {
     color: black;
     background-color: rgba(0,0,0,40);
     border: 1px solid #787878;
@@ -1655,11 +1667,16 @@ QCheckBox::indicator {
 QCheckBox::indicator:pressed,
 QCheckBox::indicator:non-exclusive:checked:pressed,
 QCheckBox::indicator:indeterminate:pressed,
-QCheckBox::indicator:checked:pressed {
+QCheckBox::indicator:checked:pressed,
+QGroupBox::indicator:pressed,
+QGroupBox::indicator:non-exclusive:checked:pressed,
+QGroupBox::indicator:indeterminate:pressed,
+QGroupBox::indicator:checked:pressed {
     border-color: #dadfc5;
 }
 
-QCheckBox::indicator:checked {
+QCheckBox::indicator:checked,
+QGroupBox::indicator:checked {
     background-color: #74831d; /* QRadioButton has the same color */
     border: 1px solid #74831d; /* QRadioButton has the same color */
     image:url(qss:images_dark-light/checkbox_light.svg);
@@ -1670,12 +1687,14 @@ QCheckBox:disabled {
     background-color: transparent;
 }
 
-QCheckBox::indicator:disabled {
+QCheckBox::indicator:disabled,
+QGroupBox::indicator:disabled {
     background-color: rgba(0,0,0,0);
     border: 1px solid rgba(0,0,0,20);
 }
 
-QCheckBox::indicator:indeterminate {
+QCheckBox::indicator:indeterminate,
+QGroupBox::indicator:indeterminate {
     background-color: #74831d;
     border: 1px solid #74831d;
     image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
diff --git a/src/Gui/Stylesheets/Darker-orange.qss b/src/Gui/Stylesheets/Darker-orange.qss
index 5db4aa63b7..cc31047b2b 100644
--- a/src/Gui/Stylesheets/Darker-orange.qss
+++ b/src/Gui/Stylesheets/Darker-orange.qss
@@ -1,8 +1,8 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.20
-Qt theme (stylesheet) specially developed for FreeCAD (https://www.freecadweb.org/).
+version 2.21
+Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
 It might work with other software that uses Qt styling.
 
 
@@ -57,7 +57,8 @@ If you would like to change the overall look/style of the theme, just find and r
 
 KNOWN BUGS and TO DO
 ============================================================================================================
-- please, follow the link to get updated information: http://forum.freecadweb.org/viewtopic.php?f=10&t=12417
+Please, follow the link to get updated information: http://forum.freecadweb.org/viewtopic.php?f=10&t=12417
+
 */
 
 
@@ -247,6 +248,16 @@ QGroupBox:title {
     left: 12px;
 }
 
+/* NOTE: QGroupBox checkboxes are styles with regular ones so that the all get the same style */
+/* QGroupBox::indicator {
+    width: 13px;
+    height: 13px;
+}
+
+QGroupBox::indicator:unchecked {
+    image: url(:/images/checkbox_unchecked.png);
+} */
+
 
 /*==================================================================================================
 Tooltip
@@ -1643,7 +1654,8 @@ QCheckBox:disabled {
     background-color: transparent;
 }
 
-QCheckBox::indicator {
+QCheckBox::indicator,
+QGroupBox::indicator {
     color: black;
     background-color: rgba(0,0,0,40);
     border: 1px solid #787878;
@@ -1655,11 +1667,16 @@ QCheckBox::indicator {
 QCheckBox::indicator:pressed,
 QCheckBox::indicator:non-exclusive:checked:pressed,
 QCheckBox::indicator:indeterminate:pressed,
-QCheckBox::indicator:checked:pressed {
+QCheckBox::indicator:checked:pressed,
+QGroupBox::indicator:pressed,
+QGroupBox::indicator:non-exclusive:checked:pressed,
+QGroupBox::indicator:indeterminate:pressed,
+QGroupBox::indicator:checked:pressed {
     border-color: #e3d8b9;
 }
 
-QCheckBox::indicator:checked {
+QCheckBox::indicator:checked,
+QGroupBox::indicator:checked {
     background-color: #b28416; /* QRadioButton has the same color */
     border: 1px solid #b28416; /* QRadioButton has the same color */
     image:url(qss:images_dark-light/checkbox_light.svg);
@@ -1670,12 +1687,14 @@ QCheckBox:disabled {
     background-color: transparent;
 }
 
-QCheckBox::indicator:disabled {
+QCheckBox::indicator:disabled,
+QGroupBox::indicator:disabled {
     background-color: rgba(0,0,0,0);
     border: 1px solid rgba(0,0,0,20);
 }
 
-QCheckBox::indicator:indeterminate {
+QCheckBox::indicator:indeterminate,
+QGroupBox::indicator:indeterminate {
     background-color: #b28416;
     border: 1px solid #b28416;
     image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
diff --git a/src/Gui/Stylesheets/Light-blue.qss b/src/Gui/Stylesheets/Light-blue.qss
index ec5cd14a01..8b6a4404ec 100644
--- a/src/Gui/Stylesheets/Light-blue.qss
+++ b/src/Gui/Stylesheets/Light-blue.qss
@@ -1,8 +1,8 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.20
-Qt theme (stylesheet) specially developed for FreeCAD (https://www.freecadweb.org/).
+version 2.21
+Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
 It might work with other software that uses Qt styling.
 
 
@@ -57,7 +57,8 @@ If you would like to change the overall look/style of the theme, just find and r
 
 KNOWN BUGS and TO DO
 ============================================================================================================
-- please, follow the link to get updated information: https://forum.freecadweb.org/viewtopic.php?f=10&t=12417
+Please, follow the link to get updated information: http://forum.freecadweb.org/viewtopic.php?f=10&t=12417
+
 */
 
 
@@ -93,7 +94,7 @@ QToolBar  {
 }
 
 QMdiArea {
-    background-image: url(qss:images_dark-light/background_freecad_dark.svg);
+        background-image: url(qss:images_dark-light/background_freecad_dark.svg);
     background-position: center center;
     background-repeat: no-repeat;
 }
@@ -248,6 +249,16 @@ QGroupBox:title {
     left: 12px;
 }
 
+/* NOTE: QGroupBox checkboxes are styles with regular ones so that the all get the same style */
+/* QGroupBox::indicator {
+    width: 13px;
+    height: 13px;
+}
+
+QGroupBox::indicator:unchecked {
+    image: url(:/images/checkbox_unchecked.png);
+} */
+
 
 /*==================================================================================================
 Tooltip
@@ -1623,7 +1634,8 @@ QCheckBox:disabled {
     background-color: transparent;
 }
 
-QCheckBox::indicator {
+QCheckBox::indicator,
+QGroupBox::indicator {
     color: #c8c8c8;
     background-color: rgba(0,0,0,20);
     border: 1px solid #505050;
@@ -1635,11 +1647,16 @@ QCheckBox::indicator {
 QCheckBox::indicator:pressed,
 QCheckBox::indicator:non-exclusive:checked:pressed,
 QCheckBox::indicator:indeterminate:pressed,
-QCheckBox::indicator:checked:pressed {
+QCheckBox::indicator:checked:pressed,
+QGroupBox::indicator:pressed,
+QGroupBox::indicator:non-exclusive:checked:pressed,
+QGroupBox::indicator:indeterminate:pressed,
+QGroupBox::indicator:checked:pressed {
     border-color: #adc5ed;
 }
 
-QCheckBox::indicator:checked {
+QCheckBox::indicator:checked,
+QGroupBox::indicator:checked {
     background-color: #5e90fa; /* QRadioButton has the same color */
     border: 1px solid #3874f2; /* QRadioButton has the same color */
     image:url(qss:images_dark-light/checkbox_light.svg);
@@ -1650,12 +1667,14 @@ QCheckBox:disabled {
     background-color: transparent;
 }
 
-QCheckBox::indicator:disabled {
+QCheckBox::indicator:disabled,
+QGroupBox::indicator:disabled {
     background-color: rgba(0,0,0,20);
     border: 1px solid rgba(0,0,0,20);
 }
 
-QCheckBox::indicator:indeterminate {
+QCheckBox::indicator:indeterminate,
+QGroupBox::indicator:indeterminate {
     background-color: #5e90fa;
     border: 1px solid #3874f2;
     image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
diff --git a/src/Gui/Stylesheets/Light-green.qss b/src/Gui/Stylesheets/Light-green.qss
index a95390efe0..768fee793a 100644
--- a/src/Gui/Stylesheets/Light-green.qss
+++ b/src/Gui/Stylesheets/Light-green.qss
@@ -1,8 +1,8 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.20
-Qt theme (stylesheet) specially developed for FreeCAD (https://www.freecadweb.org/).
+version 2.21
+Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
 It might work with other software that uses Qt styling.
 
 
@@ -57,7 +57,8 @@ If you would like to change the overall look/style of the theme, just find and r
 
 KNOWN BUGS and TO DO
 ============================================================================================================
-- please, follow the link to get updated information: https://forum.freecadweb.org/viewtopic.php?f=10&t=12417
+Please, follow the link to get updated information: http://forum.freecadweb.org/viewtopic.php?f=10&t=12417
+
 */
 
 
@@ -93,7 +94,7 @@ QToolBar  {
 }
 
 QMdiArea {
-    background-image: url(qss:images_dark-light/background_freecad_dark.svg);
+        background-image: url(qss:images_dark-light/background_freecad_dark.svg);
     background-position: center center;
     background-repeat: no-repeat;
 }
@@ -248,6 +249,16 @@ QGroupBox:title {
     left: 12px;
 }
 
+/* NOTE: QGroupBox checkboxes are styles with regular ones so that the all get the same style */
+/* QGroupBox::indicator {
+    width: 13px;
+    height: 13px;
+}
+
+QGroupBox::indicator:unchecked {
+    image: url(:/images/checkbox_unchecked.png);
+} */
+
 
 /*==================================================================================================
 Tooltip
@@ -1623,7 +1634,8 @@ QCheckBox:disabled {
     background-color: transparent;
 }
 
-QCheckBox::indicator {
+QCheckBox::indicator,
+QGroupBox::indicator {
     color: #c8c8c8;
     background-color: rgba(0,0,0,20);
     border: 1px solid #505050;
@@ -1635,11 +1647,16 @@ QCheckBox::indicator {
 QCheckBox::indicator:pressed,
 QCheckBox::indicator:non-exclusive:checked:pressed,
 QCheckBox::indicator:indeterminate:pressed,
-QCheckBox::indicator:checked:pressed {
+QCheckBox::indicator:checked:pressed,
+QGroupBox::indicator:pressed,
+QGroupBox::indicator:non-exclusive:checked:pressed,
+QGroupBox::indicator:indeterminate:pressed,
+QGroupBox::indicator:checked:pressed {
     border-color: #c5d675;
 }
 
-QCheckBox::indicator:checked {
+QCheckBox::indicator:checked,
+QGroupBox::indicator:checked {
     background-color: #94b30f; /* QRadioButton has the same color */
     border: 1px solid #819c0c; /* QRadioButton has the same color */
     image:url(qss:images_dark-light/checkbox_light.svg);
@@ -1650,12 +1667,14 @@ QCheckBox:disabled {
     background-color: transparent;
 }
 
-QCheckBox::indicator:disabled {
+QCheckBox::indicator:disabled,
+QGroupBox::indicator:disabled {
     background-color: rgba(0,0,0,20);
     border: 1px solid rgba(0,0,0,20);
 }
 
-QCheckBox::indicator:indeterminate {
+QCheckBox::indicator:indeterminate,
+QGroupBox::indicator:indeterminate {
     background-color: #94b30f;
     border: 1px solid #819c0c;
     image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
diff --git a/src/Gui/Stylesheets/Light-orange.qss b/src/Gui/Stylesheets/Light-orange.qss
index 8be931acf8..6f48101b8b 100644
--- a/src/Gui/Stylesheets/Light-orange.qss
+++ b/src/Gui/Stylesheets/Light-orange.qss
@@ -1,8 +1,8 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.20
-Qt theme (stylesheet) specially developed for FreeCAD (https://www.freecadweb.org/).
+version 2.21
+Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
 It might work with other software that uses Qt styling.
 
 
@@ -57,7 +57,8 @@ If you would like to change the overall look/style of the theme, just find and r
 
 KNOWN BUGS and TO DO
 ============================================================================================================
-- please, follow the link to get updated information: https://forum.freecadweb.org/viewtopic.php?f=10&t=12417
+Please, follow the link to get updated information: http://forum.freecadweb.org/viewtopic.php?f=10&t=12417
+
 */
 
 
@@ -93,7 +94,7 @@ QToolBar  {
 }
 
 QMdiArea {
-    background-image: url(qss:images_dark-light/background_freecad_dark.svg);
+        background-image: url(qss:images_dark-light/background_freecad_dark.svg);
     background-position: center center;
     background-repeat: no-repeat;
 }
@@ -248,6 +249,16 @@ QGroupBox:title {
     left: 12px;
 }
 
+/* NOTE: QGroupBox checkboxes are styles with regular ones so that the all get the same style */
+/* QGroupBox::indicator {
+    width: 13px;
+    height: 13px;
+}
+
+QGroupBox::indicator:unchecked {
+    image: url(:/images/checkbox_unchecked.png);
+} */
+
 
 /*==================================================================================================
 Tooltip
@@ -1623,7 +1634,8 @@ QCheckBox:disabled {
     background-color: transparent;
 }
 
-QCheckBox::indicator {
+QCheckBox::indicator,
+QGroupBox::indicator {
     color: #c8c8c8;
     background-color: rgba(0,0,0,20);
     border: 1px solid #505050;
@@ -1635,11 +1647,16 @@ QCheckBox::indicator {
 QCheckBox::indicator:pressed,
 QCheckBox::indicator:non-exclusive:checked:pressed,
 QCheckBox::indicator:indeterminate:pressed,
-QCheckBox::indicator:checked:pressed {
+QCheckBox::indicator:checked:pressed,
+QGroupBox::indicator:pressed,
+QGroupBox::indicator:non-exclusive:checked:pressed,
+QGroupBox::indicator:indeterminate:pressed,
+QGroupBox::indicator:checked:pressed {
     border-color: #e0c992;
 }
 
-QCheckBox::indicator:checked {
+QCheckBox::indicator:checked,
+QGroupBox::indicator:checked {
     background-color: #daa116; /* QRadioButton has the same color */
     border: 1px solid #d0970c; /* QRadioButton has the same color */
     image:url(qss:images_dark-light/checkbox_light.svg);
@@ -1650,12 +1667,14 @@ QCheckBox:disabled {
     background-color: transparent;
 }
 
-QCheckBox::indicator:disabled {
+QCheckBox::indicator:disabled,
+QGroupBox::indicator:disabled {
     background-color: rgba(0,0,0,20);
     border: 1px solid rgba(0,0,0,20);
 }
 
-QCheckBox::indicator:indeterminate {
+QCheckBox::indicator:indeterminate,
+QGroupBox::indicator:indeterminate {
     background-color: #daa116;
     border: 1px solid #d0970c;
     image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);