diff --git a/install.sh b/install.sh
index 426329e7..6522c272 100755
--- a/install.sh
+++ b/install.sh
@@ -117,7 +117,7 @@ install() {
 
   cp -r "${SRC_DIR}/assets/gnome-shell/common-assets"                                        "${THEME_DIR}/gnome-shell/assets"
   cp -r "${SRC_DIR}/assets/gnome-shell/assets${ELSE_DARK:-}/"*.svg                           "${THEME_DIR}/gnome-shell/assets"
-  cp -r "${SRC_DIR}/assets/gnome-shell/theme${theme}/"*.svg                                  "${THEME_DIR}/gnome-shell/assets"
+  cp -r "${SRC_DIR}/assets/gnome-shell/theme${theme}${ctype}/"*.svg                          "${THEME_DIR}/gnome-shell/assets"
 
   cd "${THEME_DIR}/gnome-shell"
   ln -s assets/no-events.svg no-events.svg
@@ -132,7 +132,7 @@ install() {
   mkdir -p                                                                                   "${THEME_DIR}/gtk-3.0"
   cp -r "${SRC_DIR}/assets/gtk/assets${theme}${ctype}"                                       "${THEME_DIR}/gtk-3.0/assets"
   cp -r "${SRC_DIR}/assets/gtk/scalable"                                                     "${THEME_DIR}/gtk-3.0/assets"
-  cp -r "${SRC_DIR}/assets/gtk/thumbnails/thumbnail${ELSE_DARK:-}.png"                       "${THEME_DIR}/gtk-3.0/thumbnail.png"
+  cp -r "${SRC_DIR}/assets/gtk/thumbnails/thumbnail${theme}${ELSE_DARK:-}.png"               "${THEME_DIR}/gtk-3.0/thumbnail.png"
 
   if [[ "$tweaks" == 'true' ]]; then
     sassc $SASSC_OPT "${SRC_DIR}/main/gtk-3.0/gtk${color}.scss"                              "${THEME_DIR}/gtk-3.0/gtk.css"
@@ -145,7 +145,7 @@ install() {
   mkdir -p                                                                                   "${THEME_DIR}/gtk-4.0"
   cp -r "${SRC_DIR}/assets/gtk/assets${theme}${ctype}"                                       "${THEME_DIR}/gtk-4.0/assets"
   cp -r "${SRC_DIR}/assets/gtk/scalable"                                                     "${THEME_DIR}/gtk-4.0/assets"
-  cp -r "${SRC_DIR}/assets/gtk/thumbnails/thumbnail${ELSE_DARK:-}.png"                       "${THEME_DIR}/gtk-4.0/thumbnail.png"
+  cp -r "${SRC_DIR}/assets/gtk/thumbnails/thumbnail${theme}${ELSE_DARK:-}.png"               "${THEME_DIR}/gtk-4.0/thumbnail.png"
 
   if [[ "$tweaks" == 'true' ]]; then
     sassc $SASSC_OPT "${SRC_DIR}/main/gtk-4.0/gtk${color}.scss"                              "${THEME_DIR}/gtk-4.0/gtk.css"
@@ -158,7 +158,7 @@ install() {
   mkdir -p                                                                                   "${THEME_DIR}/cinnamon"
   cp -r "${SRC_DIR}/assets/cinnamon/common-assets"                                           "${THEME_DIR}/cinnamon/assets"
   cp -r "${SRC_DIR}/assets/cinnamon/assets${ELSE_DARK:-}/"*'.svg'                            "${THEME_DIR}/cinnamon/assets"
-  cp -r "${SRC_DIR}/assets/cinnamon/theme${theme}/"*'.svg'                                   "${THEME_DIR}/cinnamon/assets"
+  cp -r "${SRC_DIR}/assets/cinnamon/theme${theme}${ctype}/"*'.svg'                           "${THEME_DIR}/cinnamon/assets"
 
   if [[ "$tweaks" == 'true' ]]; then
     sassc $SASSC_OPT "${SRC_DIR}/main/cinnamon/cinnamon${color}.scss"                        "${THEME_DIR}/cinnamon/cinnamon.css"
@@ -166,7 +166,7 @@ install() {
     cp -r "${SRC_DIR}/main/cinnamon/cinnamon${color}.css"                                    "${THEME_DIR}/cinnamon/cinnamon.css"
   fi
 
-  cp -r "${SRC_DIR}/assets/cinnamon/thumbnail${color}.png"                                   "${THEME_DIR}/cinnamon/thumbnail.png"
+  cp -r "${SRC_DIR}/assets/cinnamon/thumbnails/thumbnail${theme}${ctype}${color}.png"        "${THEME_DIR}/cinnamon/thumbnail.png"
 
   mkdir -p                                                                                   "${THEME_DIR}/metacity-1"
   cp -r "${SRC_DIR}/main/metacity-1/metacity-theme-2${color}.xml"                            "${THEME_DIR}/metacity-1/metacity-theme-2.xml"
diff --git a/src/assets/cinnamon/assets-dark/checkbox-off.svg b/src/assets/cinnamon/assets-dark/checkbox-off.svg
index 110a32f8..b00efa63 100644
--- a/src/assets/cinnamon/assets-dark/checkbox-off.svg
+++ b/src/assets/cinnamon/assets-dark/checkbox-off.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" opacity=".54" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z" fill="#dfdfdf"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="12" cy="12" r="10" fill="#ffffff" opacity=".12"/>
 </svg>
diff --git a/src/assets/cinnamon/assets-dark/radiobutton-off.svg b/src/assets/cinnamon/assets-dark/radiobutton-off.svg
index 110a32f8..b00efa63 100644
--- a/src/assets/cinnamon/assets-dark/radiobutton-off.svg
+++ b/src/assets/cinnamon/assets-dark/radiobutton-off.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" opacity=".54" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z" fill="#dfdfdf"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="12" cy="12" r="10" fill="#ffffff" opacity=".12"/>
 </svg>
diff --git a/src/assets/cinnamon/assets-dark/toggle-off.svg b/src/assets/cinnamon/assets-dark/toggle-off.svg
index 2341bc5e..d19c3e68 100644
--- a/src/assets/cinnamon/assets-dark/toggle-off.svg
+++ b/src/assets/cinnamon/assets-dark/toggle-off.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m10 0c-5.54 0-10 4.46-10 10s4.46 10 10 10h20c5.54 0 10-4.46 10-10s-4.46-10-10-10zm0 1h20c4.986 0 9 4.014 9 9s-4.014 9-9 9h-20c-4.986 0-9-4.014-9-9s4.014-9 9-9z" fill="#ffffff" opacity=".5" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle transform="scale(-1,1)" cx="-10" cy="10" r="5" fill="#ffffff" opacity=".5" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#ffffff" opacity=".35" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="9.98" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/cinnamon/assets/checkbox-off.svg b/src/assets/cinnamon/assets/checkbox-off.svg
index 8517604b..bd8d1941 100644
--- a/src/assets/cinnamon/assets/checkbox-off.svg
+++ b/src/assets/cinnamon/assets/checkbox-off.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" opacity=".54" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z" fill="#333333"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="12" cy="12" r="10" fill="#000000" opacity=".12"/>
 </svg>
diff --git a/src/assets/cinnamon/assets/radiobutton-off.svg b/src/assets/cinnamon/assets/radiobutton-off.svg
index 8517604b..bd8d1941 100644
--- a/src/assets/cinnamon/assets/radiobutton-off.svg
+++ b/src/assets/cinnamon/assets/radiobutton-off.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" opacity=".54" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z" fill="#333333"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="12" cy="12" r="10" fill="#000000" opacity=".12"/>
 </svg>
diff --git a/src/assets/cinnamon/assets/toggle-off.svg b/src/assets/cinnamon/assets/toggle-off.svg
index 3acc14ac..02544eb1 100644
--- a/src/assets/cinnamon/assets/toggle-off.svg
+++ b/src/assets/cinnamon/assets/toggle-off.svg
@@ -1,6 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g transform="translate(0 -1032.4)" fill="#000000" stroke-width="0">
-  <path d="m10 1032.4c-5.54 0-10 4.46-10 10s4.46 10 10 10h20c5.54 0 10-4.46 10-10s-4.46-10-10-10zm0 1h20c4.986 0 9 4.014 9 9s-4.014 9-9 9h-20c-4.986 0-9-4.014-9-9s4.014-9 9-9z" opacity=".5" style="paint-order:stroke fill markers"/>
-  <circle transform="scale(-1,1)" cx="-10" cy="1042.4" r="5" opacity=".5" style="paint-order:stroke fill markers"/>
- </g>
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#000000" opacity=".35" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="9.98" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/cinnamon/make-assets.sh b/src/assets/cinnamon/make-assets.sh
new file mode 100755
index 00000000..d097664c
--- /dev/null
+++ b/src/assets/cinnamon/make-assets.sh
@@ -0,0 +1,138 @@
+#! /usr/bin/env bash
+
+for theme in '' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-teal' '-grey'; do
+  for type in '' '-nord' '-dracula'; do
+    case "$theme" in
+      '')
+        theme_color_dark='#3c84f7'
+        theme_color_light='#5b9bf8'
+        ;;
+      -purple)
+        theme_color_dark='#AB47BC'
+        theme_color_light='#BA68C8'
+        ;;
+      -pink)
+        theme_color_dark='#EC407A'
+        theme_color_light='#F06292'
+        ;;
+      -red)
+        theme_color_dark='#E53935'
+        theme_color_light='#F44336'
+        ;;
+      -orange)
+        theme_color_dark='#F57C00'
+        theme_color_light='#FB8C00'
+        ;;
+      -yellow)
+        theme_color_dark='#FBC02D'
+        theme_color_light='#FFD600'
+        ;;
+      -green)
+        theme_color_dark='#4CAF50'
+        theme_color_light='#66BB6A'
+        ;;
+      -teal)
+        theme_color_dark='#009688'
+        theme_color_light='#4DB6AC'
+        ;;
+      -grey)
+        theme_color_dark='#464646'
+        theme_color_light='#DDDDDD'
+        ;;
+    esac
+
+    if [[ "$type" == '-nord' ]]; then
+      case "$theme" in
+        '')
+          theme_color_dark='#5e81ac'
+          theme_color_light='#89a3c2'
+          ;;
+        -purple)
+          theme_color_dark='#b57daa'
+          theme_color_light='#c89dbf'
+          ;;
+        -pink)
+          theme_color_dark='#cd7092'
+          theme_color_light='#dc98b1'
+          ;;
+        -red)
+          theme_color_dark='#c35b65'
+          theme_color_light='#d4878f'
+          ;;
+        -orange)
+          theme_color_dark='#d0846c'
+          theme_color_light='#dca493'
+          ;;
+        -yellow)
+          theme_color_dark='#e4b558'
+          theme_color_light='#eac985'
+          ;;
+        -green)
+          theme_color_dark='#82ac5d'
+          theme_color_light='#a0c082'
+          ;;
+        -teal)
+          theme_color_dark='#63a6a5'
+          theme_color_light='#83b9b8'
+          ;;
+        -grey)
+          theme_color_dark='#3a4150'
+          theme_color_light='#d9dce3'
+          ;;
+      esac
+    fi
+
+    if [[ "$type" == '-dracula' ]]; then
+      case "$theme" in
+        '')
+          theme_color_dark='#a679ec'
+          theme_color_light='#bd93f9'
+          ;;
+        -purple)
+          theme_color_dark='#a679ec'
+          theme_color_light='#bd93f9'
+          ;;
+        -pink)
+          theme_color_dark='#f04cab'
+          theme_color_light='#ff79c6'
+          ;;
+        -red)
+          theme_color_dark='#f44d4d'
+          theme_color_light='#ff5555'
+          ;;
+        -orange)
+          theme_color_dark='#f8a854'
+          theme_color_light='#ffb86c'
+          ;;
+        -yellow)
+          theme_color_dark='#e8f467'
+          theme_color_light='#f1fa8c'
+          ;;
+        -green)
+          theme_color_dark='#4be772'
+          theme_color_light='#50fa7b'
+          ;;
+        -teal)
+          theme_color_dark='#20eed9'
+          theme_color_light='#50fae9'
+          ;;
+        -grey)
+          theme_color_dark='#3c3f51'
+          theme_color_light='#d9dae3'
+          ;;
+      esac
+    fi
+
+    if [[ "$type" != '' ]]; then
+      cp -rf "theme" "theme${theme}${type}"
+      sed -i "s/#3c84f7/${theme_color_dark}/g" "theme${theme}${type}"/*.svg
+      sed -i "s/#5b9bf8/${theme_color_light}/g" "theme${theme}${type}"/*.svg
+    elif [[ "$theme" != '' ]]; then
+      cp -rf "theme" "theme${theme}"
+      sed -i "s/#3c84f7/${theme_color_dark}/g" "theme${theme}"/*.svg
+      sed -i "s/#5b9bf8/${theme_color_light}/g" "theme${theme}"/*.svg
+    fi
+  done
+done
+
+echo -e "DONE!"
diff --git a/src/assets/cinnamon/theme-dracula/add-workspace-active.svg b/src/assets/cinnamon/theme-dracula/add-workspace-active.svg
new file mode 100644
index 00000000..9363c2de
--- /dev/null
+++ b/src/assets/cinnamon/theme-dracula/add-workspace-active.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -852.36)" shape-rendering="auto">
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#a679ec" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-dracula/checkbox-dark.svg b/src/assets/cinnamon/theme-dracula/checkbox-dark.svg
new file mode 100644
index 00000000..172aed63
--- /dev/null
+++ b/src/assets/cinnamon/theme-dracula/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#bd93f9"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-dracula/checkbox.svg b/src/assets/cinnamon/theme-dracula/checkbox.svg
new file mode 100644
index 00000000..24da996a
--- /dev/null
+++ b/src/assets/cinnamon/theme-dracula/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#a679ec"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-dracula/corner-ripple.svg b/src/assets/cinnamon/theme-dracula/corner-ripple.svg
new file mode 100644
index 00000000..4a6c07e8
--- /dev/null
+++ b/src/assets/cinnamon/theme-dracula/corner-ripple.svg
@@ -0,0 +1,5 @@
+<svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -948.36)">
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#a679ec" opacity=".25"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-dracula/radiobutton-dark.svg b/src/assets/cinnamon/theme-dracula/radiobutton-dark.svg
new file mode 100644
index 00000000..75702bf3
--- /dev/null
+++ b/src/assets/cinnamon/theme-dracula/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#bd93f9"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-dracula/radiobutton.svg b/src/assets/cinnamon/theme-dracula/radiobutton.svg
new file mode 100644
index 00000000..02122be2
--- /dev/null
+++ b/src/assets/cinnamon/theme-dracula/radiobutton.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#a679ec"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-dracula/toggle-on-dark.svg b/src/assets/cinnamon/theme-dracula/toggle-on-dark.svg
new file mode 100644
index 00000000..bb5d7e69
--- /dev/null
+++ b/src/assets/cinnamon/theme-dracula/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#bd93f9" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-dracula/toggle-on.svg b/src/assets/cinnamon/theme-dracula/toggle-on.svg
new file mode 100644
index 00000000..ee15aac0
--- /dev/null
+++ b/src/assets/cinnamon/theme-dracula/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#a679ec" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-green-dracula/add-workspace-active.svg b/src/assets/cinnamon/theme-green-dracula/add-workspace-active.svg
new file mode 100644
index 00000000..5c5a1c6d
--- /dev/null
+++ b/src/assets/cinnamon/theme-green-dracula/add-workspace-active.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -852.36)" shape-rendering="auto">
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#4be772" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-green-dracula/checkbox-dark.svg b/src/assets/cinnamon/theme-green-dracula/checkbox-dark.svg
new file mode 100644
index 00000000..55750d3f
--- /dev/null
+++ b/src/assets/cinnamon/theme-green-dracula/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#50fa7b"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-green-dracula/checkbox.svg b/src/assets/cinnamon/theme-green-dracula/checkbox.svg
new file mode 100644
index 00000000..b85e3985
--- /dev/null
+++ b/src/assets/cinnamon/theme-green-dracula/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#4be772"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-green-dracula/corner-ripple.svg b/src/assets/cinnamon/theme-green-dracula/corner-ripple.svg
new file mode 100644
index 00000000..3a74d2f3
--- /dev/null
+++ b/src/assets/cinnamon/theme-green-dracula/corner-ripple.svg
@@ -0,0 +1,5 @@
+<svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -948.36)">
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#4be772" opacity=".25"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-green-dracula/radiobutton-dark.svg b/src/assets/cinnamon/theme-green-dracula/radiobutton-dark.svg
new file mode 100644
index 00000000..157cfc42
--- /dev/null
+++ b/src/assets/cinnamon/theme-green-dracula/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#50fa7b"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-green-dracula/radiobutton.svg b/src/assets/cinnamon/theme-green-dracula/radiobutton.svg
new file mode 100644
index 00000000..2d5e3fe0
--- /dev/null
+++ b/src/assets/cinnamon/theme-green-dracula/radiobutton.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#4be772"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-green-dracula/toggle-on-dark.svg b/src/assets/cinnamon/theme-green-dracula/toggle-on-dark.svg
new file mode 100644
index 00000000..e97d3e5c
--- /dev/null
+++ b/src/assets/cinnamon/theme-green-dracula/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#50fa7b" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-green-dracula/toggle-on.svg b/src/assets/cinnamon/theme-green-dracula/toggle-on.svg
new file mode 100644
index 00000000..318357ad
--- /dev/null
+++ b/src/assets/cinnamon/theme-green-dracula/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#4be772" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-green-nord/add-workspace-active.svg b/src/assets/cinnamon/theme-green-nord/add-workspace-active.svg
new file mode 100644
index 00000000..0e874230
--- /dev/null
+++ b/src/assets/cinnamon/theme-green-nord/add-workspace-active.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -852.36)" shape-rendering="auto">
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#82ac5d" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-green-nord/checkbox-dark.svg b/src/assets/cinnamon/theme-green-nord/checkbox-dark.svg
new file mode 100644
index 00000000..abc15742
--- /dev/null
+++ b/src/assets/cinnamon/theme-green-nord/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#a0c082"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-green-nord/checkbox.svg b/src/assets/cinnamon/theme-green-nord/checkbox.svg
new file mode 100644
index 00000000..2e79c544
--- /dev/null
+++ b/src/assets/cinnamon/theme-green-nord/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#82ac5d"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-green-nord/corner-ripple.svg b/src/assets/cinnamon/theme-green-nord/corner-ripple.svg
new file mode 100644
index 00000000..956fa822
--- /dev/null
+++ b/src/assets/cinnamon/theme-green-nord/corner-ripple.svg
@@ -0,0 +1,5 @@
+<svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -948.36)">
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#82ac5d" opacity=".25"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-green-nord/radiobutton-dark.svg b/src/assets/cinnamon/theme-green-nord/radiobutton-dark.svg
new file mode 100644
index 00000000..b1c00898
--- /dev/null
+++ b/src/assets/cinnamon/theme-green-nord/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#a0c082"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-green-nord/radiobutton.svg b/src/assets/cinnamon/theme-green-nord/radiobutton.svg
new file mode 100644
index 00000000..89262fc6
--- /dev/null
+++ b/src/assets/cinnamon/theme-green-nord/radiobutton.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#82ac5d"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-green-nord/toggle-on-dark.svg b/src/assets/cinnamon/theme-green-nord/toggle-on-dark.svg
new file mode 100644
index 00000000..1d9afa76
--- /dev/null
+++ b/src/assets/cinnamon/theme-green-nord/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#a0c082" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-green-nord/toggle-on.svg b/src/assets/cinnamon/theme-green-nord/toggle-on.svg
new file mode 100644
index 00000000..3b04fe25
--- /dev/null
+++ b/src/assets/cinnamon/theme-green-nord/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#82ac5d" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-green/add-workspace-active.svg b/src/assets/cinnamon/theme-green/add-workspace-active.svg
index 7657680b..0ebe8ac1 100644
--- a/src/assets/cinnamon/theme-green/add-workspace-active.svg
+++ b/src/assets/cinnamon/theme-green/add-workspace-active.svg
@@ -1,12 +1,6 @@
 <svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <filter id="filter4154" x="-.132" y="-.020842" width="1.264" height="1.0417" color-interpolation-filters="sRGB">
-   <feGaussianBlur stdDeviation="1.6500004"/>
-  </filter>
- </defs>
  <g transform="translate(0 -852.36)" shape-rendering="auto">
-  <path d="m7.2 858.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#000000" fill-opacity=".44" filter="url(#filter4154)" image-rendering="auto" opacity=".9" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
   <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#4CAF50" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
-  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#eceff1" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
  </g>
 </svg>
diff --git a/src/assets/cinnamon/theme-green/checkbox-dark.svg b/src/assets/cinnamon/theme-green/checkbox-dark.svg
new file mode 100644
index 00000000..c85554d1
--- /dev/null
+++ b/src/assets/cinnamon/theme-green/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#66BB6A"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-green/checkbox.svg b/src/assets/cinnamon/theme-green/checkbox.svg
index 64f54db9..569eba1c 100644
--- a/src/assets/cinnamon/theme-green/checkbox.svg
+++ b/src/assets/cinnamon/theme-green/checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#4CAF50" style="paint-order:stroke fill markers"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#4CAF50"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-green/radiobutton-dark.svg b/src/assets/cinnamon/theme-green/radiobutton-dark.svg
new file mode 100644
index 00000000..26b1a49c
--- /dev/null
+++ b/src/assets/cinnamon/theme-green/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#66BB6A"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-green/radiobutton.svg b/src/assets/cinnamon/theme-green/radiobutton.svg
index 120dd2da..e5219b15 100644
--- a/src/assets/cinnamon/theme-green/radiobutton.svg
+++ b/src/assets/cinnamon/theme-green/radiobutton.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 7c1.656 0 3 1.344 3 3s-1.344 3-3 3-3-1.344-3-3 1.344-3 3-3z" fill="#4CAF50"/>
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#4CAF50"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-green/toggle-on-dark.svg b/src/assets/cinnamon/theme-green/toggle-on-dark.svg
new file mode 100644
index 00000000..bfaf44c7
--- /dev/null
+++ b/src/assets/cinnamon/theme-green/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#66BB6A" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-green/toggle-on.svg b/src/assets/cinnamon/theme-green/toggle-on.svg
index 2fc064eb..02a63c43 100644
--- a/src/assets/cinnamon/theme-green/toggle-on.svg
+++ b/src/assets/cinnamon/theme-green/toggle-on.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#4CAF50" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="5" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-grey-dracula/add-workspace-active.svg b/src/assets/cinnamon/theme-grey-dracula/add-workspace-active.svg
new file mode 100644
index 00000000..9b095983
--- /dev/null
+++ b/src/assets/cinnamon/theme-grey-dracula/add-workspace-active.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -852.36)" shape-rendering="auto">
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#3c3f51" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-grey-dracula/checkbox-dark.svg b/src/assets/cinnamon/theme-grey-dracula/checkbox-dark.svg
new file mode 100644
index 00000000..45d2e417
--- /dev/null
+++ b/src/assets/cinnamon/theme-grey-dracula/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#d9dae3"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-grey-dracula/checkbox.svg b/src/assets/cinnamon/theme-grey-dracula/checkbox.svg
new file mode 100644
index 00000000..1e5f2be1
--- /dev/null
+++ b/src/assets/cinnamon/theme-grey-dracula/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#3c3f51"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-grey-dracula/corner-ripple.svg b/src/assets/cinnamon/theme-grey-dracula/corner-ripple.svg
new file mode 100644
index 00000000..873106fa
--- /dev/null
+++ b/src/assets/cinnamon/theme-grey-dracula/corner-ripple.svg
@@ -0,0 +1,5 @@
+<svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -948.36)">
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#3c3f51" opacity=".25"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-grey-dracula/radiobutton-dark.svg b/src/assets/cinnamon/theme-grey-dracula/radiobutton-dark.svg
new file mode 100644
index 00000000..6a44221c
--- /dev/null
+++ b/src/assets/cinnamon/theme-grey-dracula/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#d9dae3"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-grey-dracula/radiobutton.svg b/src/assets/cinnamon/theme-grey-dracula/radiobutton.svg
new file mode 100644
index 00000000..48dde2ef
--- /dev/null
+++ b/src/assets/cinnamon/theme-grey-dracula/radiobutton.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#3c3f51"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-grey-dracula/toggle-on-dark.svg b/src/assets/cinnamon/theme-grey-dracula/toggle-on-dark.svg
new file mode 100644
index 00000000..c6ab88a8
--- /dev/null
+++ b/src/assets/cinnamon/theme-grey-dracula/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#d9dae3" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-grey-dracula/toggle-on.svg b/src/assets/cinnamon/theme-grey-dracula/toggle-on.svg
new file mode 100644
index 00000000..79049a12
--- /dev/null
+++ b/src/assets/cinnamon/theme-grey-dracula/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#3c3f51" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-grey-nord/add-workspace-active.svg b/src/assets/cinnamon/theme-grey-nord/add-workspace-active.svg
new file mode 100644
index 00000000..c31f57f2
--- /dev/null
+++ b/src/assets/cinnamon/theme-grey-nord/add-workspace-active.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -852.36)" shape-rendering="auto">
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#3a4150" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-grey-nord/checkbox-dark.svg b/src/assets/cinnamon/theme-grey-nord/checkbox-dark.svg
new file mode 100644
index 00000000..f2848bbd
--- /dev/null
+++ b/src/assets/cinnamon/theme-grey-nord/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#d9dce3"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-grey-nord/checkbox.svg b/src/assets/cinnamon/theme-grey-nord/checkbox.svg
new file mode 100644
index 00000000..b28084a4
--- /dev/null
+++ b/src/assets/cinnamon/theme-grey-nord/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#3a4150"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-grey-nord/corner-ripple.svg b/src/assets/cinnamon/theme-grey-nord/corner-ripple.svg
new file mode 100644
index 00000000..47fa164b
--- /dev/null
+++ b/src/assets/cinnamon/theme-grey-nord/corner-ripple.svg
@@ -0,0 +1,5 @@
+<svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -948.36)">
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#3a4150" opacity=".25"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-grey-nord/radiobutton-dark.svg b/src/assets/cinnamon/theme-grey-nord/radiobutton-dark.svg
new file mode 100644
index 00000000..cef61bcf
--- /dev/null
+++ b/src/assets/cinnamon/theme-grey-nord/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#d9dce3"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-grey-nord/radiobutton.svg b/src/assets/cinnamon/theme-grey-nord/radiobutton.svg
new file mode 100644
index 00000000..7c8a0146
--- /dev/null
+++ b/src/assets/cinnamon/theme-grey-nord/radiobutton.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#3a4150"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-grey-nord/toggle-on-dark.svg b/src/assets/cinnamon/theme-grey-nord/toggle-on-dark.svg
new file mode 100644
index 00000000..56eff700
--- /dev/null
+++ b/src/assets/cinnamon/theme-grey-nord/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#d9dce3" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-grey-nord/toggle-on.svg b/src/assets/cinnamon/theme-grey-nord/toggle-on.svg
new file mode 100644
index 00000000..59f1f592
--- /dev/null
+++ b/src/assets/cinnamon/theme-grey-nord/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#3a4150" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-grey/add-workspace-active.svg b/src/assets/cinnamon/theme-grey/add-workspace-active.svg
index 4b742855..3be4ff55 100644
--- a/src/assets/cinnamon/theme-grey/add-workspace-active.svg
+++ b/src/assets/cinnamon/theme-grey/add-workspace-active.svg
@@ -1,12 +1,6 @@
 <svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <filter id="filter4154" x="-.132" y="-.020842" width="1.264" height="1.0417" color-interpolation-filters="sRGB">
-   <feGaussianBlur stdDeviation="1.6500004"/>
-  </filter>
- </defs>
  <g transform="translate(0 -852.36)" shape-rendering="auto">
-  <path d="m7.2 858.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#000000" fill-opacity=".44" filter="url(#filter4154)" image-rendering="auto" opacity=".9" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
-  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#333333" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
-  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#eceff1" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#464646" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
  </g>
 </svg>
diff --git a/src/assets/cinnamon/theme-grey/checkbox-dark.svg b/src/assets/cinnamon/theme-grey/checkbox-dark.svg
index 65c19018..8bf35dcd 100644
--- a/src/assets/cinnamon/theme-grey/checkbox-dark.svg
+++ b/src/assets/cinnamon/theme-grey/checkbox-dark.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#dddddd" style="paint-order:stroke fill markers"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#DDDDDD"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-grey/checkbox.svg b/src/assets/cinnamon/theme-grey/checkbox.svg
index b3a73fa1..716f174a 100644
--- a/src/assets/cinnamon/theme-grey/checkbox.svg
+++ b/src/assets/cinnamon/theme-grey/checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#333333" style="paint-order:stroke fill markers"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#464646"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-grey/corner-ripple.svg b/src/assets/cinnamon/theme-grey/corner-ripple.svg
index 6440b6ca..5e8ed4ef 100644
--- a/src/assets/cinnamon/theme-grey/corner-ripple.svg
+++ b/src/assets/cinnamon/theme-grey/corner-ripple.svg
@@ -1,5 +1,5 @@
 <svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <g transform="translate(0 -948.36)">
-  <circle id="corner-ripple" cx="52" cy="1000" r="48" fill="#333333" opacity=".25"/>
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#464646" opacity=".25"/>
  </g>
 </svg>
diff --git a/src/assets/cinnamon/theme-grey/radiobutton-dark.svg b/src/assets/cinnamon/theme-grey/radiobutton-dark.svg
index 375c388a..e4f99111 100644
--- a/src/assets/cinnamon/theme-grey/radiobutton-dark.svg
+++ b/src/assets/cinnamon/theme-grey/radiobutton-dark.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10c5.52 0 10-4.48 10-10s-4.48-10-10-10zm0 7c1.656 0 3 1.344 3 3s-1.344 3-3 3-3-1.344-3-3 1.344-3 3-3z" fill="#dddddd"/>
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#DDDDDD"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-grey/radiobutton.svg b/src/assets/cinnamon/theme-grey/radiobutton.svg
index 27a8ab48..cc3a1164 100644
--- a/src/assets/cinnamon/theme-grey/radiobutton.svg
+++ b/src/assets/cinnamon/theme-grey/radiobutton.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10c5.52 0 10-4.48 10-10s-4.48-10-10-10zm0 7c1.656 0 3 1.344 3 3s-1.344 3-3 3-3-1.344-3-3 1.344-3 3-3z" fill="#333333"/>
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#464646"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-grey/toggle-on-dark.svg b/src/assets/cinnamon/theme-grey/toggle-on-dark.svg
index 23f9373e..c3563d92 100644
--- a/src/assets/cinnamon/theme-grey/toggle-on-dark.svg
+++ b/src/assets/cinnamon/theme-grey/toggle-on-dark.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#dddddd" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="5" fill="#333333" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#DDDDDD" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-grey/toggle-on.svg b/src/assets/cinnamon/theme-grey/toggle-on.svg
index 510abf19..e2c9cd4f 100644
--- a/src/assets/cinnamon/theme-grey/toggle-on.svg
+++ b/src/assets/cinnamon/theme-grey/toggle-on.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#333333" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="5" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#464646" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-nord/add-workspace-active.svg b/src/assets/cinnamon/theme-nord/add-workspace-active.svg
new file mode 100644
index 00000000..79ce7d41
--- /dev/null
+++ b/src/assets/cinnamon/theme-nord/add-workspace-active.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -852.36)" shape-rendering="auto">
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#5e81ac" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-nord/checkbox-dark.svg b/src/assets/cinnamon/theme-nord/checkbox-dark.svg
new file mode 100644
index 00000000..6c7cbdc8
--- /dev/null
+++ b/src/assets/cinnamon/theme-nord/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#89a3c2"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-nord/checkbox.svg b/src/assets/cinnamon/theme-nord/checkbox.svg
new file mode 100644
index 00000000..afcf9504
--- /dev/null
+++ b/src/assets/cinnamon/theme-nord/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#5e81ac"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-nord/corner-ripple.svg b/src/assets/cinnamon/theme-nord/corner-ripple.svg
new file mode 100644
index 00000000..5dc9f5ec
--- /dev/null
+++ b/src/assets/cinnamon/theme-nord/corner-ripple.svg
@@ -0,0 +1,5 @@
+<svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -948.36)">
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#5e81ac" opacity=".25"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-nord/radiobutton-dark.svg b/src/assets/cinnamon/theme-nord/radiobutton-dark.svg
new file mode 100644
index 00000000..08074bb0
--- /dev/null
+++ b/src/assets/cinnamon/theme-nord/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#89a3c2"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-nord/radiobutton.svg b/src/assets/cinnamon/theme-nord/radiobutton.svg
new file mode 100644
index 00000000..9b9d2b0a
--- /dev/null
+++ b/src/assets/cinnamon/theme-nord/radiobutton.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#5e81ac"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-nord/toggle-on-dark.svg b/src/assets/cinnamon/theme-nord/toggle-on-dark.svg
new file mode 100644
index 00000000..1905213c
--- /dev/null
+++ b/src/assets/cinnamon/theme-nord/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#89a3c2" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-nord/toggle-on.svg b/src/assets/cinnamon/theme-nord/toggle-on.svg
new file mode 100644
index 00000000..e7600239
--- /dev/null
+++ b/src/assets/cinnamon/theme-nord/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#5e81ac" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange-dracula/add-workspace-active.svg b/src/assets/cinnamon/theme-orange-dracula/add-workspace-active.svg
new file mode 100644
index 00000000..5e0c919d
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange-dracula/add-workspace-active.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -852.36)" shape-rendering="auto">
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#f8a854" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange-dracula/checkbox-dark.svg b/src/assets/cinnamon/theme-orange-dracula/checkbox-dark.svg
new file mode 100644
index 00000000..4e1b23bf
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange-dracula/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#ffb86c"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange-dracula/checkbox.svg b/src/assets/cinnamon/theme-orange-dracula/checkbox.svg
new file mode 100644
index 00000000..919d1008
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange-dracula/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#f8a854"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange-dracula/corner-ripple.svg b/src/assets/cinnamon/theme-orange-dracula/corner-ripple.svg
new file mode 100644
index 00000000..574ede12
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange-dracula/corner-ripple.svg
@@ -0,0 +1,5 @@
+<svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -948.36)">
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#f8a854" opacity=".25"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange-dracula/radiobutton-dark.svg b/src/assets/cinnamon/theme-orange-dracula/radiobutton-dark.svg
new file mode 100644
index 00000000..14975fa8
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange-dracula/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#ffb86c"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange-dracula/radiobutton.svg b/src/assets/cinnamon/theme-orange-dracula/radiobutton.svg
new file mode 100644
index 00000000..744eed41
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange-dracula/radiobutton.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#f8a854"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange-dracula/toggle-on-dark.svg b/src/assets/cinnamon/theme-orange-dracula/toggle-on-dark.svg
new file mode 100644
index 00000000..eb449b6b
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange-dracula/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#ffb86c" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange-dracula/toggle-on.svg b/src/assets/cinnamon/theme-orange-dracula/toggle-on.svg
new file mode 100644
index 00000000..056beeff
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange-dracula/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#f8a854" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange-nord/add-workspace-active.svg b/src/assets/cinnamon/theme-orange-nord/add-workspace-active.svg
new file mode 100644
index 00000000..eb23a1d0
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange-nord/add-workspace-active.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -852.36)" shape-rendering="auto">
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#d0846c" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange-nord/checkbox-dark.svg b/src/assets/cinnamon/theme-orange-nord/checkbox-dark.svg
new file mode 100644
index 00000000..4318ec2f
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange-nord/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#dca493"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange-nord/checkbox.svg b/src/assets/cinnamon/theme-orange-nord/checkbox.svg
new file mode 100644
index 00000000..eff8b5fb
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange-nord/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#d0846c"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange-nord/corner-ripple.svg b/src/assets/cinnamon/theme-orange-nord/corner-ripple.svg
new file mode 100644
index 00000000..e5c448f0
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange-nord/corner-ripple.svg
@@ -0,0 +1,5 @@
+<svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -948.36)">
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#d0846c" opacity=".25"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange-nord/radiobutton-dark.svg b/src/assets/cinnamon/theme-orange-nord/radiobutton-dark.svg
new file mode 100644
index 00000000..059b4741
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange-nord/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#dca493"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange-nord/radiobutton.svg b/src/assets/cinnamon/theme-orange-nord/radiobutton.svg
new file mode 100644
index 00000000..0e3a5129
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange-nord/radiobutton.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#d0846c"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange-nord/toggle-on-dark.svg b/src/assets/cinnamon/theme-orange-nord/toggle-on-dark.svg
new file mode 100644
index 00000000..2f45f5d3
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange-nord/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#dca493" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange-nord/toggle-on.svg b/src/assets/cinnamon/theme-orange-nord/toggle-on.svg
new file mode 100644
index 00000000..cb224782
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange-nord/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#d0846c" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange/add-workspace-active.svg b/src/assets/cinnamon/theme-orange/add-workspace-active.svg
index f126d230..319e8c4d 100644
--- a/src/assets/cinnamon/theme-orange/add-workspace-active.svg
+++ b/src/assets/cinnamon/theme-orange/add-workspace-active.svg
@@ -1,12 +1,6 @@
 <svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <filter id="filter4154" x="-.132" y="-.020842" width="1.264" height="1.0417" color-interpolation-filters="sRGB">
-   <feGaussianBlur stdDeviation="1.6500004"/>
-  </filter>
- </defs>
  <g transform="translate(0 -852.36)" shape-rendering="auto">
-  <path d="m7.2 858.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#000000" fill-opacity=".44" filter="url(#filter4154)" image-rendering="auto" opacity=".9" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
   <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#F57C00" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
-  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#eceff1" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
  </g>
 </svg>
diff --git a/src/assets/cinnamon/theme-orange/checkbox-dark.svg b/src/assets/cinnamon/theme-orange/checkbox-dark.svg
new file mode 100644
index 00000000..4dd000cd
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#FB8C00"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange/checkbox.svg b/src/assets/cinnamon/theme-orange/checkbox.svg
index f9850241..96e2c6fb 100644
--- a/src/assets/cinnamon/theme-orange/checkbox.svg
+++ b/src/assets/cinnamon/theme-orange/checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#F57C00" style="paint-order:stroke fill markers"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#F57C00"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-orange/radiobutton-dark.svg b/src/assets/cinnamon/theme-orange/radiobutton-dark.svg
new file mode 100644
index 00000000..9edb6322
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#FB8C00"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange/radiobutton.svg b/src/assets/cinnamon/theme-orange/radiobutton.svg
index 34117656..e153c366 100644
--- a/src/assets/cinnamon/theme-orange/radiobutton.svg
+++ b/src/assets/cinnamon/theme-orange/radiobutton.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 7c1.656 0 3 1.344 3 3s-1.344 3-3 3-3-1.344-3-3 1.344-3 3-3z" fill="#F57C00"/>
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#F57C00"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-orange/toggle-on-dark.svg b/src/assets/cinnamon/theme-orange/toggle-on-dark.svg
new file mode 100644
index 00000000..c7f9b27f
--- /dev/null
+++ b/src/assets/cinnamon/theme-orange/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#FB8C00" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-orange/toggle-on.svg b/src/assets/cinnamon/theme-orange/toggle-on.svg
index afe8fc2f..458fe696 100644
--- a/src/assets/cinnamon/theme-orange/toggle-on.svg
+++ b/src/assets/cinnamon/theme-orange/toggle-on.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#F57C00" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="5" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-pink-dracula/add-workspace-active.svg b/src/assets/cinnamon/theme-pink-dracula/add-workspace-active.svg
new file mode 100644
index 00000000..804ece49
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink-dracula/add-workspace-active.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -852.36)" shape-rendering="auto">
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#f04cab" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink-dracula/checkbox-dark.svg b/src/assets/cinnamon/theme-pink-dracula/checkbox-dark.svg
new file mode 100644
index 00000000..33318e5c
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink-dracula/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#ff79c6"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink-dracula/checkbox.svg b/src/assets/cinnamon/theme-pink-dracula/checkbox.svg
new file mode 100644
index 00000000..5f6dbb02
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink-dracula/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#f04cab"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink-dracula/corner-ripple.svg b/src/assets/cinnamon/theme-pink-dracula/corner-ripple.svg
new file mode 100644
index 00000000..cf79b213
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink-dracula/corner-ripple.svg
@@ -0,0 +1,5 @@
+<svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -948.36)">
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#f04cab" opacity=".25"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink-dracula/radiobutton-dark.svg b/src/assets/cinnamon/theme-pink-dracula/radiobutton-dark.svg
new file mode 100644
index 00000000..6b765829
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink-dracula/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#ff79c6"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink-dracula/radiobutton.svg b/src/assets/cinnamon/theme-pink-dracula/radiobutton.svg
new file mode 100644
index 00000000..608b5008
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink-dracula/radiobutton.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#f04cab"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink-dracula/toggle-on-dark.svg b/src/assets/cinnamon/theme-pink-dracula/toggle-on-dark.svg
new file mode 100644
index 00000000..b38c1f31
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink-dracula/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#ff79c6" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink-dracula/toggle-on.svg b/src/assets/cinnamon/theme-pink-dracula/toggle-on.svg
new file mode 100644
index 00000000..b1effa1e
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink-dracula/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#f04cab" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink-nord/add-workspace-active.svg b/src/assets/cinnamon/theme-pink-nord/add-workspace-active.svg
new file mode 100644
index 00000000..77d0f1c4
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink-nord/add-workspace-active.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -852.36)" shape-rendering="auto">
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#cd7092" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink-nord/checkbox-dark.svg b/src/assets/cinnamon/theme-pink-nord/checkbox-dark.svg
new file mode 100644
index 00000000..eb3c3445
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink-nord/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#dc98b1"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink-nord/checkbox.svg b/src/assets/cinnamon/theme-pink-nord/checkbox.svg
new file mode 100644
index 00000000..0f8ac581
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink-nord/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#cd7092"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink-nord/corner-ripple.svg b/src/assets/cinnamon/theme-pink-nord/corner-ripple.svg
new file mode 100644
index 00000000..38b3e99a
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink-nord/corner-ripple.svg
@@ -0,0 +1,5 @@
+<svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -948.36)">
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#cd7092" opacity=".25"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink-nord/radiobutton-dark.svg b/src/assets/cinnamon/theme-pink-nord/radiobutton-dark.svg
new file mode 100644
index 00000000..33275332
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink-nord/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#dc98b1"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink-nord/radiobutton.svg b/src/assets/cinnamon/theme-pink-nord/radiobutton.svg
new file mode 100644
index 00000000..875c1514
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink-nord/radiobutton.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#cd7092"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink-nord/toggle-on-dark.svg b/src/assets/cinnamon/theme-pink-nord/toggle-on-dark.svg
new file mode 100644
index 00000000..846a71af
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink-nord/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#dc98b1" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink-nord/toggle-on.svg b/src/assets/cinnamon/theme-pink-nord/toggle-on.svg
new file mode 100644
index 00000000..f8f3eeee
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink-nord/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#cd7092" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink/add-workspace-active.svg b/src/assets/cinnamon/theme-pink/add-workspace-active.svg
index 475db76e..55f673af 100644
--- a/src/assets/cinnamon/theme-pink/add-workspace-active.svg
+++ b/src/assets/cinnamon/theme-pink/add-workspace-active.svg
@@ -1,12 +1,6 @@
 <svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <filter id="filter4154" x="-.132" y="-.020842" width="1.264" height="1.0417" color-interpolation-filters="sRGB">
-   <feGaussianBlur stdDeviation="1.6500004"/>
-  </filter>
- </defs>
  <g transform="translate(0 -852.36)" shape-rendering="auto">
-  <path d="m7.2 858.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#000000" fill-opacity=".44" filter="url(#filter4154)" image-rendering="auto" opacity=".9" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
   <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#EC407A" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
-  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#eceff1" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
  </g>
 </svg>
diff --git a/src/assets/cinnamon/theme-pink/checkbox-dark.svg b/src/assets/cinnamon/theme-pink/checkbox-dark.svg
new file mode 100644
index 00000000..aeda93d8
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#F06292"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink/checkbox.svg b/src/assets/cinnamon/theme-pink/checkbox.svg
index 540908ec..5915f523 100644
--- a/src/assets/cinnamon/theme-pink/checkbox.svg
+++ b/src/assets/cinnamon/theme-pink/checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#EC407A" style="paint-order:stroke fill markers"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#EC407A"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-pink/radiobutton-dark.svg b/src/assets/cinnamon/theme-pink/radiobutton-dark.svg
new file mode 100644
index 00000000..7edde5ab
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#F06292"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink/radiobutton.svg b/src/assets/cinnamon/theme-pink/radiobutton.svg
index a25854a3..b581a236 100644
--- a/src/assets/cinnamon/theme-pink/radiobutton.svg
+++ b/src/assets/cinnamon/theme-pink/radiobutton.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 7c1.656 0 3 1.344 3 3s-1.344 3-3 3-3-1.344-3-3 1.344-3 3-3z" fill="#EC407A"/>
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#EC407A"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-pink/toggle-on-dark.svg b/src/assets/cinnamon/theme-pink/toggle-on-dark.svg
new file mode 100644
index 00000000..6c2403d1
--- /dev/null
+++ b/src/assets/cinnamon/theme-pink/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#F06292" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-pink/toggle-on.svg b/src/assets/cinnamon/theme-pink/toggle-on.svg
index 9be3b3aa..9e76e172 100644
--- a/src/assets/cinnamon/theme-pink/toggle-on.svg
+++ b/src/assets/cinnamon/theme-pink/toggle-on.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#EC407A" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="5" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-purple-dracula/add-workspace-active.svg b/src/assets/cinnamon/theme-purple-dracula/add-workspace-active.svg
new file mode 100644
index 00000000..9363c2de
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple-dracula/add-workspace-active.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -852.36)" shape-rendering="auto">
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#a679ec" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple-dracula/checkbox-dark.svg b/src/assets/cinnamon/theme-purple-dracula/checkbox-dark.svg
new file mode 100644
index 00000000..172aed63
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple-dracula/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#bd93f9"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple-dracula/checkbox.svg b/src/assets/cinnamon/theme-purple-dracula/checkbox.svg
new file mode 100644
index 00000000..24da996a
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple-dracula/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#a679ec"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple-dracula/corner-ripple.svg b/src/assets/cinnamon/theme-purple-dracula/corner-ripple.svg
new file mode 100644
index 00000000..4a6c07e8
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple-dracula/corner-ripple.svg
@@ -0,0 +1,5 @@
+<svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -948.36)">
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#a679ec" opacity=".25"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple-dracula/radiobutton-dark.svg b/src/assets/cinnamon/theme-purple-dracula/radiobutton-dark.svg
new file mode 100644
index 00000000..75702bf3
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple-dracula/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#bd93f9"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple-dracula/radiobutton.svg b/src/assets/cinnamon/theme-purple-dracula/radiobutton.svg
new file mode 100644
index 00000000..02122be2
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple-dracula/radiobutton.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#a679ec"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple-dracula/toggle-on-dark.svg b/src/assets/cinnamon/theme-purple-dracula/toggle-on-dark.svg
new file mode 100644
index 00000000..bb5d7e69
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple-dracula/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#bd93f9" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple-dracula/toggle-on.svg b/src/assets/cinnamon/theme-purple-dracula/toggle-on.svg
new file mode 100644
index 00000000..ee15aac0
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple-dracula/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#a679ec" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple-nord/add-workspace-active.svg b/src/assets/cinnamon/theme-purple-nord/add-workspace-active.svg
new file mode 100644
index 00000000..740ac950
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple-nord/add-workspace-active.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -852.36)" shape-rendering="auto">
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#b57daa" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple-nord/checkbox-dark.svg b/src/assets/cinnamon/theme-purple-nord/checkbox-dark.svg
new file mode 100644
index 00000000..55700e03
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple-nord/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#c89dbf"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple-nord/checkbox.svg b/src/assets/cinnamon/theme-purple-nord/checkbox.svg
new file mode 100644
index 00000000..ac4f2bbe
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple-nord/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#b57daa"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple-nord/corner-ripple.svg b/src/assets/cinnamon/theme-purple-nord/corner-ripple.svg
new file mode 100644
index 00000000..dc380a41
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple-nord/corner-ripple.svg
@@ -0,0 +1,5 @@
+<svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -948.36)">
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#b57daa" opacity=".25"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple-nord/radiobutton-dark.svg b/src/assets/cinnamon/theme-purple-nord/radiobutton-dark.svg
new file mode 100644
index 00000000..054d61d2
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple-nord/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#c89dbf"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple-nord/radiobutton.svg b/src/assets/cinnamon/theme-purple-nord/radiobutton.svg
new file mode 100644
index 00000000..2f07939f
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple-nord/radiobutton.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#b57daa"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple-nord/toggle-on-dark.svg b/src/assets/cinnamon/theme-purple-nord/toggle-on-dark.svg
new file mode 100644
index 00000000..0048c920
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple-nord/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#c89dbf" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple-nord/toggle-on.svg b/src/assets/cinnamon/theme-purple-nord/toggle-on.svg
new file mode 100644
index 00000000..3c260ffc
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple-nord/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#b57daa" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple/add-workspace-active.svg b/src/assets/cinnamon/theme-purple/add-workspace-active.svg
index aec558b6..9f355c59 100644
--- a/src/assets/cinnamon/theme-purple/add-workspace-active.svg
+++ b/src/assets/cinnamon/theme-purple/add-workspace-active.svg
@@ -1,12 +1,6 @@
 <svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <filter id="filter4154" x="-.132" y="-.020842" width="1.264" height="1.0417" color-interpolation-filters="sRGB">
-   <feGaussianBlur stdDeviation="1.6500004"/>
-  </filter>
- </defs>
  <g transform="translate(0 -852.36)" shape-rendering="auto">
-  <path d="m7.2 858.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#000000" fill-opacity=".44" filter="url(#filter4154)" image-rendering="auto" opacity=".9" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
   <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#AB47BC" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
-  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#eceff1" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
  </g>
 </svg>
diff --git a/src/assets/cinnamon/theme-purple/checkbox-dark.svg b/src/assets/cinnamon/theme-purple/checkbox-dark.svg
new file mode 100644
index 00000000..75a8e858
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#BA68C8"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple/checkbox.svg b/src/assets/cinnamon/theme-purple/checkbox.svg
index ac0e4f73..c3827154 100644
--- a/src/assets/cinnamon/theme-purple/checkbox.svg
+++ b/src/assets/cinnamon/theme-purple/checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#AB47BC" style="paint-order:stroke fill markers"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#AB47BC"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-purple/radiobutton-dark.svg b/src/assets/cinnamon/theme-purple/radiobutton-dark.svg
new file mode 100644
index 00000000..8158e4b8
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#BA68C8"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple/radiobutton.svg b/src/assets/cinnamon/theme-purple/radiobutton.svg
index b13909ce..f1ee3953 100644
--- a/src/assets/cinnamon/theme-purple/radiobutton.svg
+++ b/src/assets/cinnamon/theme-purple/radiobutton.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 7c1.656 0 3 1.344 3 3s-1.344 3-3 3-3-1.344-3-3 1.344-3 3-3z" fill="#AB47BC"/>
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#AB47BC"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-purple/toggle-on-dark.svg b/src/assets/cinnamon/theme-purple/toggle-on-dark.svg
new file mode 100644
index 00000000..07e04679
--- /dev/null
+++ b/src/assets/cinnamon/theme-purple/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#BA68C8" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-purple/toggle-on.svg b/src/assets/cinnamon/theme-purple/toggle-on.svg
index 2e15fb5c..8d2fe5a3 100644
--- a/src/assets/cinnamon/theme-purple/toggle-on.svg
+++ b/src/assets/cinnamon/theme-purple/toggle-on.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#AB47BC" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="5" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-red-dracula/add-workspace-active.svg b/src/assets/cinnamon/theme-red-dracula/add-workspace-active.svg
new file mode 100644
index 00000000..7d25b600
--- /dev/null
+++ b/src/assets/cinnamon/theme-red-dracula/add-workspace-active.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -852.36)" shape-rendering="auto">
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#f44d4d" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-red-dracula/checkbox-dark.svg b/src/assets/cinnamon/theme-red-dracula/checkbox-dark.svg
new file mode 100644
index 00000000..4c796ec3
--- /dev/null
+++ b/src/assets/cinnamon/theme-red-dracula/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#ff5555"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-red-dracula/checkbox.svg b/src/assets/cinnamon/theme-red-dracula/checkbox.svg
new file mode 100644
index 00000000..fb8f677e
--- /dev/null
+++ b/src/assets/cinnamon/theme-red-dracula/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#f44d4d"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-red-dracula/corner-ripple.svg b/src/assets/cinnamon/theme-red-dracula/corner-ripple.svg
new file mode 100644
index 00000000..4bf8c442
--- /dev/null
+++ b/src/assets/cinnamon/theme-red-dracula/corner-ripple.svg
@@ -0,0 +1,5 @@
+<svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -948.36)">
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#f44d4d" opacity=".25"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-red-dracula/radiobutton-dark.svg b/src/assets/cinnamon/theme-red-dracula/radiobutton-dark.svg
new file mode 100644
index 00000000..c28d9445
--- /dev/null
+++ b/src/assets/cinnamon/theme-red-dracula/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#ff5555"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-red-dracula/radiobutton.svg b/src/assets/cinnamon/theme-red-dracula/radiobutton.svg
new file mode 100644
index 00000000..0fdedaae
--- /dev/null
+++ b/src/assets/cinnamon/theme-red-dracula/radiobutton.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#f44d4d"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-red-dracula/toggle-on-dark.svg b/src/assets/cinnamon/theme-red-dracula/toggle-on-dark.svg
new file mode 100644
index 00000000..31445aa5
--- /dev/null
+++ b/src/assets/cinnamon/theme-red-dracula/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#ff5555" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-red-dracula/toggle-on.svg b/src/assets/cinnamon/theme-red-dracula/toggle-on.svg
new file mode 100644
index 00000000..26f23bfa
--- /dev/null
+++ b/src/assets/cinnamon/theme-red-dracula/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#f44d4d" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-red-nord/add-workspace-active.svg b/src/assets/cinnamon/theme-red-nord/add-workspace-active.svg
new file mode 100644
index 00000000..f1ff75de
--- /dev/null
+++ b/src/assets/cinnamon/theme-red-nord/add-workspace-active.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -852.36)" shape-rendering="auto">
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#c35b65" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-red-nord/checkbox-dark.svg b/src/assets/cinnamon/theme-red-nord/checkbox-dark.svg
new file mode 100644
index 00000000..8d6b9679
--- /dev/null
+++ b/src/assets/cinnamon/theme-red-nord/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#d4878f"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-red-nord/checkbox.svg b/src/assets/cinnamon/theme-red-nord/checkbox.svg
new file mode 100644
index 00000000..73a5ed51
--- /dev/null
+++ b/src/assets/cinnamon/theme-red-nord/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#c35b65"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-red-nord/corner-ripple.svg b/src/assets/cinnamon/theme-red-nord/corner-ripple.svg
new file mode 100644
index 00000000..370faf18
--- /dev/null
+++ b/src/assets/cinnamon/theme-red-nord/corner-ripple.svg
@@ -0,0 +1,5 @@
+<svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -948.36)">
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#c35b65" opacity=".25"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-red-nord/radiobutton-dark.svg b/src/assets/cinnamon/theme-red-nord/radiobutton-dark.svg
new file mode 100644
index 00000000..e0167a56
--- /dev/null
+++ b/src/assets/cinnamon/theme-red-nord/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#d4878f"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-red-nord/radiobutton.svg b/src/assets/cinnamon/theme-red-nord/radiobutton.svg
new file mode 100644
index 00000000..1f3b41df
--- /dev/null
+++ b/src/assets/cinnamon/theme-red-nord/radiobutton.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#c35b65"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-red-nord/toggle-on-dark.svg b/src/assets/cinnamon/theme-red-nord/toggle-on-dark.svg
new file mode 100644
index 00000000..2f74847b
--- /dev/null
+++ b/src/assets/cinnamon/theme-red-nord/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#d4878f" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-red-nord/toggle-on.svg b/src/assets/cinnamon/theme-red-nord/toggle-on.svg
new file mode 100644
index 00000000..9e89a79e
--- /dev/null
+++ b/src/assets/cinnamon/theme-red-nord/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#c35b65" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-red/add-workspace-active.svg b/src/assets/cinnamon/theme-red/add-workspace-active.svg
index e1b43b96..2628bfa0 100644
--- a/src/assets/cinnamon/theme-red/add-workspace-active.svg
+++ b/src/assets/cinnamon/theme-red/add-workspace-active.svg
@@ -1,12 +1,6 @@
 <svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <filter id="filter4154" x="-.132" y="-.020842" width="1.264" height="1.0417" color-interpolation-filters="sRGB">
-   <feGaussianBlur stdDeviation="1.6500004"/>
-  </filter>
- </defs>
  <g transform="translate(0 -852.36)" shape-rendering="auto">
-  <path d="m7.2 858.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#000000" fill-opacity=".44" filter="url(#filter4154)" image-rendering="auto" opacity=".9" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
   <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#E53935" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
-  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#eceff1" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
  </g>
 </svg>
diff --git a/src/assets/cinnamon/theme-red/checkbox-dark.svg b/src/assets/cinnamon/theme-red/checkbox-dark.svg
new file mode 100644
index 00000000..3966c802
--- /dev/null
+++ b/src/assets/cinnamon/theme-red/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#F44336"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-red/checkbox.svg b/src/assets/cinnamon/theme-red/checkbox.svg
index 9594ebfd..7980c1bf 100644
--- a/src/assets/cinnamon/theme-red/checkbox.svg
+++ b/src/assets/cinnamon/theme-red/checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#E53935" style="paint-order:stroke fill markers"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#E53935"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-red/radiobutton-dark.svg b/src/assets/cinnamon/theme-red/radiobutton-dark.svg
new file mode 100644
index 00000000..d65805da
--- /dev/null
+++ b/src/assets/cinnamon/theme-red/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#F44336"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-red/radiobutton.svg b/src/assets/cinnamon/theme-red/radiobutton.svg
index ba26ab65..7c515155 100644
--- a/src/assets/cinnamon/theme-red/radiobutton.svg
+++ b/src/assets/cinnamon/theme-red/radiobutton.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 7c1.656 0 3 1.344 3 3s-1.344 3-3 3-3-1.344-3-3 1.344-3 3-3z" fill="#E53935"/>
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#E53935"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-red/toggle-on-dark.svg b/src/assets/cinnamon/theme-red/toggle-on-dark.svg
new file mode 100644
index 00000000..cea36cea
--- /dev/null
+++ b/src/assets/cinnamon/theme-red/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#F44336" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-red/toggle-on.svg b/src/assets/cinnamon/theme-red/toggle-on.svg
index 359625fd..29a48401 100644
--- a/src/assets/cinnamon/theme-red/toggle-on.svg
+++ b/src/assets/cinnamon/theme-red/toggle-on.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#E53935" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="5" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-teal-dracula/add-workspace-active.svg b/src/assets/cinnamon/theme-teal-dracula/add-workspace-active.svg
new file mode 100644
index 00000000..3f42a85a
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal-dracula/add-workspace-active.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -852.36)" shape-rendering="auto">
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#20eed9" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal-dracula/checkbox-dark.svg b/src/assets/cinnamon/theme-teal-dracula/checkbox-dark.svg
new file mode 100644
index 00000000..31ac8424
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal-dracula/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#50fae9"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal-dracula/checkbox.svg b/src/assets/cinnamon/theme-teal-dracula/checkbox.svg
new file mode 100644
index 00000000..b01d6146
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal-dracula/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#20eed9"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal-dracula/corner-ripple.svg b/src/assets/cinnamon/theme-teal-dracula/corner-ripple.svg
new file mode 100644
index 00000000..29d48f24
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal-dracula/corner-ripple.svg
@@ -0,0 +1,5 @@
+<svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -948.36)">
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#20eed9" opacity=".25"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal-dracula/radiobutton-dark.svg b/src/assets/cinnamon/theme-teal-dracula/radiobutton-dark.svg
new file mode 100644
index 00000000..6268ecc7
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal-dracula/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#50fae9"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal-dracula/radiobutton.svg b/src/assets/cinnamon/theme-teal-dracula/radiobutton.svg
new file mode 100644
index 00000000..c5b2f1fb
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal-dracula/radiobutton.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#20eed9"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal-dracula/toggle-on-dark.svg b/src/assets/cinnamon/theme-teal-dracula/toggle-on-dark.svg
new file mode 100644
index 00000000..df00727e
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal-dracula/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#50fae9" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal-dracula/toggle-on.svg b/src/assets/cinnamon/theme-teal-dracula/toggle-on.svg
new file mode 100644
index 00000000..8bfe72c4
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal-dracula/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#20eed9" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal-nord/add-workspace-active.svg b/src/assets/cinnamon/theme-teal-nord/add-workspace-active.svg
new file mode 100644
index 00000000..530c4594
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal-nord/add-workspace-active.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -852.36)" shape-rendering="auto">
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#63a6a5" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal-nord/checkbox-dark.svg b/src/assets/cinnamon/theme-teal-nord/checkbox-dark.svg
new file mode 100644
index 00000000..f0db4af3
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal-nord/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#83b9b8"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal-nord/checkbox.svg b/src/assets/cinnamon/theme-teal-nord/checkbox.svg
new file mode 100644
index 00000000..695d0665
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal-nord/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#63a6a5"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal-nord/corner-ripple.svg b/src/assets/cinnamon/theme-teal-nord/corner-ripple.svg
new file mode 100644
index 00000000..3eaef1d4
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal-nord/corner-ripple.svg
@@ -0,0 +1,5 @@
+<svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -948.36)">
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#63a6a5" opacity=".25"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal-nord/radiobutton-dark.svg b/src/assets/cinnamon/theme-teal-nord/radiobutton-dark.svg
new file mode 100644
index 00000000..06183e7d
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal-nord/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#83b9b8"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal-nord/radiobutton.svg b/src/assets/cinnamon/theme-teal-nord/radiobutton.svg
new file mode 100644
index 00000000..073bbb4f
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal-nord/radiobutton.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#63a6a5"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal-nord/toggle-on-dark.svg b/src/assets/cinnamon/theme-teal-nord/toggle-on-dark.svg
new file mode 100644
index 00000000..1ecc04ed
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal-nord/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#83b9b8" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal-nord/toggle-on.svg b/src/assets/cinnamon/theme-teal-nord/toggle-on.svg
new file mode 100644
index 00000000..91d16f1f
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal-nord/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#63a6a5" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal/add-workspace-active.svg b/src/assets/cinnamon/theme-teal/add-workspace-active.svg
index 5cfaf33c..88675da5 100644
--- a/src/assets/cinnamon/theme-teal/add-workspace-active.svg
+++ b/src/assets/cinnamon/theme-teal/add-workspace-active.svg
@@ -1,12 +1,6 @@
 <svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <filter id="filter4154" x="-.132" y="-.020842" width="1.264" height="1.0417" color-interpolation-filters="sRGB">
-   <feGaussianBlur stdDeviation="1.6500004"/>
-  </filter>
- </defs>
  <g transform="translate(0 -852.36)" shape-rendering="auto">
-  <path d="m7.2 858.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#000000" fill-opacity=".44" filter="url(#filter4154)" image-rendering="auto" opacity=".9" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
   <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#009688" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
-  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#eceff1" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
  </g>
 </svg>
diff --git a/src/assets/cinnamon/theme-teal/checkbox-dark.svg b/src/assets/cinnamon/theme-teal/checkbox-dark.svg
new file mode 100644
index 00000000..8e50189f
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#4DB6AC"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal/checkbox.svg b/src/assets/cinnamon/theme-teal/checkbox.svg
index 7f48501a..3d8b33d9 100644
--- a/src/assets/cinnamon/theme-teal/checkbox.svg
+++ b/src/assets/cinnamon/theme-teal/checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#009688" style="paint-order:stroke fill markers"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#009688"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-teal/radiobutton-dark.svg b/src/assets/cinnamon/theme-teal/radiobutton-dark.svg
new file mode 100644
index 00000000..820c673d
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#4DB6AC"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal/radiobutton.svg b/src/assets/cinnamon/theme-teal/radiobutton.svg
index 4c81bd0b..937f9b64 100644
--- a/src/assets/cinnamon/theme-teal/radiobutton.svg
+++ b/src/assets/cinnamon/theme-teal/radiobutton.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 7c1.656 0 3 1.344 3 3s-1.344 3-3 3-3-1.344-3-3 1.344-3 3-3z" fill="#009688"/>
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#009688"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-teal/toggle-on-dark.svg b/src/assets/cinnamon/theme-teal/toggle-on-dark.svg
new file mode 100644
index 00000000..258431de
--- /dev/null
+++ b/src/assets/cinnamon/theme-teal/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#4DB6AC" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-teal/toggle-on.svg b/src/assets/cinnamon/theme-teal/toggle-on.svg
index 355f01d6..2bcdf67e 100644
--- a/src/assets/cinnamon/theme-teal/toggle-on.svg
+++ b/src/assets/cinnamon/theme-teal/toggle-on.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#009688" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="5" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-yellow-dracula/add-workspace-active.svg b/src/assets/cinnamon/theme-yellow-dracula/add-workspace-active.svg
new file mode 100644
index 00000000..917be7a5
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow-dracula/add-workspace-active.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -852.36)" shape-rendering="auto">
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#e8f467" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow-dracula/checkbox-dark.svg b/src/assets/cinnamon/theme-yellow-dracula/checkbox-dark.svg
new file mode 100644
index 00000000..17d6727d
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow-dracula/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#f1fa8c"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow-dracula/checkbox.svg b/src/assets/cinnamon/theme-yellow-dracula/checkbox.svg
new file mode 100644
index 00000000..82e4ada0
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow-dracula/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#e8f467"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow-dracula/corner-ripple.svg b/src/assets/cinnamon/theme-yellow-dracula/corner-ripple.svg
new file mode 100644
index 00000000..af9f8883
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow-dracula/corner-ripple.svg
@@ -0,0 +1,5 @@
+<svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -948.36)">
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#e8f467" opacity=".25"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow-dracula/radiobutton-dark.svg b/src/assets/cinnamon/theme-yellow-dracula/radiobutton-dark.svg
new file mode 100644
index 00000000..aa5a3125
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow-dracula/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#f1fa8c"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow-dracula/radiobutton.svg b/src/assets/cinnamon/theme-yellow-dracula/radiobutton.svg
new file mode 100644
index 00000000..06641092
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow-dracula/radiobutton.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#e8f467"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow-dracula/toggle-on-dark.svg b/src/assets/cinnamon/theme-yellow-dracula/toggle-on-dark.svg
new file mode 100644
index 00000000..00a0d099
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow-dracula/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#f1fa8c" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow-dracula/toggle-on.svg b/src/assets/cinnamon/theme-yellow-dracula/toggle-on.svg
new file mode 100644
index 00000000..5adff487
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow-dracula/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#e8f467" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow-nord/add-workspace-active.svg b/src/assets/cinnamon/theme-yellow-nord/add-workspace-active.svg
new file mode 100644
index 00000000..f3b3b0ed
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow-nord/add-workspace-active.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -852.36)" shape-rendering="auto">
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#e4b558" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow-nord/checkbox-dark.svg b/src/assets/cinnamon/theme-yellow-nord/checkbox-dark.svg
new file mode 100644
index 00000000..d2b6a391
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow-nord/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#eac985"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow-nord/checkbox.svg b/src/assets/cinnamon/theme-yellow-nord/checkbox.svg
new file mode 100644
index 00000000..073e493a
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow-nord/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#e4b558"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow-nord/corner-ripple.svg b/src/assets/cinnamon/theme-yellow-nord/corner-ripple.svg
new file mode 100644
index 00000000..039bc182
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow-nord/corner-ripple.svg
@@ -0,0 +1,5 @@
+<svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -948.36)">
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#e4b558" opacity=".25"/>
+ </g>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow-nord/radiobutton-dark.svg b/src/assets/cinnamon/theme-yellow-nord/radiobutton-dark.svg
new file mode 100644
index 00000000..c9e9341d
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow-nord/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#eac985"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow-nord/radiobutton.svg b/src/assets/cinnamon/theme-yellow-nord/radiobutton.svg
new file mode 100644
index 00000000..d845741e
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow-nord/radiobutton.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#e4b558"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow-nord/toggle-on-dark.svg b/src/assets/cinnamon/theme-yellow-nord/toggle-on-dark.svg
new file mode 100644
index 00000000..c3d286bb
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow-nord/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#eac985" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow-nord/toggle-on.svg b/src/assets/cinnamon/theme-yellow-nord/toggle-on.svg
new file mode 100644
index 00000000..646896a9
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow-nord/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#e4b558" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow/add-workspace-active.svg b/src/assets/cinnamon/theme-yellow/add-workspace-active.svg
index ce791c58..dbdefb1f 100644
--- a/src/assets/cinnamon/theme-yellow/add-workspace-active.svg
+++ b/src/assets/cinnamon/theme-yellow/add-workspace-active.svg
@@ -1,12 +1,6 @@
 <svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <filter id="filter4154" x="-.132" y="-.020842" width="1.264" height="1.0417" color-interpolation-filters="sRGB">
-   <feGaussianBlur stdDeviation="1.6500004"/>
-  </filter>
- </defs>
  <g transform="translate(0 -852.36)" shape-rendering="auto">
-  <path d="m7.2 858.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#000000" fill-opacity=".44" filter="url(#filter4154)" image-rendering="auto" opacity=".9" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
   <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#FBC02D" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
-  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#eceff1" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
  </g>
 </svg>
diff --git a/src/assets/cinnamon/theme-yellow/checkbox-dark.svg b/src/assets/cinnamon/theme-yellow/checkbox-dark.svg
new file mode 100644
index 00000000..00db47d6
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#FFD600"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow/checkbox.svg b/src/assets/cinnamon/theme-yellow/checkbox.svg
index adc7388a..0ab70222 100644
--- a/src/assets/cinnamon/theme-yellow/checkbox.svg
+++ b/src/assets/cinnamon/theme-yellow/checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#FBC02D" style="paint-order:stroke fill markers"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#FBC02D"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-yellow/radiobutton-dark.svg b/src/assets/cinnamon/theme-yellow/radiobutton-dark.svg
new file mode 100644
index 00000000..a32b934f
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#FFD600"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow/radiobutton.svg b/src/assets/cinnamon/theme-yellow/radiobutton.svg
index 5167698b..2d7f9349 100644
--- a/src/assets/cinnamon/theme-yellow/radiobutton.svg
+++ b/src/assets/cinnamon/theme-yellow/radiobutton.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 7c1.656 0 3 1.344 3 3s-1.344 3-3 3-3-1.344-3-3 1.344-3 3-3z" fill="#FBC02D"/>
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#FBC02D"/>
 </svg>
diff --git a/src/assets/cinnamon/theme-yellow/toggle-on-dark.svg b/src/assets/cinnamon/theme-yellow/toggle-on-dark.svg
new file mode 100644
index 00000000..62c3d581
--- /dev/null
+++ b/src/assets/cinnamon/theme-yellow/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#FFD600" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme-yellow/toggle-on.svg b/src/assets/cinnamon/theme-yellow/toggle-on.svg
index edc44234..e1c96741 100644
--- a/src/assets/cinnamon/theme-yellow/toggle-on.svg
+++ b/src/assets/cinnamon/theme-yellow/toggle-on.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#FBC02D" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="5" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/cinnamon/theme/add-workspace-active.svg b/src/assets/cinnamon/theme/add-workspace-active.svg
index d1632814..f90ea30b 100644
--- a/src/assets/cinnamon/theme/add-workspace-active.svg
+++ b/src/assets/cinnamon/theme/add-workspace-active.svg
@@ -1,12 +1,6 @@
 <svg width="35" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <filter id="filter4154" x="-.132" y="-.020842" width="1.264" height="1.0417" color-interpolation-filters="sRGB">
-   <feGaussianBlur stdDeviation="1.6500004"/>
-  </filter>
- </defs>
  <g transform="translate(0 -852.36)" shape-rendering="auto">
-  <path d="m7.2 858.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#000000" fill-opacity=".44" filter="url(#filter4154)" image-rendering="auto" opacity=".9" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
-  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#3684dd" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
-  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#eceff1" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path d="m7 857.36h28v190h-28c-1.108 0-2-0.892-2-2v-186c0-1.108 0.892-2 2-2z" color="#000000" color-rendering="auto" fill="#3c84f7" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+  <path transform="translate(0 852.36)" d="m18 94c-0.554 0-1 0.446-1 1v4h-4c-0.554 0-1 0.446-1 1s0.446 1 1 1h4v4c0 0.554 0.446 1 1 1s1-0.446 1-1v-4h4c0.554 0 1-0.446 1-1s-0.446-1-1-1h-4v-4c0-0.554-0.446-1-1-1zm8 6a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z" color="#000000" color-rendering="auto" fill="#ffffff" image-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
  </g>
 </svg>
diff --git a/src/assets/cinnamon/theme/checkbox-dark.svg b/src/assets/cinnamon/theme/checkbox-dark.svg
new file mode 100644
index 00000000..d7d1529f
--- /dev/null
+++ b/src/assets/cinnamon/theme/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#5b9bf8"/>
+</svg>
diff --git a/src/assets/cinnamon/theme/checkbox.svg b/src/assets/cinnamon/theme/checkbox.svg
index ea2a002e..7a4e2112 100644
--- a/src/assets/cinnamon/theme/checkbox.svg
+++ b/src/assets/cinnamon/theme/checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#3684dd" style="paint-order:stroke fill markers"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#3c84f7"/>
 </svg>
diff --git a/src/assets/cinnamon/theme/corner-ripple.svg b/src/assets/cinnamon/theme/corner-ripple.svg
index dcef3b78..25f275e1 100644
--- a/src/assets/cinnamon/theme/corner-ripple.svg
+++ b/src/assets/cinnamon/theme/corner-ripple.svg
@@ -1,5 +1,5 @@
 <svg width="104" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <g transform="translate(0 -948.36)">
-  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#3684dd" opacity=".25"/>
+  <circle id="corner-ripple" cx="52" cy="1000.4" r="48" fill="#3c84f7" opacity=".25"/>
  </g>
 </svg>
diff --git a/src/assets/cinnamon/theme/radiobutton-dark.svg b/src/assets/cinnamon/theme/radiobutton-dark.svg
new file mode 100644
index 00000000..0ac8c919
--- /dev/null
+++ b/src/assets/cinnamon/theme/radiobutton-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#5b9bf8"/>
+</svg>
diff --git a/src/assets/cinnamon/theme/radiobutton.svg b/src/assets/cinnamon/theme/radiobutton.svg
index 13a5c2ee..8a743eca 100644
--- a/src/assets/cinnamon/theme/radiobutton.svg
+++ b/src/assets/cinnamon/theme/radiobutton.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 7c1.656 0 3 1.344 3 3s-1.344 3-3 3-3-1.344-3-3 1.344-3 3-3z" fill="#3684dd"/>
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 8c1.1046 0 2 0.89543 2 2s-0.89543 2-2 2-2-0.89543-2-2 0.89543-2 2-2z" fill="#3c84f7"/>
 </svg>
diff --git a/src/assets/cinnamon/theme/toggle-on-dark.svg b/src/assets/cinnamon/theme/toggle-on-dark.svg
new file mode 100644
index 00000000..b9ebff23
--- /dev/null
+++ b/src/assets/cinnamon/theme/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#5b9bf8" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/cinnamon/theme/toggle-on.svg b/src/assets/cinnamon/theme/toggle-on.svg
index e1e47e7e..edec9220 100644
--- a/src/assets/cinnamon/theme/toggle-on.svg
+++ b/src/assets/cinnamon/theme/toggle-on.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#3684dd" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="5" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#3c84f7" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/cinnamon/thumbnail-dark.png b/src/assets/cinnamon/thumbnail-dark.png
deleted file mode 100644
index 4b264c52..00000000
Binary files a/src/assets/cinnamon/thumbnail-dark.png and /dev/null differ
diff --git a/src/assets/cinnamon/thumbnail-light.png b/src/assets/cinnamon/thumbnail-light.png
deleted file mode 100644
index cec45c0c..00000000
Binary files a/src/assets/cinnamon/thumbnail-light.png and /dev/null differ
diff --git a/src/assets/cinnamon/thumbnail.png b/src/assets/cinnamon/thumbnail.png
deleted file mode 100644
index a3dd0656..00000000
Binary files a/src/assets/cinnamon/thumbnail.png and /dev/null differ
diff --git a/src/assets/cinnamon/thumbnails/make-thumbnails.sh b/src/assets/cinnamon/thumbnails/make-thumbnails.sh
new file mode 100755
index 00000000..ca4a7866
--- /dev/null
+++ b/src/assets/cinnamon/thumbnails/make-thumbnails.sh
@@ -0,0 +1,148 @@
+#! /usr/bin/env bash
+
+for theme in '' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-teal' '-grey'; do
+  for type in '' '-nord' '-dracula'; do
+    case "$theme" in
+      '')
+        theme_color_dark='#3c84f7'
+        theme_color_light='#5b9bf8'
+        ;;
+      -purple)
+        theme_color_dark='#AB47BC'
+        theme_color_light='#BA68C8'
+        ;;
+      -pink)
+        theme_color_dark='#EC407A'
+        theme_color_light='#F06292'
+        ;;
+      -red)
+        theme_color_dark='#E53935'
+        theme_color_light='#F44336'
+        ;;
+      -orange)
+        theme_color_dark='#F57C00'
+        theme_color_light='#FB8C00'
+        ;;
+      -yellow)
+        theme_color_dark='#FBC02D'
+        theme_color_light='#FFD600'
+        ;;
+      -green)
+        theme_color_dark='#4CAF50'
+        theme_color_light='#66BB6A'
+        ;;
+      -teal)
+        theme_color_dark='#009688'
+        theme_color_light='#4DB6AC'
+        ;;
+      -grey)
+        theme_color_dark='#464646'
+        theme_color_light='#DDDDDD'
+        ;;
+    esac
+
+    if [[ "$type" == '-nord' ]]; then
+      panel_light='#f0f1f4'
+      panel_dark='#1c1f26'
+      case "$theme" in
+        '')
+          theme_color_dark='#5e81ac'
+          theme_color_light='#89a3c2'
+          ;;
+        -purple)
+          theme_color_dark='#b57daa'
+          theme_color_light='#c89dbf'
+          ;;
+        -pink)
+          theme_color_dark='#cd7092'
+          theme_color_light='#dc98b1'
+          ;;
+        -red)
+          theme_color_dark='#c35b65'
+          theme_color_light='#d4878f'
+          ;;
+        -orange)
+          theme_color_dark='#d0846c'
+          theme_color_light='#dca493'
+          ;;
+        -yellow)
+          theme_color_dark='#e4b558'
+          theme_color_light='#eac985'
+          ;;
+        -green)
+          theme_color_dark='#82ac5d'
+          theme_color_light='#a0c082'
+          ;;
+        -teal)
+          theme_color_dark='#63a6a5'
+          theme_color_light='#83b9b8'
+          ;;
+        -grey)
+          theme_color_dark='#3a4150'
+          theme_color_light='#d9dce3'
+          ;;
+      esac
+    fi
+
+    if [[ "$type" == '-dracula' ]]; then
+      panel_light='#f0f1f4'
+      panel_dark='#1c1e26'
+      case "$theme" in
+        '')
+          theme_color_dark='#a679ec'
+          theme_color_light='#bd93f9'
+          ;;
+        -purple)
+          theme_color_dark='#a679ec'
+          theme_color_light='#bd93f9'
+          ;;
+        -pink)
+          theme_color_dark='#f04cab'
+          theme_color_light='#ff79c6'
+          ;;
+        -red)
+          theme_color_dark='#f44d4d'
+          theme_color_light='#ff5555'
+          ;;
+        -orange)
+          theme_color_dark='#f8a854'
+          theme_color_light='#ffb86c'
+          ;;
+        -yellow)
+          theme_color_dark='#e8f467'
+          theme_color_light='#f1fa8c'
+          ;;
+        -green)
+          theme_color_dark='#4be772'
+          theme_color_light='#50fa7b'
+          ;;
+        -teal)
+          theme_color_dark='#20eed9'
+          theme_color_light='#50fae9'
+          ;;
+        -grey)
+          theme_color_dark='#3c3f51'
+          theme_color_light='#d9dae3'
+          ;;
+      esac
+    fi
+
+    if [[ "$type" != '' ]]; then
+      rm -rf "thumbnail${theme}${type}.svg"
+      cp -rf "thumbnail.svg" "thumbnail${theme}${type}.svg"
+      sed -i "s/#3c84f7/${theme_color_dark}/g" "thumbnail${theme}${type}.svg"
+      sed -i "s/#5b9bf8/${theme_color_light}/g" "thumbnail${theme}${type}.svg"
+      sed -i "s/#f2f2f2/${panel_light}/g" "thumbnail${theme}${type}.svg"
+      sed -i "s/#212121/${panel_dark}/g" "thumbnail${theme}${type}.svg"
+      sed -i "s/thumbnail/thumbnail${theme}${type}/g" "thumbnail${theme}${type}.svg"
+    elif [[ "$theme" != '' ]]; then
+      rm -rf "thumbnail${theme}.svg"
+      cp -rf "thumbnail.svg" "thumbnail${theme}.svg"
+      sed -i "s/#3c84f7/${theme_color_dark}/g" "thumbnail${theme}.svg"
+      sed -i "s/#5b9bf8/${theme_color_light}/g" "thumbnail${theme}.svg"
+      sed -i "s/thumbnail/thumbnail${theme}/g" "thumbnail${theme}.svg"
+    fi
+  done
+done
+
+echo -e "DONE!"
diff --git a/src/assets/cinnamon/thumbnails/render-thumbnails.sh b/src/assets/cinnamon/thumbnails/render-thumbnails.sh
new file mode 100755
index 00000000..47ce8dcb
--- /dev/null
+++ b/src/assets/cinnamon/thumbnails/render-thumbnails.sh
@@ -0,0 +1,33 @@
+#! /usr/bin/env bash
+
+INKSCAPE="/usr/bin/inkscape"
+OPTIPNG="/usr/bin/optipng"
+
+./make-thumbnails.sh
+
+  for theme in '' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-teal' '-grey'; do
+    for type in '' '-nord' '-dracula'; do
+      SRC_FILE="thumbnail${theme}${type}.svg"
+      for color in '' '-light' '-dark'; do
+              echo
+              echo Rendering thumbnail${theme}${type}${color}.png
+              $INKSCAPE --export-id=thumbnail${theme}${type}${color} \
+                        --export-id-only \
+                        --export-dpi=96 \
+                        --export-filename=thumbnail${theme}${type}${color}.png $SRC_FILE >/dev/null \
+              && $OPTIPNG -o7 --quiet thumbnail${theme}${type}.png
+        done
+      done
+    done
+
+  for theme in '' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-teal' '-grey'; do
+    for type in '' '-nord' '-dracula'; do
+      if [[ ${theme} == '' && ${type} == '' ]]; then
+        echo "keep thumbnail.svg"
+      else
+        rm -rf "thumbnail${theme}${type}.svg"
+      fi
+    done
+  done
+
+exit 0
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-dark.png
new file mode 100644
index 00000000..944e2b11
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dracula-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-dracula-dark.png
new file mode 100644
index 00000000..bd60c20e
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-dracula-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dracula-light.png b/src/assets/cinnamon/thumbnails/thumbnail-dracula-light.png
new file mode 100644
index 00000000..84e8a1c7
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-dracula-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-dracula.png b/src/assets/cinnamon/thumbnails/thumbnail-dracula.png
new file mode 100644
index 00000000..6d0d623f
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-dracula.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-green-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-green-dark.png
new file mode 100644
index 00000000..a6495d0b
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-green-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-green-dracula-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-green-dracula-dark.png
new file mode 100644
index 00000000..ca1f064f
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-green-dracula-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-green-dracula-light.png b/src/assets/cinnamon/thumbnails/thumbnail-green-dracula-light.png
new file mode 100644
index 00000000..a24125ad
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-green-dracula-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-green-dracula.png b/src/assets/cinnamon/thumbnails/thumbnail-green-dracula.png
new file mode 100644
index 00000000..d7c567ac
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-green-dracula.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-green-light.png b/src/assets/cinnamon/thumbnails/thumbnail-green-light.png
new file mode 100644
index 00000000..d674bbc4
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-green-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-green-nord-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-green-nord-dark.png
new file mode 100644
index 00000000..2f050fe3
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-green-nord-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-green-nord-light.png b/src/assets/cinnamon/thumbnails/thumbnail-green-nord-light.png
new file mode 100644
index 00000000..638d9102
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-green-nord-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-green-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-green-nord.png
new file mode 100644
index 00000000..0fa51831
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-green-nord.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-green.png b/src/assets/cinnamon/thumbnails/thumbnail-green.png
new file mode 100644
index 00000000..2971283d
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-green.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-grey-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-grey-dark.png
new file mode 100644
index 00000000..354605c0
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-grey-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-grey-dracula-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-grey-dracula-dark.png
new file mode 100644
index 00000000..4c20fadb
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-grey-dracula-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-grey-dracula-light.png b/src/assets/cinnamon/thumbnails/thumbnail-grey-dracula-light.png
new file mode 100644
index 00000000..66b3a20f
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-grey-dracula-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-grey-dracula.png b/src/assets/cinnamon/thumbnails/thumbnail-grey-dracula.png
new file mode 100644
index 00000000..411eb765
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-grey-dracula.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-grey-light.png b/src/assets/cinnamon/thumbnails/thumbnail-grey-light.png
new file mode 100644
index 00000000..b3200fe8
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-grey-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-grey-nord-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-grey-nord-dark.png
new file mode 100644
index 00000000..daa0306a
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-grey-nord-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-grey-nord-light.png b/src/assets/cinnamon/thumbnails/thumbnail-grey-nord-light.png
new file mode 100644
index 00000000..bab95153
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-grey-nord-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-grey-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-grey-nord.png
new file mode 100644
index 00000000..e617eff5
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-grey-nord.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-grey.png b/src/assets/cinnamon/thumbnails/thumbnail-grey.png
new file mode 100644
index 00000000..5ed0527a
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-grey.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-light.png b/src/assets/cinnamon/thumbnails/thumbnail-light.png
new file mode 100644
index 00000000..0f68c6ae
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-nord-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-nord-dark.png
new file mode 100644
index 00000000..e9ca00f4
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-nord-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-nord-light.png b/src/assets/cinnamon/thumbnails/thumbnail-nord-light.png
new file mode 100644
index 00000000..f274f99e
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-nord-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-nord.png
new file mode 100644
index 00000000..82169a4b
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-nord.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-orange-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-orange-dark.png
new file mode 100644
index 00000000..7c8add17
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-orange-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-orange-dracula-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-orange-dracula-dark.png
new file mode 100644
index 00000000..160854ea
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-orange-dracula-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-orange-dracula-light.png b/src/assets/cinnamon/thumbnails/thumbnail-orange-dracula-light.png
new file mode 100644
index 00000000..24a3e837
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-orange-dracula-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-orange-dracula.png b/src/assets/cinnamon/thumbnails/thumbnail-orange-dracula.png
new file mode 100644
index 00000000..4ab5563a
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-orange-dracula.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-orange-light.png b/src/assets/cinnamon/thumbnails/thumbnail-orange-light.png
new file mode 100644
index 00000000..19cc35c1
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-orange-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-orange-nord-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-orange-nord-dark.png
new file mode 100644
index 00000000..a91b837a
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-orange-nord-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-orange-nord-light.png b/src/assets/cinnamon/thumbnails/thumbnail-orange-nord-light.png
new file mode 100644
index 00000000..37db459a
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-orange-nord-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-orange-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-orange-nord.png
new file mode 100644
index 00000000..3a72e1ce
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-orange-nord.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-orange.png b/src/assets/cinnamon/thumbnails/thumbnail-orange.png
new file mode 100644
index 00000000..3c20769e
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-orange.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-pink-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-pink-dark.png
new file mode 100644
index 00000000..5496f794
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-pink-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-pink-dracula-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-pink-dracula-dark.png
new file mode 100644
index 00000000..2d4041cd
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-pink-dracula-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-pink-dracula-light.png b/src/assets/cinnamon/thumbnails/thumbnail-pink-dracula-light.png
new file mode 100644
index 00000000..0ba751e1
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-pink-dracula-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-pink-dracula.png b/src/assets/cinnamon/thumbnails/thumbnail-pink-dracula.png
new file mode 100644
index 00000000..a0e1984a
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-pink-dracula.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-pink-light.png b/src/assets/cinnamon/thumbnails/thumbnail-pink-light.png
new file mode 100644
index 00000000..84452a92
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-pink-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-pink-nord-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-pink-nord-dark.png
new file mode 100644
index 00000000..e518c4e7
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-pink-nord-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-pink-nord-light.png b/src/assets/cinnamon/thumbnails/thumbnail-pink-nord-light.png
new file mode 100644
index 00000000..3a14e44f
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-pink-nord-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-pink-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-pink-nord.png
new file mode 100644
index 00000000..908d605a
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-pink-nord.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-pink.png b/src/assets/cinnamon/thumbnails/thumbnail-pink.png
new file mode 100644
index 00000000..cc38c3d1
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-pink.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-purple-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-purple-dark.png
new file mode 100644
index 00000000..9bfcc48d
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-purple-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-purple-dracula-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-purple-dracula-dark.png
new file mode 100644
index 00000000..bd60c20e
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-purple-dracula-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-purple-dracula-light.png b/src/assets/cinnamon/thumbnails/thumbnail-purple-dracula-light.png
new file mode 100644
index 00000000..84e8a1c7
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-purple-dracula-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-purple-dracula.png b/src/assets/cinnamon/thumbnails/thumbnail-purple-dracula.png
new file mode 100644
index 00000000..6d0d623f
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-purple-dracula.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-purple-light.png b/src/assets/cinnamon/thumbnails/thumbnail-purple-light.png
new file mode 100644
index 00000000..8a49f0c7
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-purple-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-purple-nord-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-purple-nord-dark.png
new file mode 100644
index 00000000..3c210516
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-purple-nord-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-purple-nord-light.png b/src/assets/cinnamon/thumbnails/thumbnail-purple-nord-light.png
new file mode 100644
index 00000000..6573286c
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-purple-nord-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-purple-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-purple-nord.png
new file mode 100644
index 00000000..59307c05
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-purple-nord.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-purple.png b/src/assets/cinnamon/thumbnails/thumbnail-purple.png
new file mode 100644
index 00000000..98eb2d0e
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-purple.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-red-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-red-dark.png
new file mode 100644
index 00000000..0d9bad62
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-red-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-red-dracula-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-red-dracula-dark.png
new file mode 100644
index 00000000..4c7efc7f
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-red-dracula-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-red-dracula-light.png b/src/assets/cinnamon/thumbnails/thumbnail-red-dracula-light.png
new file mode 100644
index 00000000..d87a7ffd
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-red-dracula-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-red-dracula.png b/src/assets/cinnamon/thumbnails/thumbnail-red-dracula.png
new file mode 100644
index 00000000..be060825
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-red-dracula.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-red-light.png b/src/assets/cinnamon/thumbnails/thumbnail-red-light.png
new file mode 100644
index 00000000..1c4160a6
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-red-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-red-nord-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-red-nord-dark.png
new file mode 100644
index 00000000..3e0904b8
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-red-nord-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-red-nord-light.png b/src/assets/cinnamon/thumbnails/thumbnail-red-nord-light.png
new file mode 100644
index 00000000..eaf58b26
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-red-nord-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-red-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-red-nord.png
new file mode 100644
index 00000000..b58a22f5
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-red-nord.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-red.png b/src/assets/cinnamon/thumbnails/thumbnail-red.png
new file mode 100644
index 00000000..8a9c990c
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-red.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-teal-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-teal-dark.png
new file mode 100644
index 00000000..53d451ac
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-teal-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-teal-dracula-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-teal-dracula-dark.png
new file mode 100644
index 00000000..5ddce9d4
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-teal-dracula-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-teal-dracula-light.png b/src/assets/cinnamon/thumbnails/thumbnail-teal-dracula-light.png
new file mode 100644
index 00000000..864da6c2
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-teal-dracula-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-teal-dracula.png b/src/assets/cinnamon/thumbnails/thumbnail-teal-dracula.png
new file mode 100644
index 00000000..6f88e2ac
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-teal-dracula.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-teal-light.png b/src/assets/cinnamon/thumbnails/thumbnail-teal-light.png
new file mode 100644
index 00000000..a6e39ad1
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-teal-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-teal-nord-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-teal-nord-dark.png
new file mode 100644
index 00000000..7b57a374
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-teal-nord-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-teal-nord-light.png b/src/assets/cinnamon/thumbnails/thumbnail-teal-nord-light.png
new file mode 100644
index 00000000..4938e8fd
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-teal-nord-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-teal-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-teal-nord.png
new file mode 100644
index 00000000..46b9890d
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-teal-nord.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-teal.png b/src/assets/cinnamon/thumbnails/thumbnail-teal.png
new file mode 100644
index 00000000..ad7f8c7d
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-teal.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-yellow-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-yellow-dark.png
new file mode 100644
index 00000000..bb4a72c6
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-yellow-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-yellow-dracula-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-yellow-dracula-dark.png
new file mode 100644
index 00000000..2a71e6b4
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-yellow-dracula-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-yellow-dracula-light.png b/src/assets/cinnamon/thumbnails/thumbnail-yellow-dracula-light.png
new file mode 100644
index 00000000..ba1153a8
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-yellow-dracula-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-yellow-dracula.png b/src/assets/cinnamon/thumbnails/thumbnail-yellow-dracula.png
new file mode 100644
index 00000000..1ab39bfe
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-yellow-dracula.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-yellow-light.png b/src/assets/cinnamon/thumbnails/thumbnail-yellow-light.png
new file mode 100644
index 00000000..063abd79
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-yellow-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-yellow-nord-dark.png b/src/assets/cinnamon/thumbnails/thumbnail-yellow-nord-dark.png
new file mode 100644
index 00000000..acbedf55
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-yellow-nord-dark.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-yellow-nord-light.png b/src/assets/cinnamon/thumbnails/thumbnail-yellow-nord-light.png
new file mode 100644
index 00000000..f46c0c17
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-yellow-nord-light.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-yellow-nord.png b/src/assets/cinnamon/thumbnails/thumbnail-yellow-nord.png
new file mode 100644
index 00000000..dcedeb41
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-yellow-nord.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail-yellow.png b/src/assets/cinnamon/thumbnails/thumbnail-yellow.png
new file mode 100644
index 00000000..c049471e
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail-yellow.png differ
diff --git a/src/assets/cinnamon/thumbnails/thumbnail.png b/src/assets/cinnamon/thumbnails/thumbnail.png
new file mode 100644
index 00000000..15faa5c0
Binary files /dev/null and b/src/assets/cinnamon/thumbnails/thumbnail.png differ
diff --git a/src/assets/cinnamon/thumbnail.svg b/src/assets/cinnamon/thumbnails/thumbnail.svg
similarity index 99%
rename from src/assets/cinnamon/thumbnail.svg
rename to src/assets/cinnamon/thumbnails/thumbnail.svg
index 152805eb..01515130 100644
--- a/src/assets/cinnamon/thumbnail.svg
+++ b/src/assets/cinnamon/thumbnails/thumbnail.svg
@@ -5,7 +5,7 @@
    version="1.1"
    id="svg9100"
    sodipodi:docname="thumbnail.svg"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
@@ -33,15 +33,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1014"
+     inkscape:window-width="1440"
+     inkscape:window-height="742"
      id="namedview9102"
      showgrid="false"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="5.656854"
-     inkscape:cy="51.265239"
+     inkscape:zoom="5.6568544"
+     inkscape:cx="138.7697"
+     inkscape:cy="6.8942909"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg9100"
      inkscape:document-rotation="0"
@@ -79,11 +79,8 @@
        id="g1172">
       <path
          d="m 0,83 h 240 v 7 H 0 Z"
-         fill="#ffffff"
-         fill-rule="evenodd"
-         opacity="0.35"
          id="path10"
-         style="opacity:0.75;fill:#1a1a1a;stroke-width:0.95642" />
+         style="opacity:0.75;fill:#212121;fill-opacity:1" />
       <path
          d="m 1.5362703,84.368636 h 4.098196 v 4.098196 h -4.098196 z"
          color="#bebebe"
@@ -856,11 +853,9 @@
        id="g1505">
       <path
          d="m 0,183 h 240 v 7 H 0 Z"
-         fill="#000000"
-         fill-rule="evenodd"
          opacity="0.35"
          id="path515"
-         style="opacity:0.75;fill:#1a1a1a;stroke-width:0.95642" />
+         style="opacity:0.75;fill:#212121;fill-opacity:1" />
       <path
          d="m 1.5334172,184.36665 h 4.0981961 v 4.09819 H 1.5334172 Z"
          color="#bebebe"
@@ -1042,7 +1037,7 @@
          fill="#0860f2"
          fill-rule="evenodd"
          id="path647"
-         style="opacity:1;fill:#3c84f7;stroke-width:0.947835;fill-opacity:1" />
+         style="opacity:1;fill:#5b9bf8;stroke-width:0.947835;fill-opacity:1" />
       <path
          id="path649"
          style="fill:#ffffff;stroke-width:0.236998"
@@ -1163,7 +1158,7 @@
          fill="#0860f2"
          fill-rule="evenodd"
          id="path811"
-         style="stroke-width:0.96809;fill:#3c84f7;fill-opacity:1" />
+         style="stroke-width:0.96809;fill:#5b9bf8;fill-opacity:1" />
       <path
          d="m 197.99092,126.61023 q 0.48026,0.064 0.48026,0.46959 0,0.26681 -0.18143,0.4269 -0.18144,0.14941 -0.53363,0.14941 -0.33084,0 -0.52295,-0.096 v -0.2348 q 0.24547,0.12808 0.51228,0.12808 0.23479,0 0.3522,-0.096 0.1174,-0.096 0.1174,-0.28816 0,-0.17076 -0.12808,-0.25614 -0.11739,-0.0854 -0.37354,-0.0854 H 197.532 v -0.20278 h 0.18143 q 0.21345,0 0.33085,-0.096 0.11739,-0.10672 0.11739,-0.27749 0,-0.12806 -0.096,-0.20277 -0.0854,-0.0854 -0.2348,-0.0854 -0.24547,0 -0.45891,0.1601 l -0.12808,-0.17077 q 0.24547,-0.1921 0.58699,-0.1921 0.27748,0 0.4269,0.13874 0.14941,0.12807 0.14941,0.34153 0,0.3842 -0.41622,0.46959 z"
          fill="#cfd8dc"
@@ -1475,11 +1470,9 @@
        id="g1185">
       <path
          d="m 0,83 h 240 v 7 H 0 Z"
-         fill="#ffffff"
-         fill-rule="evenodd"
          opacity="0.35"
          id="path1121"
-         style="opacity:0.75;fill:#ececec;stroke-width:0.95642" />
+         style="opacity:0.75;fill:#f2f2f2;fill-opacity:1" />
       <path
          d="m 1.5362703,84.368636 h 4.098196 v 4.098196 h -4.098196 z"
          color="#bebebe"
@@ -1661,7 +1654,7 @@
          fill="#0860f2"
          fill-rule="evenodd"
          id="path1181"
-         style="opacity:1;fill:#3c84f7;stroke-width:0.947835;fill-opacity:1" />
+         style="opacity:1;fill:#3c84f7;fill-opacity:1;stroke-width:0.947835" />
       <path
          id="path1183"
          style="fill:#ffffff;stroke-width:0.236998"
@@ -1938,7 +1931,7 @@
          fill="#0860f2"
          fill-rule="evenodd"
          id="path1308"
-         style="fill:#3c84f7;stroke-width:0.96809;fill-opacity:1" />
+         style="fill:#3c84f7;fill-opacity:1;stroke-width:0.96809" />
       <path
          d="m 197.99765,26.612207 q 0.48026,0.06399 0.48026,0.469591 0,0.266806 -0.18143,0.426899 -0.18144,0.149415 -0.53363,0.149415 -0.33085,0 -0.52296,-0.09604 v -0.2348 q 0.24547,0.128078 0.51229,0.128078 0.23479,0 0.35219,-0.09603 0.1174,-0.09604 0.1174,-0.288162 0,-0.170761 -0.12808,-0.256137 -0.11739,-0.08539 -0.37354,-0.08539 h -0.18143 V 26.52686 h 0.18143 q 0.21346,0 0.33086,-0.09604 0.11739,-0.106722 0.11739,-0.277483 0,-0.128069 -0.096,-0.202776 -0.0854,-0.08539 -0.23481,-0.08539 -0.24546,0 -0.45891,0.160093 l -0.12808,-0.170761 q 0.24547,-0.192108 0.58699,-0.192108 0.27749,0 0.4269,0.138747 0.14942,0.128068 0.14942,0.341522 0,0.384206 -0.41622,0.469592 z"
          fill="#263238"
diff --git a/src/assets/gnome-shell/assets-dark/checkbox-off-active.svg b/src/assets/gnome-shell/assets-dark/checkbox-off-active.svg
new file mode 100644
index 00000000..9cfdefd9
--- /dev/null
+++ b/src/assets/gnome-shell/assets-dark/checkbox-off-active.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="12" cy="12" r="10" fill="#ffffff" opacity=".25"/>
+</svg>
diff --git a/src/assets/gnome-shell/assets-dark/checkbox-off-hover.svg b/src/assets/gnome-shell/assets-dark/checkbox-off-hover.svg
new file mode 100644
index 00000000..ef5123a1
--- /dev/null
+++ b/src/assets/gnome-shell/assets-dark/checkbox-off-hover.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="12" cy="12" r="10" fill="#ffffff" opacity=".2"/>
+</svg>
diff --git a/src/assets/gnome-shell/assets-dark/checkbox-off.svg b/src/assets/gnome-shell/assets-dark/checkbox-off.svg
index 0c5e5a0a..b00efa63 100644
--- a/src/assets/gnome-shell/assets-dark/checkbox-off.svg
+++ b/src/assets/gnome-shell/assets-dark/checkbox-off.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#FFFFFF" opacity="0.7">
-  <path d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="12" cy="12" r="10" fill="#ffffff" opacity=".12"/>
 </svg>
diff --git a/src/assets/gnome-shell/common-assets/toggle-off-dark.svg b/src/assets/gnome-shell/assets-dark/toggle-off.svg
similarity index 100%
rename from src/assets/gnome-shell/common-assets/toggle-off-dark.svg
rename to src/assets/gnome-shell/assets-dark/toggle-off.svg
diff --git a/src/assets/gnome-shell/assets/checkbox-off-active.svg b/src/assets/gnome-shell/assets/checkbox-off-active.svg
new file mode 100644
index 00000000..0335aa6d
--- /dev/null
+++ b/src/assets/gnome-shell/assets/checkbox-off-active.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="12" cy="12" r="10" fill="#000000" opacity=".25"/>
+</svg>
diff --git a/src/assets/gnome-shell/assets/checkbox-off-hover.svg b/src/assets/gnome-shell/assets/checkbox-off-hover.svg
new file mode 100644
index 00000000..c581bd6e
--- /dev/null
+++ b/src/assets/gnome-shell/assets/checkbox-off-hover.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="12" cy="12" r="10" fill="#000000" opacity=".2"/>
+</svg>
diff --git a/src/assets/gnome-shell/assets/checkbox-off.svg b/src/assets/gnome-shell/assets/checkbox-off.svg
index 14ff8d2d..bd8d1941 100644
--- a/src/assets/gnome-shell/assets/checkbox-off.svg
+++ b/src/assets/gnome-shell/assets/checkbox-off.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#000000" opacity="0.54">
-  <path d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="12" cy="12" r="10" fill="#000000" opacity=".12"/>
 </svg>
diff --git a/src/assets/gnome-shell/common-assets/toggle-off.svg b/src/assets/gnome-shell/assets/toggle-off.svg
similarity index 100%
rename from src/assets/gnome-shell/common-assets/toggle-off.svg
rename to src/assets/gnome-shell/assets/toggle-off.svg
diff --git a/src/assets/gnome-shell/make-assets.sh b/src/assets/gnome-shell/make-assets.sh
new file mode 100755
index 00000000..d097664c
--- /dev/null
+++ b/src/assets/gnome-shell/make-assets.sh
@@ -0,0 +1,138 @@
+#! /usr/bin/env bash
+
+for theme in '' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-teal' '-grey'; do
+  for type in '' '-nord' '-dracula'; do
+    case "$theme" in
+      '')
+        theme_color_dark='#3c84f7'
+        theme_color_light='#5b9bf8'
+        ;;
+      -purple)
+        theme_color_dark='#AB47BC'
+        theme_color_light='#BA68C8'
+        ;;
+      -pink)
+        theme_color_dark='#EC407A'
+        theme_color_light='#F06292'
+        ;;
+      -red)
+        theme_color_dark='#E53935'
+        theme_color_light='#F44336'
+        ;;
+      -orange)
+        theme_color_dark='#F57C00'
+        theme_color_light='#FB8C00'
+        ;;
+      -yellow)
+        theme_color_dark='#FBC02D'
+        theme_color_light='#FFD600'
+        ;;
+      -green)
+        theme_color_dark='#4CAF50'
+        theme_color_light='#66BB6A'
+        ;;
+      -teal)
+        theme_color_dark='#009688'
+        theme_color_light='#4DB6AC'
+        ;;
+      -grey)
+        theme_color_dark='#464646'
+        theme_color_light='#DDDDDD'
+        ;;
+    esac
+
+    if [[ "$type" == '-nord' ]]; then
+      case "$theme" in
+        '')
+          theme_color_dark='#5e81ac'
+          theme_color_light='#89a3c2'
+          ;;
+        -purple)
+          theme_color_dark='#b57daa'
+          theme_color_light='#c89dbf'
+          ;;
+        -pink)
+          theme_color_dark='#cd7092'
+          theme_color_light='#dc98b1'
+          ;;
+        -red)
+          theme_color_dark='#c35b65'
+          theme_color_light='#d4878f'
+          ;;
+        -orange)
+          theme_color_dark='#d0846c'
+          theme_color_light='#dca493'
+          ;;
+        -yellow)
+          theme_color_dark='#e4b558'
+          theme_color_light='#eac985'
+          ;;
+        -green)
+          theme_color_dark='#82ac5d'
+          theme_color_light='#a0c082'
+          ;;
+        -teal)
+          theme_color_dark='#63a6a5'
+          theme_color_light='#83b9b8'
+          ;;
+        -grey)
+          theme_color_dark='#3a4150'
+          theme_color_light='#d9dce3'
+          ;;
+      esac
+    fi
+
+    if [[ "$type" == '-dracula' ]]; then
+      case "$theme" in
+        '')
+          theme_color_dark='#a679ec'
+          theme_color_light='#bd93f9'
+          ;;
+        -purple)
+          theme_color_dark='#a679ec'
+          theme_color_light='#bd93f9'
+          ;;
+        -pink)
+          theme_color_dark='#f04cab'
+          theme_color_light='#ff79c6'
+          ;;
+        -red)
+          theme_color_dark='#f44d4d'
+          theme_color_light='#ff5555'
+          ;;
+        -orange)
+          theme_color_dark='#f8a854'
+          theme_color_light='#ffb86c'
+          ;;
+        -yellow)
+          theme_color_dark='#e8f467'
+          theme_color_light='#f1fa8c'
+          ;;
+        -green)
+          theme_color_dark='#4be772'
+          theme_color_light='#50fa7b'
+          ;;
+        -teal)
+          theme_color_dark='#20eed9'
+          theme_color_light='#50fae9'
+          ;;
+        -grey)
+          theme_color_dark='#3c3f51'
+          theme_color_light='#d9dae3'
+          ;;
+      esac
+    fi
+
+    if [[ "$type" != '' ]]; then
+      cp -rf "theme" "theme${theme}${type}"
+      sed -i "s/#3c84f7/${theme_color_dark}/g" "theme${theme}${type}"/*.svg
+      sed -i "s/#5b9bf8/${theme_color_light}/g" "theme${theme}${type}"/*.svg
+    elif [[ "$theme" != '' ]]; then
+      cp -rf "theme" "theme${theme}"
+      sed -i "s/#3c84f7/${theme_color_dark}/g" "theme${theme}"/*.svg
+      sed -i "s/#5b9bf8/${theme_color_light}/g" "theme${theme}"/*.svg
+    fi
+  done
+done
+
+echo -e "DONE!"
diff --git a/src/assets/gnome-shell/theme-dracula/checkbox-dark.svg b/src/assets/gnome-shell/theme-dracula/checkbox-dark.svg
new file mode 100644
index 00000000..172aed63
--- /dev/null
+++ b/src/assets/gnome-shell/theme-dracula/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#bd93f9"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-dracula/checkbox.svg b/src/assets/gnome-shell/theme-dracula/checkbox.svg
new file mode 100644
index 00000000..24da996a
--- /dev/null
+++ b/src/assets/gnome-shell/theme-dracula/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#a679ec"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-dracula/toggle-on-dark.svg b/src/assets/gnome-shell/theme-dracula/toggle-on-dark.svg
new file mode 100644
index 00000000..bb5d7e69
--- /dev/null
+++ b/src/assets/gnome-shell/theme-dracula/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#bd93f9" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-dracula/toggle-on.svg b/src/assets/gnome-shell/theme-dracula/toggle-on.svg
new file mode 100644
index 00000000..ee15aac0
--- /dev/null
+++ b/src/assets/gnome-shell/theme-dracula/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#a679ec" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-green-dracula/checkbox-dark.svg b/src/assets/gnome-shell/theme-green-dracula/checkbox-dark.svg
new file mode 100644
index 00000000..55750d3f
--- /dev/null
+++ b/src/assets/gnome-shell/theme-green-dracula/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#50fa7b"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-green-dracula/checkbox.svg b/src/assets/gnome-shell/theme-green-dracula/checkbox.svg
new file mode 100644
index 00000000..b85e3985
--- /dev/null
+++ b/src/assets/gnome-shell/theme-green-dracula/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#4be772"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-green-dracula/toggle-on-dark.svg b/src/assets/gnome-shell/theme-green-dracula/toggle-on-dark.svg
new file mode 100644
index 00000000..e97d3e5c
--- /dev/null
+++ b/src/assets/gnome-shell/theme-green-dracula/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#50fa7b" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-green-dracula/toggle-on.svg b/src/assets/gnome-shell/theme-green-dracula/toggle-on.svg
new file mode 100644
index 00000000..318357ad
--- /dev/null
+++ b/src/assets/gnome-shell/theme-green-dracula/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#4be772" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-green-nord/checkbox-dark.svg b/src/assets/gnome-shell/theme-green-nord/checkbox-dark.svg
new file mode 100644
index 00000000..abc15742
--- /dev/null
+++ b/src/assets/gnome-shell/theme-green-nord/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#a0c082"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-green-nord/checkbox.svg b/src/assets/gnome-shell/theme-green-nord/checkbox.svg
new file mode 100644
index 00000000..2e79c544
--- /dev/null
+++ b/src/assets/gnome-shell/theme-green-nord/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#82ac5d"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-green-nord/toggle-on-dark.svg b/src/assets/gnome-shell/theme-green-nord/toggle-on-dark.svg
new file mode 100644
index 00000000..1d9afa76
--- /dev/null
+++ b/src/assets/gnome-shell/theme-green-nord/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#a0c082" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-green-nord/toggle-on.svg b/src/assets/gnome-shell/theme-green-nord/toggle-on.svg
new file mode 100644
index 00000000..3b04fe25
--- /dev/null
+++ b/src/assets/gnome-shell/theme-green-nord/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#82ac5d" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-green/checkbox-dark.svg b/src/assets/gnome-shell/theme-green/checkbox-dark.svg
new file mode 100644
index 00000000..c85554d1
--- /dev/null
+++ b/src/assets/gnome-shell/theme-green/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#66BB6A"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-green/checkbox.svg b/src/assets/gnome-shell/theme-green/checkbox.svg
index 64f54db9..569eba1c 100644
--- a/src/assets/gnome-shell/theme-green/checkbox.svg
+++ b/src/assets/gnome-shell/theme-green/checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#4CAF50" style="paint-order:stroke fill markers"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#4CAF50"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme-green/toggle-on-dark.svg b/src/assets/gnome-shell/theme-green/toggle-on-dark.svg
new file mode 100644
index 00000000..bfaf44c7
--- /dev/null
+++ b/src/assets/gnome-shell/theme-green/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#66BB6A" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-green/toggle-on.svg b/src/assets/gnome-shell/theme-green/toggle-on.svg
index 86259b8e..02a63c43 100644
--- a/src/assets/gnome-shell/theme-green/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-green/toggle-on.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#4caf50" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="9" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#4CAF50" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme-grey-dracula/checkbox-dark.svg b/src/assets/gnome-shell/theme-grey-dracula/checkbox-dark.svg
new file mode 100644
index 00000000..45d2e417
--- /dev/null
+++ b/src/assets/gnome-shell/theme-grey-dracula/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#d9dae3"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-grey-dracula/checkbox.svg b/src/assets/gnome-shell/theme-grey-dracula/checkbox.svg
new file mode 100644
index 00000000..1e5f2be1
--- /dev/null
+++ b/src/assets/gnome-shell/theme-grey-dracula/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#3c3f51"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-grey-dracula/toggle-on-dark.svg b/src/assets/gnome-shell/theme-grey-dracula/toggle-on-dark.svg
new file mode 100644
index 00000000..c6ab88a8
--- /dev/null
+++ b/src/assets/gnome-shell/theme-grey-dracula/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#d9dae3" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-grey-dracula/toggle-on.svg b/src/assets/gnome-shell/theme-grey-dracula/toggle-on.svg
new file mode 100644
index 00000000..79049a12
--- /dev/null
+++ b/src/assets/gnome-shell/theme-grey-dracula/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#3c3f51" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-grey-nord/checkbox-dark.svg b/src/assets/gnome-shell/theme-grey-nord/checkbox-dark.svg
new file mode 100644
index 00000000..f2848bbd
--- /dev/null
+++ b/src/assets/gnome-shell/theme-grey-nord/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#d9dce3"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-grey-nord/checkbox.svg b/src/assets/gnome-shell/theme-grey-nord/checkbox.svg
new file mode 100644
index 00000000..b28084a4
--- /dev/null
+++ b/src/assets/gnome-shell/theme-grey-nord/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#3a4150"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-grey-nord/toggle-on-dark.svg b/src/assets/gnome-shell/theme-grey-nord/toggle-on-dark.svg
new file mode 100644
index 00000000..56eff700
--- /dev/null
+++ b/src/assets/gnome-shell/theme-grey-nord/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#d9dce3" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-grey-nord/toggle-on.svg b/src/assets/gnome-shell/theme-grey-nord/toggle-on.svg
new file mode 100644
index 00000000..59f1f592
--- /dev/null
+++ b/src/assets/gnome-shell/theme-grey-nord/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#3a4150" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-grey/checkbox-dark.svg b/src/assets/gnome-shell/theme-grey/checkbox-dark.svg
index 8dac4757..8bf35dcd 100644
--- a/src/assets/gnome-shell/theme-grey/checkbox-dark.svg
+++ b/src/assets/gnome-shell/theme-grey/checkbox-dark.svg
@@ -1,40 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="24"
-   height="24"
-   fill="#000000"
-   version="1.1"
-   viewBox="0 0 24 24"
-   id="svg4"
-   sodipodi:docname="checkbox-dark.svg"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     id="namedview6"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="23.125"
-     inkscape:cx="9.427027"
-     inkscape:cy="12"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="32"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z"
-     fill="#616161"
-     style="paint-order:stroke fill markers;fill:#e0e0e0;fill-opacity:1"
-     id="path2" />
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#DDDDDD"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme-grey/checkbox.svg b/src/assets/gnome-shell/theme-grey/checkbox.svg
index 0f79f2b2..716f174a 100644
--- a/src/assets/gnome-shell/theme-grey/checkbox.svg
+++ b/src/assets/gnome-shell/theme-grey/checkbox.svg
@@ -1,40 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="24"
-   height="24"
-   fill="#000000"
-   version="1.1"
-   viewBox="0 0 24 24"
-   id="svg4"
-   sodipodi:docname="checkbox.svg"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     id="namedview6"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="23.125"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="32"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z"
-     fill="#616161"
-     style="paint-order:stroke fill markers;fill:#333333"
-     id="path2" />
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#464646"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme-grey/toggle-on-dark.svg b/src/assets/gnome-shell/theme-grey/toggle-on-dark.svg
index 003f3736..c3563d92 100644
--- a/src/assets/gnome-shell/theme-grey/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-grey/toggle-on-dark.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#e0e0e0" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="9" fill="#333333" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#DDDDDD" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme-grey/toggle-on.svg b/src/assets/gnome-shell/theme-grey/toggle-on.svg
index 44f86741..e2c9cd4f 100644
--- a/src/assets/gnome-shell/theme-grey/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-grey/toggle-on.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#333333" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="9" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#464646" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme-nord/checkbox-dark.svg b/src/assets/gnome-shell/theme-nord/checkbox-dark.svg
new file mode 100644
index 00000000..6c7cbdc8
--- /dev/null
+++ b/src/assets/gnome-shell/theme-nord/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#89a3c2"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-nord/checkbox.svg b/src/assets/gnome-shell/theme-nord/checkbox.svg
new file mode 100644
index 00000000..afcf9504
--- /dev/null
+++ b/src/assets/gnome-shell/theme-nord/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#5e81ac"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-nord/toggle-on-dark.svg b/src/assets/gnome-shell/theme-nord/toggle-on-dark.svg
new file mode 100644
index 00000000..1905213c
--- /dev/null
+++ b/src/assets/gnome-shell/theme-nord/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#89a3c2" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-nord/toggle-on.svg b/src/assets/gnome-shell/theme-nord/toggle-on.svg
new file mode 100644
index 00000000..e7600239
--- /dev/null
+++ b/src/assets/gnome-shell/theme-nord/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#5e81ac" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-orange-dracula/checkbox-dark.svg b/src/assets/gnome-shell/theme-orange-dracula/checkbox-dark.svg
new file mode 100644
index 00000000..4e1b23bf
--- /dev/null
+++ b/src/assets/gnome-shell/theme-orange-dracula/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#ffb86c"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-orange-dracula/checkbox.svg b/src/assets/gnome-shell/theme-orange-dracula/checkbox.svg
new file mode 100644
index 00000000..919d1008
--- /dev/null
+++ b/src/assets/gnome-shell/theme-orange-dracula/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#f8a854"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-orange-dracula/toggle-on-dark.svg b/src/assets/gnome-shell/theme-orange-dracula/toggle-on-dark.svg
new file mode 100644
index 00000000..eb449b6b
--- /dev/null
+++ b/src/assets/gnome-shell/theme-orange-dracula/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#ffb86c" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-orange-dracula/toggle-on.svg b/src/assets/gnome-shell/theme-orange-dracula/toggle-on.svg
new file mode 100644
index 00000000..056beeff
--- /dev/null
+++ b/src/assets/gnome-shell/theme-orange-dracula/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#f8a854" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-orange-nord/checkbox-dark.svg b/src/assets/gnome-shell/theme-orange-nord/checkbox-dark.svg
new file mode 100644
index 00000000..4318ec2f
--- /dev/null
+++ b/src/assets/gnome-shell/theme-orange-nord/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#dca493"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-orange-nord/checkbox.svg b/src/assets/gnome-shell/theme-orange-nord/checkbox.svg
new file mode 100644
index 00000000..eff8b5fb
--- /dev/null
+++ b/src/assets/gnome-shell/theme-orange-nord/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#d0846c"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-orange-nord/toggle-on-dark.svg b/src/assets/gnome-shell/theme-orange-nord/toggle-on-dark.svg
new file mode 100644
index 00000000..2f45f5d3
--- /dev/null
+++ b/src/assets/gnome-shell/theme-orange-nord/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#dca493" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-orange-nord/toggle-on.svg b/src/assets/gnome-shell/theme-orange-nord/toggle-on.svg
new file mode 100644
index 00000000..cb224782
--- /dev/null
+++ b/src/assets/gnome-shell/theme-orange-nord/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#d0846c" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-orange/checkbox-dark.svg b/src/assets/gnome-shell/theme-orange/checkbox-dark.svg
new file mode 100644
index 00000000..4dd000cd
--- /dev/null
+++ b/src/assets/gnome-shell/theme-orange/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#FB8C00"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-orange/checkbox.svg b/src/assets/gnome-shell/theme-orange/checkbox.svg
index f9850241..96e2c6fb 100644
--- a/src/assets/gnome-shell/theme-orange/checkbox.svg
+++ b/src/assets/gnome-shell/theme-orange/checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#F57C00" style="paint-order:stroke fill markers"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#F57C00"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme-orange/toggle-on-dark.svg b/src/assets/gnome-shell/theme-orange/toggle-on-dark.svg
new file mode 100644
index 00000000..c7f9b27f
--- /dev/null
+++ b/src/assets/gnome-shell/theme-orange/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#FB8C00" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-orange/toggle-on.svg b/src/assets/gnome-shell/theme-orange/toggle-on.svg
index fbbb4195..458fe696 100644
--- a/src/assets/gnome-shell/theme-orange/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-orange/toggle-on.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#F57C00" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="9" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme-pink-dracula/checkbox-dark.svg b/src/assets/gnome-shell/theme-pink-dracula/checkbox-dark.svg
new file mode 100644
index 00000000..33318e5c
--- /dev/null
+++ b/src/assets/gnome-shell/theme-pink-dracula/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#ff79c6"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-pink-dracula/checkbox.svg b/src/assets/gnome-shell/theme-pink-dracula/checkbox.svg
new file mode 100644
index 00000000..5f6dbb02
--- /dev/null
+++ b/src/assets/gnome-shell/theme-pink-dracula/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#f04cab"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-pink-dracula/toggle-on-dark.svg b/src/assets/gnome-shell/theme-pink-dracula/toggle-on-dark.svg
new file mode 100644
index 00000000..b38c1f31
--- /dev/null
+++ b/src/assets/gnome-shell/theme-pink-dracula/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#ff79c6" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-pink-dracula/toggle-on.svg b/src/assets/gnome-shell/theme-pink-dracula/toggle-on.svg
new file mode 100644
index 00000000..b1effa1e
--- /dev/null
+++ b/src/assets/gnome-shell/theme-pink-dracula/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#f04cab" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-pink-nord/checkbox-dark.svg b/src/assets/gnome-shell/theme-pink-nord/checkbox-dark.svg
new file mode 100644
index 00000000..eb3c3445
--- /dev/null
+++ b/src/assets/gnome-shell/theme-pink-nord/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#dc98b1"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-pink-nord/checkbox.svg b/src/assets/gnome-shell/theme-pink-nord/checkbox.svg
new file mode 100644
index 00000000..0f8ac581
--- /dev/null
+++ b/src/assets/gnome-shell/theme-pink-nord/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#cd7092"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-pink-nord/toggle-on-dark.svg b/src/assets/gnome-shell/theme-pink-nord/toggle-on-dark.svg
new file mode 100644
index 00000000..846a71af
--- /dev/null
+++ b/src/assets/gnome-shell/theme-pink-nord/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#dc98b1" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-pink-nord/toggle-on.svg b/src/assets/gnome-shell/theme-pink-nord/toggle-on.svg
new file mode 100644
index 00000000..f8f3eeee
--- /dev/null
+++ b/src/assets/gnome-shell/theme-pink-nord/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#cd7092" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-pink/checkbox-dark.svg b/src/assets/gnome-shell/theme-pink/checkbox-dark.svg
new file mode 100644
index 00000000..aeda93d8
--- /dev/null
+++ b/src/assets/gnome-shell/theme-pink/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#F06292"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-pink/checkbox.svg b/src/assets/gnome-shell/theme-pink/checkbox.svg
index 540908ec..5915f523 100644
--- a/src/assets/gnome-shell/theme-pink/checkbox.svg
+++ b/src/assets/gnome-shell/theme-pink/checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#EC407A" style="paint-order:stroke fill markers"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#EC407A"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme-pink/toggle-on-dark.svg b/src/assets/gnome-shell/theme-pink/toggle-on-dark.svg
new file mode 100644
index 00000000..6c2403d1
--- /dev/null
+++ b/src/assets/gnome-shell/theme-pink/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#F06292" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-pink/toggle-on.svg b/src/assets/gnome-shell/theme-pink/toggle-on.svg
index 11cfaab9..9e76e172 100644
--- a/src/assets/gnome-shell/theme-pink/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-pink/toggle-on.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#EC407A" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="9" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme-purple-dracula/checkbox-dark.svg b/src/assets/gnome-shell/theme-purple-dracula/checkbox-dark.svg
new file mode 100644
index 00000000..172aed63
--- /dev/null
+++ b/src/assets/gnome-shell/theme-purple-dracula/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#bd93f9"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-purple-dracula/checkbox.svg b/src/assets/gnome-shell/theme-purple-dracula/checkbox.svg
new file mode 100644
index 00000000..24da996a
--- /dev/null
+++ b/src/assets/gnome-shell/theme-purple-dracula/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#a679ec"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-purple-dracula/toggle-on-dark.svg b/src/assets/gnome-shell/theme-purple-dracula/toggle-on-dark.svg
new file mode 100644
index 00000000..bb5d7e69
--- /dev/null
+++ b/src/assets/gnome-shell/theme-purple-dracula/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#bd93f9" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-purple-dracula/toggle-on.svg b/src/assets/gnome-shell/theme-purple-dracula/toggle-on.svg
new file mode 100644
index 00000000..ee15aac0
--- /dev/null
+++ b/src/assets/gnome-shell/theme-purple-dracula/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#a679ec" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-purple-nord/checkbox-dark.svg b/src/assets/gnome-shell/theme-purple-nord/checkbox-dark.svg
new file mode 100644
index 00000000..55700e03
--- /dev/null
+++ b/src/assets/gnome-shell/theme-purple-nord/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#c89dbf"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-purple-nord/checkbox.svg b/src/assets/gnome-shell/theme-purple-nord/checkbox.svg
new file mode 100644
index 00000000..ac4f2bbe
--- /dev/null
+++ b/src/assets/gnome-shell/theme-purple-nord/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#b57daa"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-purple-nord/toggle-on-dark.svg b/src/assets/gnome-shell/theme-purple-nord/toggle-on-dark.svg
new file mode 100644
index 00000000..0048c920
--- /dev/null
+++ b/src/assets/gnome-shell/theme-purple-nord/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#c89dbf" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-purple-nord/toggle-on.svg b/src/assets/gnome-shell/theme-purple-nord/toggle-on.svg
new file mode 100644
index 00000000..3c260ffc
--- /dev/null
+++ b/src/assets/gnome-shell/theme-purple-nord/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#b57daa" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-purple/checkbox-dark.svg b/src/assets/gnome-shell/theme-purple/checkbox-dark.svg
new file mode 100644
index 00000000..75a8e858
--- /dev/null
+++ b/src/assets/gnome-shell/theme-purple/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#BA68C8"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-purple/checkbox.svg b/src/assets/gnome-shell/theme-purple/checkbox.svg
index ac0e4f73..c3827154 100644
--- a/src/assets/gnome-shell/theme-purple/checkbox.svg
+++ b/src/assets/gnome-shell/theme-purple/checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#AB47BC" style="paint-order:stroke fill markers"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#AB47BC"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme-purple/toggle-on-dark.svg b/src/assets/gnome-shell/theme-purple/toggle-on-dark.svg
new file mode 100644
index 00000000..07e04679
--- /dev/null
+++ b/src/assets/gnome-shell/theme-purple/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#BA68C8" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-purple/toggle-on.svg b/src/assets/gnome-shell/theme-purple/toggle-on.svg
index 3e282e3a..8d2fe5a3 100644
--- a/src/assets/gnome-shell/theme-purple/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-purple/toggle-on.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#AB47BC" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="9" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme-red-dracula/checkbox-dark.svg b/src/assets/gnome-shell/theme-red-dracula/checkbox-dark.svg
new file mode 100644
index 00000000..4c796ec3
--- /dev/null
+++ b/src/assets/gnome-shell/theme-red-dracula/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#ff5555"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-red-dracula/checkbox.svg b/src/assets/gnome-shell/theme-red-dracula/checkbox.svg
new file mode 100644
index 00000000..fb8f677e
--- /dev/null
+++ b/src/assets/gnome-shell/theme-red-dracula/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#f44d4d"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-red-dracula/toggle-on-dark.svg b/src/assets/gnome-shell/theme-red-dracula/toggle-on-dark.svg
new file mode 100644
index 00000000..31445aa5
--- /dev/null
+++ b/src/assets/gnome-shell/theme-red-dracula/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#ff5555" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-red-dracula/toggle-on.svg b/src/assets/gnome-shell/theme-red-dracula/toggle-on.svg
new file mode 100644
index 00000000..26f23bfa
--- /dev/null
+++ b/src/assets/gnome-shell/theme-red-dracula/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#f44d4d" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-red-nord/checkbox-dark.svg b/src/assets/gnome-shell/theme-red-nord/checkbox-dark.svg
new file mode 100644
index 00000000..8d6b9679
--- /dev/null
+++ b/src/assets/gnome-shell/theme-red-nord/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#d4878f"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-red-nord/checkbox.svg b/src/assets/gnome-shell/theme-red-nord/checkbox.svg
new file mode 100644
index 00000000..73a5ed51
--- /dev/null
+++ b/src/assets/gnome-shell/theme-red-nord/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#c35b65"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-red-nord/toggle-on-dark.svg b/src/assets/gnome-shell/theme-red-nord/toggle-on-dark.svg
new file mode 100644
index 00000000..2f74847b
--- /dev/null
+++ b/src/assets/gnome-shell/theme-red-nord/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#d4878f" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-red-nord/toggle-on.svg b/src/assets/gnome-shell/theme-red-nord/toggle-on.svg
new file mode 100644
index 00000000..9e89a79e
--- /dev/null
+++ b/src/assets/gnome-shell/theme-red-nord/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#c35b65" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-red/checkbox-dark.svg b/src/assets/gnome-shell/theme-red/checkbox-dark.svg
new file mode 100644
index 00000000..3966c802
--- /dev/null
+++ b/src/assets/gnome-shell/theme-red/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#F44336"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-red/checkbox.svg b/src/assets/gnome-shell/theme-red/checkbox.svg
index 9594ebfd..7980c1bf 100644
--- a/src/assets/gnome-shell/theme-red/checkbox.svg
+++ b/src/assets/gnome-shell/theme-red/checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#E53935" style="paint-order:stroke fill markers"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#E53935"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme-red/toggle-on-dark.svg b/src/assets/gnome-shell/theme-red/toggle-on-dark.svg
new file mode 100644
index 00000000..cea36cea
--- /dev/null
+++ b/src/assets/gnome-shell/theme-red/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#F44336" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-red/toggle-on.svg b/src/assets/gnome-shell/theme-red/toggle-on.svg
index d1fb105a..29a48401 100644
--- a/src/assets/gnome-shell/theme-red/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-red/toggle-on.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#E53935" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="9" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme-teal-dracula/checkbox-dark.svg b/src/assets/gnome-shell/theme-teal-dracula/checkbox-dark.svg
new file mode 100644
index 00000000..31ac8424
--- /dev/null
+++ b/src/assets/gnome-shell/theme-teal-dracula/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#50fae9"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-teal-dracula/checkbox.svg b/src/assets/gnome-shell/theme-teal-dracula/checkbox.svg
new file mode 100644
index 00000000..b01d6146
--- /dev/null
+++ b/src/assets/gnome-shell/theme-teal-dracula/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#20eed9"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-teal-dracula/toggle-on-dark.svg b/src/assets/gnome-shell/theme-teal-dracula/toggle-on-dark.svg
new file mode 100644
index 00000000..df00727e
--- /dev/null
+++ b/src/assets/gnome-shell/theme-teal-dracula/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#50fae9" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-teal-dracula/toggle-on.svg b/src/assets/gnome-shell/theme-teal-dracula/toggle-on.svg
new file mode 100644
index 00000000..8bfe72c4
--- /dev/null
+++ b/src/assets/gnome-shell/theme-teal-dracula/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#20eed9" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-teal-nord/checkbox-dark.svg b/src/assets/gnome-shell/theme-teal-nord/checkbox-dark.svg
new file mode 100644
index 00000000..f0db4af3
--- /dev/null
+++ b/src/assets/gnome-shell/theme-teal-nord/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#83b9b8"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-teal-nord/checkbox.svg b/src/assets/gnome-shell/theme-teal-nord/checkbox.svg
new file mode 100644
index 00000000..695d0665
--- /dev/null
+++ b/src/assets/gnome-shell/theme-teal-nord/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#63a6a5"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-teal-nord/toggle-on-dark.svg b/src/assets/gnome-shell/theme-teal-nord/toggle-on-dark.svg
new file mode 100644
index 00000000..1ecc04ed
--- /dev/null
+++ b/src/assets/gnome-shell/theme-teal-nord/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#83b9b8" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-teal-nord/toggle-on.svg b/src/assets/gnome-shell/theme-teal-nord/toggle-on.svg
new file mode 100644
index 00000000..91d16f1f
--- /dev/null
+++ b/src/assets/gnome-shell/theme-teal-nord/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#63a6a5" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-teal/checkbox-dark.svg b/src/assets/gnome-shell/theme-teal/checkbox-dark.svg
new file mode 100644
index 00000000..8e50189f
--- /dev/null
+++ b/src/assets/gnome-shell/theme-teal/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#4DB6AC"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-teal/checkbox.svg b/src/assets/gnome-shell/theme-teal/checkbox.svg
index 7f48501a..3d8b33d9 100644
--- a/src/assets/gnome-shell/theme-teal/checkbox.svg
+++ b/src/assets/gnome-shell/theme-teal/checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#009688" style="paint-order:stroke fill markers"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#009688"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme-teal/toggle-on-dark.svg b/src/assets/gnome-shell/theme-teal/toggle-on-dark.svg
new file mode 100644
index 00000000..258431de
--- /dev/null
+++ b/src/assets/gnome-shell/theme-teal/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#4DB6AC" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-teal/toggle-on.svg b/src/assets/gnome-shell/theme-teal/toggle-on.svg
index 9b43d408..2bcdf67e 100644
--- a/src/assets/gnome-shell/theme-teal/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-teal/toggle-on.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#009688" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="9" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme-yellow-dracula/checkbox-dark.svg b/src/assets/gnome-shell/theme-yellow-dracula/checkbox-dark.svg
new file mode 100644
index 00000000..17d6727d
--- /dev/null
+++ b/src/assets/gnome-shell/theme-yellow-dracula/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#f1fa8c"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-yellow-dracula/checkbox.svg b/src/assets/gnome-shell/theme-yellow-dracula/checkbox.svg
new file mode 100644
index 00000000..82e4ada0
--- /dev/null
+++ b/src/assets/gnome-shell/theme-yellow-dracula/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#e8f467"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-yellow-dracula/toggle-on-dark.svg b/src/assets/gnome-shell/theme-yellow-dracula/toggle-on-dark.svg
new file mode 100644
index 00000000..00a0d099
--- /dev/null
+++ b/src/assets/gnome-shell/theme-yellow-dracula/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#f1fa8c" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-yellow-dracula/toggle-on.svg b/src/assets/gnome-shell/theme-yellow-dracula/toggle-on.svg
new file mode 100644
index 00000000..5adff487
--- /dev/null
+++ b/src/assets/gnome-shell/theme-yellow-dracula/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#e8f467" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-yellow-nord/checkbox-dark.svg b/src/assets/gnome-shell/theme-yellow-nord/checkbox-dark.svg
new file mode 100644
index 00000000..d2b6a391
--- /dev/null
+++ b/src/assets/gnome-shell/theme-yellow-nord/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#eac985"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-yellow-nord/checkbox.svg b/src/assets/gnome-shell/theme-yellow-nord/checkbox.svg
new file mode 100644
index 00000000..073e493a
--- /dev/null
+++ b/src/assets/gnome-shell/theme-yellow-nord/checkbox.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#e4b558"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-yellow-nord/toggle-on-dark.svg b/src/assets/gnome-shell/theme-yellow-nord/toggle-on-dark.svg
new file mode 100644
index 00000000..c3d286bb
--- /dev/null
+++ b/src/assets/gnome-shell/theme-yellow-nord/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#eac985" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-yellow-nord/toggle-on.svg b/src/assets/gnome-shell/theme-yellow-nord/toggle-on.svg
new file mode 100644
index 00000000..646896a9
--- /dev/null
+++ b/src/assets/gnome-shell/theme-yellow-nord/toggle-on.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#e4b558" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-yellow/checkbox-dark.svg b/src/assets/gnome-shell/theme-yellow/checkbox-dark.svg
new file mode 100644
index 00000000..00db47d6
--- /dev/null
+++ b/src/assets/gnome-shell/theme-yellow/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#FFD600"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-yellow/checkbox.svg b/src/assets/gnome-shell/theme-yellow/checkbox.svg
index adc7388a..0ab70222 100644
--- a/src/assets/gnome-shell/theme-yellow/checkbox.svg
+++ b/src/assets/gnome-shell/theme-yellow/checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#FBC02D" style="paint-order:stroke fill markers"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#FBC02D"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme-yellow/toggle-on-dark.svg b/src/assets/gnome-shell/theme-yellow/toggle-on-dark.svg
new file mode 100644
index 00000000..62c3d581
--- /dev/null
+++ b/src/assets/gnome-shell/theme-yellow/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#FFD600" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme-yellow/toggle-on.svg b/src/assets/gnome-shell/theme-yellow/toggle-on.svg
index cc921d04..e1c96741 100644
--- a/src/assets/gnome-shell/theme-yellow/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-yellow/toggle-on.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#FBC02D" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="9" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme/checkbox-dark.svg b/src/assets/gnome-shell/theme/checkbox-dark.svg
new file mode 100644
index 00000000..d7d1529f
--- /dev/null
+++ b/src/assets/gnome-shell/theme/checkbox-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#5b9bf8"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme/checkbox.svg b/src/assets/gnome-shell/theme/checkbox.svg
index f2cc516c..7a4e2112 100644
--- a/src/assets/gnome-shell/theme/checkbox.svg
+++ b/src/assets/gnome-shell/theme/checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m5 3c-1.108 0-2 0.892-2 2v14c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-14c0-1.108-0.892-2-2-2zm12.59 3.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#3c84f7" style="paint-order:stroke fill markers"/>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm5.6289 5.9629v0.0019532c0.12781-4e-6 0.25558 0.04855 0.35352 0.14648 0.19587 0.19587 0.19587 0.51116 0 0.70703l-7.0723 7.0723c-0.02449 0.02449-0.050325 0.046133-0.078125 0.064453-0.02772 0.01839-0.055857 0.032682-0.085937 0.044922-0.03009 0.01224-0.06225 0.019271-0.09375 0.025391-0.03149 0.0061-0.063743 0.011718-0.095703 0.011718-0.03195 0-0.06226-0.005518-0.09375-0.011718-0.03149-0.0061-0.06367-0.013151-0.09375-0.025391-0.03009-0.01224-0.058188-0.026562-0.085938-0.044922-0.01389-0.0092-0.027866-0.02051-0.041015-0.03125-0.013121-0.01071-0.026823-0.022916-0.039063-0.035156l-4.1855-4.1875c-0.19587-0.19587-0.19587-0.51116 0-0.70703 0.19587-0.19587 0.51116-0.19587 0.70703 0l3.832 3.834 6.7188-6.7188c0.09793-0.09793 0.22571-0.14648 0.35352-0.14648z" fill="#3c84f7"/>
 </svg>
diff --git a/src/assets/gnome-shell/theme/toggle-on-dark.svg b/src/assets/gnome-shell/theme/toggle-on-dark.svg
new file mode 100644
index 00000000..b9ebff23
--- /dev/null
+++ b/src/assets/gnome-shell/theme/toggle-on-dark.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#5b9bf8" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/assets/gnome-shell/theme/toggle-on.svg b/src/assets/gnome-shell/theme/toggle-on.svg
index f1c11e69..edec9220 100644
--- a/src/assets/gnome-shell/theme/toggle-on.svg
+++ b/src/assets/gnome-shell/theme/toggle-on.svg
@@ -1,4 +1,4 @@
 <svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#3c84f7" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="9" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+ <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/main/cinnamon/cinnamon-dark.css b/src/main/cinnamon/cinnamon-dark.css
index 01025399..05d5fbd8 100644
--- a/src/main/cinnamon/cinnamon-dark.css
+++ b/src/main/cinnamon/cinnamon-dark.css
@@ -247,19 +247,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   width: 40px;
   height: 20px;
   background-size: contain;
+}
+
+.toggle-switch, .popup-menu-item:active .toggle-switch {
   background-image: url("assets/toggle-off.svg");
 }
 
-.toggle-switch:checked {
-  background-image: url("assets/toggle-on.svg");
-}
-
-.popup-menu-item:active .toggle-switch {
-  background-image: url("assets/toggle-off.svg");
-}
-
-.popup-menu-item:active .toggle-switch:checked {
-  background-image: url("assets/toggle-on.svg");
+.toggle-switch:checked, .popup-menu-item:active .toggle-switch:checked {
+  background-image: url("assets/toggle-on-dark.svg");
 }
 
 .cinnamon-link {
diff --git a/src/main/cinnamon/cinnamon-light.css b/src/main/cinnamon/cinnamon-light.css
index 29fe2c21..543b5841 100644
--- a/src/main/cinnamon/cinnamon-light.css
+++ b/src/main/cinnamon/cinnamon-light.css
@@ -247,18 +247,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   width: 40px;
   height: 20px;
   background-size: contain;
+}
+
+.toggle-switch, .popup-menu-item:active .toggle-switch {
   background-image: url("assets/toggle-off.svg");
 }
 
-.toggle-switch:checked {
-  background-image: url("assets/toggle-on.svg");
-}
-
-.popup-menu-item:active .toggle-switch {
-  background-image: url("assets/toggle-off.svg");
-}
-
-.popup-menu-item:active .toggle-switch:checked {
+.toggle-switch:checked, .popup-menu-item:active .toggle-switch:checked {
   background-image: url("assets/toggle-on.svg");
 }
 
diff --git a/src/main/cinnamon/cinnamon.css b/src/main/cinnamon/cinnamon.css
index 564d15e3..c843365c 100644
--- a/src/main/cinnamon/cinnamon.css
+++ b/src/main/cinnamon/cinnamon.css
@@ -247,18 +247,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   width: 40px;
   height: 20px;
   background-size: contain;
+}
+
+.toggle-switch, .popup-menu-item:active .toggle-switch {
   background-image: url("assets/toggle-off.svg");
 }
 
-.toggle-switch:checked {
-  background-image: url("assets/toggle-on.svg");
-}
-
-.popup-menu-item:active .toggle-switch {
-  background-image: url("assets/toggle-off.svg");
-}
-
-.popup-menu-item:active .toggle-switch:checked {
+.toggle-switch:checked, .popup-menu-item:active .toggle-switch:checked {
   background-image: url("assets/toggle-on.svg");
 }
 
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark.css b/src/main/gnome-shell/shell-3-28/gnome-shell-dark.css
index bc3b19d6..6fe0be22 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-dark.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark.css
@@ -674,7 +674,6 @@ StWidget.focused .app-well-app-running-dot {
   width: 24px;
   height: 24px;
   padding: 3px;
-  border-radius: 6px;
 }
 
 .check-box StBin, .check-box:focus StBin {
@@ -682,11 +681,11 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .check-box:hover StBin {
-  background-color: rgba(255, 255, 255, 0.12);
+  background-image: url("assets/checkbox-off-hover.svg");
 }
 
 .check-box:active StBin {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-image: url("assets/checkbox-off-active.svg");
 }
 
 .check-box:checked StBin, .check-box:focus:checked StBin {
@@ -2861,19 +2860,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   width: 40px;
   height: 20px;
   background-size: contain;
-  background-image: url("assets/toggle-off-dark.svg");
 }
 
-.toggle-switch:checked {
-  background-image: url("assets/toggle-on.svg");
-}
-
-.popup-sub-menu .toggle-switch {
+.toggle-switch, .popup-sub-menu .toggle-switch {
   background-image: url("assets/toggle-off.svg");
 }
 
-.popup-sub-menu .toggle-switch:checked {
-  background-image: url("assets/toggle-on.svg");
+.toggle-switch:checked, .popup-sub-menu .toggle-switch:checked {
+  background-image: url("assets/toggle-on-dark.svg");
 }
 
 /* Tiled window previews */
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light.css b/src/main/gnome-shell/shell-3-28/gnome-shell-light.css
index d2172b74..c32a0c57 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-light.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light.css
@@ -674,7 +674,6 @@ StWidget.focused .app-well-app-running-dot {
   width: 24px;
   height: 24px;
   padding: 3px;
-  border-radius: 6px;
 }
 
 .check-box StBin, .check-box:focus StBin {
@@ -682,11 +681,11 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .check-box:hover StBin {
-  background-color: rgba(0, 0, 0, 0.12);
+  background-image: url("assets/checkbox-off-hover.svg");
 }
 
 .check-box:active StBin {
-  background-color: rgba(0, 0, 0, 0.26);
+  background-image: url("assets/checkbox-off-active.svg");
 }
 
 .check-box:checked StBin, .check-box:focus:checked StBin {
@@ -2861,18 +2860,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   width: 40px;
   height: 20px;
   background-size: contain;
+}
+
+.toggle-switch, .popup-sub-menu .toggle-switch {
   background-image: url("assets/toggle-off.svg");
 }
 
-.toggle-switch:checked {
-  background-image: url("assets/toggle-on.svg");
-}
-
-.popup-sub-menu .toggle-switch {
-  background-image: url("assets/toggle-off-dark.svg");
-}
-
-.popup-sub-menu .toggle-switch:checked {
+.toggle-switch:checked, .popup-sub-menu .toggle-switch:checked {
   background-image: url("assets/toggle-on.svg");
 }
 
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell.css b/src/main/gnome-shell/shell-3-28/gnome-shell.css
index ffd5e45e..f724506a 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell.css
@@ -674,7 +674,6 @@ StWidget.focused .app-well-app-running-dot {
   width: 24px;
   height: 24px;
   padding: 3px;
-  border-radius: 6px;
 }
 
 .check-box StBin, .check-box:focus StBin {
@@ -682,11 +681,11 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .check-box:hover StBin {
-  background-color: rgba(0, 0, 0, 0.12);
+  background-image: url("assets/checkbox-off-hover.svg");
 }
 
 .check-box:active StBin {
-  background-color: rgba(0, 0, 0, 0.26);
+  background-image: url("assets/checkbox-off-active.svg");
 }
 
 .check-box:checked StBin, .check-box:focus:checked StBin {
@@ -2861,18 +2860,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   width: 40px;
   height: 20px;
   background-size: contain;
+}
+
+.toggle-switch, .popup-sub-menu .toggle-switch {
   background-image: url("assets/toggle-off.svg");
 }
 
-.toggle-switch:checked {
-  background-image: url("assets/toggle-on.svg");
-}
-
-.popup-sub-menu .toggle-switch {
-  background-image: url("assets/toggle-off-dark.svg");
-}
-
-.popup-sub-menu .toggle-switch:checked {
+.toggle-switch:checked, .popup-sub-menu .toggle-switch:checked {
   background-image: url("assets/toggle-on.svg");
 }
 
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark.css b/src/main/gnome-shell/shell-40-0/gnome-shell-dark.css
index 2e073100..f92d014a 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-dark.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark.css
@@ -674,7 +674,6 @@ StWidget.focused .app-well-app-running-dot {
   width: 24px;
   height: 24px;
   padding: 3px;
-  border-radius: 6px;
 }
 
 .check-box StBin, .check-box:focus StBin {
@@ -682,11 +681,11 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .check-box:hover StBin {
-  background-color: rgba(255, 255, 255, 0.12);
+  background-image: url("assets/checkbox-off-hover.svg");
 }
 
 .check-box:active StBin {
-  background-color: rgba(255, 255, 255, 0.3);
+  background-image: url("assets/checkbox-off-active.svg");
 }
 
 .check-box:checked StBin, .check-box:focus:checked StBin {
@@ -2861,19 +2860,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   width: 40px;
   height: 20px;
   background-size: contain;
-  background-image: url("assets/toggle-off-dark.svg");
 }
 
-.toggle-switch:checked {
-  background-image: url("assets/toggle-on.svg");
-}
-
-.popup-sub-menu .toggle-switch {
+.toggle-switch, .popup-sub-menu .toggle-switch {
   background-image: url("assets/toggle-off.svg");
 }
 
-.popup-sub-menu .toggle-switch:checked {
-  background-image: url("assets/toggle-on.svg");
+.toggle-switch:checked, .popup-sub-menu .toggle-switch:checked {
+  background-image: url("assets/toggle-on-dark.svg");
 }
 
 /* Tiled window previews */
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light.css b/src/main/gnome-shell/shell-40-0/gnome-shell-light.css
index dbd00e7a..1c808e25 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-light.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light.css
@@ -674,7 +674,6 @@ StWidget.focused .app-well-app-running-dot {
   width: 24px;
   height: 24px;
   padding: 3px;
-  border-radius: 6px;
 }
 
 .check-box StBin, .check-box:focus StBin {
@@ -682,11 +681,11 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .check-box:hover StBin {
-  background-color: rgba(0, 0, 0, 0.12);
+  background-image: url("assets/checkbox-off-hover.svg");
 }
 
 .check-box:active StBin {
-  background-color: rgba(0, 0, 0, 0.26);
+  background-image: url("assets/checkbox-off-active.svg");
 }
 
 .check-box:checked StBin, .check-box:focus:checked StBin {
@@ -2861,18 +2860,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   width: 40px;
   height: 20px;
   background-size: contain;
+}
+
+.toggle-switch, .popup-sub-menu .toggle-switch {
   background-image: url("assets/toggle-off.svg");
 }
 
-.toggle-switch:checked {
-  background-image: url("assets/toggle-on.svg");
-}
-
-.popup-sub-menu .toggle-switch {
-  background-image: url("assets/toggle-off-dark.svg");
-}
-
-.popup-sub-menu .toggle-switch:checked {
+.toggle-switch:checked, .popup-sub-menu .toggle-switch:checked {
   background-image: url("assets/toggle-on.svg");
 }
 
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell.css b/src/main/gnome-shell/shell-40-0/gnome-shell.css
index d9ce4ed2..17f41904 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell.css
@@ -674,7 +674,6 @@ StWidget.focused .app-well-app-running-dot {
   width: 24px;
   height: 24px;
   padding: 3px;
-  border-radius: 6px;
 }
 
 .check-box StBin, .check-box:focus StBin {
@@ -682,11 +681,11 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .check-box:hover StBin {
-  background-color: rgba(0, 0, 0, 0.12);
+  background-image: url("assets/checkbox-off-hover.svg");
 }
 
 .check-box:active StBin {
-  background-color: rgba(0, 0, 0, 0.26);
+  background-image: url("assets/checkbox-off-active.svg");
 }
 
 .check-box:checked StBin, .check-box:focus:checked StBin {
@@ -2861,18 +2860,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   width: 40px;
   height: 20px;
   background-size: contain;
+}
+
+.toggle-switch, .popup-sub-menu .toggle-switch {
   background-image: url("assets/toggle-off.svg");
 }
 
-.toggle-switch:checked {
-  background-image: url("assets/toggle-on.svg");
-}
-
-.popup-sub-menu .toggle-switch {
-  background-image: url("assets/toggle-off-dark.svg");
-}
-
-.popup-sub-menu .toggle-switch:checked {
+.toggle-switch:checked, .popup-sub-menu .toggle-switch:checked {
   background-image: url("assets/toggle-on.svg");
 }
 
diff --git a/src/sass/cinnamon/_common.scss b/src/sass/cinnamon/_common.scss
index eb31d835..22cead7d 100644
--- a/src/sass/cinnamon/_common.scss
+++ b/src/sass/cinnamon/_common.scss
@@ -187,11 +187,7 @@ StScrollBar {
 
   StBin, &:focus StBin { background-image: url("#{$asset_path}/checkbox-off.svg"); }
 
-  @if $variant == 'dark' and $theme == 'default' {
-    &:checked StBin, &:focus:checked StBin { background-image: url("#{$asset_path}/checkbox-dark.svg"); }
-  } @else {
-    &:checked StBin, &:focus:checked StBin { background-image: url("#{$asset_path}/checkbox.svg"); }
-  }
+  &:checked StBin, &:focus:checked StBin { background-image: url("#{$asset_path}/checkbox#{$asset-suffix}.svg"); }
 }
 
 //
@@ -217,11 +213,7 @@ StScrollBar {
 
   StBin, &:focus StBin { background-image: url("#{$asset_path}/radiobutton-off.svg"); }
 
-  @if $variant == 'dark' and $theme == 'default' {
-    &:checked StBin, &:focus:checked StBin { background-image: url("#{$asset_path}/radiobutton-dark.svg"); }
-  } @else {
-    &:checked StBin, &:focus:checked StBin { background-image: url("#{$asset_path}/radiobutton.svg"); }
-  }
+  &:checked StBin, &:focus:checked StBin { background-image: url("#{$asset_path}/radiobutton#{$asset-suffix}.svg"); }
 }
 
 //
@@ -231,22 +223,11 @@ StScrollBar {
   width: 40px;
   height: 20px;
   background-size: contain;
-  background-image: url("#{$asset_path}/toggle-off.svg");
 
-  @if $variant == 'dark' and $theme == 'grey' {
-    &:checked { background-image: url("#{$asset_path}/toggle-on-dark.svg"); }
-  } @else {
-    &:checked { background-image: url("#{$asset_path}/toggle-on.svg"); }
-  }
-
-  .popup-menu-item:active & {
+  &, .popup-menu-item:active & {
     background-image: url("#{$asset_path}/toggle-off.svg");
 
-    @if $variant == 'dark' and $theme == 'grey' {
-      &:checked { background-image: url("#{$asset_path}/toggle-on-dark.svg"); }
-    } @else {
-      &:checked { background-image: url("#{$asset_path}/toggle-on.svg"); }
-    }
+    &:checked { background-image: url("#{$asset_path}/toggle-on#{$asset-suffix}.svg"); }
   }
 }
 
diff --git a/src/sass/gnome-shell/common/_check-box.scss b/src/sass/gnome-shell/common/_check-box.scss
index 06ead5c4..23f41b97 100644
--- a/src/sass/gnome-shell/common/_check-box.scss
+++ b/src/sass/gnome-shell/common/_check-box.scss
@@ -7,7 +7,6 @@
     width: 24px;
     height: 24px;
     padding: $base_padding / 2;
-    border-radius: $base_radius;
   }
 
   StBin, &:focus StBin {
@@ -15,19 +14,14 @@
   }
 
   &:hover StBin {
-    background-color: $divider;
+    background-image: url("assets/checkbox-off-hover.svg");
   }
 
   &:active StBin {
-    background-color: $track;
+    background-image: url("assets/checkbox-off-active.svg");
   }
 
   &:checked StBin, &:focus:checked StBin {
-    @if $theme == 'default' {
-      background-image: url("assets/checkbox#{$asset_suffix}.svg");
-    }
-    @else {
-      background-image: url("assets/checkbox.svg");
-    }
+    background-image: url("assets/checkbox#{$asset_suffix}.svg");
   }
 }
diff --git a/src/sass/gnome-shell/common/_switches.scss b/src/sass/gnome-shell/common/_switches.scss
index 3ddd6f28..aa652dc9 100644
--- a/src/sass/gnome-shell/common/_switches.scss
+++ b/src/sass/gnome-shell/common/_switches.scss
@@ -4,29 +4,12 @@
   width: 40px;
   height: 20px;
   background-size: contain;
-  background-image: url("assets/toggle-off#{$asset_suffix}.svg");
 
-  &:checked {
-    @if $theme == 'grey' {
-      background-image: url("assets/toggle-on#{$asset_suffix}.svg");
-    }
-    @else {
-      background-image: url("assets/toggle-on.svg");
-    }
-  }
-
-  .popup-sub-menu & {
-    @if $variant == 'dark' { background-image: url("assets/toggle-off.svg"); }
-    @else { background-image: url("assets/toggle-off-dark.svg"); }
+  &, .popup-sub-menu & {
+    background-image: url("assets/toggle-off.svg");
 
     &:checked {
-      @if $theme == 'grey' {
-        @if $variant == 'dark' { background-image: url("assets/toggle-on.svg"); }
-        @else { background-image: url("assets/toggle-on-dark.svg"); }
-      }
-      @else {
-        background-image: url("assets/toggle-on.svg");
-      }
+      background-image: url("assets/toggle-on#{$asset_suffix}.svg");
     }
   }
 }