You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/03/27 07:37:17 UTC

[royale-asjs] branch develop updated: jewel-themes: fix selected tooglebutton style in all themes

This is an automated email from the ASF dual-hosted git repository.

carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/develop by this push:
     new e5f73bb  jewel-themes: fix selected tooglebutton style in all themes
e5f73bb is described below

commit e5f73bb89e07bda8b2207b5e1b42cf8025d58d08
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Mar 27 08:37:11 2020 +0100

    jewel-themes: fix selected tooglebutton style in all themes
---
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                | 11 +++++---
 .../src/main/resources/defaults.css                | 11 +++++---
 .../src/main/resources/defaults.css                | 11 +++++---
 .../src/main/resources/defaults.css                | 11 +++++---
 .../src/main/resources/defaults.css                | 11 +++++---
 .../src/main/resources/defaults.css                | 11 +++++---
 .../src/main/resources/defaults.css                | 11 +++++---
 .../src/main/resources/defaults.css                | 11 +++++---
 .../src/main/resources/defaults.css                | 11 +++++---
 .../src/main/resources/defaults.css                | 11 +++++---
 .../src/main/resources/defaults.css                | 11 +++++---
 .../src/main/resources/defaults.css                | 11 +++++---
 .../src/main/resources/defaults.css                | 22 ++++++++++------
 .../src/main/resources/defaults.css                | 22 ++++++++++------
 .../src/main/resources/defaults.css                | 22 ++++++++++------
 .../src/main/resources/defaults.css                | 22 ++++++++++------
 .../src/main/resources/defaults.css                | 22 ++++++++++------
 .../src/main/resources/defaults.css                | 22 ++++++++++------
 .../src/main/resources/defaults.css                | 22 ++++++++++------
 .../src/main/resources/defaults.css                | 22 ++++++++++------
 .../src/main/resources/defaults.css                | 22 ++++++++++------
 .../src/main/resources/defaults.css                | 22 ++++++++++------
 .../src/main/resources/defaults.css                | 22 ++++++++++------
 .../src/main/resources/defaults.css                | 22 ++++++++++------
 .../src/main/resources/defaults.css                |  6 +++--
 .../src/main/resources/defaults.css                |  6 +++--
 .../src/main/resources/defaults.css                |  6 +++--
 .../src/main/resources/defaults.css                |  6 +++--
 .../src/main/resources/defaults.css                |  6 +++--
 .../src/main/resources/defaults.css                |  6 +++--
 .../src/main/resources/defaults.css                |  6 +++--
 .../src/main/resources/defaults.css                |  6 +++--
 .../src/main/resources/defaults.css                |  6 +++--
 .../src/main/resources/defaults.css                |  6 +++--
 .../src/main/resources/defaults.css                |  6 +++--
 .../src/main/resources/defaults.css                |  6 +++--
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 15 ++++++-----
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                | 30 +++++++++++++---------
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 .../src/main/resources/defaults.css                |  8 +++---
 108 files changed, 1068 insertions(+), 672 deletions(-)

diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Amethyst-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Amethyst-Theme/src/main/resources/defaults.css
index 06b5668..ad1c9a0 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Amethyst-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Amethyst-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#9f239d, #751a74);
   border: 1px solid #4b114a;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#9f239d, #751a74);
-  border: 1px solid #4b114a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(201, 44, 198, 0.25);
+  border: 1px solid #7e1c7c;
+  box-shadow: none;
+  color: #60155f;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#9f239d, #751a74);
-  border: 1px solid #4b114a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(201, 44, 198, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #60155f;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Blue-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Blue-Theme/src/main/resources/defaults.css
index 0510b92..fe79b94 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Blue-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Blue-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#1198e9, #0d79ba);
   border: 1px solid #0a5a8a;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#1198e9, #0d79ba);
-  border: 1px solid #0a5a8a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(60, 173, 241, 0.25);
+  border: 1px solid #0e7fc3;
+  box-shadow: none;
+  color: #0c69a2;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#1198e9, #0d79ba);
-  border: 1px solid #0a5a8a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(60, 173, 241, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #0c69a2;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Emerald-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Emerald-Theme/src/main/resources/defaults.css
index ac07936..5db06e5 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Emerald-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Emerald-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#71a02f, #557923);
   border: 1px solid #395118;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#71a02f, #557923);
-  border: 1px solid #395118;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(140, 198, 60, 0.25);
+  border: 1px solid #5a8126;
+  box-shadow: none;
+  color: #47651e;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#71a02f, #557923);
-  border: 1px solid #395118;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(140, 198, 60, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #47651e;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Green-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Green-Theme/src/main/resources/defaults.css
index 708f00d..36c8706 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Green-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Green-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#2e8e39, #21682a);
   border: 1px solid #15411a;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#2e8e39, #21682a);
-  border: 1px solid #15411a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(58, 181, 73, 0.25);
+  border: 1px solid #246f2d;
+  box-shadow: none;
+  color: #1b5422;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#2e8e39, #21682a);
-  border: 1px solid #15411a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(58, 181, 73, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #1b5422;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Orange-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Orange-Theme/src/main/resources/defaults.css
index 5d1efab..4a83316 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Orange-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Orange-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#d97a08, #a85e06);
   border: 1px solid #774304;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#d97a08, #a85e06);
-  border: 1px solid #774304;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(247, 148, 29, 0.25);
+  border: 1px solid #b26406;
+  box-shadow: none;
+  color: #8f5105;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#d97a08, #a85e06);
-  border: 1px solid #774304;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(247, 148, 29, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #8f5105;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Red-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Red-Theme/src/main/resources/defaults.css
index b087103..8830397 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Red-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Red-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#c51017, #950d12);
   border: 1px solid #66090c;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#c51017, #950d12);
-  border: 1px solid #66090c;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(236, 28, 36, 0.25);
+  border: 1px solid #9f0d13;
+  box-shadow: none;
+  color: #7e0b0f;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#c51017, #950d12);
-  border: 1px solid #66090c;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(236, 28, 36, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #7e0b0f;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Sapphire-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Sapphire-Theme/src/main/resources/defaults.css
index 0a8791c..e14e17a 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Sapphire-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Sapphire-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#225b95, #19416b);
   border: 1px solid #0f2842;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#225b95, #19416b);
-  border: 1px solid #0f2842;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(44, 116, 190, 0.25);
+  border: 1px solid #1b4673;
+  box-shadow: none;
+  color: #143556;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#225b95, #19416b);
-  border: 1px solid #0f2842;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(44, 116, 190, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #143556;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Sunflower-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Sunflower-Theme/src/main/resources/defaults.css
index 72dd912..93ebf2b 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Sunflower-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Sunflower-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#f69d0e, #ca7f07);
   border: 1px solid #986006;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#f69d0e, #ca7f07);
-  border: 1px solid #986006;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(248, 177, 63, 0.25);
+  border: 1px solid #d38508;
+  box-shadow: none;
+  color: #b17006;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#f69d0e, #ca7f07);
-  border: 1px solid #986006;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(248, 177, 63, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #b17006;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Topaz-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Topaz-Theme/src/main/resources/defaults.css
index 0565505..e7cf08e 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Topaz-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Topaz-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#d64010, #a6320d);
   border: 1px solid #772409;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#d64010, #a6320d);
-  border: 1px solid #772409;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(239, 90, 42, 0.25);
+  border: 1px solid #b0350d;
+  box-shadow: none;
+  color: #8f2b0b;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#d64010, #a6320d);
-  border: 1px solid #772409;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(239, 90, 42, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #8f2b0b;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Turquoise-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Turquoise-Theme/src/main/resources/defaults.css
index 923bf00..e44c748 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Turquoise-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Turquoise-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#1f7f78, #155651);
   border: 1px solid #0b2d2b;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#1f7f78, #155651);
-  border: 1px solid #0b2d2b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(41, 168, 159, 0.25);
+  border: 1px solid #175e59;
+  box-shadow: none;
+  color: #10423e;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#1f7f78, #155651);
-  border: 1px solid #0b2d2b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(41, 168, 159, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #10423e;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Violet-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Violet-Theme/src/main/resources/defaults.css
index 4868918..04ff6a2 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Violet-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Violet-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#4a2069, #2f1442);
   border: 1px solid #13081b;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#4a2069, #2f1442);
-  border: 1px solid #13081b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(102, 44, 144, 0.25);
+  border: 1px solid #34174a;
+  box-shadow: none;
+  color: #210e2e;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#4a2069, #2f1442);
-  border: 1px solid #13081b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(102, 44, 144, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #210e2e;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Yellow-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Yellow-Theme/src/main/resources/defaults.css
index 4f4d4fb..bc3830d 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Yellow-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Emphasized-Yellow-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#b1a909, #817a06);
   border: 1px solid #504c04;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#b1a909, #817a06);
-  border: 1px solid #504c04;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(226, 215, 11, 0.25);
+  border: 1px solid #8a8407;
+  box-shadow: none;
+  color: #686305;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#b1a909, #817a06);
-  border: 1px solid #504c04;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(226, 215, 11, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #686305;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
index 3d175da..f0fa74d 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(#404040, #262626);
   border: 1px solid #0d0d0d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#9f239d, #751a74);
   border: 1px solid #4b114a;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid #050505;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#9f239d, #751a74);
-  border: 1px solid #4b114a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(201, 44, 198, 0.25);
+  border: 1px solid #7e1c7c;
+  box-shadow: none;
+  color: #60155f;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#9f239d, #751a74);
-  border: 1px solid #4b114a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(201, 44, 198, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #60155f;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
index 0e44990..10c635e 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(#404040, #262626);
   border: 1px solid #0d0d0d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#1198e9, #0d79ba);
   border: 1px solid #0a5a8a;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid #050505;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#1198e9, #0d79ba);
-  border: 1px solid #0a5a8a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(60, 173, 241, 0.25);
+  border: 1px solid #0e7fc3;
+  box-shadow: none;
+  color: #0c69a2;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#1198e9, #0d79ba);
-  border: 1px solid #0a5a8a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(60, 173, 241, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #0c69a2;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Emerald-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Emerald-Theme/src/main/resources/defaults.css
index 5c56224..2b51f70 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Emerald-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Emerald-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(#404040, #262626);
   border: 1px solid #0d0d0d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#71a02f, #557923);
   border: 1px solid #395118;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid #050505;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#71a02f, #557923);
-  border: 1px solid #395118;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(140, 198, 60, 0.25);
+  border: 1px solid #5a8126;
+  box-shadow: none;
+  color: #47651e;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#71a02f, #557923);
-  border: 1px solid #395118;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(140, 198, 60, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #47651e;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Green-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Green-Theme/src/main/resources/defaults.css
index 1203f61..e4b9ebc 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Green-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Green-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(#404040, #262626);
   border: 1px solid #0d0d0d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#2e8e39, #21682a);
   border: 1px solid #15411a;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid #050505;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#2e8e39, #21682a);
-  border: 1px solid #15411a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(58, 181, 73, 0.25);
+  border: 1px solid #246f2d;
+  box-shadow: none;
+  color: #1b5422;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#2e8e39, #21682a);
-  border: 1px solid #15411a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(58, 181, 73, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #1b5422;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Orange-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Orange-Theme/src/main/resources/defaults.css
index 8af3be4..3cb2026 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Orange-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Orange-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(#404040, #262626);
   border: 1px solid #0d0d0d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#d97a08, #a85e06);
   border: 1px solid #774304;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid #050505;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#d97a08, #a85e06);
-  border: 1px solid #774304;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(247, 148, 29, 0.25);
+  border: 1px solid #b26406;
+  box-shadow: none;
+  color: #8f5105;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#d97a08, #a85e06);
-  border: 1px solid #774304;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(247, 148, 29, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #8f5105;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Red-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Red-Theme/src/main/resources/defaults.css
index 6229655..86e78e8 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Red-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Red-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(#404040, #262626);
   border: 1px solid #0d0d0d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#c51017, #950d12);
   border: 1px solid #66090c;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid #050505;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#c51017, #950d12);
-  border: 1px solid #66090c;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(236, 28, 36, 0.25);
+  border: 1px solid #9f0d13;
+  box-shadow: none;
+  color: #7e0b0f;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#c51017, #950d12);
-  border: 1px solid #66090c;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(236, 28, 36, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #7e0b0f;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sapphire-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sapphire-Theme/src/main/resources/defaults.css
index 8fc976a..5a41a98 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sapphire-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sapphire-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(#404040, #262626);
   border: 1px solid #0d0d0d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#225b95, #19416b);
   border: 1px solid #0f2842;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid #050505;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#225b95, #19416b);
-  border: 1px solid #0f2842;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(44, 116, 190, 0.25);
+  border: 1px solid #1b4673;
+  box-shadow: none;
+  color: #143556;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#225b95, #19416b);
-  border: 1px solid #0f2842;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(44, 116, 190, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #143556;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sunflower-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sunflower-Theme/src/main/resources/defaults.css
index fce1f5b..19b10e0 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sunflower-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sunflower-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(#404040, #262626);
   border: 1px solid #0d0d0d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#f69d0e, #ca7f07);
   border: 1px solid #986006;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid #050505;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#f69d0e, #ca7f07);
-  border: 1px solid #986006;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(248, 177, 63, 0.25);
+  border: 1px solid #d38508;
+  box-shadow: none;
+  color: #b17006;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#f69d0e, #ca7f07);
-  border: 1px solid #986006;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(248, 177, 63, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #b17006;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Topaz-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Topaz-Theme/src/main/resources/defaults.css
index 6b7b5df..469d6eb 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Topaz-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Topaz-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(#404040, #262626);
   border: 1px solid #0d0d0d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#d64010, #a6320d);
   border: 1px solid #772409;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid #050505;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#d64010, #a6320d);
-  border: 1px solid #772409;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(239, 90, 42, 0.25);
+  border: 1px solid #b0350d;
+  box-shadow: none;
+  color: #8f2b0b;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#d64010, #a6320d);
-  border: 1px solid #772409;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(239, 90, 42, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #8f2b0b;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Turquoise-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Turquoise-Theme/src/main/resources/defaults.css
index e20341d..d926c8e 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Turquoise-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Turquoise-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(#404040, #262626);
   border: 1px solid #0d0d0d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#1f7f78, #155651);
   border: 1px solid #0b2d2b;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid #050505;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#1f7f78, #155651);
-  border: 1px solid #0b2d2b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(41, 168, 159, 0.25);
+  border: 1px solid #175e59;
+  box-shadow: none;
+  color: #10423e;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#1f7f78, #155651);
-  border: 1px solid #0b2d2b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(41, 168, 159, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #10423e;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Violet-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Violet-Theme/src/main/resources/defaults.css
index 366f0cf..d5ae6fc 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Violet-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Violet-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(#404040, #262626);
   border: 1px solid #0d0d0d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#4a2069, #2f1442);
   border: 1px solid #13081b;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid #050505;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#4a2069, #2f1442);
-  border: 1px solid #13081b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(102, 44, 144, 0.25);
+  border: 1px solid #34174a;
+  box-shadow: none;
+  color: #210e2e;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#4a2069, #2f1442);
-  border: 1px solid #13081b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(102, 44, 144, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #210e2e;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Yellow-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Yellow-Theme/src/main/resources/defaults.css
index 11ce9e5..a0d884c 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Yellow-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Yellow-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(#404040, #262626);
   border: 1px solid #0d0d0d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#b1a909, #817a06);
   border: 1px solid #504c04;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid #050505;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#b1a909, #817a06);
-  border: 1px solid #504c04;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(226, 215, 11, 0.25);
+  border: 1px solid #8a8407;
+  box-shadow: none;
+  color: #686305;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#191919, black);
-  border: 1px solid black;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(51, 51, 51, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: black;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#b1a909, #817a06);
-  border: 1px solid #504c04;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(226, 215, 11, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #686305;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Amethyst-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Amethyst-Theme/src/main/resources/defaults.css
index e09d1f9..d1dcc6f 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Amethyst-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Amethyst-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#9f239d, #751a74);
   border: 1px solid #4b114a;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#9f239d, #751a74);
-  border: 1px solid #4b114a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(201, 44, 198, 0.25);
+  border: 1px solid #7e1c7c;
+  box-shadow: none;
+  color: #60155f;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Blue-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Blue-Theme/src/main/resources/defaults.css
index 53032b8..7e77d29 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Blue-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Blue-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#1198e9, #0d79ba);
   border: 1px solid #0a5a8a;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#1198e9, #0d79ba);
-  border: 1px solid #0a5a8a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(60, 173, 241, 0.25);
+  border: 1px solid #0e7fc3;
+  box-shadow: none;
+  color: #0c69a2;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Emerald-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Emerald-Theme/src/main/resources/defaults.css
index 7e3677f..4218b48 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Emerald-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Emerald-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#71a02f, #557923);
   border: 1px solid #395118;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#71a02f, #557923);
-  border: 1px solid #395118;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(140, 198, 60, 0.25);
+  border: 1px solid #5a8126;
+  box-shadow: none;
+  color: #47651e;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Green-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Green-Theme/src/main/resources/defaults.css
index aa9dc89..8759686 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Green-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Green-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#2e8e39, #21682a);
   border: 1px solid #15411a;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#2e8e39, #21682a);
-  border: 1px solid #15411a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(58, 181, 73, 0.25);
+  border: 1px solid #246f2d;
+  box-shadow: none;
+  color: #1b5422;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Orange-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Orange-Theme/src/main/resources/defaults.css
index b4d044e..4d0aeba 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Orange-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Orange-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#d97a08, #a85e06);
   border: 1px solid #774304;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#d97a08, #a85e06);
-  border: 1px solid #774304;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(247, 148, 29, 0.25);
+  border: 1px solid #b26406;
+  box-shadow: none;
+  color: #8f5105;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Red-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Red-Theme/src/main/resources/defaults.css
index 141dd69..f6b27e3 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Red-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Red-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#c51017, #950d12);
   border: 1px solid #66090c;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#c51017, #950d12);
-  border: 1px solid #66090c;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(236, 28, 36, 0.25);
+  border: 1px solid #9f0d13;
+  box-shadow: none;
+  color: #7e0b0f;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Sapphire-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Sapphire-Theme/src/main/resources/defaults.css
index 2d8de44..ef2aaa4 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Sapphire-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Sapphire-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#225b95, #19416b);
   border: 1px solid #0f2842;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#225b95, #19416b);
-  border: 1px solid #0f2842;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(44, 116, 190, 0.25);
+  border: 1px solid #1b4673;
+  box-shadow: none;
+  color: #143556;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Sunflower-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Sunflower-Theme/src/main/resources/defaults.css
index d8295dc..614a4c5 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Sunflower-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Sunflower-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#f69d0e, #ca7f07);
   border: 1px solid #986006;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#f69d0e, #ca7f07);
-  border: 1px solid #986006;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(248, 177, 63, 0.25);
+  border: 1px solid #d38508;
+  box-shadow: none;
+  color: #b17006;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Topaz-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Topaz-Theme/src/main/resources/defaults.css
index 95c2436..f366520 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Topaz-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Topaz-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#d64010, #a6320d);
   border: 1px solid #772409;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#d64010, #a6320d);
-  border: 1px solid #772409;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(239, 90, 42, 0.25);
+  border: 1px solid #b0350d;
+  box-shadow: none;
+  color: #8f2b0b;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Turquoise-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Turquoise-Theme/src/main/resources/defaults.css
index beed374..e1931c4 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Turquoise-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Turquoise-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#1f7f78, #155651);
   border: 1px solid #0b2d2b;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#1f7f78, #155651);
-  border: 1px solid #0b2d2b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(41, 168, 159, 0.25);
+  border: 1px solid #175e59;
+  box-shadow: none;
+  color: #10423e;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Violet-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Violet-Theme/src/main/resources/defaults.css
index bd85664..1225e06 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Violet-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Violet-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#4a2069, #2f1442);
   border: 1px solid #13081b;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#4a2069, #2f1442);
-  border: 1px solid #13081b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(102, 44, 144, 0.25);
+  border: 1px solid #34174a;
+  box-shadow: none;
+  color: #210e2e;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Yellow-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Yellow-Theme/src/main/resources/defaults.css
index daeff06..cdea365 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Yellow-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Secondary-Yellow-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#b1a909, #817a06);
   border: 1px solid #504c04;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#b1a909, #817a06);
-  border: 1px solid #504c04;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(226, 215, 11, 0.25);
+  border: 1px solid #8a8407;
+  box-shadow: none;
+  color: #686305;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Amethyst-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Emphasized-Amethyst-Theme/src/main/resources/defaults.css
index 049100e..1f4381d 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Amethyst-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Amethyst-Theme/src/main/resources/defaults.css
@@ -210,6 +210,7 @@
   background: #8a1e88;
   border: 1px solid #a825a5;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -242,9 +243,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: #8a1e88;
-  border: 1px solid #a825a5;
+  background: rgba(201, 44, 198, 0.25);
+  border: 1px solid #7e1c7c;
   box-shadow: none;
+  color: #60155f;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -278,9 +280,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: #8a1e88;
-  border: 1px solid #a825a5;
+  background: rgba(201, 44, 198, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #60155f;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Blue-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Emphasized-Blue-Theme/src/main/resources/defaults.css
index 2cb1e7f..a539e13 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Blue-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Blue-Theme/src/main/resources/defaults.css
@@ -210,6 +210,7 @@
   background: #0f88d1;
   border: 1px solid #169dee;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -242,9 +243,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: #0f88d1;
-  border: 1px solid #169dee;
+  background: rgba(60, 173, 241, 0.25);
+  border: 1px solid #0e7fc3;
   box-shadow: none;
+  color: #0c69a2;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -278,9 +280,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: #0f88d1;
-  border: 1px solid #169dee;
+  background: rgba(60, 173, 241, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #0c69a2;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Emerald-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Emphasized-Emerald-Theme/src/main/resources/defaults.css
index fd65f21..14be9c0 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Emerald-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Emerald-Theme/src/main/resources/defaults.css
@@ -210,6 +210,7 @@
   background: #638c29;
   border: 1px solid #76a831;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -242,9 +243,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: #638c29;
-  border: 1px solid #76a831;
+  background: rgba(140, 198, 60, 0.25);
+  border: 1px solid #5a8126;
   box-shadow: none;
+  color: #47651e;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -278,9 +280,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: #638c29;
-  border: 1px solid #76a831;
+  background: rgba(140, 198, 60, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #47651e;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Green-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Emphasized-Green-Theme/src/main/resources/defaults.css
index 2912842..84a3179 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Green-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Green-Theme/src/main/resources/defaults.css
@@ -210,6 +210,7 @@
   background: #277b32;
   border: 1px solid #30963d;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -242,9 +243,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: #277b32;
-  border: 1px solid #30963d;
+  background: rgba(58, 181, 73, 0.25);
+  border: 1px solid #246f2d;
   box-shadow: none;
+  color: #1b5422;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -278,9 +280,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: #277b32;
-  border: 1px solid #30963d;
+  background: rgba(58, 181, 73, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #1b5422;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Orange-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Emphasized-Orange-Theme/src/main/resources/defaults.css
index ea953af..e494e52 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Orange-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Orange-Theme/src/main/resources/defaults.css
@@ -210,6 +210,7 @@
   background: #c16c07;
   border: 1px solid #e38008;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -242,9 +243,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: #c16c07;
-  border: 1px solid #e38008;
+  background: rgba(247, 148, 29, 0.25);
+  border: 1px solid #b26406;
   box-shadow: none;
+  color: #8f5105;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -278,9 +280,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: #c16c07;
-  border: 1px solid #e38008;
+  background: rgba(247, 148, 29, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #8f5105;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Red-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Emphasized-Red-Theme/src/main/resources/defaults.css
index 96a3efa..77e0ae4 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Red-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Red-Theme/src/main/resources/defaults.css
@@ -210,6 +210,7 @@
   background: #ad0e15;
   border: 1px solid #ce1118;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -242,9 +243,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: #ad0e15;
-  border: 1px solid #ce1118;
+  background: rgba(236, 28, 36, 0.25);
+  border: 1px solid #9f0d13;
   box-shadow: none;
+  color: #7e0b0f;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -278,9 +280,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: #ad0e15;
-  border: 1px solid #ce1118;
+  background: rgba(236, 28, 36, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #7e0b0f;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Sapphire-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Emphasized-Sapphire-Theme/src/main/resources/defaults.css
index 0539125..26da519 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Sapphire-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Sapphire-Theme/src/main/resources/defaults.css
@@ -210,6 +210,7 @@
   background: #1e4e80;
   border: 1px solid #24609d;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -242,9 +243,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: #1e4e80;
-  border: 1px solid #24609d;
+  background: rgba(44, 116, 190, 0.25);
+  border: 1px solid #1b4673;
   box-shadow: none;
+  color: #143556;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -278,9 +280,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: #1e4e80;
-  border: 1px solid #24609d;
+  background: rgba(44, 116, 190, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #143556;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Sunflower-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Emphasized-Sunflower-Theme/src/main/resources/defaults.css
index 07197e3..0da5b15 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Sunflower-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Sunflower-Theme/src/main/resources/defaults.css
@@ -210,6 +210,7 @@
   background: #e28f08;
   border: 1px solid #f7a118;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -242,9 +243,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: #e28f08;
-  border: 1px solid #f7a118;
+  background: rgba(248, 177, 63, 0.25);
+  border: 1px solid #d38508;
   box-shadow: none;
+  color: #b17006;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -278,9 +280,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: #e28f08;
-  border: 1px solid #f7a118;
+  background: rgba(248, 177, 63, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #b17006;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Topaz-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Emphasized-Topaz-Theme/src/main/resources/defaults.css
index c35dc31..622dd8b 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Topaz-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Topaz-Theme/src/main/resources/defaults.css
@@ -210,6 +210,7 @@
   background: #be390e;
   border: 1px solid #df4311;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -242,9 +243,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: #be390e;
-  border: 1px solid #df4311;
+  background: rgba(239, 90, 42, 0.25);
+  border: 1px solid #b0350d;
   box-shadow: none;
+  color: #8f2b0b;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -278,9 +280,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: #be390e;
-  border: 1px solid #df4311;
+  background: rgba(239, 90, 42, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #8f2b0b;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Turquoise-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Emphasized-Turquoise-Theme/src/main/resources/defaults.css
index 4c588ec..ea4c09b 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Turquoise-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Turquoise-Theme/src/main/resources/defaults.css
@@ -210,6 +210,7 @@
   background: #1a6b65;
   border: 1px solid #218780;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -242,9 +243,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: #1a6b65;
-  border: 1px solid #218780;
+  background: rgba(41, 168, 159, 0.25);
+  border: 1px solid #175e59;
   box-shadow: none;
+  color: #10423e;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -278,9 +280,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: #1a6b65;
-  border: 1px solid #218780;
+  background: rgba(41, 168, 159, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #10423e;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Violet-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Emphasized-Violet-Theme/src/main/resources/defaults.css
index 35e4b95..af6a83b 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Violet-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Violet-Theme/src/main/resources/defaults.css
@@ -210,6 +210,7 @@
   background: #3c1a55;
   border: 1px solid #502271;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -242,9 +243,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: #3c1a55;
-  border: 1px solid #502271;
+  background: rgba(102, 44, 144, 0.25);
+  border: 1px solid #34174a;
   box-shadow: none;
+  color: #210e2e;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -278,9 +280,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: #3c1a55;
-  border: 1px solid #502271;
+  background: rgba(102, 44, 144, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #210e2e;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-Flat-Emphasized-Yellow-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Emphasized-Yellow-Theme/src/main/resources/defaults.css
index 0adebae..61500fb 100644
--- a/frameworks/themes/Jewel-Light-Flat-Emphasized-Yellow-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Emphasized-Yellow-Theme/src/main/resources/defaults.css
@@ -210,6 +210,7 @@
   background: #999207;
   border: 1px solid #bbb209;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -242,9 +243,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: #999207;
-  border: 1px solid #bbb209;
+  background: rgba(226, 215, 11, 0.25);
+  border: 1px solid #8a8407;
   box-shadow: none;
+  color: #686305;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -278,9 +280,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: #999207;
-  border: 1px solid #bbb209;
+  background: rgba(226, 215, 11, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #686305;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Amethyst-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Primary-Amethyst-Theme/src/main/resources/defaults.css
index a5596d6..6c766d7 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Amethyst-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Amethyst-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: #b3b3b3;
   border: 1px solid #c5c5c5;
   box-shadow: none;
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1440,6 +1441,7 @@ div {
   background: #8a1e88;
   border: 1px solid #a825a5;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1472,9 +1474,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1507,9 +1510,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: #8a1e88;
-  border: 1px solid #a825a5;
+  background: rgba(201, 44, 198, 0.25);
+  border: 1px solid #7e1c7c;
   box-shadow: none;
+  color: #60155f;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1543,9 +1547,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1579,9 +1584,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: #8a1e88;
-  border: 1px solid #a825a5;
+  background: rgba(201, 44, 198, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #60155f;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Blue-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Primary-Blue-Theme/src/main/resources/defaults.css
index a4a19f4..2f43569 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Blue-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Blue-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: #b3b3b3;
   border: 1px solid #c5c5c5;
   box-shadow: none;
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1440,6 +1441,7 @@ div {
   background: #0f88d1;
   border: 1px solid #169dee;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1472,9 +1474,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1507,9 +1510,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: #0f88d1;
-  border: 1px solid #169dee;
+  background: rgba(60, 173, 241, 0.25);
+  border: 1px solid #0e7fc3;
   box-shadow: none;
+  color: #0c69a2;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1543,9 +1547,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1579,9 +1584,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: #0f88d1;
-  border: 1px solid #169dee;
+  background: rgba(60, 173, 241, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #0c69a2;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Emerald-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Primary-Emerald-Theme/src/main/resources/defaults.css
index 57077a1..c10e846 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Emerald-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Emerald-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: #b3b3b3;
   border: 1px solid #c5c5c5;
   box-shadow: none;
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1440,6 +1441,7 @@ div {
   background: #638c29;
   border: 1px solid #76a831;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1472,9 +1474,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1507,9 +1510,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: #638c29;
-  border: 1px solid #76a831;
+  background: rgba(140, 198, 60, 0.25);
+  border: 1px solid #5a8126;
   box-shadow: none;
+  color: #47651e;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1543,9 +1547,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1579,9 +1584,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: #638c29;
-  border: 1px solid #76a831;
+  background: rgba(140, 198, 60, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #47651e;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Green-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Primary-Green-Theme/src/main/resources/defaults.css
index 06697be..8e0d5cd 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Green-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Green-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: #b3b3b3;
   border: 1px solid #c5c5c5;
   box-shadow: none;
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1440,6 +1441,7 @@ div {
   background: #277b32;
   border: 1px solid #30963d;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1472,9 +1474,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1507,9 +1510,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: #277b32;
-  border: 1px solid #30963d;
+  background: rgba(58, 181, 73, 0.25);
+  border: 1px solid #246f2d;
   box-shadow: none;
+  color: #1b5422;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1543,9 +1547,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1579,9 +1584,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: #277b32;
-  border: 1px solid #30963d;
+  background: rgba(58, 181, 73, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #1b5422;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Orange-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Primary-Orange-Theme/src/main/resources/defaults.css
index 048fbb0..2d2bda6 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Orange-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Orange-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: #b3b3b3;
   border: 1px solid #c5c5c5;
   box-shadow: none;
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1440,6 +1441,7 @@ div {
   background: #c16c07;
   border: 1px solid #e38008;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1472,9 +1474,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1507,9 +1510,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: #c16c07;
-  border: 1px solid #e38008;
+  background: rgba(247, 148, 29, 0.25);
+  border: 1px solid #b26406;
   box-shadow: none;
+  color: #8f5105;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1543,9 +1547,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1579,9 +1584,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: #c16c07;
-  border: 1px solid #e38008;
+  background: rgba(247, 148, 29, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #8f5105;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Red-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Primary-Red-Theme/src/main/resources/defaults.css
index f27a06a..6f6a341 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Red-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Red-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: #b3b3b3;
   border: 1px solid #c5c5c5;
   box-shadow: none;
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1440,6 +1441,7 @@ div {
   background: #ad0e15;
   border: 1px solid #ce1118;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1472,9 +1474,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1507,9 +1510,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: #ad0e15;
-  border: 1px solid #ce1118;
+  background: rgba(236, 28, 36, 0.25);
+  border: 1px solid #9f0d13;
   box-shadow: none;
+  color: #7e0b0f;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1543,9 +1547,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1579,9 +1584,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: #ad0e15;
-  border: 1px solid #ce1118;
+  background: rgba(236, 28, 36, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #7e0b0f;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Sapphire-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Primary-Sapphire-Theme/src/main/resources/defaults.css
index b1fc0cd..f384a1f 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Sapphire-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Sapphire-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: #b3b3b3;
   border: 1px solid #c5c5c5;
   box-shadow: none;
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1440,6 +1441,7 @@ div {
   background: #1e4e80;
   border: 1px solid #24609d;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1472,9 +1474,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1507,9 +1510,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: #1e4e80;
-  border: 1px solid #24609d;
+  background: rgba(44, 116, 190, 0.25);
+  border: 1px solid #1b4673;
   box-shadow: none;
+  color: #143556;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1543,9 +1547,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1579,9 +1584,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: #1e4e80;
-  border: 1px solid #24609d;
+  background: rgba(44, 116, 190, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #143556;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Sunflower-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Primary-Sunflower-Theme/src/main/resources/defaults.css
index 639c7ff..bfcf627 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Sunflower-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Sunflower-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: #b3b3b3;
   border: 1px solid #c5c5c5;
   box-shadow: none;
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1440,6 +1441,7 @@ div {
   background: #e28f08;
   border: 1px solid #f7a118;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1472,9 +1474,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1507,9 +1510,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: #e28f08;
-  border: 1px solid #f7a118;
+  background: rgba(248, 177, 63, 0.25);
+  border: 1px solid #d38508;
   box-shadow: none;
+  color: #b17006;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1543,9 +1547,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1579,9 +1584,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: #e28f08;
-  border: 1px solid #f7a118;
+  background: rgba(248, 177, 63, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #b17006;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Topaz-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Primary-Topaz-Theme/src/main/resources/defaults.css
index d26431c..0fd3048 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Topaz-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Topaz-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: #b3b3b3;
   border: 1px solid #c5c5c5;
   box-shadow: none;
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1440,6 +1441,7 @@ div {
   background: #be390e;
   border: 1px solid #df4311;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1472,9 +1474,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1507,9 +1510,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: #be390e;
-  border: 1px solid #df4311;
+  background: rgba(239, 90, 42, 0.25);
+  border: 1px solid #b0350d;
   box-shadow: none;
+  color: #8f2b0b;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1543,9 +1547,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1579,9 +1584,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: #be390e;
-  border: 1px solid #df4311;
+  background: rgba(239, 90, 42, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #8f2b0b;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Turquoise-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Primary-Turquoise-Theme/src/main/resources/defaults.css
index d92a31f..edf2c22 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Turquoise-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Turquoise-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: #b3b3b3;
   border: 1px solid #c5c5c5;
   box-shadow: none;
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1440,6 +1441,7 @@ div {
   background: #1a6b65;
   border: 1px solid #218780;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1472,9 +1474,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1507,9 +1510,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: #1a6b65;
-  border: 1px solid #218780;
+  background: rgba(41, 168, 159, 0.25);
+  border: 1px solid #175e59;
   box-shadow: none;
+  color: #10423e;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1543,9 +1547,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1579,9 +1584,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: #1a6b65;
-  border: 1px solid #218780;
+  background: rgba(41, 168, 159, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #10423e;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Violet-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Primary-Violet-Theme/src/main/resources/defaults.css
index 3e6d4b0..96703cf 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Violet-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Violet-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: #b3b3b3;
   border: 1px solid #c5c5c5;
   box-shadow: none;
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1440,6 +1441,7 @@ div {
   background: #3c1a55;
   border: 1px solid #502271;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1472,9 +1474,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1507,9 +1510,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: #3c1a55;
-  border: 1px solid #502271;
+  background: rgba(102, 44, 144, 0.25);
+  border: 1px solid #34174a;
   box-shadow: none;
+  color: #210e2e;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1543,9 +1547,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1579,9 +1584,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: #3c1a55;
-  border: 1px solid #502271;
+  background: rgba(102, 44, 144, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #210e2e;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-Flat-Primary-Yellow-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Primary-Yellow-Theme/src/main/resources/defaults.css
index 63aebee..c368354 100644
--- a/frameworks/themes/Jewel-Light-Flat-Primary-Yellow-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Primary-Yellow-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: #b3b3b3;
   border: 1px solid #c5c5c5;
   box-shadow: none;
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1440,6 +1441,7 @@ div {
   background: #999207;
   border: 1px solid #bbb209;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1472,9 +1474,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1507,9 +1510,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: #999207;
-  border: 1px solid #bbb209;
+  background: rgba(226, 215, 11, 0.25);
+  border: 1px solid #8a8407;
   box-shadow: none;
+  color: #686305;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1543,9 +1547,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: #8d8d8d;
-  border: 1px solid #9e9e9e;
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1579,9 +1584,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: #999207;
-  border: 1px solid #bbb209;
+  background: rgba(226, 215, 11, 0.25);
+  border: 1px solid transparent;
   box-shadow: none;
+  color: #686305;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Amethyst-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Secondary-Amethyst-Theme/src/main/resources/defaults.css
index 69d2cd9..a00dddf 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Amethyst-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Amethyst-Theme/src/main/resources/defaults.css
@@ -222,6 +222,7 @@ a:active {
   background: #8a1e88;
   border: 1px solid #a825a5;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -254,9 +255,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: #8a1e88;
-  border: 1px solid #a825a5;
+  background: rgba(201, 44, 198, 0.25);
+  border: 1px solid #7e1c7c;
   box-shadow: none;
+  color: #60155f;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Blue-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Secondary-Blue-Theme/src/main/resources/defaults.css
index 6bff3d3..49c7f1d 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Blue-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Blue-Theme/src/main/resources/defaults.css
@@ -222,6 +222,7 @@ a:active {
   background: #0f88d1;
   border: 1px solid #169dee;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -254,9 +255,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: #0f88d1;
-  border: 1px solid #169dee;
+  background: rgba(60, 173, 241, 0.25);
+  border: 1px solid #0e7fc3;
   box-shadow: none;
+  color: #0c69a2;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Emerald-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Secondary-Emerald-Theme/src/main/resources/defaults.css
index dfa60d1..e07ef3b 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Emerald-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Emerald-Theme/src/main/resources/defaults.css
@@ -222,6 +222,7 @@ a:active {
   background: #638c29;
   border: 1px solid #76a831;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -254,9 +255,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: #638c29;
-  border: 1px solid #76a831;
+  background: rgba(140, 198, 60, 0.25);
+  border: 1px solid #5a8126;
   box-shadow: none;
+  color: #47651e;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Green-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Secondary-Green-Theme/src/main/resources/defaults.css
index 9b14c91..08ed8af 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Green-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Green-Theme/src/main/resources/defaults.css
@@ -222,6 +222,7 @@ a:active {
   background: #277b32;
   border: 1px solid #30963d;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -254,9 +255,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: #277b32;
-  border: 1px solid #30963d;
+  background: rgba(58, 181, 73, 0.25);
+  border: 1px solid #246f2d;
   box-shadow: none;
+  color: #1b5422;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Orange-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Secondary-Orange-Theme/src/main/resources/defaults.css
index 730415a..4ae3cf3 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Orange-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Orange-Theme/src/main/resources/defaults.css
@@ -222,6 +222,7 @@ a:active {
   background: #c16c07;
   border: 1px solid #e38008;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -254,9 +255,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: #c16c07;
-  border: 1px solid #e38008;
+  background: rgba(247, 148, 29, 0.25);
+  border: 1px solid #b26406;
   box-shadow: none;
+  color: #8f5105;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Red-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Secondary-Red-Theme/src/main/resources/defaults.css
index 2b7cee7..4830310 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Red-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Red-Theme/src/main/resources/defaults.css
@@ -222,6 +222,7 @@ a:active {
   background: #ad0e15;
   border: 1px solid #ce1118;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -254,9 +255,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: #ad0e15;
-  border: 1px solid #ce1118;
+  background: rgba(236, 28, 36, 0.25);
+  border: 1px solid #9f0d13;
   box-shadow: none;
+  color: #7e0b0f;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Sapphire-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Secondary-Sapphire-Theme/src/main/resources/defaults.css
index e0a1023..b66ea15 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Sapphire-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Sapphire-Theme/src/main/resources/defaults.css
@@ -222,6 +222,7 @@ a:active {
   background: #1e4e80;
   border: 1px solid #24609d;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -254,9 +255,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: #1e4e80;
-  border: 1px solid #24609d;
+  background: rgba(44, 116, 190, 0.25);
+  border: 1px solid #1b4673;
   box-shadow: none;
+  color: #143556;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Sunflower-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Secondary-Sunflower-Theme/src/main/resources/defaults.css
index 5805c28..b9955a4 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Sunflower-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Sunflower-Theme/src/main/resources/defaults.css
@@ -222,6 +222,7 @@ a:active {
   background: #e28f08;
   border: 1px solid #f7a118;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -254,9 +255,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: #e28f08;
-  border: 1px solid #f7a118;
+  background: rgba(248, 177, 63, 0.25);
+  border: 1px solid #d38508;
   box-shadow: none;
+  color: #b17006;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Topaz-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Secondary-Topaz-Theme/src/main/resources/defaults.css
index ba984f6..962ff56 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Topaz-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Topaz-Theme/src/main/resources/defaults.css
@@ -222,6 +222,7 @@ a:active {
   background: #be390e;
   border: 1px solid #df4311;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -254,9 +255,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: #be390e;
-  border: 1px solid #df4311;
+  background: rgba(239, 90, 42, 0.25);
+  border: 1px solid #b0350d;
   box-shadow: none;
+  color: #8f2b0b;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Turquoise-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Secondary-Turquoise-Theme/src/main/resources/defaults.css
index 30a6034..e8440f9 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Turquoise-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Turquoise-Theme/src/main/resources/defaults.css
@@ -222,6 +222,7 @@ a:active {
   background: #1a6b65;
   border: 1px solid #218780;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -254,9 +255,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: #1a6b65;
-  border: 1px solid #218780;
+  background: rgba(41, 168, 159, 0.25);
+  border: 1px solid #175e59;
   box-shadow: none;
+  color: #10423e;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Violet-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Secondary-Violet-Theme/src/main/resources/defaults.css
index 01682fe..d2cd883 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Violet-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Violet-Theme/src/main/resources/defaults.css
@@ -222,6 +222,7 @@ a:active {
   background: #3c1a55;
   border: 1px solid #502271;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -254,9 +255,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: #3c1a55;
-  border: 1px solid #502271;
+  background: rgba(102, 44, 144, 0.25);
+  border: 1px solid #34174a;
   box-shadow: none;
+  color: #210e2e;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-Flat-Secondary-Yellow-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-Flat-Secondary-Yellow-Theme/src/main/resources/defaults.css
index 88f7383..a939236 100644
--- a/frameworks/themes/Jewel-Light-Flat-Secondary-Yellow-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-Flat-Secondary-Yellow-Theme/src/main/resources/defaults.css
@@ -222,6 +222,7 @@ a:active {
   background: #999207;
   border: 1px solid #bbb209;
   box-shadow: none;
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -254,9 +255,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: #999207;
-  border: 1px solid #bbb209;
+  background: rgba(226, 215, 11, 0.25);
+  border: 1px solid #8a8407;
   box-shadow: none;
+  color: #686305;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Amethyst-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Amethyst-Theme/src/main/resources/defaults.css
index c197f60..2cfb1b5 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Amethyst-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Amethyst-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#9f239d, #751a74);
   border: 1px solid #4b114a;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#9f239d, #751a74);
-  border: 1px solid #4b114a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(201, 44, 198, 0.25);
+  border: 1px solid #7e1c7c;
+  box-shadow: none;
+  color: #60155f;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#9f239d, #751a74);
-  border: 1px solid #4b114a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(201, 44, 198, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #60155f;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/src/main/resources/defaults.css
index 57be63d..fdc81b1 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#1198e9, #0d79ba);
   border: 1px solid #0a5a8a;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#1198e9, #0d79ba);
-  border: 1px solid #0a5a8a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(60, 173, 241, 0.25);
+  border: 1px solid #0e7fc3;
+  box-shadow: none;
+  color: #0c69a2;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#1198e9, #0d79ba);
-  border: 1px solid #0a5a8a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(60, 173, 241, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #0c69a2;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Emerald-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Emerald-Theme/src/main/resources/defaults.css
index 3935673..fb01e5b 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Emerald-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Emerald-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#71a02f, #557923);
   border: 1px solid #395118;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#71a02f, #557923);
-  border: 1px solid #395118;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(140, 198, 60, 0.25);
+  border: 1px solid #5a8126;
+  box-shadow: none;
+  color: #47651e;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#71a02f, #557923);
-  border: 1px solid #395118;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(140, 198, 60, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #47651e;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Green-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Green-Theme/src/main/resources/defaults.css
index 4fc3b63..c20efe3 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Green-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Green-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#2e8e39, #21682a);
   border: 1px solid #15411a;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#2e8e39, #21682a);
-  border: 1px solid #15411a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(58, 181, 73, 0.25);
+  border: 1px solid #246f2d;
+  box-shadow: none;
+  color: #1b5422;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#2e8e39, #21682a);
-  border: 1px solid #15411a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(58, 181, 73, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #1b5422;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Orange-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Orange-Theme/src/main/resources/defaults.css
index 84bfa3f..aff31b2 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Orange-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Orange-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#d97a08, #a85e06);
   border: 1px solid #774304;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#d97a08, #a85e06);
-  border: 1px solid #774304;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(247, 148, 29, 0.25);
+  border: 1px solid #b26406;
+  box-shadow: none;
+  color: #8f5105;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#d97a08, #a85e06);
-  border: 1px solid #774304;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(247, 148, 29, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #8f5105;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Red-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Red-Theme/src/main/resources/defaults.css
index e807479..8930885 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Red-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Red-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#c51017, #950d12);
   border: 1px solid #66090c;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#c51017, #950d12);
-  border: 1px solid #66090c;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(236, 28, 36, 0.25);
+  border: 1px solid #9f0d13;
+  box-shadow: none;
+  color: #7e0b0f;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#c51017, #950d12);
-  border: 1px solid #66090c;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(236, 28, 36, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #7e0b0f;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Sapphire-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Sapphire-Theme/src/main/resources/defaults.css
index f30b767..9870852 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Sapphire-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Sapphire-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#225b95, #19416b);
   border: 1px solid #0f2842;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#225b95, #19416b);
-  border: 1px solid #0f2842;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(44, 116, 190, 0.25);
+  border: 1px solid #1b4673;
+  box-shadow: none;
+  color: #143556;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#225b95, #19416b);
-  border: 1px solid #0f2842;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(44, 116, 190, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #143556;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Sunflower-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Sunflower-Theme/src/main/resources/defaults.css
index b8028a2..e07bc7f 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Sunflower-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Sunflower-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#f69d0e, #ca7f07);
   border: 1px solid #986006;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#f69d0e, #ca7f07);
-  border: 1px solid #986006;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(248, 177, 63, 0.25);
+  border: 1px solid #d38508;
+  box-shadow: none;
+  color: #b17006;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#f69d0e, #ca7f07);
-  border: 1px solid #986006;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(248, 177, 63, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #b17006;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Topaz-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Topaz-Theme/src/main/resources/defaults.css
index c602607..72f74bf 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Topaz-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Topaz-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#d64010, #a6320d);
   border: 1px solid #772409;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#d64010, #a6320d);
-  border: 1px solid #772409;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(239, 90, 42, 0.25);
+  border: 1px solid #b0350d;
+  box-shadow: none;
+  color: #8f2b0b;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#d64010, #a6320d);
-  border: 1px solid #772409;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(239, 90, 42, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #8f2b0b;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Turquoise-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Turquoise-Theme/src/main/resources/defaults.css
index ecfb9dd..8dcb3ee 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Turquoise-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Turquoise-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#1f7f78, #155651);
   border: 1px solid #0b2d2b;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#1f7f78, #155651);
-  border: 1px solid #0b2d2b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(41, 168, 159, 0.25);
+  border: 1px solid #175e59;
+  box-shadow: none;
+  color: #10423e;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#1f7f78, #155651);
-  border: 1px solid #0b2d2b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(41, 168, 159, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #10423e;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Violet-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Violet-Theme/src/main/resources/defaults.css
index a5e9367..f7a958a 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Violet-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Violet-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#4a2069, #2f1442);
   border: 1px solid #13081b;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#4a2069, #2f1442);
-  border: 1px solid #13081b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(102, 44, 144, 0.25);
+  border: 1px solid #34174a;
+  box-shadow: none;
+  color: #210e2e;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#4a2069, #2f1442);
-  border: 1px solid #13081b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(102, 44, 144, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #210e2e;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Yellow-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Yellow-Theme/src/main/resources/defaults.css
index 989703a..5b53353 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Yellow-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Yellow-Theme/src/main/resources/defaults.css
@@ -208,6 +208,7 @@
   background: linear-gradient(#b1a909, #817a06);
   border: 1px solid #504c04;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.emphasized.outlined {
@@ -240,9 +241,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.outlined.selected {
-  background: linear-gradient(#b1a909, #817a06);
-  border: 1px solid #504c04;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(226, 215, 11, 0.25);
+  border: 1px solid #8a8407;
+  box-shadow: none;
+  color: #686305;
 }
 
 .jewel.togglebutton.emphasized.unboxed {
@@ -276,9 +278,10 @@
   text-shadow: unset;
 }
 .jewel.togglebutton.emphasized.unboxed.selected {
-  background: linear-gradient(#b1a909, #817a06);
-  border: 1px solid #504c04;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(226, 215, 11, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #686305;
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
index 88a3328..69609ba 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(silver, #a6a6a6);
   border: 1px solid #8d8d8d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#9f239d, #751a74);
   border: 1px solid #4b114a;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#9f239d, #751a74);
-  border: 1px solid #4b114a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(201, 44, 198, 0.25);
+  border: 1px solid #7e1c7c;
+  box-shadow: none;
+  color: #60155f;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#9f239d, #751a74);
-  border: 1px solid #4b114a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(201, 44, 198, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #60155f;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
index 7c6b550..74e9431 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(silver, #a6a6a6);
   border: 1px solid #8d8d8d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#1198e9, #0d79ba);
   border: 1px solid #0a5a8a;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#1198e9, #0d79ba);
-  border: 1px solid #0a5a8a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(60, 173, 241, 0.25);
+  border: 1px solid #0e7fc3;
+  box-shadow: none;
+  color: #0c69a2;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#1198e9, #0d79ba);
-  border: 1px solid #0a5a8a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(60, 173, 241, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #0c69a2;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Emerald-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Emerald-Theme/src/main/resources/defaults.css
index 6a2618f..f56fc15 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Emerald-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Emerald-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(silver, #a6a6a6);
   border: 1px solid #8d8d8d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#71a02f, #557923);
   border: 1px solid #395118;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#71a02f, #557923);
-  border: 1px solid #395118;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(140, 198, 60, 0.25);
+  border: 1px solid #5a8126;
+  box-shadow: none;
+  color: #47651e;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#71a02f, #557923);
-  border: 1px solid #395118;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(140, 198, 60, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #47651e;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Green-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Green-Theme/src/main/resources/defaults.css
index 097c97d..6e933d2 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Green-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Green-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(silver, #a6a6a6);
   border: 1px solid #8d8d8d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#2e8e39, #21682a);
   border: 1px solid #15411a;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#2e8e39, #21682a);
-  border: 1px solid #15411a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(58, 181, 73, 0.25);
+  border: 1px solid #246f2d;
+  box-shadow: none;
+  color: #1b5422;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#2e8e39, #21682a);
-  border: 1px solid #15411a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(58, 181, 73, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #1b5422;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Orange-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Orange-Theme/src/main/resources/defaults.css
index ac87dd6..91811fd 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Orange-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Orange-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(silver, #a6a6a6);
   border: 1px solid #8d8d8d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#d97a08, #a85e06);
   border: 1px solid #774304;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#d97a08, #a85e06);
-  border: 1px solid #774304;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(247, 148, 29, 0.25);
+  border: 1px solid #b26406;
+  box-shadow: none;
+  color: #8f5105;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#d97a08, #a85e06);
-  border: 1px solid #774304;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(247, 148, 29, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #8f5105;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Red-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Red-Theme/src/main/resources/defaults.css
index e733619..3c7d6c7 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Red-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Red-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(silver, #a6a6a6);
   border: 1px solid #8d8d8d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#c51017, #950d12);
   border: 1px solid #66090c;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#c51017, #950d12);
-  border: 1px solid #66090c;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(236, 28, 36, 0.25);
+  border: 1px solid #9f0d13;
+  box-shadow: none;
+  color: #7e0b0f;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#c51017, #950d12);
-  border: 1px solid #66090c;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(236, 28, 36, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #7e0b0f;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Sapphire-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Sapphire-Theme/src/main/resources/defaults.css
index 270f4f5..1543755 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Sapphire-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Sapphire-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(silver, #a6a6a6);
   border: 1px solid #8d8d8d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#225b95, #19416b);
   border: 1px solid #0f2842;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#225b95, #19416b);
-  border: 1px solid #0f2842;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(44, 116, 190, 0.25);
+  border: 1px solid #1b4673;
+  box-shadow: none;
+  color: #143556;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#225b95, #19416b);
-  border: 1px solid #0f2842;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(44, 116, 190, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #143556;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Sunflower-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Sunflower-Theme/src/main/resources/defaults.css
index 79eec25..107c74f 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Sunflower-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Sunflower-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(silver, #a6a6a6);
   border: 1px solid #8d8d8d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#f69d0e, #ca7f07);
   border: 1px solid #986006;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#f69d0e, #ca7f07);
-  border: 1px solid #986006;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(248, 177, 63, 0.25);
+  border: 1px solid #d38508;
+  box-shadow: none;
+  color: #b17006;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#f69d0e, #ca7f07);
-  border: 1px solid #986006;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(248, 177, 63, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #b17006;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Topaz-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Topaz-Theme/src/main/resources/defaults.css
index a84ed56..1dcfefa 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Topaz-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Topaz-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(silver, #a6a6a6);
   border: 1px solid #8d8d8d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#d64010, #a6320d);
   border: 1px solid #772409;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#d64010, #a6320d);
-  border: 1px solid #772409;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(239, 90, 42, 0.25);
+  border: 1px solid #b0350d;
+  box-shadow: none;
+  color: #8f2b0b;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#d64010, #a6320d);
-  border: 1px solid #772409;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(239, 90, 42, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #8f2b0b;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Turquoise-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Turquoise-Theme/src/main/resources/defaults.css
index 8b143eb..6135be6 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Turquoise-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Turquoise-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(silver, #a6a6a6);
   border: 1px solid #8d8d8d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#1f7f78, #155651);
   border: 1px solid #0b2d2b;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#1f7f78, #155651);
-  border: 1px solid #0b2d2b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(41, 168, 159, 0.25);
+  border: 1px solid #175e59;
+  box-shadow: none;
+  color: #10423e;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#1f7f78, #155651);
-  border: 1px solid #0b2d2b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(41, 168, 159, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #10423e;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Violet-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Violet-Theme/src/main/resources/defaults.css
index 835f49d..df366f9 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Violet-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Violet-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(silver, #a6a6a6);
   border: 1px solid #8d8d8d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#4a2069, #2f1442);
   border: 1px solid #13081b;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#4a2069, #2f1442);
-  border: 1px solid #13081b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(102, 44, 144, 0.25);
+  border: 1px solid #34174a;
+  box-shadow: none;
+  color: #210e2e;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#4a2069, #2f1442);
-  border: 1px solid #13081b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(102, 44, 144, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #210e2e;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Yellow-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Yellow-Theme/src/main/resources/defaults.css
index 97c3d56..08dc414 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Yellow-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Yellow-Theme/src/main/resources/defaults.css
@@ -1384,6 +1384,7 @@ div {
   background: linear-gradient(silver, #a6a6a6);
   border: 1px solid #8d8d8d;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #808080;
 }
 .jewel.togglebutton[disabled] {
   font-weight: 400;
@@ -1439,6 +1440,7 @@ div {
   background: linear-gradient(#b1a909, #817a06);
   border: 1px solid #504c04;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.outlined {
@@ -1471,9 +1473,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.outlined.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid #858585;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.outlined {
@@ -1506,9 +1509,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.outlined.selected {
-  background: linear-gradient(#b1a909, #817a06);
-  border: 1px solid #504c04;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(226, 215, 11, 0.25);
+  border: 1px solid #8a8407;
+  box-shadow: none;
+  color: #686305;
 }
 
 .jewel.togglebutton.unboxed {
@@ -1542,9 +1546,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.unboxed.selected {
-  background: linear-gradient(#999999, gray);
-  border: 1px solid #666666;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(179, 179, 179, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #737373;
 }
 
 .jewel.togglebutton.primary.unboxed {
@@ -1578,9 +1583,10 @@ div {
   text-shadow: unset;
 }
 .jewel.togglebutton.primary.unboxed.selected {
-  background: linear-gradient(#b1a909, #817a06);
-  border: 1px solid #504c04;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(226, 215, 11, 0.25);
+  border: 1px solid transparent;
+  box-shadow: none;
+  color: #686305;
 }
 
 .jewel.tooltip {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Amethyst-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Amethyst-Theme/src/main/resources/defaults.css
index 7b1544a..224b265 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Amethyst-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Amethyst-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#9f239d, #751a74);
   border: 1px solid #4b114a;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#9f239d, #751a74);
-  border: 1px solid #4b114a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(201, 44, 198, 0.25);
+  border: 1px solid #7e1c7c;
+  box-shadow: none;
+  color: #60155f;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/src/main/resources/defaults.css
index f63c068..7209e7b 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#1198e9, #0d79ba);
   border: 1px solid #0a5a8a;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#1198e9, #0d79ba);
-  border: 1px solid #0a5a8a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(60, 173, 241, 0.25);
+  border: 1px solid #0e7fc3;
+  box-shadow: none;
+  color: #0c69a2;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Emerald-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Emerald-Theme/src/main/resources/defaults.css
index 34665a5..2b11c75 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Emerald-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Emerald-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#71a02f, #557923);
   border: 1px solid #395118;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#71a02f, #557923);
-  border: 1px solid #395118;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(140, 198, 60, 0.25);
+  border: 1px solid #5a8126;
+  box-shadow: none;
+  color: #47651e;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Green-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Green-Theme/src/main/resources/defaults.css
index 645832b..ae88d9a 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Green-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Green-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#2e8e39, #21682a);
   border: 1px solid #15411a;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#2e8e39, #21682a);
-  border: 1px solid #15411a;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(58, 181, 73, 0.25);
+  border: 1px solid #246f2d;
+  box-shadow: none;
+  color: #1b5422;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Orange-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Orange-Theme/src/main/resources/defaults.css
index f589b8e..3b5e395 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Orange-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Orange-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#d97a08, #a85e06);
   border: 1px solid #774304;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#d97a08, #a85e06);
-  border: 1px solid #774304;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(247, 148, 29, 0.25);
+  border: 1px solid #b26406;
+  box-shadow: none;
+  color: #8f5105;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Red-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Red-Theme/src/main/resources/defaults.css
index e58e490..b9736a9 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Red-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Red-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#c51017, #950d12);
   border: 1px solid #66090c;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#c51017, #950d12);
-  border: 1px solid #66090c;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(236, 28, 36, 0.25);
+  border: 1px solid #9f0d13;
+  box-shadow: none;
+  color: #7e0b0f;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Sapphire-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Sapphire-Theme/src/main/resources/defaults.css
index f6e92df..854df4e 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Sapphire-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Sapphire-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#225b95, #19416b);
   border: 1px solid #0f2842;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#225b95, #19416b);
-  border: 1px solid #0f2842;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(44, 116, 190, 0.25);
+  border: 1px solid #1b4673;
+  box-shadow: none;
+  color: #143556;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Sunflower-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Sunflower-Theme/src/main/resources/defaults.css
index 93cddac..fb1f3f9 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Sunflower-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Sunflower-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#f69d0e, #ca7f07);
   border: 1px solid #986006;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#f69d0e, #ca7f07);
-  border: 1px solid #986006;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(248, 177, 63, 0.25);
+  border: 1px solid #d38508;
+  box-shadow: none;
+  color: #b17006;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Topaz-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Topaz-Theme/src/main/resources/defaults.css
index 24fb312..53cccbc 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Topaz-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Topaz-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#d64010, #a6320d);
   border: 1px solid #772409;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#d64010, #a6320d);
-  border: 1px solid #772409;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(239, 90, 42, 0.25);
+  border: 1px solid #b0350d;
+  box-shadow: none;
+  color: #8f2b0b;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Turquoise-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Turquoise-Theme/src/main/resources/defaults.css
index e6f5d2b..2b831e3 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Turquoise-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Turquoise-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#1f7f78, #155651);
   border: 1px solid #0b2d2b;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#1f7f78, #155651);
-  border: 1px solid #0b2d2b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(41, 168, 159, 0.25);
+  border: 1px solid #175e59;
+  box-shadow: none;
+  color: #10423e;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Violet-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Violet-Theme/src/main/resources/defaults.css
index 4bff5f2..199b2cf 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Violet-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Violet-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#4a2069, #2f1442);
   border: 1px solid #13081b;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#4a2069, #2f1442);
-  border: 1px solid #13081b;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(102, 44, 144, 0.25);
+  border: 1px solid #34174a;
+  box-shadow: none;
+  color: #210e2e;
 }
 
 .jewel.togglebutton.secondary.unboxed {
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Yellow-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Yellow-Theme/src/main/resources/defaults.css
index c28e379..db8613c 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Secondary-Yellow-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Yellow-Theme/src/main/resources/defaults.css
@@ -220,6 +220,7 @@ a:active {
   background: linear-gradient(#b1a909, #817a06);
   border: 1px solid #504c04;
   box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  color: #FFFFFF;
 }
 
 .jewel.togglebutton.secondary.outlined {
@@ -252,9 +253,10 @@ a:active {
   text-shadow: unset;
 }
 .jewel.togglebutton.secondary.outlined.selected {
-  background: linear-gradient(#b1a909, #817a06);
-  border: 1px solid #504c04;
-  box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+  background: rgba(226, 215, 11, 0.25);
+  border: 1px solid #8a8407;
+  box-shadow: none;
+  color: #686305;
 }
 
 .jewel.togglebutton.secondary.unboxed {