diff --git a/install.sh b/install.sh
index 74763ec..1665022 100755
--- a/install.sh
+++ b/install.sh
@@ -110,10 +110,6 @@ else
 
   prompt -w "Removing the old '${name}' themes..."
 
-  if [[ "${GNOME_VERSION}" == 'new' ]]; then
-    prompt -w "SORRY: WhiteSur Shell theme for GNOME 40 is in development and not yet available"
-  fi
-
   remove_themes; customize_theme; avoid_variant_duplicates; echo
 
   prompt -i "Installing '${name}' themes in '${dest}'..."
@@ -126,11 +122,11 @@ else
   prompt -i "Nautilus variant : ${nautilus_style}"
   echo; install_themes
 
-  if [[ "$(which xfce4-session 2> /dev/null)" ]]; then
-    msg="XFCE: you may need to logout after changing your theme to fix your panel opacity."
-  fi
+  # if [[ "$(which xfce4-session 2> /dev/null)" ]]; then
+  #   msg="XFCE: you may need to logout after changing your theme to fix your panel opacity."
+  # fi
 
   echo; prompt -s "Done!"; echo; prompt -w "${msg}"; echo
 
-  [[ -x /usr/bin/notify-send ]] && notify-send "'${name}' theme has been installed. Enjoy!" "${msg}" -i "weather-snow-symbolic"
+  [[ -x /usr/bin/notify-send ]] && notify-send "'${name}' theme has been installed. Enjoy!" "${msg}" -i "dialog-information-symbolic"
 fi
diff --git a/lib-install.sh b/lib-install.sh
index 526d1cc..282fa50 100755
--- a/lib-install.sh
+++ b/lib-install.sh
@@ -90,7 +90,13 @@ install_shelly() {
   mkdir -p                                                                                    "${TARGET_DIR}/assets"
   cp -r "${THEME_SRC_DIR}/assets/gnome-shell/icons"                                           "${TARGET_DIR}"
   cp -r "${THEME_SRC_DIR}/main/gnome-shell/pad-osd.css"                                       "${TARGET_DIR}"
-  sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gnome-shell/gnome-shell${color}${opacity}${alt}${theme}.scss" "${TARGET_DIR}/gnome-shell.css"
+
+  if [[ "${GNOME_VERSION}" == 'new'  ]]; then
+    sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gnome-shell/shell-40-0/gnome-shell${color}${opacity}${alt}${theme}.scss" "${TARGET_DIR}/gnome-shell.css"
+  else
+    sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gnome-shell/shell-3-28/gnome-shell${color}${opacity}${alt}${theme}.scss" "${TARGET_DIR}/gnome-shell.css"
+  fi
+
   cp -r "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/"*".svg"                           "${TARGET_DIR}/assets"
 
   if [[ "${theme}" != '' ]]; then
@@ -217,7 +223,7 @@ install_themes() {
   start_animation
   process_ids=()
 
-  [[ "${GNOME_VERSION}" != 'new' ]] && install_beggy
+  install_beggy
 
   for opacity in "${opacities[@]}"; do
     for alt in "${alts[@]}"; do
@@ -228,10 +234,8 @@ install_themes() {
           install_theemy "${color}" "${opacity}" "${alt}" "${theme}" "${icon}" &
           process_ids+=("${!}")
 
-          if [[ "${GNOME_VERSION}" != 'new' ]]; then
-            install_shelly "${color}" "${opacity}" "${alt}" "${theme}" "${icon}" &
-            process_ids+=("${!}")
-          fi
+          install_shelly "${color}" "${opacity}" "${alt}" "${theme}" "${icon}" &
+          process_ids+=("${!}")
         done
       done
     done
diff --git a/parse-sass.sh b/parse-sass.sh
new file mode 100755
index 0000000..3d0d1c0
--- /dev/null
+++ b/parse-sass.sh
@@ -0,0 +1,67 @@
+#! /usr/bin/env bash
+
+# Check command availability
+function has_command() {
+  command -v $1 > /dev/null
+}
+
+if [ ! "$(which sassc 2> /dev/null)" ]; then
+  echo sassc needs to be installed to generate the css.
+  if has_command zypper; then
+    sudo zypper in sassc
+  elif has_command apt; then
+    sudo apt install sassc
+  elif has_command dnf; then
+    sudo dnf install -y sassc
+  elif has_command yum; then
+    sudo yum install sassc
+  elif has_command pacman; then
+    sudo pacman -S --noconfirm sassc
+  fi
+fi
+
+SASSC_OPT="-M -t expanded"
+
+_COLOR_VARIANTS=('-light' '-dark')
+if [ ! -z "${COLOR_VARIANTS:-}" ]; then
+  IFS=', ' read -r -a _COLOR_VARIANTS <<< "${COLOR_VARIANTS:-}"
+fi
+
+_TRANS_VARIANTS=('' '-solid')
+if [ ! -z "${TRANS_VARIANTS:-}" ]; then
+  IFS=', ' read -r -a _TRANS_VARIANTS <<< "${TRANS_VARIANTS:-}"
+fi
+
+_ALT_VARIANTS=('' '-alt')
+if [ ! -z "${TRANS_VARIANTS:-}" ]; then
+  IFS=', ' read -r -a _TRANS_VARIANTS <<< "${TRANS_VARIANTS:-}"
+fi
+
+_THEME_VARIANTS=('' '-blue' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-grey')
+if [ ! -z "${THEME_VARIANTS:-}" ]; then
+  IFS=', ' read -r -a _THEME_VARIANTS <<< "${THEME_VARIANTS:-}"
+fi
+
+#for color in "${_COLOR_VARIANTS[@]}"; do
+#  for trans in "${_TRANS_VARIANTS[@]}"; do
+#    for theme in "${_THEME_VARIANTS[@]}"; do
+#      sassc $SASSC_OPT src/main/gtk-3.0/gtk${color}${trans}${theme}.{scss,css}
+#      echo "==> Generating the gtk${color}${trans}${theme}.css..."
+#      sassc $SASSC_OPT src/main/cinnamon/cinnamon${color}${trans}${theme}.{scss,css}
+#      echo "==> Generating the cinnamon${color}${trans}${theme}.css..."
+#    done
+#  done
+#done
+
+for color in "${_COLOR_VARIANTS[@]}"; do
+  for trans in "${_TRANS_VARIANTS[@]}"; do
+    for alt in "${_ALT_VARIANTS[@]}"; do
+      for theme in "${_THEME_VARIANTS[@]}"; do
+        sassc $SASSC_OPT src/main/gnome-shell/shell-3-28/gnome-shell${color}${trans}${alt}${theme}.{scss,css}
+        echo "==> Generating the shell-3-28 gnome-shell${color}${trans}${alt}${theme}.css..."
+        sassc $SASSC_OPT src/main/gnome-shell/shell-40-0/gnome-shell${color}${trans}${alt}${theme}.{scss,css}
+        echo "==> Generating the shell-40-0 gnome-shell${color}${trans}${alt}${theme}.css..."
+      done
+    done
+  done
+done
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-blue.scss b/src/main/gnome-shell/gnome-shell-dark-alt-blue.scss
deleted file mode 100644
index d252bfd..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-alt-blue.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'blue';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-green.scss b/src/main/gnome-shell/gnome-shell-dark-alt-green.scss
deleted file mode 100644
index 2c2daa3..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-alt-green.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'green';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-grey.scss b/src/main/gnome-shell/gnome-shell-dark-alt-grey.scss
deleted file mode 100644
index 0dcbea3..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-alt-grey.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'grey';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-orange.scss b/src/main/gnome-shell/gnome-shell-dark-alt-orange.scss
deleted file mode 100644
index 1d8a837..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-alt-orange.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'orange';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-pink.scss b/src/main/gnome-shell/gnome-shell-dark-alt-pink.scss
deleted file mode 100644
index 056e73f..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-alt-pink.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'pink';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-purple.scss b/src/main/gnome-shell/gnome-shell-dark-alt-purple.scss
deleted file mode 100644
index 4f964dd..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-alt-purple.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'purple';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-red.scss b/src/main/gnome-shell/gnome-shell-dark-alt-red.scss
deleted file mode 100644
index 155a05e..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-alt-red.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'red';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-yellow.scss b/src/main/gnome-shell/gnome-shell-dark-alt-yellow.scss
deleted file mode 100644
index 0a56599..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-alt-yellow.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'yellow';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.scss b/src/main/gnome-shell/gnome-shell-dark-alt.scss
deleted file mode 100644
index 92b3634..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-alt.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'default';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-blue.scss b/src/main/gnome-shell/gnome-shell-dark-blue.scss
deleted file mode 100644
index d252bfd..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-blue.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'blue';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-green.scss b/src/main/gnome-shell/gnome-shell-dark-green.scss
deleted file mode 100644
index 2c2daa3..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-green.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'green';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-grey.scss b/src/main/gnome-shell/gnome-shell-dark-grey.scss
deleted file mode 100644
index 0dcbea3..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-grey.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'grey';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-orange.scss b/src/main/gnome-shell/gnome-shell-dark-orange.scss
deleted file mode 100644
index 1d8a837..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-orange.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'orange';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-pink.scss b/src/main/gnome-shell/gnome-shell-dark-pink.scss
deleted file mode 100644
index 056e73f..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-pink.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'pink';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-purple.scss b/src/main/gnome-shell/gnome-shell-dark-purple.scss
deleted file mode 100644
index 4f964dd..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-purple.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'purple';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-red.scss b/src/main/gnome-shell/gnome-shell-dark-red.scss
deleted file mode 100644
index 155a05e..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-red.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'red';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-blue.scss b/src/main/gnome-shell/gnome-shell-dark-solid-alt-blue.scss
deleted file mode 100644
index 19c1365..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-blue.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'false';
-$black: 'false';
-$theme: 'blue';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-green.scss b/src/main/gnome-shell/gnome-shell-dark-solid-alt-green.scss
deleted file mode 100644
index b2d79a1..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-green.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'false';
-$black: 'false';
-$theme: 'green';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-grey.scss b/src/main/gnome-shell/gnome-shell-dark-solid-alt-grey.scss
deleted file mode 100644
index 0a0482e..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-grey.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'false';
-$black: 'false';
-$theme: 'grey';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-orange.scss b/src/main/gnome-shell/gnome-shell-dark-solid-alt-orange.scss
deleted file mode 100644
index 8fbe047..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-orange.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'false';
-$black: 'false';
-$theme: 'orange';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-pink.scss b/src/main/gnome-shell/gnome-shell-dark-solid-alt-pink.scss
deleted file mode 100644
index 6788d02..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-pink.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'false';
-$black: 'false';
-$theme: 'pink';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-purple.scss b/src/main/gnome-shell/gnome-shell-dark-solid-alt-purple.scss
deleted file mode 100644
index 2107ee9..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-purple.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'false';
-$black: 'false';
-$theme: 'purple';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-red.scss b/src/main/gnome-shell/gnome-shell-dark-solid-alt-red.scss
deleted file mode 100644
index 997b656..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-red.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'false';
-$black: 'false';
-$theme: 'red';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-yellow.scss b/src/main/gnome-shell/gnome-shell-dark-solid-alt-yellow.scss
deleted file mode 100644
index a348902..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-yellow.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'false';
-$black: 'false';
-$theme: 'yellow';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt.scss b/src/main/gnome-shell/gnome-shell-dark-solid-alt.scss
deleted file mode 100644
index 4341fec..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'false';
-$black: 'false';
-$theme: 'default';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-blue.scss b/src/main/gnome-shell/gnome-shell-dark-solid-blue.scss
deleted file mode 100644
index 19c1365..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-solid-blue.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'false';
-$black: 'false';
-$theme: 'blue';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-green.scss b/src/main/gnome-shell/gnome-shell-dark-solid-green.scss
deleted file mode 100644
index b2d79a1..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-solid-green.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'false';
-$black: 'false';
-$theme: 'green';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-grey.scss b/src/main/gnome-shell/gnome-shell-dark-solid-grey.scss
deleted file mode 100644
index 0a0482e..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-solid-grey.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'false';
-$black: 'false';
-$theme: 'grey';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-orange.scss b/src/main/gnome-shell/gnome-shell-dark-solid-orange.scss
deleted file mode 100644
index 8fbe047..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-solid-orange.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'false';
-$black: 'false';
-$theme: 'orange';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-pink.scss b/src/main/gnome-shell/gnome-shell-dark-solid-pink.scss
deleted file mode 100644
index 6788d02..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-solid-pink.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'false';
-$black: 'false';
-$theme: 'pink';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-purple.scss b/src/main/gnome-shell/gnome-shell-dark-solid-purple.scss
deleted file mode 100644
index 2107ee9..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-solid-purple.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'false';
-$black: 'false';
-$theme: 'purple';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-red.scss b/src/main/gnome-shell/gnome-shell-dark-solid-red.scss
deleted file mode 100644
index 997b656..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-solid-red.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'false';
-$black: 'false';
-$theme: 'red';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-yellow.scss b/src/main/gnome-shell/gnome-shell-dark-solid-yellow.scss
deleted file mode 100644
index a348902..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-solid-yellow.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'false';
-$black: 'false';
-$theme: 'yellow';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.scss b/src/main/gnome-shell/gnome-shell-dark-solid.scss
deleted file mode 100644
index 4341fec..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-solid.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'false';
-$black: 'false';
-$theme: 'default';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark-yellow.scss b/src/main/gnome-shell/gnome-shell-dark-yellow.scss
deleted file mode 100644
index 0a56599..0000000
--- a/src/main/gnome-shell/gnome-shell-dark-yellow.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'yellow';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-dark.scss b/src/main/gnome-shell/gnome-shell-dark.scss
deleted file mode 100644
index 92b3634..0000000
--- a/src/main/gnome-shell/gnome-shell-dark.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'default';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-blue.scss b/src/main/gnome-shell/gnome-shell-light-alt-blue.scss
deleted file mode 100644
index 8dd342b..0000000
--- a/src/main/gnome-shell/gnome-shell-light-alt-blue.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'true';
-$black: 'true';
-$theme: 'blue';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-green.scss b/src/main/gnome-shell/gnome-shell-light-alt-green.scss
deleted file mode 100644
index 91cfd66..0000000
--- a/src/main/gnome-shell/gnome-shell-light-alt-green.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'true';
-$black: 'true';
-$theme: 'green';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-grey.scss b/src/main/gnome-shell/gnome-shell-light-alt-grey.scss
deleted file mode 100644
index e41ad9d..0000000
--- a/src/main/gnome-shell/gnome-shell-light-alt-grey.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'true';
-$black: 'true';
-$theme: 'grey';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-orange.scss b/src/main/gnome-shell/gnome-shell-light-alt-orange.scss
deleted file mode 100644
index f466356..0000000
--- a/src/main/gnome-shell/gnome-shell-light-alt-orange.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'true';
-$black: 'true';
-$theme: 'orange';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-pink.scss b/src/main/gnome-shell/gnome-shell-light-alt-pink.scss
deleted file mode 100644
index 4b4cd89..0000000
--- a/src/main/gnome-shell/gnome-shell-light-alt-pink.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'true';
-$black: 'true';
-$theme: 'pink';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-purple.scss b/src/main/gnome-shell/gnome-shell-light-alt-purple.scss
deleted file mode 100644
index a99158c..0000000
--- a/src/main/gnome-shell/gnome-shell-light-alt-purple.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'true';
-$black: 'true';
-$theme: 'purple';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-red.scss b/src/main/gnome-shell/gnome-shell-light-alt-red.scss
deleted file mode 100644
index 4875056..0000000
--- a/src/main/gnome-shell/gnome-shell-light-alt-red.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'true';
-$black: 'true';
-$theme: 'red';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-yellow.scss b/src/main/gnome-shell/gnome-shell-light-alt-yellow.scss
deleted file mode 100644
index 49a5785..0000000
--- a/src/main/gnome-shell/gnome-shell-light-alt-yellow.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'true';
-$black: 'true';
-$theme: 'yellow';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-alt.scss b/src/main/gnome-shell/gnome-shell-light-alt.scss
deleted file mode 100644
index e378805..0000000
--- a/src/main/gnome-shell/gnome-shell-light-alt.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'true';
-$black: 'true';
-$theme: 'default';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-blue.scss b/src/main/gnome-shell/gnome-shell-light-blue.scss
deleted file mode 100644
index 742ee15..0000000
--- a/src/main/gnome-shell/gnome-shell-light-blue.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'blue';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-green.scss b/src/main/gnome-shell/gnome-shell-light-green.scss
deleted file mode 100644
index dd07d1a..0000000
--- a/src/main/gnome-shell/gnome-shell-light-green.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'green';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-grey.scss b/src/main/gnome-shell/gnome-shell-light-grey.scss
deleted file mode 100644
index 6b71f11..0000000
--- a/src/main/gnome-shell/gnome-shell-light-grey.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'grey';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-orange.scss b/src/main/gnome-shell/gnome-shell-light-orange.scss
deleted file mode 100644
index 795a3c6..0000000
--- a/src/main/gnome-shell/gnome-shell-light-orange.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'orange';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-pink.scss b/src/main/gnome-shell/gnome-shell-light-pink.scss
deleted file mode 100644
index f76378b..0000000
--- a/src/main/gnome-shell/gnome-shell-light-pink.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'pink';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-purple.scss b/src/main/gnome-shell/gnome-shell-light-purple.scss
deleted file mode 100644
index 854df36..0000000
--- a/src/main/gnome-shell/gnome-shell-light-purple.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'purple';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-red.scss b/src/main/gnome-shell/gnome-shell-light-red.scss
deleted file mode 100644
index 5083221..0000000
--- a/src/main/gnome-shell/gnome-shell-light-red.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'red';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-blue.scss b/src/main/gnome-shell/gnome-shell-light-solid-alt-blue.scss
deleted file mode 100644
index a31aeb0..0000000
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-blue.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'false';
-$black: 'true';
-$theme: 'blue';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-green.scss b/src/main/gnome-shell/gnome-shell-light-solid-alt-green.scss
deleted file mode 100644
index f3c440a..0000000
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-green.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'false';
-$black: 'true';
-$theme: 'green';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-grey.scss b/src/main/gnome-shell/gnome-shell-light-solid-alt-grey.scss
deleted file mode 100644
index c07f83d..0000000
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-grey.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'false';
-$black: 'true';
-$theme: 'grey';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-orange.scss b/src/main/gnome-shell/gnome-shell-light-solid-alt-orange.scss
deleted file mode 100644
index bcaba16..0000000
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-orange.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'false';
-$black: 'true';
-$theme: 'orange';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-pink.scss b/src/main/gnome-shell/gnome-shell-light-solid-alt-pink.scss
deleted file mode 100644
index 761fb11..0000000
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-pink.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'false';
-$black: 'true';
-$theme: 'pink';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-purple.scss b/src/main/gnome-shell/gnome-shell-light-solid-alt-purple.scss
deleted file mode 100644
index af982e2..0000000
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-purple.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'false';
-$black: 'true';
-$theme: 'purple';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-red.scss b/src/main/gnome-shell/gnome-shell-light-solid-alt-red.scss
deleted file mode 100644
index aab0027..0000000
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-red.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'false';
-$black: 'true';
-$theme: 'red';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-yellow.scss b/src/main/gnome-shell/gnome-shell-light-solid-alt-yellow.scss
deleted file mode 100644
index bcaba16..0000000
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-yellow.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'false';
-$black: 'true';
-$theme: 'orange';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt.scss b/src/main/gnome-shell/gnome-shell-light-solid-alt.scss
deleted file mode 100644
index e87082d..0000000
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'false';
-$black: 'true';
-$theme: 'default';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-blue.scss b/src/main/gnome-shell/gnome-shell-light-solid-blue.scss
deleted file mode 100644
index a31aeb0..0000000
--- a/src/main/gnome-shell/gnome-shell-light-solid-blue.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'false';
-$black: 'true';
-$theme: 'blue';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-green.scss b/src/main/gnome-shell/gnome-shell-light-solid-green.scss
deleted file mode 100644
index f3c440a..0000000
--- a/src/main/gnome-shell/gnome-shell-light-solid-green.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'false';
-$black: 'true';
-$theme: 'green';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-grey.scss b/src/main/gnome-shell/gnome-shell-light-solid-grey.scss
deleted file mode 100644
index c07f83d..0000000
--- a/src/main/gnome-shell/gnome-shell-light-solid-grey.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'false';
-$black: 'true';
-$theme: 'grey';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-orange.scss b/src/main/gnome-shell/gnome-shell-light-solid-orange.scss
deleted file mode 100644
index bcaba16..0000000
--- a/src/main/gnome-shell/gnome-shell-light-solid-orange.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'false';
-$black: 'true';
-$theme: 'orange';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-pink.scss b/src/main/gnome-shell/gnome-shell-light-solid-pink.scss
deleted file mode 100644
index 761fb11..0000000
--- a/src/main/gnome-shell/gnome-shell-light-solid-pink.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'false';
-$black: 'true';
-$theme: 'pink';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-purple.scss b/src/main/gnome-shell/gnome-shell-light-solid-purple.scss
deleted file mode 100644
index af982e2..0000000
--- a/src/main/gnome-shell/gnome-shell-light-solid-purple.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'false';
-$black: 'true';
-$theme: 'purple';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-red.scss b/src/main/gnome-shell/gnome-shell-light-solid-red.scss
deleted file mode 100644
index aab0027..0000000
--- a/src/main/gnome-shell/gnome-shell-light-solid-red.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'false';
-$black: 'true';
-$theme: 'red';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-yellow.scss b/src/main/gnome-shell/gnome-shell-light-solid-yellow.scss
deleted file mode 100644
index 24dd29a..0000000
--- a/src/main/gnome-shell/gnome-shell-light-solid-yellow.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'false';
-$black: 'true';
-$theme: 'yellow';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-solid.scss b/src/main/gnome-shell/gnome-shell-light-solid.scss
deleted file mode 100644
index e87082d..0000000
--- a/src/main/gnome-shell/gnome-shell-light-solid.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'false';
-$black: 'true';
-$theme: 'default';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light-yellow.scss b/src/main/gnome-shell/gnome-shell-light-yellow.scss
deleted file mode 100644
index aa383fd..0000000
--- a/src/main/gnome-shell/gnome-shell-light-yellow.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'yellow';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/gnome-shell-light.scss b/src/main/gnome-shell/gnome-shell-light.scss
deleted file mode 100644
index a4c360e..0000000
--- a/src/main/gnome-shell/gnome-shell-light.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$trans: 'true';
-$black: 'false';
-$theme: 'default';
-
-@import '../../sass/colors';
-@import '../../sass/variables';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets';
-@import '../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-blue.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-blue.scss
new file mode 100644
index 0000000..2ea334a
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-blue.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'blue';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-green.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-green.scss
new file mode 100644
index 0000000..8be7e08
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-green.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'green';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-grey.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-grey.scss
new file mode 100644
index 0000000..25e5c00
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-grey.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'grey';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-orange.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-orange.scss
new file mode 100644
index 0000000..cffe0e2
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-orange.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'orange';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-pink.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-pink.scss
new file mode 100644
index 0000000..6d879cb
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-pink.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'pink';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-purple.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-purple.scss
new file mode 100644
index 0000000..77eb0ec
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-purple.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'purple';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-red.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-red.scss
new file mode 100644
index 0000000..ace25ae
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-red.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'red';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-yellow.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-yellow.scss
new file mode 100644
index 0000000..e8efeaa
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt-yellow.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'yellow';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt.scss
new file mode 100644
index 0000000..6320110
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-alt.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'default';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-blue.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-blue.scss
new file mode 100644
index 0000000..2ea334a
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-blue.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'blue';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-green.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-green.scss
new file mode 100644
index 0000000..8be7e08
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-green.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'green';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-grey.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-grey.scss
new file mode 100644
index 0000000..25e5c00
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-grey.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'grey';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-orange.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-orange.scss
new file mode 100644
index 0000000..cffe0e2
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-orange.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'orange';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-pink.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-pink.scss
new file mode 100644
index 0000000..6d879cb
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-pink.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'pink';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-purple.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-purple.scss
new file mode 100644
index 0000000..77eb0ec
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-purple.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'purple';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-red.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-red.scss
new file mode 100644
index 0000000..ace25ae
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-red.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'red';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-blue.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-blue.scss
new file mode 100644
index 0000000..0f95fc6
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-blue.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'blue';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-green.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-green.scss
new file mode 100644
index 0000000..90197b4
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-green.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'green';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-grey.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-grey.scss
new file mode 100644
index 0000000..d7d3aa8
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-grey.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'grey';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-orange.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-orange.scss
new file mode 100644
index 0000000..c402843
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-orange.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'orange';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-pink.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-pink.scss
new file mode 100644
index 0000000..58a3df7
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-pink.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'pink';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-purple.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-purple.scss
new file mode 100644
index 0000000..b7e7adb
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-purple.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'purple';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-red.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-red.scss
new file mode 100644
index 0000000..10811e8
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-red.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'red';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-yellow.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-yellow.scss
new file mode 100644
index 0000000..6238157
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt-yellow.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'yellow';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt.scss
new file mode 100644
index 0000000..4bdf3c8
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-alt.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'default';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-blue.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-blue.scss
new file mode 100644
index 0000000..0f95fc6
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-blue.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'blue';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-green.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-green.scss
new file mode 100644
index 0000000..90197b4
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-green.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'green';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-grey.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-grey.scss
new file mode 100644
index 0000000..d7d3aa8
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-grey.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'grey';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-orange.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-orange.scss
new file mode 100644
index 0000000..c402843
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-orange.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'orange';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-pink.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-pink.scss
new file mode 100644
index 0000000..58a3df7
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-pink.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'pink';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-purple.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-purple.scss
new file mode 100644
index 0000000..b7e7adb
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-purple.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'purple';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-red.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-red.scss
new file mode 100644
index 0000000..10811e8
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-red.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'red';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-yellow.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-yellow.scss
new file mode 100644
index 0000000..6238157
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid-yellow.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'yellow';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid.scss
new file mode 100644
index 0000000..4bdf3c8
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-solid.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'default';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark-yellow.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-yellow.scss
new file mode 100644
index 0000000..e8efeaa
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark-yellow.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'yellow';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-dark.scss
new file mode 100644
index 0000000..6320110
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark.scss
@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'default';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-blue.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-blue.scss
new file mode 100644
index 0000000..397e423
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-blue.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'true';
+$theme: 'blue';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-green.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-green.scss
new file mode 100644
index 0000000..8a2c9a4
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-green.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'true';
+$theme: 'green';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-grey.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-grey.scss
new file mode 100644
index 0000000..33f73f6
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-grey.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'true';
+$theme: 'grey';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-orange.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-orange.scss
new file mode 100644
index 0000000..bb1d34b
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-orange.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'true';
+$theme: 'orange';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-pink.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-pink.scss
new file mode 100644
index 0000000..b6cc62b
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-pink.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'true';
+$theme: 'pink';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-purple.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-purple.scss
new file mode 100644
index 0000000..2df3741
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-purple.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'true';
+$theme: 'purple';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-red.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-red.scss
new file mode 100644
index 0000000..f74220b
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-red.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'true';
+$theme: 'red';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-yellow.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-yellow.scss
new file mode 100644
index 0000000..6e682c8
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt-yellow.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'true';
+$theme: 'yellow';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt.scss
new file mode 100644
index 0000000..967e362
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-alt.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'true';
+$theme: 'default';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-blue.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-blue.scss
new file mode 100644
index 0000000..a4874a3
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-blue.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'blue';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-green.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-green.scss
new file mode 100644
index 0000000..12c3858
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-green.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'green';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-grey.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-grey.scss
new file mode 100644
index 0000000..5e64119
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-grey.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'grey';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-orange.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-orange.scss
new file mode 100644
index 0000000..d849d16
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-orange.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'orange';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-pink.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-pink.scss
new file mode 100644
index 0000000..11c7a4f
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-pink.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'pink';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-purple.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-purple.scss
new file mode 100644
index 0000000..82cbe6d
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-purple.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'purple';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-red.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-red.scss
new file mode 100644
index 0000000..796d04a
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-red.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'red';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-blue.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-blue.scss
new file mode 100644
index 0000000..4298957
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-blue.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'blue';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-green.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-green.scss
new file mode 100644
index 0000000..a8b3847
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-green.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'green';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-grey.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-grey.scss
new file mode 100644
index 0000000..6888c5e
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-grey.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'grey';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-orange.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-orange.scss
new file mode 100644
index 0000000..2312d04
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-orange.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'orange';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-pink.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-pink.scss
new file mode 100644
index 0000000..0bdafde
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-pink.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'pink';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-purple.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-purple.scss
new file mode 100644
index 0000000..418b425
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-purple.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'purple';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-red.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-red.scss
new file mode 100644
index 0000000..4ee4c60
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-red.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'red';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-yellow.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-yellow.scss
new file mode 100644
index 0000000..2312d04
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt-yellow.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'orange';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt.scss
new file mode 100644
index 0000000..4c3e4fc
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-alt.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'default';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-blue.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-blue.scss
new file mode 100644
index 0000000..4298957
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-blue.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'blue';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-green.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-green.scss
new file mode 100644
index 0000000..a8b3847
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-green.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'green';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-grey.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-grey.scss
new file mode 100644
index 0000000..6888c5e
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-grey.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'grey';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-orange.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-orange.scss
new file mode 100644
index 0000000..2312d04
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-orange.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'orange';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-pink.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-pink.scss
new file mode 100644
index 0000000..0bdafde
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-pink.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'pink';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-purple.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-purple.scss
new file mode 100644
index 0000000..418b425
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-purple.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'purple';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-red.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-red.scss
new file mode 100644
index 0000000..4ee4c60
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-red.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'red';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-yellow.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-yellow.scss
new file mode 100644
index 0000000..6eb4a4f
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid-yellow.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'yellow';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid.scss
new file mode 100644
index 0000000..4c3e4fc
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-solid.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'default';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light-yellow.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light-yellow.scss
new file mode 100644
index 0000000..a5cb0fd
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light-yellow.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'yellow';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light.scss b/src/main/gnome-shell/shell-3-28/gnome-shell-light.scss
new file mode 100644
index 0000000..f4083f6
--- /dev/null
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light.scss
@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'default';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-blue.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-blue.scss
new file mode 100644
index 0000000..0dfb947
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-blue.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'blue';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-green.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-green.scss
new file mode 100644
index 0000000..70344d0
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-green.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'green';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-grey.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-grey.scss
new file mode 100644
index 0000000..7056768
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-grey.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'grey';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-orange.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-orange.scss
new file mode 100644
index 0000000..a723f39
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-orange.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'orange';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-pink.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-pink.scss
new file mode 100644
index 0000000..5d4fa6c
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-pink.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'pink';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-purple.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-purple.scss
new file mode 100644
index 0000000..31e32a5
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-purple.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'purple';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-red.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-red.scss
new file mode 100644
index 0000000..8f4947d
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-red.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'red';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-yellow.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-yellow.scss
new file mode 100644
index 0000000..21b5f47
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt-yellow.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'yellow';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt.scss
new file mode 100644
index 0000000..ba9adc4
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-alt.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'default';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-blue.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-blue.scss
new file mode 100644
index 0000000..0dfb947
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-blue.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'blue';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-green.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-green.scss
new file mode 100644
index 0000000..70344d0
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-green.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'green';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-grey.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-grey.scss
new file mode 100644
index 0000000..7056768
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-grey.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'grey';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-orange.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-orange.scss
new file mode 100644
index 0000000..a723f39
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-orange.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'orange';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-pink.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-pink.scss
new file mode 100644
index 0000000..5d4fa6c
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-pink.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'pink';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-purple.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-purple.scss
new file mode 100644
index 0000000..31e32a5
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-purple.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'purple';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-red.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-red.scss
new file mode 100644
index 0000000..8f4947d
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-red.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'red';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-blue.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-blue.scss
new file mode 100644
index 0000000..67ff5cd
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-blue.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'blue';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-green.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-green.scss
new file mode 100644
index 0000000..a7e5111
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-green.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'green';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-grey.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-grey.scss
new file mode 100644
index 0000000..23e2825
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-grey.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'grey';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-orange.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-orange.scss
new file mode 100644
index 0000000..17bc9a8
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-orange.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'orange';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-pink.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-pink.scss
new file mode 100644
index 0000000..7c26f1d
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-pink.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'pink';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-purple.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-purple.scss
new file mode 100644
index 0000000..d810e56
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-purple.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'purple';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-red.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-red.scss
new file mode 100644
index 0000000..bba262e
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-red.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'red';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-yellow.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-yellow.scss
new file mode 100644
index 0000000..c392d5a
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt-yellow.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'yellow';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt.scss
new file mode 100644
index 0000000..23b6954
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-alt.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'default';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-blue.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-blue.scss
new file mode 100644
index 0000000..67ff5cd
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-blue.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'blue';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-green.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-green.scss
new file mode 100644
index 0000000..a7e5111
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-green.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'green';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-grey.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-grey.scss
new file mode 100644
index 0000000..23e2825
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-grey.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'grey';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-orange.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-orange.scss
new file mode 100644
index 0000000..17bc9a8
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-orange.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'orange';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-pink.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-pink.scss
new file mode 100644
index 0000000..7c26f1d
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-pink.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'pink';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-purple.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-purple.scss
new file mode 100644
index 0000000..d810e56
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-purple.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'purple';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-red.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-red.scss
new file mode 100644
index 0000000..bba262e
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-red.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'red';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-yellow.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-yellow.scss
new file mode 100644
index 0000000..c392d5a
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid-yellow.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'yellow';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid.scss
new file mode 100644
index 0000000..23b6954
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-solid.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'false';
+$black: 'false';
+$theme: 'default';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark-yellow.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-yellow.scss
new file mode 100644
index 0000000..21b5f47
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark-yellow.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'yellow';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-dark.scss
new file mode 100644
index 0000000..ba9adc4
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark.scss
@@ -0,0 +1,12 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'default';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-blue.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-blue.scss
new file mode 100644
index 0000000..2a307a1
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-blue.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'true';
+$theme: 'blue';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-green.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-green.scss
new file mode 100644
index 0000000..f75fd83
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-green.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'true';
+$theme: 'green';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-grey.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-grey.scss
new file mode 100644
index 0000000..2246e1a
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-grey.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'true';
+$theme: 'grey';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-orange.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-orange.scss
new file mode 100644
index 0000000..4050769
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-orange.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'true';
+$theme: 'orange';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-pink.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-pink.scss
new file mode 100644
index 0000000..371c6de
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-pink.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'true';
+$theme: 'pink';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-purple.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-purple.scss
new file mode 100644
index 0000000..a91eb51
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-purple.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'true';
+$theme: 'purple';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-red.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-red.scss
new file mode 100644
index 0000000..fa1465b
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-red.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'true';
+$theme: 'red';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-yellow.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-yellow.scss
new file mode 100644
index 0000000..17c4d6c
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt-yellow.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'true';
+$theme: 'yellow';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt.scss
new file mode 100644
index 0000000..6d19a39
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-alt.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'true';
+$theme: 'default';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-blue.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-blue.scss
new file mode 100644
index 0000000..b951b5a
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-blue.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'blue';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-green.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-green.scss
new file mode 100644
index 0000000..a0724f4
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-green.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'green';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';;
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-grey.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-grey.scss
new file mode 100644
index 0000000..6fb12d6
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-grey.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'grey';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-orange.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-orange.scss
new file mode 100644
index 0000000..bc93812
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-orange.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'orange';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-pink.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-pink.scss
new file mode 100644
index 0000000..3f342c6
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-pink.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'pink';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-purple.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-purple.scss
new file mode 100644
index 0000000..3e2e136
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-purple.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'purple';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-red.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-red.scss
new file mode 100644
index 0000000..7e6f2e5
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-red.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'red';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-blue.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-blue.scss
new file mode 100644
index 0000000..96c7278
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-blue.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'blue';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-green.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-green.scss
new file mode 100644
index 0000000..2710034
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-green.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'green';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-grey.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-grey.scss
new file mode 100644
index 0000000..165caeb
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-grey.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'grey';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';;
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-orange.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-orange.scss
new file mode 100644
index 0000000..1f041f9
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-orange.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'orange';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-pink.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-pink.scss
new file mode 100644
index 0000000..4d3ffaa
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-pink.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'pink';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-purple.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-purple.scss
new file mode 100644
index 0000000..41dd0a1
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-purple.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'purple';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-red.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-red.scss
new file mode 100644
index 0000000..a487f84
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-red.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'red';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-yellow.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-yellow.scss
new file mode 100644
index 0000000..1f041f9
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt-yellow.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'orange';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt.scss
new file mode 100644
index 0000000..19decaa
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-alt.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'default';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-blue.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-blue.scss
new file mode 100644
index 0000000..96c7278
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-blue.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'blue';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-green.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-green.scss
new file mode 100644
index 0000000..2710034
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-green.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'green';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-grey.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-grey.scss
new file mode 100644
index 0000000..f4016d5
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-grey.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'grey';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-orange.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-orange.scss
new file mode 100644
index 0000000..1f041f9
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-orange.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'orange';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-pink.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-pink.scss
new file mode 100644
index 0000000..4d3ffaa
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-pink.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'pink';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-purple.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-purple.scss
new file mode 100644
index 0000000..41dd0a1
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-purple.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'purple';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-red.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-red.scss
new file mode 100644
index 0000000..a487f84
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-red.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'red';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-yellow.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-yellow.scss
new file mode 100644
index 0000000..762581a
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid-yellow.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'yellow';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid.scss
new file mode 100644
index 0000000..19decaa
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-solid.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'false';
+$black: 'true';
+$theme: 'default';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light-yellow.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light-yellow.scss
new file mode 100644
index 0000000..880de83
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light-yellow.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'yellow';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-light.scss
new file mode 100644
index 0000000..2c2d807
--- /dev/null
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light.scss
@@ -0,0 +1,12 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'default';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/common';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions';
diff --git a/src/sass/_variables.scss b/src/sass/_variables.scss
index 5e3b921..bb2dbba 100644
--- a/src/sass/_variables.scss
+++ b/src/sass/_variables.scss
@@ -13,6 +13,7 @@ $large-font-family: Roboto, "M+ 1c", Cantarell, Sans-Serif;
 // font sizes
 $root-font-size: if($laptop == 'false', 14px, 13px);
 $subheading-size: if($laptop == 'false', 16px, 15px);
+$base_font_size: 11;
 
 // opacities
 $higher_opacity: 0.9;
@@ -31,6 +32,11 @@ $menuitem_size: if($laptop == 'false', 32px, 28px);
 $container_padding: if($laptop == 'false', 6px, 4px);
 $nautilus_headerbar_size: 42px;
 
+// padding, margin and spacing
+$base_padding: 6px;
+$base_margin: 4px;
+$base_spacing: 6px;
+
 // radiuses
 $circular_radius: 9999px;
 $bt_radius: 6px;
@@ -38,6 +44,12 @@ $bd_radius: 8px;
 $wm_radius: 12px;
 $mn_radius: 10px;
 $maximized_radius: 0;
+$base_border_radius: 8px;
+$modal_radius: $base_border_radius * 2;
+
+// icons
+$base_icon_size: 1.09em;
+// $base_icon_size: 16px;
 
 // durations
 $shorter_duration: 100ms;
diff --git a/src/sass/gnome-shell/widgets/_base.scss b/src/sass/gnome-shell/_common.scss
similarity index 58%
rename from src/sass/gnome-shell/widgets/_base.scss
rename to src/sass/gnome-shell/_common.scss
index 00ed8a2..c209d2a 100644
--- a/src/sass/gnome-shell/widgets/_base.scss
+++ b/src/sass/gnome-shell/_common.scss
@@ -1,43 +1,51 @@
+//This is the RIGHT PLACE to edit the stylesheet
+
 //let's start by telling people not to edit the generated CSS:
 $cakeisalie: "This stylesheet is generated, DO NOT EDIT";
 /* #{$cakeisalie} */
 
-// GLOBALS
-// * {
-//   // transition-timing-function: $deceleration_curve;
-//   transition-duration: $longer_duration;
-// }
+/* Copyright 2009, 2015 Red Hat, Inc.
+ *
+ * Portions adapted from Mx's data/style/default.css
+ *   Copyright 2009 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
+// Stage
 stage {
-  // font-family: $font-family;
-  @include font(body-1);
+  @include fontsize($base_font_size);
   color: $fg_color;
 }
 
-// links
-.shell-link {
-  border-radius: $bt_radius;
-  color: $link_color;
-  &:hover {
-    color: $link_color;
-    background-color: rgba($link_color, $lower_opacity / 2);
-  }
-  &:active {
-    color: $link_color;
-    background-color: rgba($link_color, $lower_opacity);
-  }
+%button {
+  @include button(normal);
+  &:hover { @include button(hover); }
+  &:active { @include button(active); }
+  &:insensitive { @include button(insensitive); }
+  &:focus { @include button(focus); }
 }
 
-// Outline for low res icons
-.lowres-icon {
-  icon-shadow: 0 1px 2px rgba(black, 0.3);
-}
-
-// Dropshadow for large icons
-.icon-dropshadow {
-  icon-shadow: 0 1px 2px rgba(black, 0.4);
+%flat_button {
+  @include button(flat-normal);
+  &:hover { @include button(flat-hover); }
+  &:active { @include button(flat-active); }
+  &:insensitive { @include button(flat-insensitive); }
+  &:focus { @include button(flat-focus); }
 }
 
+// Common Stylings
 %icon_tile {
   color: $light_alt_fg_color;
   border-radius: $bd_radius * 1.5;
@@ -47,7 +55,7 @@ stage {
   text-align: center;
 }
 
-%osd-panel {
+%osd_panel {
   color: $fg_color;
   background-color: $base_color;
   border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
@@ -56,7 +64,7 @@ stage {
   padding: 12px;
 }
 
-%overview-panel {
+%overview_panel {
   color: $light_alt_fg_color;
   background-color: $light_divider_color;
   border: none;
@@ -136,3 +144,24 @@ stage {
     &:active { background-color: $light_alt_fg_color; }
   }
 }
+
+%last_dialog_button {
+  color: white;
+  background-color: $primary_color;
+  box-shadow: inset 0 1px 0 0 rgba(white,0.1);
+
+  &:hover {
+    color: white;
+    background-color: lighten($primary_color, 9%);
+  }
+
+  &:active {
+    color: white;
+    background-color: darken($primary_color, 5%);
+  }
+
+  &:insensitive {
+    background-color: rgba($primary_color, 0.05);
+    color: rgba($primary_color, 0.35);
+  }
+}
diff --git a/src/sass/gnome-shell/_drawing.scss b/src/sass/gnome-shell/_drawing.scss
index 4c85a89..827df6e 100644
--- a/src/sass/gnome-shell/_drawing.scss
+++ b/src/sass/gnome-shell/_drawing.scss
@@ -10,6 +10,12 @@
   @return ($size / $root-font-size) + em;
 }
 
+// provide font size in rem, with px fallback
+@mixin fontsize($size: 24, $base: 16) {
+  font-size: round($size) + pt;
+  //font-size: ($size / $base) * 1rem;
+}
+
 // Typography
 // based on:
 // https://material.io/guidelines/style/typography.html#typography-styles
diff --git a/src/sass/gnome-shell/_widgets-3-28.scss b/src/sass/gnome-shell/_widgets-3-28.scss
new file mode 100644
index 0000000..3530c8e
--- /dev/null
+++ b/src/sass/gnome-shell/_widgets-3-28.scss
@@ -0,0 +1,41 @@
+@import 'common/a11y';
+@import 'common/app-grid';
+@import 'common/base';
+@import 'common/buttons';
+@import 'common/calendar';
+@import 'common/check-box';
+@import 'common/corner-ripple';
+@import 'common/dash';
+@import 'common/dialogs';
+@import 'common/entries';
+@import 'common/hotplug';
+@import 'common/ibus-popup';
+@import 'common/keyboard';
+@import 'common/login-dialog';
+@import 'common/looking-glass';
+@import 'common/message-list';
+@import 'common/misc';
+@import 'common/network-dialog';
+@import 'common/notifications';
+@import 'common/osd';
+@import 'common/overview';
+@import 'common/panel';
+@import 'common/popovers';
+@import 'common/screen-shield';
+@import 'common/scrollbars';
+@import 'common/search-entry';
+@import 'common/search-results';
+@import 'common/slider';
+@import 'common/switcher-popup';
+@import 'common/switches';
+@import 'common/tiled-previews';
+@import 'common/workspace-switcher';
+@import 'common/workspace-thumbnails';
+@import 'widgets-3-28/app-grid';
+@import 'widgets-3-28/dash';
+@import 'widgets-3-28/login-dialog';
+//@import 'widgets-3-28/other';
+@import 'widgets-3-28/overview';
+@import 'widgets-3-28/panel';
+@import 'widgets-3-28/search-results';
+@import 'widgets-3-28/window-picker';
diff --git a/src/sass/gnome-shell/_widgets-40-0.scss b/src/sass/gnome-shell/_widgets-40-0.scss
new file mode 100644
index 0000000..2561dcb
--- /dev/null
+++ b/src/sass/gnome-shell/_widgets-40-0.scss
@@ -0,0 +1,42 @@
+@import 'common/a11y';
+@import 'common/app-grid';
+@import 'common/base';
+@import 'common/buttons';
+@import 'common/calendar';
+@import 'common/check-box';
+@import 'common/corner-ripple';
+@import 'common/dash';
+@import 'common/dialogs';
+@import 'common/entries';
+@import 'common/hotplug';
+@import 'common/ibus-popup';
+@import 'common/keyboard';
+@import 'common/login-dialog';
+@import 'common/looking-glass';
+@import 'common/message-list';
+@import 'common/misc';
+@import 'common/network-dialog';
+@import 'common/notifications';
+@import 'common/osd';
+@import 'common/overview';
+@import 'common/panel';
+@import 'common/popovers';
+@import 'common/screen-shield';
+@import 'common/scrollbars';
+@import 'common/search-entry';
+@import 'common/search-results';
+@import 'common/slider';
+@import 'common/switcher-popup';
+@import 'common/switches';
+@import 'common/tiled-previews';
+@import 'common/workspace-switcher';
+@import 'common/workspace-thumbnails';
+@import 'widgets-40-0/app-grid';
+@import 'widgets-40-0/dash';
+@import 'widgets-40-0/misc';
+@import 'widgets-40-0/overview';
+@import 'widgets-40-0/panel';
+@import 'widgets-40-0/screen-shield';
+@import 'widgets-40-0/search-entry';
+@import 'widgets-40-0/search-results';
+@import 'widgets-40-0/window-picker';
diff --git a/src/sass/gnome-shell/_widgets.scss b/src/sass/gnome-shell/_widgets.scss
deleted file mode 100644
index ec21579..0000000
--- a/src/sass/gnome-shell/_widgets.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@import 'widgets/base';
-@import 'widgets/buttons';
-@import 'widgets/calendar';
-@import 'widgets/checkbox';
-@import 'widgets/dashboard';
-@import 'widgets/dialogs';
-@import 'widgets/entrys';
-@import 'widgets/keyboard';
-@import 'widgets/login-dialog';
-@import 'widgets/looking-glass';
-@import 'widgets/misc';
-@import 'widgets/notifications';
-@import 'widgets/osd';
-@import 'widgets/overview';
-@import 'widgets/panel';
-@import 'widgets/popovers';
-@import 'widgets/screen-shield';
-@import 'widgets/scrollbar';
-@import 'widgets/slider';
-@import 'widgets/switch';
diff --git a/src/sass/gnome-shell/common/_a11y.scss b/src/sass/gnome-shell/common/_a11y.scss
new file mode 100644
index 0000000..a72fbba
--- /dev/null
+++ b/src/sass/gnome-shell/common/_a11y.scss
@@ -0,0 +1,23 @@
+// Pointer location
+.ripple-pointer-location {
+  width: 48px;
+  height: 48px;
+  border-radius: 24px; // radius equals the size of the box to give us the curve
+  background-color: lighten(transparentize($primary_color, 0.7), 30%);
+  box-shadow: 0 0 2px 2px lighten($primary_color, 20%);
+}
+
+// Pointer accessibility notifications
+.pie-timer {
+  width: 60px;
+  height: 60px;
+  -pie-border-width: 3px;
+  -pie-border-color: $primary_color;
+  -pie-background-color: lighten(transparentize($primary_color, 0.7), 40%);
+}
+
+// Screen zoom/Magnifier
+.magnifier-zoom-region {
+  border: 2px solid $primary_color;
+  &.full-screen { border-width: 0; }
+}
diff --git a/src/sass/gnome-shell/common/_app-grid.scss b/src/sass/gnome-shell/common/_app-grid.scss
new file mode 100644
index 0000000..e797ccd
--- /dev/null
+++ b/src/sass/gnome-shell/common/_app-grid.scss
@@ -0,0 +1,136 @@
+
+/* App Icons */
+
+$app_grid_fg_color: #fff;
+
+%app-well-app,
+.show-apps,
+.app-well-app,
+.grid-search-result {
+  & .overview-icon {
+    @extend %icon_tile !optional;
+
+    &, & > StIcon {
+      icon-shadow: $panel_asset_shadow;
+    }
+  }
+
+  &:hover .overview-icon,
+  &:focus .overview-icon,
+  &:selected .overview-icon {
+    background-color: $light_divider_color;
+    border-image: none;
+    background-image: none;
+  }
+
+  &:active .overview-icon,
+  &:checked .overview-icon {
+    background-color: $light_track_color;
+    box-shadow: none;
+  }
+}
+
+// App Folders
+.app-folder {
+  background: none;
+
+  .overview-icon {
+    background-color: $light_divider_color;
+    // padding: 16px;
+    border-radius: $bt_radius * 2;
+  }
+
+  &:hover .overview-icon  {
+    background-color: rgba(white, 0.2);
+  }
+}
+
+// expanded folder
+.app-folder-dialog {
+  border-radius: $bd_radius * 4;
+  border: 2px solid rgba(white, 0.15);
+  padding: 12px;
+  background-color: rgba(#181818, 0.95);
+
+  & .folder-name-container {
+    padding: 24px 36px 0;
+    spacing: 12px;
+
+    & .folder-name-label,
+    & .folder-name-entry {
+      font-size: 18pt;
+      font-weight: bold;
+    }
+
+    & .folder-name-entry {
+      @extend %search-entry !optional;
+      width: 300px;
+    }
+
+    /* FIXME: this is to keep the label in sync with the entry */
+    & .folder-name-label { padding: 5px 7px; color: $light_alt_fg_color; }
+
+    & .edit-folder-button {
+      background-color: $light_divider_color;
+      color: $light_alt_fg_color;
+      border: none;
+      padding: 0;
+      width: 36px;
+      height: 36px;
+      border-radius: 18px;
+
+      & > StIcon { icon-size: 16px }
+
+      &:hover { background-color: $light_divider_color; }
+      &:checked, &:active { background-color: $light_track_color; }
+    }
+  }
+
+  & .icon-grid {
+    row-spacing: $container_padding * 2;
+    column-spacing: $container_padding * 5;
+    page-padding-top: 0;
+    page-padding-bottom: 0;
+    page-padding-left: 0;
+    page-padding-right: 0;
+  }
+
+  & .page-indicators {
+    margin-bottom: 18px;
+  }
+}
+
+.app-folder-dialog-container {
+  padding: $container_padding;
+  width: 620px;
+  height: 620px;
+}
+
+// Running app indicator (also shown in dash)
+.app-well-app-running-dot {
+  width: 5px; height: 5px;
+  border-radius: 3px;
+  background-color: $light_alt_fg_color;
+  margin-bottom: 0;
+
+  StWidget.focused & {
+    background-color: $primary_color;
+  }
+}
+
+// Rename popup for app folders
+.rename-folder-popup {
+  .rename-folder-popup-item {
+    spacing: $container_padding;
+    &:ltr, &:rtl { padding: 0 $container_padding * 2; }
+  }
+}
+
+// shutdown and other actions in the grid
+.system-action-icon {
+  box-shadow: 0 4px 4px rgba(0, 0, 0, 0.2); // FIXME: this should really have a highlight
+  background-color: $dark_bg_color;
+  color: white;
+  border-radius: 100px;
+  icon-size: 48px;
+}
diff --git a/src/sass/gnome-shell/common/_base.scss b/src/sass/gnome-shell/common/_base.scss
new file mode 100644
index 0000000..f06d21f
--- /dev/null
+++ b/src/sass/gnome-shell/common/_base.scss
@@ -0,0 +1,23 @@
+// links
+.shell-link {
+  border-radius: $bt_radius;
+  color: $link_color;
+  &:hover {
+    color: $link_color;
+    background-color: rgba($link_color, $lower_opacity / 2);
+  }
+  &:active {
+    color: $link_color;
+    background-color: rgba($link_color, $lower_opacity);
+  }
+}
+
+// Outline for low res icons
+.lowres-icon {
+  icon-shadow: 0 1px 2px rgba(black, 0.3);
+}
+
+// Dropshadow for large icons
+.icon-dropshadow {
+  icon-shadow: 0 1px 5px rgba(black, 0.8);
+}
diff --git a/src/sass/gnome-shell/common/_buttons.scss b/src/sass/gnome-shell/common/_buttons.scss
new file mode 100644
index 0000000..a3ca317
--- /dev/null
+++ b/src/sass/gnome-shell/common/_buttons.scss
@@ -0,0 +1,12 @@
+/* Buttons */
+
+.button {
+  min-height: $medium_size;
+  padding: 0 16px;
+  border-radius: $bt_radius;
+
+  &, .popup-menu & {
+    @extend %flat_button;
+    border: none;
+  }
+}
diff --git a/src/sass/gnome-shell/common/_calendar.scss b/src/sass/gnome-shell/common/_calendar.scss
new file mode 100644
index 0000000..6ec63a6
--- /dev/null
+++ b/src/sass/gnome-shell/common/_calendar.scss
@@ -0,0 +1,343 @@
+/* Date/Time Menu */
+
+.clock-display-box {
+  spacing: 2px;
+
+  .clock {
+    padding-left: $base_padding * 2;
+    padding-right: $base_padding * 2;
+  }
+}
+
+// overall menu
+#calendarArea {
+  padding: 12px 0;
+}
+
+// Calendar menu side column
+.datemenu-calendar-column {
+  spacing: $base_spacing;
+  border: 0 solid $borders_color;
+  padding: 0 $base_padding * 2;
+
+  &:ltr {margin-right: $base_margin * 2; border-left-width: 0; }
+  &:rtl {margin-left: $base_margin * 2; border-right-width: 0; }
+
+  .datemenu-displays-section { padding-bottom: 0; }
+
+  .datemenu-displays-box {
+    spacing: $base_spacing;
+  }
+}
+
+.world-clocks-header,
+.weather-header,
+.events-section-title {
+  color: $alt_fg_color;
+  font-weight: bold;
+}
+
+.datemenu-today-button,
+.datemenu-displays-box,
+.message-list-sections {
+  margin: 4px 8px;
+}
+
+/* today button (the date) */
+.datemenu-today-button {
+//  min-height: $menuitem_size * 2 - 4px * 2;
+  border: none;
+  box-shadow: none;
+  background: none;
+  padding: 4px 8px;
+  text-shadow: none;
+  color: $alt_fg_color;
+
+  &:hover, &:focus {
+    color: $fg_color;
+    background-color: if($variant == 'light', rgba(white, 1), rgba(lighten($base_color, 15%), 0.75));
+  }
+
+  &:active {
+    color: $fg_color;
+    background-color: if($variant == 'light', rgba(white, 0.65), rgba(lighten($base_color, 10%), 0.75));
+  }
+
+  // weekday label
+  .day-label {
+    @include font(title);
+    font-weight: bold;
+  }
+
+  // date label
+  .date-label {
+    @include font(headline);
+  }
+}
+
+/* Calendar */
+.calendar {
+  margin: 2px 12px;
+  border: none;
+  box-shadow: none;
+  background-color: if($variant == 'light', rgba(white, 0.75), rgba(lighten($base_color, 8%), 0.75));
+  padding: 4px 8px;
+  text-shadow: none;
+  border-radius: $mn_radius;
+
+  // month
+  .calendar-month-label {
+    margin: 2px;
+    padding: 6px 16px;
+    color: $fg_color;
+    font-weight: bold;
+    text-align: center;
+    text-shadow: none;
+
+    &:focus { background-color: $divider_color; }
+  }
+
+  // prev/next month icons
+  .calendar-change-month-back StIcon,
+  .calendar-change-month-forward StIcon {
+    icon-size: $base_icon_size;
+  }
+
+  .calendar-change-month-back { //arrow back
+    padding: 0 2px;
+    background-image: url("assets/calendar-arrow-left.svg");
+    &:rtl { background-image: url("assets/calendar-arrow-right.svg"); }
+  }
+
+  .calendar-change-month-forward { //arrow foreward
+    padding: 0 2px;
+    background-image: url("assets/calendar-arrow-right.svg");
+    &:rtl { background-image: url("assets/calendar-arrow-left.svg"); }
+  }
+
+  .pager-button {
+    width: $menuitem_size;
+    height: $menuitem_size;
+    margin: 2px;
+    border-radius: 100px;
+    background-color: transparent;
+    color: $fg_color;
+    &:hover, &:focus { background-color: $divider_color; }
+    &:active { background-color: $track_color; }
+  }
+
+  .calendar-day-base {
+    @include font(caption);
+    text-align: center;
+    width: $menuitem_size;
+    height: $menuitem_size;
+    padding: 2px;
+    margin: 2px;
+    border-radius: 1000px;
+    color: $alt_fg_color;
+    font-feature-settings: "tnum";
+
+    &:hover, &:focus { background-color: $divider_color; }
+
+    &:active {
+      color: $alt_fg_color;
+      background-color: $track_color;
+      border-color: transparent; //avoid jumparound due to today
+    }
+
+    &:selected {
+      color: $fg_color;
+      background-color: $track_color;
+      border-color: transparent; //avoid jumparound due to today
+    }
+
+    &.calendar-day-heading {  //day of week heading
+      width: $menuitem_size;
+      height: $menuitem_size - 7px;
+      margin-top: 2px;
+      padding: 7px 0 0;
+      border-radius: 100px;
+      background-color: transparent;
+      color: $hint_fg_color;
+      @include font(caption);
+      font-weight: bold;
+      text-align: center;
+    }
+  }
+
+  .calendar-day { //border collapse hack - see calendar.js
+    border-width: 0;
+  }
+
+  .calendar-day-top {
+    border-top-width: 0;
+  }
+
+  .calendar-day-left {
+    border-left-width: 0;
+  }
+
+  .calendar-work-day {}
+
+  .calendar-nonwork-day {
+    color: $disabled_fg_color;
+  }
+
+  // Today
+  .calendar-today {
+    font-weight: bold;
+    color: $light_alt_fg_color;
+    background-color: $primary_color;
+    border: none;
+
+    &:hover, &:focus {
+      background-color:lighten($primary_color, 3%);
+      color: $light_alt_fg_color;
+    }
+
+    &:active, &:selected {
+      background-color: $primary_color;
+      color: $light_alt_fg_color;
+
+      &:hover, &:focus {
+        background-color:lighten($primary_color, 3%);
+        color: $light_alt_fg_color;
+      }
+    }
+  }
+
+  .calendar-day-with-events {
+    color: $hint_fg_color;
+    background-image: url("assets/calendar-today.svg");
+
+    &.calendar-work-day {
+      color: $hint_fg_color;
+      font-weight: bold;
+    }
+  }
+
+  .calendar-other-month-day {
+    color: $disabled_fg_color;
+    opacity: 0.5;
+  }
+
+  .calendar-week-number {
+    width: 22px;
+    height: 16px;
+    margin: 6px 6px 6px 4px;
+    padding: 0 0;
+    border-radius: $bt_radius;
+    background-color: if($variant == 'light', rgba(black, 0.05), rgba(white, 0.05));
+    color: $hint_fg_color;
+    font-size: inherit;
+    font-weight: bold;
+    text-align: center;
+  }
+}
+
+.world-clocks-button,
+.weather-button,
+.events-button {
+  @extend %popover_bubble !optional;
+  padding: 12px;
+  margin: 2px 4px;
+}
+
+// Events
+.events-button {
+  .events-box {
+    spacing: 6px;
+  }
+
+  .events-list {
+    spacing: 12px;
+    text-shadow: none;
+  }
+
+  .events-title {
+    color: $hint_fg_color;
+    font-weight: bold;
+    margin-bottom: 4px;
+    text-shadow: none;
+  }
+
+  .event-time {
+    color: $hint_fg_color;
+    font-feature-settings: "tnum";
+  }
+}
+
+// World Clock
+.world-clocks-button {
+  .world-clocks-city {
+    color: $hint_fg_color;
+    font-weight: bold;
+    font-size: 0.9em;
+  }
+
+  .world-clocks-time {
+    color: $hint_fg_color;
+    font-feature-settings: "tnum";
+    font-size: 1.2em;
+
+    &:ltr { text-align: right; }
+    &:rtl { text-align: left; }
+  }
+
+  .world-clocks-timezone {
+    color: $hint_fg_color;
+    font-feature-settings: "tnum";
+    font-size: 0.9em;
+  }
+}
+
+.world-clocks-grid,
+.weather-grid {
+  spacing-rows: 0.4em;
+  spacing-columns: 0.8em;
+}
+
+// Weather
+.weather-button {
+  margin-bottom: 6px;
+
+  .weather-box {
+    spacing: 12px;
+  }
+
+  .weather-header-box {
+    spacing: 6px;
+  }
+
+  .weather-header {
+    color: $alt_fg_color;
+    font-weight: bold;
+
+    &.location {
+      font-weight: normal;
+      color: $hint_fg_color;
+    }
+  }
+
+  .weather-grid {
+    spacing-rows: 6px;
+    spacing-columns: 12px;
+  }
+
+  .weather-forecast-time {
+    color: $alt_fg_color;
+    font-feature-settings: "tnum";
+    font-size: 9pt;
+    font-weight: normal;
+    padding-top: 0.2em;
+    padding-bottom: 0.4em;
+  }
+
+  .weather-forecast-icon {
+    icon-size: 32px;
+  }
+
+  .weather-forecast-temp {
+    font-weight: bold;
+  }
+}
diff --git a/src/sass/gnome-shell/widgets/_checkbox.scss b/src/sass/gnome-shell/common/_check-box.scss
similarity index 91%
rename from src/sass/gnome-shell/widgets/_checkbox.scss
rename to src/sass/gnome-shell/common/_check-box.scss
index 92a04dc..33f745b 100644
--- a/src/sass/gnome-shell/widgets/_checkbox.scss
+++ b/src/sass/gnome-shell/common/_check-box.scss
@@ -1,9 +1,6 @@
-.check-box {
-  * {
-    min-height: $medium_size - 8px * 2;
-    padding: 8px 0;
-  }
+/* Check Boxes */
 
+.check-box {
   StBoxLayout { spacing: .8em; }
   StBin {
     width: 24px;
diff --git a/src/sass/gnome-shell/common/_corner-ripple.scss b/src/sass/gnome-shell/common/_corner-ripple.scss
new file mode 100644
index 0000000..7603fe5
--- /dev/null
+++ b/src/sass/gnome-shell/common/_corner-ripple.scss
@@ -0,0 +1,15 @@
+/* Activities Ripple */
+
+$ripple_size: 50px;
+
+.ripple-box {
+  background-color: rgba($primary_color, 0.35);
+  box-shadow: 0 0 2px 2px lighten($primary_color, 20%);
+  // plus + 2px for the border (box-shadow)
+  width: $ripple_size + 2px;
+  height: $ripple_size + 2px;
+  border-radius: 0 0 $ripple_size + 2px 0; // radius equals the size of the box to give us the curve
+
+  // just a simple change to the border radius position
+  &:rtl { border-radius: 0 0 0 $ripple_size + 2px; }
+}
diff --git a/src/sass/gnome-shell/common/_dash.scss b/src/sass/gnome-shell/common/_dash.scss
new file mode 100644
index 0000000..3727a90
--- /dev/null
+++ b/src/sass/gnome-shell/common/_dash.scss
@@ -0,0 +1,43 @@
+/* Dash */
+
+$dash_placeholder_size: 32px;
+
+#dash {
+  @include fontsize($base_font_size - 2);
+
+  .empty-dash-drop-target {
+    width: $dash_placeholder_size;
+    height: $dash_placeholder_size;
+  }
+}
+
+// OSD Tooltip
+.dash-label {
+  color: rgba(white, 0.9);
+  background-color: rgba(#222, 0.95);
+  border-radius: $bt_radius;
+  padding: $base_padding $base_padding * 2;
+  box-shadow: none;
+  border: none;
+  text-align: center;
+  -y-offset: $base_margin * 3; // distance from the dash edge
+  -x-offset: 8px;
+}
+
+// Show apps button
+.show-apps .show-apps-icon {
+  color: transparent;
+  background-image: url("assets/view-app-grid.svg");
+  background-size: contain;
+}
+
+.show-apps .overview-icon {
+  color: transparent;
+}
+
+.show-apps:hover .show-apps-icon,
+.show-apps:active .show-apps-icon,
+.show-apps:checked .show-apps-icon,
+.show-apps:focus .show-apps-icon {
+  color: transparent;
+}
diff --git a/src/sass/gnome-shell/widgets/_dialogs.scss b/src/sass/gnome-shell/common/_dialogs.scss
similarity index 52%
rename from src/sass/gnome-shell/widgets/_dialogs.scss
rename to src/sass/gnome-shell/common/_dialogs.scss
index 1d6a233..374c540 100644
--- a/src/sass/gnome-shell/widgets/_dialogs.scss
+++ b/src/sass/gnome-shell/common/_dialogs.scss
@@ -1,23 +1,4 @@
-%last_dialog_button {
-  color: white;
-  background-color: $primary_color;
-  box-shadow: inset 0 1px 0 0 rgba(white,0.1);
-
-  &:hover {
-    color: white;
-    background-color: lighten($primary_color, 9%);
-  }
-
-  &:active {
-    color: white;
-    background-color: darken($primary_color, 5%);
-  }
-
-  &:insensitive {
-    background-color: rgba($primary_color, 0.05);
-    color: rgba($primary_color, 0.35);
-  }
-}
+/* Modal Dialogs */
 
 .headline {
   @include font(title);
@@ -27,7 +8,7 @@
 .modal-dialog {
   color: $fg_color;
   padding: 0 5px 6px 5px;
-  @extend %theme_dialogs;
+  @extend %theme_dialogs !optional;
 
   &-linked-button {
     min-height: 40px;
@@ -51,7 +32,7 @@
   }
 
   &-linked-button:last-child {
-    @extend %last_dialog_button;
+    @extend %last_dialog_button !optional;
   }
 
   .modal-dialog-content-box {
@@ -61,6 +42,17 @@
   }
 }
 
+// End Session Dialog
+.end-session-dialog {
+  width: 30em;
+  // border: none;
+
+  .end-session-dialog-battery-warning,
+  .dialog-list-title {
+    color: $warning_color;
+  }
+}
+
 // Message Dialog
 .message-dialog-content {
   spacing: 18px;
@@ -70,7 +62,7 @@
     font-size: 18pt;
     font-weight: 800;
 
-    &.leightweight {
+    &.lightweight {
       font-size: 13pt;
       font-weight: 800;
     }
@@ -119,74 +111,6 @@
   }
 }
 
-// End Session Dialog
-.end-session-dialog {
-  width: 28em;
-  // border: none;
-
-  .end-session-dialog-battery-warning,
-  .dialog-list-title {
-    color: $warning_color;
-  }
-}
-
-// ShellMountOperation Dialogs
-.shell-mount-operation-icon { icon-size: 48px; }
-
-.mount-dialog {
-  spacing: 24px;
-
-  .message-dialog-title {
-    padding-top: 10px;
-    padding-left: 17px;
-    padding-bottom: 6px;
-    max-width: 34em;
-  }
-
-  .message-dialog-title:rtl {
-    padding-left: 0px;
-    padding-right: 17px;
-  }
-
-  .message-dialog-body {
-    padding-left: 17px;
-    width: 28em;
-  }
-
-  .message-dialog-body:rtl {
-    padding-left: 0px;
-    padding-right: 17px;
-  }
-}
-
-.mount-dialog-app-list {
-  max-height: 200px;
-  padding-top: 24px;
-  padding-left: 49px;
-  padding-right: 32px;
-}
-
-.mount-dialog-app-list:rtl {
-  padding-right: 49px;
-  padding-left: 32px;
-}
-
-.mount-dialog-app-list-item {
-  color: $fg_color;
-  &:hover { color: $fg_color; }
-  &:ltr { padding-right: 1em; }
-  &:rtl { padding-left: 1em; }
-}
-
-.mount-dialog-app-list-item-icon {
-  &:ltr { padding-right: 17px; }
-  &:rtl { padding-left: 17px; }
-}
-
-.mount-dialog-app-list-item-name {
-  font-size: 1em;
-}
-
 // Password or Authentication Dialog
 .prompt-dialog {
   //this is the width of the entire modal popup
@@ -211,6 +135,19 @@
   }
 }
 
+.prompt-dialog-password-grid {
+  spacing-rows: 8px;
+  spacing-columns: 4px;
+
+  .prompt-dialog-password-entry {
+    width: auto;
+
+    // 4px (spacing) + 16px (spinner-width)
+    &:ltr { margin-left: 20px; }
+    &:rtl { margin-right: 20px; }
+  }
+}
+
 .prompt-dialog-password-layout {
   spacing: 8px;
 }
@@ -269,88 +206,13 @@
 }
 
 .audio-selection-device-icon {
-  icon-size: 64px;
+  icon-size: $base_icon_size * 4;
 }
 
-// Access Dialog
-.access-dialog {
-  spacing: 30px;
+// Welcome dialog
+.welcome-dialog-image {
+  background-image: url("resource:///org/gnome/shell/theme/gnome-shell-start.svg");
+  background-size: contain;
+  height: 300px;
+  width: 300px;
 }
-
-// Geolocation Dialog
-.geolocation-dialog {
-  spacing: 30px;
-}
-
-// Extension Dialog
-.extension-dialog {
-  .message-dialog-main-layout { spacing: 24px; padding: 10px; }
-  .message-dialog-title { color: $alt_fg_color; }
-}
-
-// Inhibit-Shortcuts Dialog
-.inhibit-shortcuts-dialog {
-  spacing: 30px;
-}
-
-// Network Agent Dialog
-.network-dialog-secret-table {
-  spacing-rows: 15px;
-  spacing-columns: 1em;
-}
-
-.keyring-dialog-control-table {
-  spacing-rows: 15px;
-  spacing-columns: 1em;
-}
-
-// NETWORK DIALOGS
-.nm-dialog {
-  max-height: 34em;
-  min-height: 31em;
-  min-width: 32em;
-}
-
-.nm-dialog-content {
-  spacing: 20px;
-  padding: 24px;
-}
-
-.nm-dialog-header-hbox { spacing: 10px; }
-.nm-dialog-airplane-box { spacing: 12px; }
-
-.nm-dialog-airplane-headline {
-  font-weight: bold;
-  text-align: center;
-}
-
-.nm-dialog-airplane-text { color: $fg_color; }
-.nm-dialog-header-icon { icon-size: 32px; }
-.nm-dialog-scroll-view {
-  border: 1px solid $borders_color;
-  padding: 0;
-  background-color: if($variant == 'light', rgba(black, 0.05), rgba(black, 0.1));
-  border-radius: $bt_radius;
-}
-
-.nm-dialog-header { @include font(title); }
-
-.nm-dialog-item {
-  font-size: 1em;
-  border-bottom: none;
-  border-radius: $bt_radius;
-  padding: 12px;
-  spacing: 20px;
-  &:hover, &:focus { background-color: $divider_color; }
-  &:active { background-color: $track_color; }
-}
-
-.nm-dialog-item:selected {
-  background-color: $primary_color;
-  color: $light_alt_fg_color;
-}
-
-.nm-dialog-icons { spacing: .5em; }
-.nm-dialog-icon { icon-size: 16px; }
-.no-networks-label { color: $hint_fg_color; }
-.no-networks-box { spacing: 12px; }
diff --git a/src/sass/gnome-shell/widgets/_entrys.scss b/src/sass/gnome-shell/common/_entries.scss
similarity index 89%
rename from src/sass/gnome-shell/widgets/_entrys.scss
rename to src/sass/gnome-shell/common/_entries.scss
index 0e430fa..6470003 100644
--- a/src/sass/gnome-shell/widgets/_entrys.scss
+++ b/src/sass/gnome-shell/common/_entries.scss
@@ -1,7 +1,7 @@
+/* Entries */
+
 StEntry {
-  min-height: $medium_size;
-  min-width: $large_size;
-  padding: 0 8px;
+  padding: 2px 8px;
   margin: 3px;
   border-width: 0;
   color: $fg_color;
diff --git a/src/sass/gnome-shell/common/_hotplug.scss b/src/sass/gnome-shell/common/_hotplug.scss
new file mode 100644
index 0000000..6531cf7
--- /dev/null
+++ b/src/sass/gnome-shell/common/_hotplug.scss
@@ -0,0 +1,10 @@
+// hotplug
+
+.hotplug-notification-item {
+  @extend %bubble_button !optional;
+}
+
+.hotplug-notification-item-icon {
+  icon-size: 24px;
+  padding: 0 4px;
+}
diff --git a/src/sass/gnome-shell/common/_ibus-popup.scss b/src/sass/gnome-shell/common/_ibus-popup.scss
new file mode 100644
index 0000000..fe33c0a
--- /dev/null
+++ b/src/sass/gnome-shell/common/_ibus-popup.scss
@@ -0,0 +1,50 @@
+// IBus Candidate Popup
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
+.candidate-popup-content {
+  @extend %theme_dialogs;
+  box-shadow: 0 8px 16px 0 rgba(black, 0.25);
+  border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
+  margin: ($container_padding / 2) 8px;
+  padding: $container_padding + 2px;
+  spacing: $container_padding;
+}
+
+.candidate-index {
+  padding: 0 0.5em 0 0;
+  color: $hint_fg_color;
+  .candidate-box:selected & { color: $light_hint_fg_color; }
+}
+
+.candidate-box {
+  transition-duration: 0ms; // FIXME: needs more natural transitions
+  padding: 0.3em 0.5em 0.3em 0.5em;
+  margin-right: 2px;
+  border-radius: $bt_radius;
+  &:hover { background-color: $divider_color; color: $fg_color; }
+  &:active { background-color: $track_color; color: $fg_color; }
+  &:selected { background-color: $primary_color; color: $light_alt_fg_color; }
+  &:last-child { margin-right: 0; }
+}
+
+.candidate-page-button-box {
+  height: 2em;
+  .vertical & { padding-top: 0.5em; }
+  .horizontal & { padding-left: 0.5em; }
+}
+
+.candidate-page-button {
+  padding: 4px;
+}
+
+.candidate-page-button-previous,
+.candidate-page-button-next { border-radius: $bt_radius;  }
+.candidate-page-button-icon { icon-size: 1em; }
diff --git a/src/sass/gnome-shell/widgets/_keyboard.scss b/src/sass/gnome-shell/common/_keyboard.scss
similarity index 74%
rename from src/sass/gnome-shell/widgets/_keyboard.scss
rename to src/sass/gnome-shell/common/_keyboard.scss
index f25e5a7..a7394de 100644
--- a/src/sass/gnome-shell/widgets/_keyboard.scss
+++ b/src/sass/gnome-shell/common/_keyboard.scss
@@ -1,16 +1,19 @@
-// On-screen Keyboard
-.word-suggestions {
-  font-size: 14pt;
-  spacing: 12px;
-  min-height: 20pt;
-}
+/* On-screen Keyboard */
 
+$key_size: 1.2em;
+$key_border_radius: $base_border_radius + 3px;
+$key_bg_color:  $bg_color;
+// $default_key_bg_color: darken($key_bg_color, 4%);
+$default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten($osd_bg_color, 2%));
+
+
+// draw keys using button function
 #keyboard {
   background-color: rgba(black, 0.25);
   box-shadow: none;
 
   .page-indicator {
-    padding: 6px;
+    padding: $base_padding;
 
     .page-indicator-icon {
       width: 8px;
@@ -22,17 +25,16 @@
 // the container for individual keys
 .key-container,
 .keyboard-layout {
-  padding: 4px;
-  spacing: 4px;
+  padding: $base_margin;
+  spacing: $base_margin;
 }
 
-//  .keyboard-row { spacing: 15px; }
-
+// the keys
 .keyboard-key {
-  min-height: 1.2em;
-  min-width: 1.2em;
-  font-weight: bold;
   font-size: round(16) + pt;
+  font-weight: bold;
+  min-height: $key_size;
+  min-width: $key_size;
   border-radius: $mn_radius;
   border: none;
   color: $alt_fg_color;
@@ -41,6 +43,7 @@
 
   &:focus, &:hover { color: $fg_color; background-color: if($variant == 'light', white, lighten($solid_bg_color, 10%)); }
   &:checked, &:active { color: $fg_color; background-color: darken($solid_bg_color, 10%); }
+
   &:grayed { //FIXME
     background-color: $alt_dark_bg_color;
     color: $light_alt_fg_color;
@@ -84,3 +87,26 @@
   -boxpointer-gap: 5px;
   box-shadow: 0 2px 5px rgba(black, 0.25);
 }
+
+// emoji
+.emoji-page {
+  .keyboard-key {
+    background-color: transparent;
+    border: none;
+    color: initial;
+  }
+}
+
+.emoji-panel {
+  .keyboard-key:latched {
+    border-color: lighten($primary_color, 5%);
+    background-color: $primary_color;
+  }
+}
+
+// On-screen Keyboard
+.word-suggestions {
+  font-size: 14pt;
+  spacing: 12px;
+  min-height: 20pt;
+}
diff --git a/src/sass/gnome-shell/widgets/_login-dialog.scss b/src/sass/gnome-shell/common/_login-dialog.scss
similarity index 71%
rename from src/sass/gnome-shell/widgets/_login-dialog.scss
rename to src/sass/gnome-shell/common/_login-dialog.scss
index 669c681..db04f36 100644
--- a/src/sass/gnome-shell/widgets/_login-dialog.scss
+++ b/src/sass/gnome-shell/common/_login-dialog.scss
@@ -1,3 +1,10 @@
+/* Login Dialog */
+
+#lockDialogGroup {
+  background: url("assets/background.png");
+  background-size: cover;
+}
+
 .login-dialog-banner-view {
   padding-top: 24px;
   max-width: 23em;
@@ -63,17 +70,10 @@
   }
 }
 
-// Caps-lock warning
-.caps-lock-warning-label {
-  text-align: center;
-  margin-bottom: 8px;
-  padding: 2px 6px;
-  color: $warning_color;
-}
-
 .login-dialog-logo-bin { padding: 24px 0px; }
 .login-dialog-banner { color: $light_alt_fg_color; }
 .login-dialog-button-box { spacing: 5px; }
+.login-dialog-message { text-align: center; }
 .login-dialog-message-warning { color: $warning_color; }
 .login-dialog-message-hint { padding-top: 0; padding-bottom: 20px; }
 .login-dialog-user-selection-box { padding: 100px 0px; }
@@ -138,109 +138,39 @@
   }
 }
 
-// .login-dialog-username,
 .user-widget-label {
   color: $light_alt_fg_color;
 }
 
-// User icon
-.user-icon {
-  background-size: contain;
-  color: $light_alt_fg_color;
-  border-radius: $circular_radius;
-  border: none;
-  box-shadow: 0 3px 8px rgba(black, 0.25);
+.user-widget.horizontal .user-widget-label {
+  @include fontsize($base_font_size + 2);
+  font-weight: bold;
+  padding-left: 15px;
 
-  &:hover {
-    color: $light_fg_color;
-  }
-
-  & StIcon {
-    background-color: transparentize($light_alt_fg_color, 0.95);
-    border-radius: 99px;
-  }
+  &:ltr { padding-left: 14px; text-align: left; }
+  &:rtl { padding-right: 14px; text-align: right; }
 }
 
-.user-widget.vertical .user-icon {
-  icon-size: 128px; // 128px
-
-  & StIcon {
-    padding: $container_padding * 3 + 2px; // 20px
-    padding-top: $container_padding * 3; // 18 px
-    padding-bottom: $container_padding * 3 + 4px; // 22px
-    width: 88px; height:  88px; // 88px;
-  }
+.user-widget.vertical .user-widget-label {
+  @include fontsize($base_font_size + 5);
+  text-align: center;
+  font-weight: normal;
+  padding-top: 16px;
 }
 
-.user-widget.horizontal .user-icon {
-  icon-size: 64px;
-
-  & StIcon {
-    padding: $container_padding * 2 ; // 12px
-    width: $container_padding * 2.5; height:  $container_padding * 2.5; // 40px;
-  }
-}
-
-.user-widget.horizontal {
-  .user-widget-label {
-    // @include font(title);
-    font-weight: bold;
-    text-align: left;
-    padding-left: 15px;
-
-    &:ltr { padding-left: 14px; }
-    &:rtl { padding-right: 14px; }
-  }
-
-  .user-icon {
-    icon-size: 64px; // 64px
-
-    & StIcon {
-      padding: 12px; // 12px
-      width: 40px;
-      height: 40px; // 40px;
-    }
-  }
-}
-
-.user-widget.vertical {
-  .user-widget-label {
-    text-align: center;
-    font-weight: normal;
-    padding-top: 16px;
-  }
-
-  .user-icon {
-    icon-size: 96px; // 128px
-
-    & StIcon {
-      padding: 20px; // 20px
-      padding-top: 18px; // 18 px
-      padding-bottom: 22px; // 22px
-      width: 88px;
-      height: 88px; // 88px;
-    }
-  }
+.login-dialog-prompt-layout {
+  padding-top: 24px;
+  padding-bottom: 12px;
+  spacing: $base_spacing * 2;
+  width: 23em;
 }
 
 .login-dialog-prompt-entry {
   height: 1.5em;
 }
 
-.login-dialog-prompt-layout {
-  padding-top: 24px;
-  padding-bottom: 12px;
-  spacing: 8px;
-  width: 23em;
-}
-
 .login-dialog-prompt-label {
   color: $light_hint_fg_color;
-  font-size: 1em;
+  @include fontsize($base_font_size + 1);
   padding-top: 1em;
 }
-
-#lockDialogGroup {
-  background: url("assets/background.png");
-  background-size: cover;
-}
diff --git a/src/sass/gnome-shell/widgets/_looking-glass.scss b/src/sass/gnome-shell/common/_looking-glass.scss
similarity index 78%
rename from src/sass/gnome-shell/widgets/_looking-glass.scss
rename to src/sass/gnome-shell/common/_looking-glass.scss
index d0a1e4a..2aa2923 100644
--- a/src/sass/gnome-shell/widgets/_looking-glass.scss
+++ b/src/sass/gnome-shell/common/_looking-glass.scss
@@ -1,3 +1,6 @@
+/* Looking Glass */
+
+// Dialog
 #LookingGlassDialog {
   background-color: $base_color;
   spacing: 4px;
@@ -21,7 +24,6 @@
     -minimum-hpadding: 6px;
     font-weight: bold;
     color: $hint_fg_color;
-    transition-duration: $longer_duration;
     padding-left: 16px;
     padding-right: 16px;
     min-height: $medium_size;
@@ -46,43 +48,47 @@
 
 .lg-dialog {
   StEntry {
+    min-height: 22px;
     selection-background-color: $primary_color;
     selected-color: $light_alt_fg_color;
   }
   .shell-link {
     color: $link_color;
-    &:hover { color: $link_color; }
+    &:hover { color: lighten($link_color, 10%); }
+    &:active { color: darken($link_color, 10%); }
+   }
+  .actor-link {
+    color: $alt_fg_color;
+    &:hover { color: lighten($alt_fg_color, 20%); }
+    &:active { color: darken($alt_fg_color, 20%); }
    }
 }
 
 .lg-completions-text {
-  font-size: 1em;
-  font-style: italic;
+    font-size: .9em;
+    font-style: italic;
 }
 
 .lg-obj-inspector-title {
-    spacing: 4px;
+    spacing: $base_spacing;
 }
 
 .lg-obj-inspector-button {
-  min-height: $medium_size;
   padding: 0 16px;
   border: none;
   border-radius: $bt_radius;
   @include font(button);
-  @include button(flat-normal);
-  &:hover { @include button(flat-hover); }
-  &:active { @include button(flat-active); }
-  &:insensitive { @include button(flat-insensitive); }
-  &:focus { @include button(flat-focus); }
+  @extend %flat_button;
+
   &:hover { border: none; }
 }
 
+// Extensions
 #lookingGlassExtensions { padding: 4px; }
 
 .lg-extensions-list {
-  padding: 4px;
-  spacing: 6px;
+    padding: 4px;
+    spacing: 6px;
 }
 
 .lg-extension {
@@ -92,13 +98,14 @@
 }
 
 .lg-extension-name {
-  @include font(headline);
+    font-weight: bold;
 }
 
 .lg-extension-meta {
-  spacing: 6px;
+    spacing: 6px;
 }
 
+// Inspector
 #LookingGlassPropertyInspector {
   background: $base_color;
   border: none;
diff --git a/src/sass/gnome-shell/common/_message-list.scss b/src/sass/gnome-shell/common/_message-list.scss
new file mode 100644
index 0000000..7322440
--- /dev/null
+++ b/src/sass/gnome-shell/common/_message-list.scss
@@ -0,0 +1,136 @@
+/* Message List */
+// a.k.a. notifications in the menu
+
+.message-list {
+  width: 31.5em;
+  padding: 0 12px;
+  text-shadow: none;
+
+  .message-list-placeholder { spacing: 12px; }
+}
+
+.message-list-sections {
+  margin: 0 $base_margin * 4; // to account for scrollbar
+}
+
+.message-list-section,
+.message-list-sections,
+.message-list-section-list {
+  spacing: $base_spacing;
+}
+
+// do-not-disturb + clear button
+.message-list-controls {
+  margin: ($base_margin * 2) ($base_margin * 4) 0;
+  // NOTE: remove the padding if notification_bubble could remove margin for drop shadow
+  padding: $base_margin;
+  spacing: $base_spacing * 2;
+}
+
+// .message-list-clear-button.button {
+//   margin: 8px 8px;
+// }
+
+// message bubbles
+.message {
+  margin: 0 4px 6px;
+  @extend %popover_bubble;
+
+  // icon container
+  .message-icon-bin {
+    margin: 8px 0;
+    padding: 8px 0px 8px 8px;
+    &:rtl { padding: 8px 8px 8px 0px; }
+
+    // icon size and color
+    > StIcon {
+      icon-size: 32px; // 32px
+      -st-icon-style: symbolic;
+    }
+
+    // fallback
+    > .fallback-app-icon {
+      width: 16px;
+      height: 16px;
+    }
+  }
+
+  .message-secondary-bin {
+    padding: 0 8px;
+
+    > .event-time {
+      min-height: $small_size - 2px;
+      color: $hint_fg_color;
+      font-size: 1em;
+      text-align: right;
+      /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
+      padding-bottom: 0.13em;
+    }
+  }
+
+  .message-title {
+    min-height: $small_size - 2px;
+    padding-top: 2px;
+    color: $fg_color;
+    font-weight: bold;
+    font-size: 1em;
+  }
+
+  .message-content {
+    min-height: $menuitem_size * 2 - 8px * 2;
+    padding: 8px;
+    color: $hint_fg_color;
+    font-size: 1em;
+  }
+
+  // close button
+  .message-close-button {
+    color: $alt_fg_color;
+    padding: 0;
+    height: 24px;
+    width: 24px;
+    border-radius: 100px;
+
+    &:hover, &:active { color: $fg_color; }
+    &:hover, &:focus { background-color: $divider_color; }
+    &:active { background-color: $track_color; }
+  }
+
+  // body
+  .message-body {
+    color: $hint_fg_color;
+  }
+}
+
+// URLs in messages
+.url-highlighter {
+  link-color: $link_color;
+}
+
+.message-media-control {
+  margin: 16px 4px;
+  padding: 8px;
+  border-radius: 100px;
+  color: $alt_fg_color;
+  &:hover, &:focus { color: $fg_color; background-color: $divider_color; }
+  &:active { color: $fg_color; background-color: $track_color; }
+  &:insensitive { color: $disabled_fg_color; }
+
+  &:last-child:ltr { margin-right: 16px; padding-right: 8px; }
+  &:last-child:rtl { margin-left: 16px; padding-left: 8px; }
+}
+
+// album-art
+.media-message-cover-icon {
+  icon-size: 32px !important;
+  margin: 0 0px 0 4px !important;
+  &:rtl { margin: 0 4px 0 0px !important; }
+  &.fallback {
+    icon-size: 16px !important;
+    padding: 8px;
+    border: none;
+    border-radius: $bt_radius;
+    background-color: $divider_color;
+    color: $hint_fg_color;
+  }
+}
diff --git a/src/sass/gnome-shell/common/_misc.scss b/src/sass/gnome-shell/common/_misc.scss
new file mode 100644
index 0000000..7d63be4
--- /dev/null
+++ b/src/sass/gnome-shell/common/_misc.scss
@@ -0,0 +1,57 @@
+// Rubberband for select-area screenshots
+.select-area-rubberband {
+  background-color: transparentize($primary_color, 0.7);
+  border: 1px solid $primary_color;
+  border-radius: 3px;
+}
+
+// User icon
+.user-icon {
+  background-size: contain;
+  color: $light_alt_fg_color;
+  border-radius: $circular_radius;
+  border: none;
+  box-shadow: 0 3px 8px rgba(black, 0.25);
+  icon-size: $base_icon_size * 4; // 64px
+
+  &:hover {
+    color: lighten($osd_fg_color,30%);
+  }
+
+  & StIcon {
+    background-color: transparentize($light_alt_fg_color, 0.95);
+    border-radius: $circular_radius;
+    padding: $base_padding * 2 ; // 12px
+    width: $base_icon_size * 2.5; height:  $base_icon_size * 2.5; // 40px;
+  }
+
+  &.user-avatar {
+    border: 2px $osd_fg_color;
+  }
+}
+
+.user-widget.vertical .user-icon {
+  icon-size: $base_icon_size * 6; // 128px
+
+  & StIcon {
+    padding: $base_padding * 3 + 2px; // 20px
+    padding-top: $base_padding * 3; // 18 px
+    padding-bottom: $base_padding * 3 + 4px; // 22px
+    width: $base_icon_size * 5.5; height:  $base_icon_size * 5.5; // 88px;
+  }
+}
+
+.lightbox { background-color: black; }
+.flashspot { background-color: white; }
+
+
+// Hidden
+.hidden { color: rgba(0,0,0,0);}
+
+// Caps-lock warning
+.caps-lock-warning-label {
+  text-align: center;
+  padding-bottom: 8px;
+  @include font(body-1);
+  color: $warning_color;
+}
diff --git a/src/sass/gnome-shell/common/_network-dialog.scss b/src/sass/gnome-shell/common/_network-dialog.scss
new file mode 100644
index 0000000..2f3d7f2
--- /dev/null
+++ b/src/sass/gnome-shell/common/_network-dialog.scss
@@ -0,0 +1,61 @@
+/* Network Dialogs */
+.nm-dialog {
+  max-height: 34em;
+  min-height: 31em;
+  min-width: 32em;
+}
+
+.nm-dialog-content {
+  spacing: 20px;
+  padding: 24px;
+}
+
+.nm-dialog-header-hbox { spacing: 10px; }
+.nm-dialog-airplane-box { spacing: 12px; }
+
+.nm-dialog-airplane-headline {
+  font-weight: bold;
+  text-align: center;
+}
+
+.nm-dialog-airplane-text { color: $fg_color; }
+
+// header
+.nm-dialog-header {
+  font-weight: bold;
+}
+.nm-dialog-header-icon {
+  icon-size: $base_icon_size * 2;
+}
+.nm-dialog-header-hbox { spacing: 10px; }
+
+// list of networks
+.nm-dialog-scroll-view {
+  border: 1px solid $borders_color;
+  padding: 0;
+  background-color: if($variant == 'light', rgba(black, 0.05), rgba(black, 0.1));
+  border-radius: $bt_radius;
+}
+// list item
+.nm-dialog-item {
+  @include fontsize($base_font_size);
+  border-bottom: 1px solid $borders_color;
+  padding: $base_padding * 2;
+  spacing: 0px;
+
+  &:selected {
+    background-color: $primary_color;
+    color: $light_alt_fg_color;
+  }
+
+  &:hover, &:focus { background-color: $divider_color; }
+  &:active { background-color: $track_color; }
+}
+
+// icons in list
+.nm-dialog-icon { icon-size: $base_icon_size; }
+.nm-dialog-icons { spacing: $base_spacing * 2; }
+
+// no networks
+.no-networks-label { color: $hint_fg_color; }
+.no-networks-box { spacing: $base_padding; }
diff --git a/src/sass/gnome-shell/widgets/_notifications.scss b/src/sass/gnome-shell/common/_notifications.scss
similarity index 60%
rename from src/sass/gnome-shell/widgets/_notifications.scss
rename to src/sass/gnome-shell/common/_notifications.scss
index a9ea194..0221414 100644
--- a/src/sass/gnome-shell/widgets/_notifications.scss
+++ b/src/sass/gnome-shell/common/_notifications.scss
@@ -1,8 +1,6 @@
-// NOTIFICATIONS & MESSAGE TRAY
+/* Notifications & Message Tray */
 
-.url-highlighter { link-color: $link_color; }
-
-// Banners
+// Banner notifications
 .notification-banner {
   font-size: 1em;
   width: 34em;
@@ -60,8 +58,39 @@
   }
 }
 
-// Eeeky things
-.magnifier-zoom-region {
+// counter
+.summary-source-counter {
+  font-size: $base_font_size - 1pt;
+  font-weight: bold;
+  height: 1.6em; width: 1.6em;
+  -shell-counter-overlap-x: 3px;
+  -shell-counter-overlap-y: 3px;
+  background-color: $primary_color;
+  color: $light_alt_fg_color;
   border: 2px solid $primary_color;
-  &.full-screen { border-width: 0; }
+  box-shadow: 0 2px 2px rgba(black, 0.5);
+  border-radius: 0.9em; // should be 0.8 but whatever; wish I could do 50%;
+}
+
+// chat bubbles
+.chat-body { spacing: 5px; }
+.chat-response { margin: 5px; }
+.chat-log-message { color: $fg_color; }
+.chat-new-group { padding-top: 1em; }
+.chat-received {
+  padding-left: 4px;
+  &:rtl { padding-left: 0px; padding-right: 4px; }
+}
+
+.chat-sent {
+  padding-left: 18pt;
+  color: $alt_fg_color;
+  &:rtl { padding-left: 0; padding-right: 18pt; }
+}
+
+.chat-meta-message {
+  padding-left: 4px;
+  @include font(caption);
+  color: $hint_fg_color;
+  &:rtl { padding-left: 0; padding-right: 4px; }
 }
diff --git a/src/sass/gnome-shell/widgets/_osd.scss b/src/sass/gnome-shell/common/_osd.scss
similarity index 83%
rename from src/sass/gnome-shell/widgets/_osd.scss
rename to src/sass/gnome-shell/common/_osd.scss
index 34ead21..cdfd36f 100644
--- a/src/sass/gnome-shell/widgets/_osd.scss
+++ b/src/sass/gnome-shell/common/_osd.scss
@@ -1,6 +1,9 @@
-// OSD
+/* OSD */
+
+$osd_levelbar_height: 8px;
+
 .osd-window {
-  @extend %osd-panel;
+  @extend %osd_panel !optional;
   text-align: center;
   font-weight: bold;
   spacing: 1em;
@@ -8,7 +11,11 @@
   min-width: 64px;
   min-height: 64px;
 
-  .osd-monitor-label { @include font(display-2); }
+  StIcon {
+    icon-size: $base_icon_size * 6;
+  }
+
+  .osd-monitor-label { font-size: 3em; }
 
   .level {
     height: 4px;
@@ -46,3 +53,7 @@
 .combo-box-label {
   width: 15em;
 }
+
+.resize-popup {
+  @extend %osd_panel;
+}
diff --git a/src/sass/gnome-shell/common/_overview.scss b/src/sass/gnome-shell/common/_overview.scss
new file mode 100644
index 0000000..1513102
--- /dev/null
+++ b/src/sass/gnome-shell/common/_overview.scss
@@ -0,0 +1,4 @@
+
+.overview-controls {
+  padding-bottom: 32px;
+}
diff --git a/src/sass/gnome-shell/widgets/_panel.scss b/src/sass/gnome-shell/common/_panel.scss
similarity index 65%
rename from src/sass/gnome-shell/widgets/_panel.scss
rename to src/sass/gnome-shell/common/_panel.scss
index 6a2e0fe..d21f65a 100644
--- a/src/sass/gnome-shell/widgets/_panel.scss
+++ b/src/sass/gnome-shell/common/_panel.scss
@@ -1,3 +1,6 @@
+/* Top Bar */
+// a.k.a. the panel
+
 @if $trans == 'true' { $panel_bg:   if($variant == 'light', rgba(white, $panel_opacity), rgba(black, $panel_opacity)); }
 $shell_panel_bg: if($trans == 'true', $panel_bg, rgba($panel_bg, 0.95));
 
@@ -8,7 +11,9 @@ $shell_panel_bg: if($trans == 'true', $panel_bg, rgba($panel_bg, 0.95));
   height: $menuitem_size;
   box-shadow: 0 5px 16px rgba(black, 0.35);
   color: $panel_fg;
+  font-feature-settings: "tnum";
 
+  // transparent panel on lock & login screens
   &:overview,
   &.unlock-screen,
   &.login-screen,
@@ -38,38 +43,23 @@ $shell_panel_bg: if($trans == 'true', $panel_bg, rgba($panel_bg, 0.95));
     }
   }
 
-  #panelLeft, #panelCenter { // spacing between activities<>app menu and such
-    spacing: 0;
-  }
-
+  // the rounded outset corners
   .panel-corner {
-    -panel-corner-radius: $panel-corner-radius;
+    -panel-corner-radius: 0;
     -panel-corner-background-color: $shell_panel_bg;
     -panel-corner-border-width: 2px;
     -panel-corner-border-color: transparent;
-
-    &:active, &:overview, &:focus {
-      -panel-corner-border-color: $panel_fg;
-    }
-
-    &.lock-screen, &.login-screen, &.unlock-screen {
-      -panel-corner-radius: 0;
-      -panel-corner-background-color: transparent;
-      -panel-corner-border-color: transparent;
-    }
-
-    StLabel { padding: 0 4px; }
+    -panel-corner-opacity: 1;
   }
 
+  // panel menus
   .panel-button {
     -natural-hpadding: 8px;
     -minimum-hpadding: 8px;
     font-weight: bold;
     color: $panel_fg;
-    transition-duration: $longer_duration;
+    // transition-duration: $longer_duration;
     border-radius: $bt_radius;
-    // margin-top: 2px;
-    // margin-bottom: 2px;
 
     StLabel { padding: 0 2px; }
 
@@ -83,21 +73,6 @@ $shell_panel_bg: if($trans == 'true', $panel_bg, rgba($panel_bg, 0.95));
       }
     }
 
-    .app-menu-icon {
-      -st-icon-style: symbolic;
-      margin-left: 0;
-      margin-right: 0;
-      icon-size: 16px;
-      //dimensions of the icon are hardcoded
-
-      > StIcon {
-        padding-left: 4px;
-        padding-right: 6px;
-      }
-    }
-
-    .popup-menu-arrow { width: 0; height: 0; } // Remove arrow on panel button
-
     &:hover {
       color: $panel_fg;
       background-color: if($trans == 'false' and $variant == 'light', $divider_color, $light_divider_color);
@@ -111,23 +86,76 @@ $shell_panel_bg: if($trans == 'true', $panel_bg, rgba($panel_bg, 0.95));
       }
     }
 
-    .system-status-icon { icon-size: em(16px); padding: 0 4px; }
-
     .unlock-screen &,
     .login-screen &,
     .lock-screen & {
       color: $panel_fg;
       &:focus, &:hover, &:active { color: $panel_fg; }
     }
-  }
 
-  .panel-button.clock-display {
-    &:active, &:overview, &:focus, &:checked {
+    &.clock-display {
       .clock {
+        // transition-duration: 150ms;
+        border: none;
+        border-radius: 0;
         background: none;
         box-shadow: none;
       }
     }
+
+    &:hover, &:active, &:overview, &:focus, &:checked {
+      box-shadow: none;
+
+      // The clock display needs to have the background on .clock because
+      // we want to exclude the do-not-disturb indicator from the background
+      &.clock-display {
+        box-shadow: none;
+
+        .clock {
+          box-shadow: none;
+        }
+      }
+    }
+
+    // status area icons
+    .system-status-icon {
+      icon-size: $base_icon_size;
+      padding: $base_padding - 1px;
+      margin: 0 $base_margin;
+    }
+
+    .panel-status-indicators-box .system-status-icon,
+    .panel-status-menu-box .system-status-icon {
+      margin: 0;
+    }
+
+    // app menu icon
+    .app-menu-icon {
+      -st-icon-style: symbolic;
+      // dimensions of the icon are hardcoded
+    }
+
+    &#panelActivities {
+      -natural-hpadding: $base_padding * 3;
+    }
+  }
+
+  &.unlock-screen,
+  &.login-screen,
+  &:overview {
+    .panel-button {
+      &:hover, &:active, &:overview, &:focus, &:checked {
+        box-shadow: none;
+
+        &.clock-display {
+          box-shadow: none;
+
+          .clock {
+            box-shadow: none;
+          }
+        }
+      }
+    }
   }
 
   .panel-status-indicators-box,
@@ -140,41 +168,9 @@ $shell_panel_bg: if($trans == 'true', $panel_bg, rgba($panel_bg, 0.95));
     spacing: 0;
   }
 
-  .screencast-indicator { color: $error_color; }
-  .remote-access-indicator { color: $warning_color; } // > 3.29.4
-
-  &.solid {
-    background-color: $panel_bg;
-    transition-duration: 250ms;
-    background-gradient-direction: none; // for Ubuntu session
-    text-shadow: none; // for Ubuntu session
-
-    &:overview { background-color: transparent; } // for Ubuntu session
-
-    .panel-corner {
-      -panel-corner-background-color: $panel_bg;
-    }
-
-    .panel-button {
-      color: $panel_fg;
-      text-shadow: none;
-
-      &:active, &:overview, &:focus, &:checked {
-        color: $light_alt_fg_color;
-        text-shadow: 0 1px rgba(black, 0.45);
-      }
-    }
-
-    .system-status-icon,
-    .app-menu-icon > StIcon,
-    .popup-menu-arrow {
-      icon-shadow: none;
-
-      &:active, &:overview, &:focus, &:checked {
-        icon-shadow: 0 1px rgba(black, 0.45);
-      }
-    }
-  }
+  // indicator for active
+  .screencast-indicator,
+  .remote-access-indicator { color: $warning_color; }
 }
 
 // Activities button
diff --git a/src/sass/gnome-shell/widgets/_popovers.scss b/src/sass/gnome-shell/common/_popovers.scss
similarity index 57%
rename from src/sass/gnome-shell/widgets/_popovers.scss
rename to src/sass/gnome-shell/common/_popovers.scss
index 0e31197..e149268 100644
--- a/src/sass/gnome-shell/widgets/_popovers.scss
+++ b/src/sass/gnome-shell/common/_popovers.scss
@@ -1,12 +1,31 @@
+/* Popovers/Menus */
+
 $popop_menuitem_radius: $wm_radius - 4px;
 
+//.the popover itself
+.popup-menu-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 0;
+  -arrow-box-shadow: none; //dreaming. bug #689995
+  background: transparent; // needs to reset?
+
+  StEntry {
+    selection-background-color: $light_alt_fg_color;
+    selected-background-color: $light_alt_fg_color;
+    selected-color: $primary_color;
+  }
+}
+
+// container of the popover menu
 .popup-menu {
   min-width: 12em;
   color: $alt_fg_color;
   padding: 0 0 !important;
 
-  .popup-menu-arrow { } //defined globally in the TOP BAR
-
   .popup-menu-content {
     padding: 6px 0 !important;
     @extend %theme_dialogs;
@@ -23,7 +42,6 @@ $popop_menuitem_radius: $wm_radius - 4px;
     text-shadow: none;
     border-radius: $popop_menuitem_radius;
     margin: 0 6px;
-    transition-duration: 0ms;
 
     &:ltr { padding-right: 2em !important; padding-left: 0 !important; }
     &:rtl { padding-right: 0 !important; padding-left: 2em !important; }
@@ -52,13 +70,11 @@ $popop_menuitem_radius: $wm_radius - 4px;
     &.selected {
       color: $selected_fg_color;
       background-color: $selected_bg_color;
-      transition: none;
     }
 
     &:active, &.selected:active {
       color: $selected_fg_color;
       background-color: mix($fg_color, $selected_bg_color, 5%);
-      transition-duration: 100ms;
     }
 
     &:insensitive { color: $disabled_fg_color; }
@@ -70,7 +86,6 @@ $popop_menuitem_radius: $wm_radius - 4px;
     border: none;
     box-shadow: none;
     margin: 0 6px;
-    transition-duration: 0ms;
 
     .popup-menu-item {
       margin: 0;
@@ -100,34 +115,23 @@ $popop_menuitem_radius: $wm_radius - 4px;
 
   //.popup-status-menu-item { font-weight: normal;  color: pink; } //dunno what that is
   &.panel-menu {
-    -boxpointer-gap: 4px;
+    -boxpointer-gap: $base_margin; // distance from the panel
     margin-bottom: 1.75em;
   }
 }
+// symbolic icons in popover
+.popup-menu-arrow,
+.popup-menu-icon { icon-size: $base_icon_size; }
 
+// container for radio and check boxes
 .popup-menu-ornament {
-  text-align: right;
-  width: 16px;
-  height: 16px;
-}
-
-.popup-menu-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: transparent;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 64px;
-  -arrow-rise: 0;
-  -arrow-box-shadow: none; //dreaming. bug #689995
-  background: transparent; // needs to reset?
-
-  StEntry {
-    selection-background-color: $light_alt_fg_color;
-    selected-background-color: $light_alt_fg_color;
-    selected-color: $primary_color;
-  }
+  width: 1.2em;
+
+  &:ltr { text-align: right };
+  &:rtl { text-align: left };
 }
 
+// separator
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -149,27 +153,10 @@ $popop_menuitem_radius: $wm_radius - 4px;
   }
 }
 
-// a little unstructured mess:
-.system-switch-user-submenu-icon.user-icon {
-  icon-size: 20px;
-  padding: 0 2px;
-}
-
-.system-switch-user-submenu-icon.default-icon {
-  icon-size: 16px;
-  padding: 0 4px;
-}
-
-.system-switch-user-submenu-icon {
-  icon-size: 16px;
-  padding: 0 4px;
-}
-
-#appMenu {
-  spinner-image: url("process-working.svg");
-  spacing: 4px;
-
-  .label-shadow { color: transparent; }
+// desktop background menu
+.background-menu {
+  -boxpointer-gap: $base_margin;
+  -arrow-rise: 0px; // hide the beak on the menu
 }
 
 // system status popover menu
@@ -190,96 +177,3 @@ $popop_menuitem_radius: $wm_radius - 4px;
             padding-right: 16px; margin-right: 1em; }
   }
 }
-
-.system-menu-action {
-  color: $alt_fg_color;
-  border-radius: 100px; /* wish we could do 50% */
-  padding: ($large_size - 20px) / 2;
-  border: none;
-  -st-icon-style: symbolic; // >= 3.29.90
-
-  &:hover, &:focus {
-    background-color: $divider_color;
-    color: $fg_color;
-    border: none;
-    padding: ($large_size - 20px) / 2;
-  }
-
-  &:active { background-color: $track_color; color: $fg_color; }
-
-  & > StIcon { icon-size: 16px; }
-}
-
-// Background menu
-.background-menu { -boxpointer-gap: 4px; -arrow-rise: 0; }
-
-// not really top bar only
-.popup-menu-arrow,
-.popup-menu-icon { icon-size: em(16px); }
-
-// emoji
-.emoji-page {
-  .keyboard-key {
-    background-color: transparent;
-    border: none;
-    color: initial;
-  }
-}
-
-.emoji-panel {
-  .keyboard-key:latched {
-    border-color: lighten($primary_color, 5%);
-    background-color: $primary_color;
-  }
-}
-
-// IBus Candidate Popup
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: transparent;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 64px;
-  -arrow-rise: 12px;
-  background-color: transparent;
-}
-
-.candidate-popup-content {
-  @extend %theme_dialogs;
-  box-shadow: 0 8px 16px 0 rgba(black, 0.25);
-  border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
-  margin: ($container_padding / 2) 8px;
-  padding: $container_padding + 2px;
-  spacing: $container_padding;
-}
-
-.candidate-index {
-  padding: 0 0.5em 0 0;
-  color: $hint_fg_color;
-  .candidate-box:selected & { color: $light_hint_fg_color; }
-}
-
-.candidate-box {
-  transition-duration: 0ms; // FIXME: needs more natural transitions
-  padding: 0.3em 0.5em 0.3em 0.5em;
-  margin-right: 2px;
-  border-radius: $bt_radius;
-  &:hover { background-color: $divider_color; color: $fg_color; }
-  &:active { background-color: $track_color; color: $fg_color; }
-  &:selected { background-color: $primary_color; color: $light_alt_fg_color; }
-  &:last-child { margin-right: 0; }
-}
-
-.candidate-page-button-box {
-  height: 2em;
-  .vertical & { padding-top: 0.5em; }
-  .horizontal & { padding-left: 0.5em; }
-}
-
-.candidate-page-button {
-  padding: 4px;
-}
-
-.candidate-page-button-previous,
-.candidate-page-button-next { border-radius: $bt_radius;  }
-.candidate-page-button-icon { icon-size: 1em; }
diff --git a/src/sass/gnome-shell/common/_screen-shield.scss b/src/sass/gnome-shell/common/_screen-shield.scss
new file mode 100644
index 0000000..c82ec9a
--- /dev/null
+++ b/src/sass/gnome-shell/common/_screen-shield.scss
@@ -0,0 +1,74 @@
+/* Screen Shield */
+
+.unlock-dialog-clock {
+  color: white;
+  font-weight: 300;
+  text-align: center;
+  spacing: 24px;
+  padding-bottom: 2.5em;
+}
+
+.unlock-dialog-clock-time {
+  font-size: 64pt;
+  padding-top: 42px;
+  font-feature-settings: "tnum";
+}
+
+.unlock-dialog-clock-date {
+  font-size: 16pt;
+  font-weight: normal;
+}
+
+.unlock-dialog-clock-hint {
+  font-weight: normal;
+  padding-top: 48px;
+}
+
+.unlock-dialog-notifications-container {
+  margin: 12px 0;
+  spacing: 6px;
+  width: 23em;
+  background-color: transparent;
+
+  .summary-notification-stack-scrollview {
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+
+  .notification,
+  .unlock-dialog-notification-source {
+    padding: 12px 6px;
+    border: none;
+    background-color: $dark_bg_color;
+    color: $light_fg_color;
+    border-radius: $bt_radius;
+
+    &.critical { background-color: $alt_dark_bg_color; }
+  }
+}
+
+.unlock-dialog-notification-label {
+  padding: 0px 0px 0px 12px;
+}
+
+.unlock-dialog-notification-count-text {
+  weight: bold;
+  padding: 0 6px;
+  color: white;
+  background-color: $primary_color;
+  border-radius: 99px;
+  margin-right: 12px;
+}
+
+.screen-shield-background { //just the shadow, really
+  background: black;
+  box-shadow: 0 2px 3px 0 rgba(black, 0.15);
+}
+
+#unlockDialogNotifications {
+  StButton#vhandle, StButton#hhandle {
+    background-color: transparentize($bg_color,0.7);
+    &:hover, &:focus { background-color: transparentize($bg_color,0.5); }
+    &:active { background-color: transparentize($selected_bg_color,0.5); }
+  }
+}
diff --git a/src/sass/gnome-shell/widgets/_scrollbar.scss b/src/sass/gnome-shell/common/_scrollbars.scss
similarity index 93%
rename from src/sass/gnome-shell/widgets/_scrollbar.scss
rename to src/sass/gnome-shell/common/_scrollbars.scss
index d04540f..08ac086 100644
--- a/src/sass/gnome-shell/widgets/_scrollbar.scss
+++ b/src/sass/gnome-shell/common/_scrollbars.scss
@@ -1,3 +1,5 @@
+/* Scrollbars */
+
 StScrollView {
   &.vfade { -st-vfade-offset: 32px; }
   &.hfade { -st-hfade-offset: 32px; }
@@ -8,7 +10,7 @@ StScrollBar {
 
   StScrollView & {
     min-width: 16px;
-    min-height: 6px;
+    min-height: 16px;
   }
 
   StBin#trough {
diff --git a/src/sass/gnome-shell/common/_search-entry.scss b/src/sass/gnome-shell/common/_search-entry.scss
new file mode 100644
index 0000000..dd9cc14
--- /dev/null
+++ b/src/sass/gnome-shell/common/_search-entry.scss
@@ -0,0 +1,36 @@
+// Search entry
+%search-entry, .search-entry {
+  width: 320px;
+  padding: $base_padding+1 $base_padding+3;
+  border: none;
+  color: $light_hint_fg_color;
+  caret-color: $light_alt_fg_color;
+  selection-background-color: $light_track_color;
+  selected-color: $light_alt_fg_color;
+  @include search_entry(normal, $fc:$light_track_color);
+
+  &:focus {
+    @include search_entry(focus, $fc:$light_alt_fg_color);
+    border: none;
+    color: $light_alt_fg_color;
+  }
+
+  .search-entry-icon {
+    icon-size: 16px;
+    padding: 0 0;
+    color: $light_hint_fg_color;
+  }
+
+  &:hover, &:focus {
+    .search-entry-icon { color: $light_alt_fg_color; }
+  }
+
+  &:insensitive {
+    border: none;
+    color: $light_disabled_fg_color;
+  }
+
+  StLabel.hint-text {
+    color: $light_hint_fg_color;
+  }
+}
diff --git a/src/sass/gnome-shell/common/_search-results.scss b/src/sass/gnome-shell/common/_search-results.scss
new file mode 100644
index 0000000..490a173
--- /dev/null
+++ b/src/sass/gnome-shell/common/_search-results.scss
@@ -0,0 +1,59 @@
+/* Search */
+
+// search results sections "the boxes"
+.search-section {
+  // This should be equal to #searchResultsContent spacing
+  spacing: $base_margin * 2;
+
+  // separator
+  .search-section-separator {
+    height: 1px;
+    background-color: $light_divider_color;
+  }
+}
+
+// content
+.search-section-content {  // This is the space between the provider icon and the results container
+  spacing: 32px;
+  border-radius: 0;
+  border: none;
+  box-shadow: none;
+  background: none;
+  text-shadow: none;
+  color: $light_alt_fg_color;
+}
+
+// "no results" text
+.search-statustext {
+  @extend %status_text !optional;
+}
+
+//Icon tile
+.search-provider-icon,
+.list-search-result {
+  @extend %icon_tile;
+  &:focus, &:selected, &:hover {
+    background-color: $light_divider_color;
+  }
+  &:active, &:checked {
+    background-color: $light_track_color;
+  }
+}
+
+// search result provider
+.search-provider-icon {
+  @extend %app-well-app;
+
+  // content
+  .list-search-provider-content {
+    spacing: 12px;
+
+    // provider labels
+    .list-search-provider-details {
+      width: 120px;
+      margin-top: 0;
+      color: $light_hint_fg_color;
+      // font-weight: bold;
+    }
+  }
+}
diff --git a/src/sass/gnome-shell/widgets/_slider.scss b/src/sass/gnome-shell/common/_slider.scss
similarity index 98%
rename from src/sass/gnome-shell/widgets/_slider.scss
rename to src/sass/gnome-shell/common/_slider.scss
index 7e829ae..4e0cde2 100644
--- a/src/sass/gnome-shell/widgets/_slider.scss
+++ b/src/sass/gnome-shell/common/_slider.scss
@@ -1,3 +1,5 @@
+/* Slider */
+
 $slider_color: if($variant == 'light', white, white);
 $barlevel_bg_color: if($variant == 'light', rgba(black, 0.1), rgba(white, 0.1));
 $barlevel_active_bg_color: if($variant == 'light', white, rgba(white, 0.35));
diff --git a/src/sass/gnome-shell/common/_switcher-popup.scss b/src/sass/gnome-shell/common/_switcher-popup.scss
new file mode 100644
index 0000000..2683c78
--- /dev/null
+++ b/src/sass/gnome-shell/common/_switcher-popup.scss
@@ -0,0 +1,67 @@
+/* App Switcher */
+
+.switcher-popup {
+  padding: 8px;
+  spacing: $base_spacing * 4;
+}
+
+// switcher onscreen panel
+.switcher-list {
+  @extend %osd_panel;
+
+  .item-box {
+    padding: 8px;
+    border-radius: $bt_radius;
+    border: 1px solid transparent;
+
+    &:outlined {
+      background-color: $divider_color;
+      color: $fg_color; // for Ubuntu session
+    }
+
+    &:selected {
+      background-color: $primary_color;
+      color: $light_alt_fg_color;
+    }
+  }
+
+  // window thumbnails
+  .thumbnail-box {
+    padding: 2px;
+    spacing: $base_spacing;
+  }
+
+  .thumbnail {
+    width: 256px;
+  }
+
+  .separator {
+    width: 1px;
+    background: $borders_color;
+  }
+
+  .switcher-list-item-container {
+    spacing: $base_spacing * 2;
+  }
+}
+
+.switcher-arrow {
+  border-color: rgba(0,0,0,0);
+  color: $hint_fg_color;
+
+  &:highlighted {
+    color: $fg_color;
+  }
+}
+
+// Input Source Switcher
+.input-source-switcher-symbol {
+  font-size: 34pt;
+  width: 96px;
+  height: 96px;
+}
+
+// Window cycler highlight
+.cycler-highlight {
+  border: 5px solid $primary_color;
+}
diff --git a/src/sass/gnome-shell/widgets/_switch.scss b/src/sass/gnome-shell/common/_switches.scss
similarity index 67%
rename from src/sass/gnome-shell/widgets/_switch.scss
rename to src/sass/gnome-shell/common/_switches.scss
index c496f6b..036759c 100644
--- a/src/sass/gnome-shell/widgets/_switch.scss
+++ b/src/sass/gnome-shell/common/_switches.scss
@@ -1,3 +1,5 @@
+/* Switches */
+
 .toggle-switch {
   width: 40px;
   height: 24px;
@@ -12,10 +14,3 @@
     &:checked { background-image: url("assets/toggle-on.svg"); }
   }
 }
-
-@each $v in us, intl {
-  .toggle-switch-#{$v} {
-    background-image: url("assets/toggle-off.svg");
-    &:checked { background-image: url("assets/toggle-on.svg"); }
-  }
-}
diff --git a/src/sass/gnome-shell/common/_tiled-previews.scss b/src/sass/gnome-shell/common/_tiled-previews.scss
new file mode 100644
index 0000000..fe161cb
--- /dev/null
+++ b/src/sass/gnome-shell/common/_tiled-previews.scss
@@ -0,0 +1,21 @@
+
+/* Tiled window previews */
+
+$tile_corner_radius: $base_border_radius + 1px;
+
+.tile-preview {
+  background-color: rgba($primary_color, $lower_opacity);
+  border: 1px solid $primary_color;
+}
+
+.tile-preview-left.on-primary {
+  border-radius: $tile_corner_radius 0 0 0;
+}
+
+.tile-preview-right.on-primary {
+  border-radius: 0 $tile_corner_radius 0 0;
+}
+
+.tile-preview-left.tile-preview-right.on-primary {
+  border-radius: $tile_corner_radius $tile_corner_radius 0 0;
+}
diff --git a/src/sass/gnome-shell/common/_workspace-switcher.scss b/src/sass/gnome-shell/common/_workspace-switcher.scss
new file mode 100644
index 0000000..8ce1c62
--- /dev/null
+++ b/src/sass/gnome-shell/common/_workspace-switcher.scss
@@ -0,0 +1,36 @@
+/* Workspace Switcher */
+.workspace-switcher-group {
+  padding: $base_padding * 2;
+}
+
+.workspace-switcher-container {
+  @extend %osd_panel;
+}
+
+.workspace-switcher {
+  background: transparent;
+  border: none;
+  border-radius: 0;
+  padding: 0;
+  spacing: $base_spacing * 2;
+}
+
+.ws-switcher-box {
+  background: transparent;
+  height: 50px;
+  background-size: 32px;
+  background: $divider_color;
+  border-radius: $bt_radius;
+}
+
+// active workspace in the switcher
+.ws-switcher-active-up,
+.ws-switcher-active-down,
+.ws-switcher-active-left,
+.ws-switcher-active-right {
+  height: 52px;
+  background-color: $primary_color;
+  color: $light_alt_fg_color;
+  border-radius: $base_border_radius + 3px;
+  border: none;
+}
diff --git a/src/sass/gnome-shell/common/_workspace-thumbnails.scss b/src/sass/gnome-shell/common/_workspace-thumbnails.scss
new file mode 100644
index 0000000..99c9926
--- /dev/null
+++ b/src/sass/gnome-shell/common/_workspace-thumbnails.scss
@@ -0,0 +1,29 @@
+/* Workspace pager */
+
+// thumbnails in overview
+.workspace-thumbnails {
+  visible-width: 32px; //amount visible before hover
+  spacing: $base_spacing;
+  padding: $base_padding;
+
+  .workspace-thumbnail {
+    @extend %overview_panel !optional;
+    border-radius: $bt_radius;
+  }
+
+  // drag and drop indicator
+  .placeholder {
+    background-image: url("assets/dash-placeholder.svg");
+    background-size: contain;
+    width: 18px;
+    height: 24px;
+  }
+}
+
+// selected indicator
+.workspace-thumbnail-indicator {
+  border: 3px solid $primary_color;
+  border-radius: 3px;
+  padding: 0px;
+  // background-color: transparentize($primary_color, 0.9);
+}
diff --git a/src/sass/gnome-shell/widgets-3-28/_app-grid.scss b/src/sass/gnome-shell/widgets-3-28/_app-grid.scss
new file mode 100644
index 0000000..d1e5af0
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-3-28/_app-grid.scss
@@ -0,0 +1,70 @@
+$app_icon_size: 96px;
+
+// App Vault/Grid
+.icon-grid {
+  spacing: 30px;
+  -shell-grid-horizontal-item-size: 136px;
+  -shell-grid-vertical-item-size: 136px;
+
+  row-spacing: $container_padding * 6;
+  column-spacing: $container_padding * 6;
+  max-row-spacing: $container_padding * 12;
+  max-column-spacing: $container_padding * 12;
+
+  .overview-icon { icon-size: $app_icon_size; }
+}
+
+.app-folder-icon {
+  padding: $container_padding;
+  spacing-rows: $container_padding;
+  spacing-columns: $container_padding;
+}
+
+// expanded folder
+.app-folder-dialog {
+  & .page-indicators {
+    .page-indicator {
+      padding: 15px 12px;
+    }
+  }
+
+  & StButton#vhandle,
+  & StButton#vhandle:hover,
+  & StButton#vhandle:active { background-color: transparent; }
+}
+
+.page-indicator {
+  padding: 15px 20px;
+
+  .page-indicator-icon {
+    width: 12px;
+    height: 12px;
+    border-radius: 12px;
+    margin: 0;
+    padding: 0;
+    background-image: none;
+    color: transparent;
+    border: none;
+    box-shadow: none;
+    background-color: $light_alt_disabled_fg_color;
+  }
+  &:hover .page-indicator-icon {
+    background-image: none;
+    background-color: $light_disabled_fg_color;
+  }
+  &:active .page-indicator-icon {
+    margin: 0;
+    padding: 0;
+    background-image: none;
+    color: transparent;
+    border: none;
+    box-shadow: none;
+    background-color: $light_alt_fg_color;
+  }
+  &:checked .page-indicator-icon {
+    background-image: none;
+    background-color: $light_alt_fg_color;
+    transition-duration: 0ms;
+  }
+  &:checked:active { background-image: none; }
+}
diff --git a/src/sass/gnome-shell/widgets-3-28/_dash.scss b/src/sass/gnome-shell/widgets-3-28/_dash.scss
new file mode 100644
index 0000000..2914fc9
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-3-28/_dash.scss
@@ -0,0 +1,21 @@
+#dash {
+  color: $light_alt_fg_color;
+  background-color: $light_divider_color;
+  border-left: 0;
+  border-radius: 0 ($bd_radius * 1.5) ($bd_radius * 1.5) 0;
+  padding: 0 6px;
+
+  &:rtl {
+    border-radius: ($bd_radius * 1.5)  0 0 ($bd_radius * 1.5);
+  }
+
+  .placeholder {
+    background-image: url("assets/dash-placeholder.svg");
+    background-size: contain;
+    height: 24px;
+  }
+}
+
+.dash-item-container > StWidget {
+  padding: 3px 6px;
+}
diff --git a/src/sass/gnome-shell/widgets-3-28/_login-dialog.scss b/src/sass/gnome-shell/widgets-3-28/_login-dialog.scss
new file mode 100644
index 0000000..1f3f65f
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-3-28/_login-dialog.scss
@@ -0,0 +1,41 @@
+.user-widget.horizontal {
+  .user-widget-label {
+    // @include font(title);
+    font-weight: bold;
+    text-align: left;
+    padding-left: 15px;
+
+    &:ltr { padding-left: 14px; }
+    &:rtl { padding-right: 14px; }
+  }
+
+  .user-icon {
+    icon-size: 64px; // 64px
+
+    & StIcon {
+      padding: 12px; // 12px
+      width: 40px;
+      height: 40px; // 40px;
+    }
+  }
+}
+
+.user-widget.vertical {
+  .user-widget-label {
+    text-align: center;
+    font-weight: normal;
+    padding-top: 16px;
+  }
+
+  .user-icon {
+    icon-size: 96px; // 128px
+
+    & StIcon {
+      padding: 20px; // 20px
+      padding-top: 18px; // 18 px
+      padding-bottom: 22px; // 22px
+      width: 88px;
+      height: 88px; // 88px;
+    }
+  }
+}
diff --git a/src/sass/gnome-shell/widgets-3-28/_other.scss b/src/sass/gnome-shell/widgets-3-28/_other.scss
new file mode 100644
index 0000000..16ad54e
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-3-28/_other.scss
@@ -0,0 +1,289 @@
+
+.app-view-controls { //favorties | all toggle container
+  width: 320px;
+  padding-bottom: 32px;
+  margin: 0 0;
+}
+
+.app-view-control { //favorties | all toggle button
+  padding: 0 16px;
+  margin: 0 0;
+  font-weight: bold;
+  color: $light_alt_fg_color;
+  background-color: rgba($light_alt_fg_color, 0.15);
+  &:hover {
+    color: $light_alt_fg_color;
+    background-color: rgba($light_alt_fg_color, 0.22);
+  }
+  &:active {
+    color: $light_alt_fg_color;
+    background-color: darken($primary_color, 3%);
+  }
+  &:checked {
+    color: $light_alt_fg_color;
+    background-color: $primary_color;
+    box-shadow: none;
+  }
+  &:first-child {
+    border-right-width: 0;
+    border-radius: $bt_radius 0 0 $bt_radius;
+  }
+  &:last-child {
+    border-radius: 0 $bt_radius $bt_radius 0;
+  }
+}
+
+// Collections
+.app-folder-popup { //expanded collection
+  -arrow-border-radius: $bd_radius * 2;
+  -arrow-background-color: $light_divider_color;
+  -arrow-base: 0;
+  -arrow-rise: 12px;
+}
+
+.app-folder-popup-bin { padding: 5px; }
+
+.no-frequent-applications-label { @extend %status_text; }
+
+.overview-icon.overview-icon-with-label,
+.grid-search-result .overview-icon.overview-icon-with-label {
+  padding: 10px 8px 5px 8px;
+  spacing: 6px;
+
+  > StBoxLayout {
+    spacing: 6px;
+  }
+}
+
+//Some hacks I don't even
+.all-apps,
+.search-display > StBoxLayout,
+.frequent-apps > StBoxLayout {
+  // horizontal padding to make sure scrollbars or dash don't overlap content
+  padding: 0px 88px 10px 88px;
+}
+
+// ShellMountOperation Dialogs
+.shell-mount-operation-icon { icon-size: 48px; }
+
+.mount-dialog {
+  spacing: 24px;
+
+  .message-dialog-title {
+    padding-top: 10px;
+    padding-left: 17px;
+    padding-bottom: 6px;
+    max-width: 34em;
+  }
+
+  .message-dialog-title:rtl {
+    padding-left: 0px;
+    padding-right: 17px;
+  }
+
+  .message-dialog-body {
+    padding-left: 17px;
+    width: 28em;
+  }
+
+  .message-dialog-body:rtl {
+    padding-left: 0px;
+    padding-right: 17px;
+  }
+}
+
+.mount-dialog-app-list {
+  max-height: 200px;
+  padding-top: 24px;
+  padding-left: 49px;
+  padding-right: 32px;
+}
+
+.mount-dialog-app-list:rtl {
+  padding-right: 49px;
+  padding-left: 32px;
+}
+
+.mount-dialog-app-list-item {
+  color: $fg_color;
+  &:hover { color: $fg_color; }
+  &:ltr { padding-right: 1em; }
+  &:rtl { padding-left: 1em; }
+}
+
+.mount-dialog-app-list-item-icon {
+  &:ltr { padding-right: 17px; }
+  &:rtl { padding-left: 17px; }
+}
+
+.mount-dialog-app-list-item-name {
+  font-size: 1em;
+}
+
+// Access Dialog
+.access-dialog {
+  spacing: 30px;
+}
+
+// Geolocation Dialog
+.geolocation-dialog {
+  spacing: 30px;
+}
+
+// Extension Dialog
+.extension-dialog {
+  .message-dialog-main-layout { spacing: 24px; padding: 10px; }
+  .message-dialog-title { color: $alt_fg_color; }
+}
+
+// Inhibit-Shortcuts Dialog
+.inhibit-shortcuts-dialog {
+  spacing: 30px;
+}
+
+// Network Agent Dialog
+.network-dialog-secret-table {
+  spacing-rows: 15px;
+  spacing-columns: 1em;
+}
+
+.keyring-dialog-control-table {
+  spacing-rows: 15px;
+  spacing-columns: 1em;
+}
+
+.secondary-icon { icon-size: em(16px); }
+
+//hotplug
+.hotplug-resident-box { spacing: 8px; }
+
+.hotplug-resident-mount {
+  spacing: 8px;
+  border-radius: $bt_radius;
+  &:hover { background-color: $divider_color; }
+  &:active { background-color: $track_color; }
+}
+
+.hotplug-resident-mount-label {
+  color: inherit;
+  padding-left: 6px;
+}
+
+.hotplug-resident-mount-icon {
+  icon-size: 24px;
+  padding-left: 6px;
+}
+
+.hotplug-resident-eject-icon {
+  icon-size: 16px;
+}
+
+.hotplug-resident-eject-button {
+  padding: 7px;
+  border-radius: $bt_radius;
+  color: $fg_color;
+}
+// NOTIFICATIONS & MESSAGE TRAY
+
+.url-highlighter { link-color: $link_color; }
+
+// a little unstructured mess:
+.system-switch-user-submenu-icon.user-icon {
+  icon-size: 20px;
+  padding: 0 2px;
+}
+
+.system-switch-user-submenu-icon.default-icon {
+  icon-size: 16px;
+  padding: 0 4px;
+}
+
+.system-switch-user-submenu-icon {
+  icon-size: 16px;
+  padding: 0 4px;
+}
+
+.system-menu-action {
+  color: $alt_fg_color;
+  border-radius: 100px; /* wish we could do 50% */
+  padding: ($large_size - 20px) / 2;
+  border: none;
+  -st-icon-style: symbolic; // >= 3.29.90
+
+  &:hover, &:focus {
+    background-color: $divider_color;
+    color: $fg_color;
+    border: none;
+    padding: ($large_size - 20px) / 2;
+  }
+
+  &:active { background-color: $track_color; color: $fg_color; }
+
+  & > StIcon { icon-size: 16px; }
+}
+
+.screen-shield-arrows {
+  padding-bottom: 3em;
+}
+
+.screen-shield-arrows Gjs_Arrow {
+  color: white;
+  width: 80px;
+  height: 48px;
+  -arrow-thickness: 12px;
+  -arrow-shadow: $shadow_1;
+}
+
+.screen-shield-clock {
+  color: white;
+  text-shadow: $shadow_1;
+  font-weight: normal;
+  text-align: center;
+  padding-bottom: 1.5em;
+}
+
+.screen-shield-clock-time {
+  @include font(display-4);
+  text-shadow: $shadow_1;
+}
+
+.screen-shield-clock-date { @include font(display-2); }
+
+.screen-shield-notifications-container {
+  spacing: 6px;
+  width: 30em;
+  background-color: transparent;
+  max-height: 500px;
+  .summary-notification-stack-scrollview {
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+
+  .notification,
+  .screen-shield-notification-source {
+    padding: 8px;
+    border: none;
+    background-color: $alt_dark_bg_color;
+    color: $light_alt_fg_color;
+    border-radius: $bt_radius;
+  }
+  .notification { margin-right: 16px; } //compensate for space allocated to the scrollbar
+}
+
+.screen-shield-notification-label {
+  min-height: $small_size - 2px;
+  padding: 2px 0px 0px 16px;
+  font-weight: bold;
+}
+
+.screen-shield-notification-count-text {
+  min-height: $small_size - 2px;
+  padding: 2px 0px 0px 16px;
+  color: $light_alt_fg_color;
+}
+
+#panel.lock-screen { background-color: $alt_dark_bg_color; }
+
+#screenShieldNotifications {
+  StScrollBar { @extend %overview_scrollbar; }
+}
diff --git a/src/sass/gnome-shell/widgets-3-28/_overview.scss b/src/sass/gnome-shell/widgets-3-28/_overview.scss
new file mode 100644
index 0000000..02ee2e1
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-3-28/_overview.scss
@@ -0,0 +1,4 @@
+#overview {
+  spacing: 24px;
+  StScrollBar { @extend %overview_scrollbar !optional; }
+}
diff --git a/src/sass/gnome-shell/widgets-3-28/_panel.scss b/src/sass/gnome-shell/widgets-3-28/_panel.scss
new file mode 100644
index 0000000..45bfac1
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-3-28/_panel.scss
@@ -0,0 +1,31 @@
+// panel
+#panel {
+  #panelLeft, #panelCenter { // spacing between activities<>app menu and such
+    spacing: 0;
+  }
+
+  .panel-button {
+    .popup-menu-arrow { width: 0; height: 0; } // Remove arrow on panel button
+  }
+
+  .panel-status-indicators-box,
+  .panel-status-menu-box {
+    spacing: 2px;
+  }
+
+  // spacing between power icon and (optional) percentage label
+  .power-status.panel-status-indicators-box {
+    spacing: 0;
+  }
+
+  .screencast-indicator { color: $error_color; }
+  .remote-access-indicator { color: $warning_color; } // > 3.29.4
+}
+
+// App Menu
+#appMenu {
+  spinner-image: url("process-working.svg");
+  spacing: 4px;
+
+  .label-shadow { color: transparent; }
+}
diff --git a/src/sass/gnome-shell/widgets-3-28/_search-results.scss b/src/sass/gnome-shell/widgets-3-28/_search-results.scss
new file mode 100644
index 0000000..5654212
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-3-28/_search-results.scss
@@ -0,0 +1,14 @@
+#searchResultsContent {
+  max-width: 1000px;
+  padding-left: 20px;
+  padding-right: 20px;
+  spacing: 16px;
+}
+
+.list-search-results { spacing: 3px; }
+.list-search-result-content { spacing: 30px; }
+.list-search-result-title { @include font(subheading); color: $light_alt_fg_color; spacing: 12px; }
+.list-search-result-description { color: $light_alt_fg_color; }
+.list-search-provider-details { width: 150px; color: $light_alt_fg_color; margin-top: 0.24em; }
+.list-search-provider-content { spacing: 20px; }
+.search-provider-icon { padding: 15px; }
diff --git a/src/sass/gnome-shell/widgets-3-28/_window-picker.scss b/src/sass/gnome-shell/widgets-3-28/_window-picker.scss
new file mode 100644
index 0000000..fb54d65
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-3-28/_window-picker.scss
@@ -0,0 +1,57 @@
+.window-picker { //container around window thumbnails
+  -horizontal-spacing: 16px;
+  -vertical-spacing: 16px;
+  padding: 0 16px 32px;
+  spacing: 12px;
+
+  &.external-monitor { padding: 16px; }
+}
+
+.window-caption {
+  spacing: 25px;
+  color: $light_alt_fg_color;
+  background-color: $dark_bg_color;
+  border-radius: $bt_radius;
+  padding: 4px 8px;
+  border: none;
+  font-weight: normal;
+  @include font(body);
+}
+
+.window-clone-border {
+  border: 4px solid $light_track_color;
+  border-radius: $bt_radius;
+  // For window decorations with round corners we can't match
+  // the exact shape when the window is scaled. So apply a shadow
+  // to fix that case
+  box-shadow: inset 0 0 0 1px $light_track_color;
+}
+
+//close buttons
+.window-close {
+  background-size: 26px;
+  height: 26px;
+  width: 26px;
+  -shell-close-overlap: 10px;
+  border-radius: 100px;
+  border: 0 none transparent;
+  background-color: transparent;
+  color: transparent;
+  box-shadow: none;
+  StIcon { icon-size: 26px; } // for safety
+  background-image: url("assets/window-close.svg");
+
+  &:hover {
+    background-size: 26px;
+    height: 26px;
+    width: 26px;
+    background-image: url("assets/window-close-hover.svg");
+  }
+
+  &:active {
+    background-size: 26px;
+    height: 26px;
+    width: 26px;
+    background-image: url("assets/window-close-active.svg");
+  }
+}
diff --git a/src/sass/gnome-shell/widgets-40-0/_app-grid.scss b/src/sass/gnome-shell/widgets-40-0/_app-grid.scss
new file mode 100644
index 0000000..319e8e5
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-40-0/_app-grid.scss
@@ -0,0 +1,66 @@
+
+$app_icon_size: 96px;
+
+// app icons
+.icon-grid {
+  row-spacing: $base_spacing * 2;
+  column-spacing: $base_spacing * 2;
+  max-row-spacing: $base_spacing * 12;
+  max-column-spacing: $base_spacing * 12;
+  page-padding-top: $base_padding * 4;
+  page-padding-bottom: $base_padding * 4;
+  page-padding-left: $base_padding * 2;
+  page-padding-right: $base_padding * 2;
+}
+
+// right-click app menu
+.app-menu,
+.app-well-menu {
+  max-width: 27.25em;
+}
+
+// App Grid pagination indicators
+.page-indicator {
+  padding: $base_padding $base_padding * 2 0;
+
+  .page-indicator-icon {
+    width: 10px;
+    height: 10px;
+    border-radius: 10px; // the same as height&width
+    background-color: white;
+  }
+}
+
+.apps-scroll-view {
+  padding: 0;
+}
+
+.page-navigation-hint {
+  width: 300px;
+
+  &.dnd {
+    background: rgba(255, 255, 255, 0.1);
+  }
+
+  &.next:ltr,
+  &.previous:rtl {
+    background-gradient-start: rgba(255, 255, 255, 0.05);
+    background-gradient-end: transparent;
+    background-gradient-direction: horizontal;
+    border-radius: 15px 0px 0px 15px;
+  }
+
+  &.previous:ltr,
+  &.next:rtl {
+    background-gradient-start: transparent;
+    background-gradient-end: rgba(255, 255, 255, 0.05);
+    background-gradient-direction: horizontal;
+    border-radius: 0px 15px 15px 0px;
+  }
+}
+
+.page-navigation-arrow {
+  margin: 6px;
+  width: 24px;
+  height: 24px;
+}
diff --git a/src/sass/gnome-shell/widgets-40-0/_dash.scss b/src/sass/gnome-shell/widgets-40-0/_dash.scss
new file mode 100644
index 0000000..426b614
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-40-0/_dash.scss
@@ -0,0 +1,39 @@
+$dash_background_color: #3b3b3b;
+$dash_placeholder_size: 32px;
+$dash_padding: $base_padding + 4px; // 10px
+$dash_spacing: $base_padding / 4;
+$dash_bottom_margin: $base_margin * 4;
+$dash_border_radius: $bt_radius * 2.5;
+
+#dash {
+  margin-top: $base_spacing * 2;
+  padding: 0 $dash_padding;
+
+  .placeholder {
+    background-image:none;
+    background-size: contain;
+    height: $dash_placeholder_size;
+  }
+
+  .overview-icon {
+    padding: $dash_padding / 2;
+  }
+}
+
+.dash-background {
+  background-color: $dash_background_color;
+  margin-bottom: $dash_bottom_margin;
+  padding: $dash_padding;
+  border-radius: $dash_border_radius;
+}
+
+// Dash Items
+.dash-item-container .app-well-app, .show-apps {
+  padding: $dash_padding $dash_spacing $dash_padding + $dash_bottom_margin;
+}
+
+.dash-separator {
+  width: 1px;
+  margin: 0 ($dash_spacing + ($dash_padding / 2)) $dash_bottom_margin;
+  background-color: rgba(white, 0.25);
+}
diff --git a/src/sass/gnome-shell/widgets-40-0/_misc.scss b/src/sass/gnome-shell/widgets-40-0/_misc.scss
new file mode 100644
index 0000000..bf79abe
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-40-0/_misc.scss
@@ -0,0 +1,5 @@
+/* Workspace animation */
+
+.workspace-animation {
+  background-color: rgba($osd_bg_color, 1);
+}
diff --git a/src/sass/gnome-shell/widgets-40-0/_overview.scss b/src/sass/gnome-shell/widgets-40-0/_overview.scss
new file mode 100644
index 0000000..9863dae
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-40-0/_overview.scss
@@ -0,0 +1,7 @@
+.controls-manager, .secondary-monitor-workspaces {
+  spacing: $base_spacing * 2;
+}
+
+#overviewGroup {
+  background-color: rgba($osd_bg_color, 1);
+}
diff --git a/src/sass/gnome-shell/widgets-40-0/_panel.scss b/src/sass/gnome-shell/widgets-40-0/_panel.scss
new file mode 100644
index 0000000..eb3adaf
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-40-0/_panel.scss
@@ -0,0 +1,10 @@
+// App Menu
+#appMenu {
+  spacing: $base_spacing;
+  .label-shadow { color: transparent; }
+}
+
+#appMenu .panel-status-menu-box {
+  padding: 0 $base_padding;
+  spacing: $base_spacing;
+}
diff --git a/src/sass/gnome-shell/widgets-40-0/_screen-shield.scss b/src/sass/gnome-shell/widgets-40-0/_screen-shield.scss
new file mode 100644
index 0000000..8db1c30
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-40-0/_screen-shield.scss
@@ -0,0 +1,8 @@
+
+#unlockDialogNotifications {
+  StButton#vhandle, StButton#hhandle {
+    background-color: transparentize($bg_color, 0.7);
+    &:hover, &:focus { background-color: transparentize($bg_color, 0.5); }
+    &:active { background-color: transparentize($primary_color, 0.5); }
+  }
+}
diff --git a/src/sass/gnome-shell/widgets-40-0/_search-entry.scss b/src/sass/gnome-shell/widgets-40-0/_search-entry.scss
new file mode 100644
index 0000000..cf5cdf8
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-40-0/_search-entry.scss
@@ -0,0 +1,5 @@
+
+.search-entry {
+  margin-top: $base_spacing * 4;
+  margin-bottom: $base_spacing;
+}
diff --git a/src/sass/gnome-shell/widgets-40-0/_search-results.scss b/src/sass/gnome-shell/widgets-40-0/_search-results.scss
new file mode 100644
index 0000000..5dfcc53
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-40-0/_search-results.scss
@@ -0,0 +1,36 @@
+// search overview container
+#searchResultsContent {
+  max-width: 1024px;
+  spacing: $base_margin * 2;
+}
+
+.grid-search-results {
+  spacing: $base_spacing * 6;
+}
+
+// Search results with icons
+.grid-search-result {
+  @extend %app-well-app;
+}
+
+// search results list
+.list-search-results {
+  spacing: $base_spacing;
+}
+
+// search result listitem
+.list-search-result {
+  // content
+  .list-search-result-content {
+    spacing: $base_padding;
+  }
+
+  // list item title (with leading icon)
+  .list-search-result-title {
+    spacing: $base_spacing * 2;
+    // font-weight: bold;
+  }
+
+  // list item description
+  .list-search-result-description { color: $light_alt_fg_color; }
+}
diff --git a/src/sass/gnome-shell/widgets-40-0/_window-picker.scss b/src/sass/gnome-shell/widgets-40-0/_window-picker.scss
new file mode 100644
index 0000000..0d0108f
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-40-0/_window-picker.scss
@@ -0,0 +1,47 @@
+// Window picker
+.window-picker {
+  // Space between window thumbnails
+  spacing: $base_spacing;
+}
+
+// Window titles
+.window-caption {
+  color: $osd_fg_color;
+  background-color: rgba($osd_bg_color, 1);
+  border-radius: 100px;
+  padding: $base_padding $base_padding * 2;
+}
+
+$window_close_button_size: 30px;
+$window_close_button_padding: 3px;
+
+// Close button
+.window-close {
+  background-color: rgba($osd_bg_color, 1);
+  color: $osd_fg_color;
+  border-radius: $window_close_button_size * 0.5 + $window_close_button_padding * 2;
+  padding: $window_close_button_padding;
+  height: $window_close_button_size;
+  width: $window_close_button_size;
+  box-shadow: -1px 1px 5px 0px rgba(0,0,0,0.5);
+  transition-duration: 300ms;
+
+  & StIcon { icon-size: 24px; }
+
+  &:hover {
+    color: lighten($osd_fg_color, 10%);
+    background-color: lighten(rgba($osd_bg_color, 1), 15%);
+  }
+
+  &:active {
+    color: transparentize($osd_fg_color, 0.2);
+    background-color: darken(rgba($osd_bg_color, 1), 5%);
+  }
+}
+
+.workspace-background {
+  // keep in sync with BACKGROUND_CORNER_RADIUS_PIXELS in workspace.js
+  border-radius: 30px;
+  background-color: $osd_bg_color;
+  box-shadow: 0 4px 16px 4px transparentize(darken($osd_bg_color, 30%), 0.7);
+}
diff --git a/src/sass/gnome-shell/widgets/_buttons.scss b/src/sass/gnome-shell/widgets/_buttons.scss
deleted file mode 100644
index bbab298..0000000
--- a/src/sass/gnome-shell/widgets/_buttons.scss
+++ /dev/null
@@ -1,41 +0,0 @@
-.button {
-  min-height: $medium_size;
-  padding: 0 16px;
-  border-width: 0;
-  border-radius: $bt_radius;
-  @include font(button);
-  @include button(flat-normal);
-  &:hover { @include button(flat-hover); }
-  &:active { @include button(flat-active); }
-  &:insensitive { @include button(flat-insensitive); }
-  &:focus { @include button(flat-focus); }
-}
-
-//close buttons
-.window-close {
-  background-size: 26px;
-  height: 26px;
-  width: 26px;
-  -shell-close-overlap: 10px;
-  border-radius: 100px;
-  border: 0 none transparent;
-  background-color: transparent;
-  color: transparent;
-  box-shadow: none;
-  StIcon { icon-size: 26px; } // for safety
-  background-image: url("assets/window-close.svg");
-
-  &:hover {
-    background-size: 26px;
-    height: 26px;
-    width: 26px;
-    background-image: url("assets/window-close-hover.svg");
-  }
-
-  &:active {
-    background-size: 26px;
-    height: 26px;
-    width: 26px;
-    background-image: url("assets/window-close-active.svg");
-  }
-}
diff --git a/src/sass/gnome-shell/widgets/_calendar.scss b/src/sass/gnome-shell/widgets/_calendar.scss
deleted file mode 100644
index 1e1493d..0000000
--- a/src/sass/gnome-shell/widgets/_calendar.scss
+++ /dev/null
@@ -1,456 +0,0 @@
-// calendar popover
-.clock-display-box {
-  spacing: 4px;
-
-  .clock {
-    padding-left: 6px;
-    padding-right: 6px;
-  }
-}
-
-#calendarArea {
-  padding: 12px 0;
-}
-
-.calendar {
-  margin: 2px 12px;
-  border: none;
-  box-shadow: none;
-  background-color: if($variant == 'light', rgba(white, 0.75), rgba(lighten($base_color, 8%), 0.75));
-  padding: 4px 8px;
-  text-shadow: none;
-  border-radius: $mn_radius;
-}
-
-.datemenu-today-button,
-.datemenu-displays-box,
-.message-list-sections {
-  margin: 4px 8px;
-}
-
-.datemenu-calendar-column {
-  spacing: 8px;
-  border: none;
-  padding: 0 $container_padding * 2;
-
-  &:ltr { margin-right: $container_padding * 2; border-left-width: 0; }
-  &:rtl { margin-left: $container_padding * 2; border-right-width: 0; }
-
-  .datemenu-displays-section { padding-bottom: 0; }
-  .datemenu-displays-box { spacing: 8px; }
-}
-
-.datemenu-today-button {
-  min-height: $menuitem_size * 2 - 4px * 2;
-  border: none;
-  box-shadow: none;
-  background: none;
-  padding: 4px 8px;
-  text-shadow: none;
-  color: $alt_fg_color;
-
-  // weekday label
-  .day-label {
-    @include font(title);
-    font-weight: bold;
-  }
-
-  // date label
-  .date-label {
-    @include font(headline);
-  }
-}
-
-.calendar-month-label {
-  height: $menuitem_size - 4px * 2;
-  margin: 2px;
-  padding: 6px 16px;
-  color: $fg_color;
-  font-weight: bold;
-  text-align: center;
-  text-shadow: none;
-
-  &:focus { background-color: $divider_color; }
-}
-
-.pager-button {
-  width: $menuitem_size;
-  height: $menuitem_size;
-  margin: 2px;
-  border-radius: 100px;
-  background-color: transparent;
-  color: $fg_color;
-  &:hover, &:focus { background-color: $divider_color; }
-  &:active { background-color: $track_color; }
-}
-
-.calendar-change-month-back { //arrow back
-  padding: 0 2px;
-  background-image: url("assets/calendar-arrow-left.svg");
-  &:rtl { background-image: url("assets/calendar-arrow-right.svg"); }
-}
-
-.calendar-change-month-forward { //arrow foreward
-  padding: 0 2px;
-  background-image: url("assets/calendar-arrow-right.svg");
-  &:rtl { background-image: url("assets/calendar-arrow-left.svg"); }
-}
-
-// prev/next month icons
-.calendar-change-month-back StIcon,
-.calendar-change-month-forward StIcon {
-  icon-size: 16px;
-}
-
-.calendar-day-base {
-  @include font(caption);
-  text-align: center;
-  width: $menuitem_size;
-  height: $menuitem_size;
-  padding: 2px;
-  margin: 2px;
-  border-radius: 1000px;
-  color: $alt_fg_color;
-  font-feature-settings: "tnum";
-
-  &:hover, &:focus { background-color: $divider_color; }
-
-  &:active {
-    color: $alt_fg_color;
-    background-color: $track_color;
-    border-color: transparent; //avoid jumparound due to today
-  }
-
-  &:selected {
-    color: $fg_color;
-    background-color: $track_color;
-    border-color: transparent; //avoid jumparound due to today
-  }
-
-  &.calendar-day-heading {  //day of week heading
-    width: $menuitem_size;
-    height: $menuitem_size - 7px;
-    margin-top: 2px;
-    padding: 7px 0 0;
-    border-radius: 100px;
-    background-color: transparent;
-    color: $hint_fg_color;
-    @include font(caption);
-    font-weight: bold;
-    text-align: center;
-  }
-}
-
-.calendar-day { //border collapse hack - see calendar.js
-  border-width: 0;
-}
-
-.calendar-day-top { border-top-width: 0; }
-.calendar-day-left { border-left-width: 0; }
-.calendar-nonwork-day {
-  color: $fg_color;
-}
-
-.calendar-today {
-  font-weight: bold;
-  color: $light_alt_fg_color;
-  background-color: $primary_color;
-  border: none;
-
-  &:hover, &:focus {
-    background-color:lighten($primary_color, 3%);
-    color: $light_alt_fg_color;
-  }
-
-  &:active, &:selected {
-    background-color: $primary_color;
-    color: $light_alt_fg_color;
-
-    &:hover, &:focus {
-      background-color:lighten($primary_color, 3%);
-      color: $light_alt_fg_color;
-    }
-  }
-}
-
-.calendar-day-with-events {
-  color: $hint_fg_color;
-  background-image: url("assets/calendar-today.svg");
-
-  &.calendar-work-day {
-    color: $hint_fg_color;
-    font-weight: bold;
-  }
-}
-
-.calendar-other-month-day {
-  color: $disabled_fg_color;
-  opacity: 0.5;
-}
-
-.calendar-week-number {
-  width: 22px;
-  height: 16px;
-  margin: 6px 6px 6px 4px;
-  padding: 0 0;
-  border-radius: $bt_radius;
-  background-color: if($variant == 'light', rgba(black, 0.05), rgba(white, 0.05));
-  color: $hint_fg_color;
-  font-size: inherit;
-  font-weight: bold;
-  text-align: center;
-}
-
-.world-clocks-button,
-.weather-button,
-.events-button {
-  @extend %popover_bubble;
-  padding: 12px;
-  margin: 2px 4px;
-}
-
-.world-clocks-header,
-.weather-header,
-.events-section-title {
-  color: $alt_fg_color;
-  font-weight: bold;
-}
-
-// Events
-.events-button {
-  .events-box {
-    spacing: 6px;
-  }
-
-  .events-list {
-    spacing: 12px;
-    text-shadow: none;
-  }
-
-  .events-title {
-    color: $hint_fg_color;
-    font-weight: bold;
-    margin-bottom: 4px;
-    text-shadow: none;
-  }
-
-  .event-time {
-    color: $hint_fg_color;
-    font-feature-settings: "tnum";
-  }
-}
-
-// World Clock
-.world-clocks-button {
-  .world-clocks-city {
-    color: $hint_fg_color;
-    font-weight: bold;
-    font-size: 0.9em;
-  }
-
-  .world-clocks-time {
-    color: $hint_fg_color;
-    font-feature-settings: "tnum";
-    font-size: 1.2em;
-
-    &:ltr { text-align: right; }
-    &:rtl { text-align: left; }
-  }
-
-  .world-clocks-timezone {
-    color: $hint_fg_color;
-    font-feature-settings: "tnum";
-    font-size: 0.9em;
-  }
-}
-
-.world-clocks-grid,
-.weather-grid {
-  spacing-rows: 0.4em;
-  spacing-columns: 0.8em;
-}
-
-// Weather
-.weather-button {
-  margin-bottom: 6px;
-
-  .weather-box {
-    spacing: 12px;
-  }
-
-  .weather-header-box {
-    spacing: 6px;
-  }
-
-  .weather-header {
-    color: $alt_fg_color;
-    font-weight: bold;
-
-    &.location {
-      font-weight: normal;
-      color: $hint_fg_color;
-    }
-  }
-
-  .weather-grid {
-    spacing-rows: 6px;
-    spacing-columns: 12px;
-  }
-
-  .weather-forecast-time {
-    color: $alt_fg_color;
-    font-feature-settings: "tnum";
-    font-size: 9pt;
-    font-weight: normal;
-    padding-top: 0.2em;
-    padding-bottom: 0.4em;
-  }
-
-  .weather-forecast-icon {
-    icon-size: 32px;
-  }
-
-  .weather-forecast-temp {
-    font-weight: bold;
-  }
-}
-
-// Message list
-.message-list {
-  width: 31.5em;
-  padding: 0 12px;
-  text-shadow: none;
-
-  .message-list-placeholder { spacing: 12px; }
-}
-
-.message-list-clear-button.button {
-  background-color: transparent;
-  &:hover, &:focus { background-color: $divider_color; }
-  &:active { background-color: $track_color; }
-  margin: 8px 8px 0;
-}
-
-.message-list-section,
-.message-list-sections,
-.message-list-section-list {
-  spacing: 8px;
-}
-
-.message-list-section-list:ltr {
-  padding-left: 0;
-}
-
-.message-list-section-list:rtl {
-  padding-right: 0;
-}
-
-// do-not-disturb + clear button
-.message-list-controls {
-  margin: 8px 16px 0;
-  // NOTE: remove the padding if notification_bubble could remove margin for drop shadow
-  padding: 4px;
-  spacing: 16px;
-}
-
-.message {
-  margin: 0 4px 6px;
-  @extend %popover_bubble;
-
-  // icon container
-  .message-icon-bin {
-    margin: 8px 0;
-    padding: 8px 0px 8px 8px;
-    &:rtl { padding: 8px 8px 8px 0px; }
-
-    // icon size and color
-    > StIcon {
-      icon-size: 32px; // 32px
-      -st-icon-style: symbolic;
-    }
-
-    // fallback
-    > .fallback-app-icon {
-      width: 16px;
-      height: 16px;
-    }
-  }
-
-  .message-secondary-bin {
-    padding: 0 8px;
-
-    > .event-time {
-      min-height: $small_size - 2px;
-      color: $hint_fg_color;
-      font-size: 1em;
-      text-align: right;
-      /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
-      padding-bottom: 0.13em;
-    }
-  }
-
-  .message-title {
-    min-height: $small_size - 2px;
-    padding-top: 2px;
-    color: $fg_color;
-    font-weight: bold;
-    font-size: 1em;
-  }
-
-  .message-content {
-    min-height: $menuitem_size * 2 - 8px * 2;
-    padding: 8px;
-    color: $hint_fg_color;
-    font-size: 1em;
-  }
-
-  // close button
-  .message-close-button {
-    color: $alt_fg_color;
-    padding: 0;
-    height: 24px;
-    width: 24px;
-    border-radius: 100px;
-
-    &:hover, &:active { color: $fg_color; }
-    &:hover, &:focus { background-color: $divider_color; }
-    &:active { background-color: $track_color; }
-  }
-
-  // body
-  .message-body {
-    color: $hint_fg_color;
-  }
-}
-
-// URLs in messages
-.url-highlighter {
-  link-color: $link_color;
-}
-
-.message-media-control {
-  margin: 16px 4px;
-  padding: 8px;
-  border-radius: 100px;
-  color: $alt_fg_color;
-  &:hover, &:focus { color: $fg_color; background-color: $divider_color; }
-  &:active { color: $fg_color; background-color: $track_color; }
-  &:insensitive { color: $disabled_fg_color; }
-
-  &:last-child:ltr { margin-right: 16px; padding-right: 8px; }
-  &:last-child:rtl { margin-left: 16px; padding-left: 8px; }
-}
-
-.media-message-cover-icon {
-  icon-size: 32px !important;
-  margin: 0 0px 0 4px !important;
-  &:rtl { margin: 0 4px 0 0px !important; }
-  &.fallback {
-    icon-size: 16px !important;
-    padding: 8px;
-    border: none;
-    border-radius: $bt_radius;
-    background-color: $divider_color;
-    color: $hint_fg_color;
-  }
-}
diff --git a/src/sass/gnome-shell/widgets/_dashboard.scss b/src/sass/gnome-shell/widgets/_dashboard.scss
deleted file mode 100644
index b381df3..0000000
--- a/src/sass/gnome-shell/widgets/_dashboard.scss
+++ /dev/null
@@ -1,363 +0,0 @@
-#dash {
-  font-size: 1em;
-  color: $light_alt_fg_color;
-  background-color: $light_divider_color;
-  padding: 3px 0;
-  border: none;
-  border-left: 0px;
-  border-radius: 0px ($bd_radius * 1.5) ($bd_radius * 1.5) 0px;
-
-  &:rtl {
-    border-radius: ($bd_radius * 1.5)  0 0 ($bd_radius * 1.5);
-  }
-
-  .placeholder {
-    background-image: url("assets/dash-placeholder.svg");
-    background-size: contain;
-    height: 24px;
-  }
-
-  .empty-dash-drop-target {
-    width: 24px;
-    height: 24px;
-  }
-}
-
-.dash-item-container > StWidget {
-  padding: 3px 6px;
-}
-
-.dash-label { //osd tooltip
-  // min-height: 32px - 6px * 2;
-  border-radius: $bt_radius;
-  padding: 6px 8px;
-  color: rgba(white, 0.9);
-  background-color: rgba(black, 0.75);
-  box-shadow: none;
-  text-align: center;
-  border: none;
-  -x-offset: 8px;
-}
-
-// App Vault/Grid
-.icon-grid {
-  spacing: 30px;
-  -shell-grid-horizontal-item-size: 136px;
-  -shell-grid-vertical-item-size: 136px;
-
-  row-spacing: $container_padding * 6;
-  column-spacing: $container_padding * 6;
-  max-row-spacing: $container_padding * 12;
-  max-column-spacing: $container_padding * 12;
-
-  .overview-icon { icon-size: 96px; }
-}
-
-//.app-display { spacing: 20px; }
-
-.system-action-icon {
-  box-shadow: 0 4px 4px rgba(0, 0, 0, 0.2); // FIXME: this should really have a highlight
-  background-color: $dark_bg_color;
-  color: white;
-  border-radius: 99px;
-  icon-size: 48px;
-}
-
-.app-view-controls { //favorties | all toggle container
-  width: 320px;
-  padding-bottom: 32px;
-  margin: 0 0;
-}
-.app-view-control { //favorties | all toggle button
-  padding: 0 16px;
-  margin: 0 0;
-  font-weight: bold;
-  color: $light_alt_fg_color;
-  background-color: rgba($light_alt_fg_color, 0.15);
-  &:hover {
-    color: $light_alt_fg_color;
-    background-color: rgba($light_alt_fg_color, 0.22);
-  }
-  &:active {
-    color: $light_alt_fg_color;
-    background-color: darken($primary_color, 3%);
-  }
-  &:checked {
-    color: $light_alt_fg_color;
-    background-color: $primary_color;
-    box-shadow: none;
-  }
-  &:first-child {
-    border-right-width: 0;
-    border-radius: $bt_radius 0 0 $bt_radius;
-  }
-  &:last-child {
-    border-radius: 0 $bt_radius $bt_radius 0;
-  }
-}
-
-//Icon tile
-.search-provider-icon,
-.list-search-result {
-  @extend %icon_tile;
-  &:focus, &:selected, &:hover {
-    background-color: $light_divider_color;
-    transition-duration: 0ms;
-  }
-  &:active, &:checked {
-    background-color: $light_track_color;
-    transition-duration: $longer_duration;
-  }
-}
-
-%app-well-app,
-.show-apps,
-.app-well-app,
-.grid-search-result {
-  & .overview-icon {
-    @extend %icon_tile;
-
-    &, & > StIcon {
-      icon-shadow: $panel_asset_shadow;
-    }
-  }
-
-  &:hover .overview-icon,
-  &:focus .overview-icon,
-  &:selected .overview-icon {
-    background-color: $light_divider_color;
-    transition-duration: 0ms;
-    border-image: none;
-    background-image: none;
-  }
-
-  &:active .overview-icon,
-  &:checked .overview-icon {
-    background-color: $light_track_color;
-    box-shadow: none;
-    transition-duration: $longer_duration;
-  }
-}
-
-.app-well-app-running-dot { //running apps indicator
-  width: 5px; height: 5px;
-  border-radius: 3px;
-  background-color: $light_alt_fg_color;
-  margin-bottom: 0;
-}
-
-StWidget.focused .app-well-app-running-dot {
-  background-color: $primary_color;
-}
-
-.app-well-app.app-folder > .overview-icon {
-  background-color: $light_divider_color;
-}
-
-.show-apps .show-apps-icon {
-  color: transparent;
-  background-image: url("assets/view-app-grid.svg");
-  background-size: contain;
-}
-
-.show-apps .overview-icon {
-  color: transparent;
-}
-
-.show-apps:hover .show-apps-icon,
-.show-apps:active .show-apps-icon,
-.show-apps:checked .show-apps-icon,
-.show-apps:focus .show-apps-icon {
-  color: transparent;
-  transition-duration: $longer_duration;
-}
-
-// Collections
-.app-folder-popup { //expanded collection
-  -arrow-border-radius: $bd_radius * 2;
-  -arrow-background-color: $light_divider_color;
-  -arrow-base: 0;
-  -arrow-rise: 12px;
-}
-
-.app-folder-popup-bin { padding: 5px; }
-
-.app-folder-icon {
-  padding: 5px;
-  spacing-rows: 5px;
-  spacing-columns: 5px;
-}
-
-.page-indicator {
-  padding: 15px 20px;
-
-  .page-indicator-icon {
-    width: 12px;
-    height: 12px;
-    border-radius: 12px;
-    margin: 0;
-    padding: 0;
-    background-image: none;
-    color: transparent;
-    border: none;
-    box-shadow: none;
-    background-color: $light_alt_disabled_fg_color;
-  }
-  &:hover .page-indicator-icon {
-    background-image: none;
-    background-color: $light_disabled_fg_color;
-  }
-  &:active .page-indicator-icon {
-    margin: 0;
-    padding: 0;
-    background-image: none;
-    color: transparent;
-    border: none;
-    box-shadow: none;
-    background-color: $light_alt_fg_color;
-  }
-  &:checked .page-indicator-icon {
-    background-image: none;
-    background-color: $light_alt_fg_color;
-    transition-duration: 0ms;
-  }
-  &:checked:active { background-image: none; }
-}
-
-.no-frequent-applications-label { @extend %status_text; }
-
-.overview-icon.overview-icon-with-label,
-.grid-search-result .overview-icon.overview-icon-with-label {
-  padding: 10px 8px 5px 8px;
-  spacing: 6px;
-
-  > StBoxLayout {
-    spacing: 6px;
-  }
-}
-
-// App Folders
-.app-folder {
-  background: none;
-  transition: $longer_transition;
-
-  .overview-icon {
-    background-color: $light_divider_color;
-    // padding: 16px;
-    border-radius: $bt_radius * 2;
-  }
-
-  &:hover .overview-icon  {
-    background-color: rgba(white, 0.2);
-  }
-}
-
-// expanded folder
-.app-folder-dialog {
-  border-radius: $bd_radius * 4;
-  border: 2px solid rgba(white, 0.15);
-  padding: 12px;
-  background-color: rgba(#181818, 0.95);
-
-  & .folder-name-container {
-    padding: 24px 36px 0;
-    spacing: 12px;
-
-    & .folder-name-label,
-    & .folder-name-entry {
-      font-size: 18pt;
-      font-weight: bold;
-    }
-
-    & .folder-name-entry {
-      @extend %search-entry;
-      width: 300px;
-    }
-
-    /* FIXME: this is to keep the label in sync with the entry */
-    & .folder-name-label { padding: 5px 7px; color: $light_alt_fg_color; }
-
-    & .edit-folder-button {
-      background-color: $light_divider_color;
-      color: $light_alt_fg_color;
-      border: none;
-
-      padding: 0;
-      width: 36px;
-      height: 36px;
-      border-radius: 18px;
-
-      & > StIcon { icon-size: 16px }
-
-      &:hover { background-color: $light_divider_color; }
-      &:checked, &:active { background-color: $light_track_color; }
-    }
-  }
-
-  & .icon-grid {
-    row-spacing: $container_padding * 2;
-    column-spacing: $container_padding * 5;
-  }
-
-  & .page-indicators {
-    margin-bottom: 18px;
-
-    .page-indicator {
-      padding: 15px 12px;
-    }
-  }
-
-  & StButton#vhandle,
-  & StButton#vhandle:hover,
-  & StButton#vhandle:active { background-color: transparent; }
-}
-.app-folder-dialog-container {
-  padding: $container_padding;
-  width: 600px;
-  height: 600px;
-}
-
-.app-folder-icon {
-  padding: $container_padding;
-  spacing-rows: $container_padding;
-  spacing-columns: $container_padding;
-}
-
-// Rename popup for app folders
-.rename-folder-popup {
-  .rename-folder-popup-item {
-    spacing: $container_padding;
-    &:ltr, &:rtl { padding: 0 $container_padding * 2; }
-  }
-}
-
-// Workspace pager
-.workspace-thumbnails { //container ala dash
-  @extend %overview-panel;
-  visible-width: 32px; //amount visible before hover
-  spacing: 12px;
-  padding: 16px;
-  border-radius: $bt_radius;
-  margin: 6px;
-  // border-width: 0; //fixme: can't have non unoform borders :(
-  // &:rtl { border-radius: $bt_radius; }
-
-  .placeholder {
-    background-image: url("assets/dash-placeholder.svg");
-    background-size: contain;
-    height: 24px;
-  }
-}
-.workspace-thumbnail-indicator {
-  border: 2px solid $primary_color;
-  padding: 6px;
-  border-radius: 2px;
-}
-
-//Some hacks I don't even
-.all-apps,
-.search-display > StBoxLayout,
-.frequent-apps > StBoxLayout {
-  // horizontal padding to make sure scrollbars or dash don't overlap content
-  padding: 0px 88px 10px 88px;
-}
diff --git a/src/sass/gnome-shell/widgets/_misc.scss b/src/sass/gnome-shell/widgets/_misc.scss
deleted file mode 100644
index 6f09924..0000000
--- a/src/sass/gnome-shell/widgets/_misc.scss
+++ /dev/null
@@ -1,217 +0,0 @@
-// Pointer location
-.ripple-pointer-location {
-  width: 48px;
-  height: 48px;
-  border-radius: 24px; // radius equals the size of the box to give us the curve
-  background-color: lighten(transparentize($primary_color, 0.7), 30%);
-  box-shadow: 0 0 2px 2px lighten($primary_color, 20%);
-}
-
-// Pointer accessibility notifications
-.pie-timer {
-  width: 60px;
-  height: 60px;
-  -pie-border-width: 3px;
-  -pie-border-color: $primary_color;
-  -pie-background-color: lighten(transparentize($primary_color, 0.7), 40%);
-}
-
-// Rubberband for select-area screenshots
-.select-area-rubberband {
-  background-color: transparentize($primary_color, 0.7);
-  border: 1px solid $primary_color;
-  border-radius: 3px;
-}
-
-// Caps-lock warning
-.caps-lock-warning-label {
-  text-align: center;
-  padding-bottom: 8px;
-  @include font(body-1);
-  color: $warning_color;
-}
-
-.lightbox { background-color: black; }
-.flashspot { background-color: white; }
-
-// Hidden
-.hidden {
-  color: rgba(0,0,0,0);
-}
-
-// App Switcher
-.switcher-popup {
-  padding: 8px;
-  spacing: 24px;
-}
-
-.osd-window,
-.resize-popup,
-.switcher-list {
-  @extend %osd-panel;
-}
-
-.switcher-list-item-container { spacing: 8px; }
-
-.switcher-list .item-box {
-  padding: 8px;
-  border-radius: $bt_radius;
-}
-
-.switcher-list .item-box:outlined {
-  padding: 8px;
-  border: none;
-  background-color: $divider_color;
-  color: $fg_color; // for Ubuntu session
-}
-
-.switcher-list .item-box:selected {
-  background-color: $primary_color;
-  color: $light_alt_fg_color;
-}
-
-.switcher-list .thumbnail-box {
-  padding: 2px;
-  spacing: 4px;
-}
-
-.switcher-list .thumbnail {
-  width:  256px;
-}
-
-.switcher-list .separator {
-  width: 1px;
-  background: $borders_color;
-}
-
-.switcher-arrow {
-  border-color: rgba(0,0,0,0);
-  color: $hint_fg_color;
-  &:highlighted {
-    color: $fg_color;
-  }
-}
-
-.input-source-switcher-symbol {
-  @include font(display-2);
-  width: 96px;
-  height: 96px;
-}
-
-// Tiled window previews
-.tile-preview {
-  background-color: rgba($primary_color, $lower_opacity);
-  border: 1px solid $primary_color;
-}
-
-.tile-preview-left.on-primary {
-  border-radius: $panel-corner-radius 0 0 0;
-}
-
-.tile-preview-right.on-primary {
-  border-radius: 0 $panel-corner-radius 0 0;
-}
-
-.tile-preview-left.tile-preview-right.on-primary {
-  border-radius: $panel-corner-radius $panel-corner-radius 0 0;
-}
-
-// Activities Ripples
-.ripple-box {
-  width: 48px;
-  height: 48px;
-  border-radius: 0 0 48px 0;
-  background-color: rgba($primary_color, 0.35);
-  background-image: none;
-  background-size: auto;
-}
-
-.ripple-box:rtl {
-  border-radius: 0 0 0 48px;
-  background-image: none;
-}
-
-// counter
-.summary-source-counter {
-  font-size: 1em;
-  font-weight: bold;
-  height: 1.6em; width: 1.6em;
-  -shell-counter-overlap-x: 3px;
-  -shell-counter-overlap-y: 3px;
-  background-color: $primary_color;
-  color: $light_alt_fg_color;
-  border: 2px solid $primary_color;
-  box-shadow: 0 2px 2px rgba(black, 0.5);
-  border-radius: 0.9em; // should be 0.8 but whatever; wish I could do 50%;
-}
-
-.secondary-icon { icon-size: em(16px); }
-
-//chat bubbles
-.chat-body { spacing: 5px; }
-.chat-response { margin: 5px; }
-.chat-log-message { color: $fg_color; }
-.chat-new-group { padding-top: 1em; }
-.chat-received {
-  padding-left: 4px;
-  &:rtl { padding-left: 0px; padding-right: 4px; }
-}
-
-.chat-sent {
-  padding-left: 18pt;
-  color: $alt_fg_color;
-  &:rtl { padding-left: 0; padding-right: 18pt; }
-}
-
-.chat-meta-message {
-  padding-left: 4px;
-  @include font(caption);
-  color: $hint_fg_color;
-  &:rtl { padding-left: 0; padding-right: 4px; }
-}
-
-//hotplug
-.hotplug-transient-box {
-  spacing: 6px;
-  padding: 2px 72px 2px 12px;
-}
-
-.hotplug-notification-item {
-  padding: 2px 10px;
-  @extend %bubble_button;
-  &:focus { padding: 1px 71px 1px 11px; }
-}
-
-.hotplug-notification-item-icon {
-  icon-size: 24px;
-  padding: 2px 5px;
-}
-
-.hotplug-resident-box { spacing: 8px; }
-
-.hotplug-resident-mount {
-  spacing: 8px;
-  border-radius: $bt_radius;
-  &:hover { background-color: $divider_color; }
-  &:active { background-color: $track_color; }
-}
-
-.hotplug-resident-mount-label {
-  color: inherit;
-  padding-left: 6px;
-}
-
-.hotplug-resident-mount-icon {
-  icon-size: 24px;
-  padding-left: 6px;
-}
-
-.hotplug-resident-eject-icon {
-  icon-size: 16px;
-}
-
-.hotplug-resident-eject-button {
-  padding: 7px;
-  border-radius: $bt_radius;
-  color: $fg_color;
-}
diff --git a/src/sass/gnome-shell/widgets/_overview.scss b/src/sass/gnome-shell/widgets/_overview.scss
deleted file mode 100644
index a9bb656..0000000
--- a/src/sass/gnome-shell/widgets/_overview.scss
+++ /dev/null
@@ -1,172 +0,0 @@
-#overview {
-  spacing: 24px;
-  StScrollBar { @extend %overview_scrollbar; }
-}
-
-.overview-controls {
-  padding-bottom: 32px;
-}
-
-.window-picker { //container around window thumbnails
-  -horizontal-spacing: 16px;
-  -vertical-spacing: 16px;
-  padding: 0 16px 32px;
-  spacing: 12px;
-
-  &.external-monitor { padding: 16px; }
-}
-
-.window-clone-border {
-  border: 4px solid $light_track_color;
-  border-radius: $bt_radius;
-  // For window decorations with round corners we can't match
-  // the exact shape when the window is scaled. So apply a shadow
-  // to fix that case
-  box-shadow: inset 0 0 0 1px $light_track_color;
-}
-
-.window-caption {
-  spacing: 25px;
-  color: $light_alt_fg_color;
-  background-color: $dark_bg_color;
-  border-radius: $bt_radius;
-  padding: 4px 8px;
-  border: none;
-  font-weight: normal;
-  @include font(body);
-}
-
-//search entry
-%search-entry, .search-entry {
-  width: 320px - 8px * 2;
-  padding: 0 8px;
-  border: none;
-  color: $light_hint_fg_color;
-  caret-color: $light_alt_fg_color;
-  selection-background-color: $light_track_color;
-  selected-color: $light_alt_fg_color;
-  @include search_entry(normal, $fc:$light_track_color);
-
-  &:focus {
-    @include search_entry(focus, $fc:$light_alt_fg_color);
-    padding: 0 8px;
-    border: none;
-    color: $light_alt_fg_color;
-  }
-
-  .search-entry-icon {
-    icon-size: 16px;
-    padding: 0 0;
-    color: $light_hint_fg_color;
-  }
-
-  &:hover, &:focus {
-    .search-entry-icon { color: $light_alt_fg_color; }
-  }
-
-  &:insensitive {
-    border: none;
-    color: $light_disabled_fg_color;
-  }
-
-  StLabel.hint-text {
-    color: $light_hint_fg_color;
-  }
-}
-
-//search results
-
-// #searchResultsBin {
-//   max-width: 1000px;
-// }
-
-#searchResultsContent {
-  max-width: 1000px;
-  padding-left: 20px;
-  padding-right: 20px;
-  spacing: 16px;
-}
-
-.search-section {  // This should be equal to #searchResultsContent spacing
-  spacing: 16px;
-
-  .search-section-separator {
-    height: 1px;
-    background-color: $light_divider_color;
-  }
-}
-
-.search-section-content {  // This is the space between the provider icon and the results container
-  spacing: 32px;
-  border-radius: 0;
-  border: none;
-  box-shadow: none;
-  background: none;
-  text-shadow: none;
-  color: $light_alt_fg_color;
-}
-
-.search-statustext { // "no results"
-  @extend %status_text;
-}
-
-// search result provider
-.search-provider-icon {
-  @extend %app-well-app;
-
-  // content
-  .list-search-provider-content {
-    spacing: 12px;
-
-    // provider labels
-    .list-search-provider-details {
-      width: 120px;
-      margin-top: 0;
-      color: $light_hint_fg_color;
-      // font-weight: bold;
-    }
-  }
-}
-
-.list-search-results { spacing: 3px; }
-
-.list-search-result-content { spacing: 30px; }
-.list-search-result-title { @include font(subheading); color: $light_alt_fg_color; spacing: 12px; }
-.list-search-result-description { color: $light_alt_fg_color; }
-.list-search-provider-details { width: 150px; color: $light_alt_fg_color; margin-top: 0.24em; }
-.list-search-provider-content { spacing: 20px; }
-.search-provider-icon { padding: 15px; }
-
-
-// Window Cycler
-.cycler-highlight { border: 4px solid $primary_color; }
-
-// Workspace Switcher
-.workspace-switcher-group { padding: 8px; }
-
-.workspace-switcher-container {
-  @extend %osd-panel;
-}
-
-.workspace-switcher {
-  background: transparent;
-  border: 0px;
-  border-radius: 0px;
-  padding: 0px;
-  spacing: 8px;
-}
-
-.ws-switcher-active-up, .ws-switcher-active-down {
-  height: 48px;
-  background-color: $primary_color;
-  color: $light_alt_fg_color;
-  background-size: 32px;
-  border-radius: $bt_radius;
-}
-
-.ws-switcher-box {
-  height: 48px;
-  border: none;
-  background: $divider_color;
-  border-radius: $bt_radius;
-}
diff --git a/src/sass/gnome-shell/widgets/_screen-shield.scss b/src/sass/gnome-shell/widgets/_screen-shield.scss
deleted file mode 100644
index 2535f3b..0000000
--- a/src/sass/gnome-shell/widgets/_screen-shield.scss
+++ /dev/null
@@ -1,132 +0,0 @@
-.screen-shield-arrows {
-  padding-bottom: 3em;
-}
-
-.screen-shield-arrows Gjs_Arrow {
-  color: white;
-  width: 80px;
-  height: 48px;
-  -arrow-thickness: 12px;
-  -arrow-shadow: $shadow_1;
-}
-
-.screen-shield-clock {
-  color: white;
-  text-shadow: $shadow_1;
-  font-weight: normal;
-  text-align: center;
-  padding-bottom: 1.5em;
-}
-
-.screen-shield-clock-time {
-  @include font(display-4);
-  text-shadow: $shadow_1;
-}
-
-.screen-shield-clock-date { @include font(display-2); }
-
-.screen-shield-notifications-container {
-  spacing: 6px;
-  width: 30em;
-  background-color: transparent;
-  max-height: 500px;
-  .summary-notification-stack-scrollview {
-    padding-top: 0;
-    padding-bottom: 0;
-  }
-
-  .notification,
-  .screen-shield-notification-source {
-    padding: 8px;
-    border: none;
-    background-color: $alt_dark_bg_color;
-    color: $light_alt_fg_color;
-    border-radius: $bt_radius;
-  }
-  .notification { margin-right: 16px; } //compensate for space allocated to the scrollbar
-}
-
-
-.screen-shield-notification-label {
-  min-height: $small_size - 2px;
-  padding: 2px 0px 0px 16px;
-  font-weight: bold;
-}
-
-.screen-shield-notification-count-text {
-  min-height: $small_size - 2px;
-  padding: 2px 0px 0px 16px;
-  color: $light_alt_fg_color;
-}
-
-#panel.lock-screen { background-color: $alt_dark_bg_color; }
-
-.screen-shield-background { //just the shadow, really
-  background: black;
-  box-shadow: 0 2px 3px 0 rgba(black, 0.15);
-}
-
-#screenShieldNotifications {
-  StScrollBar { @extend %overview_scrollbar; }
-}
-
-// unlock-dialog
-.unlock-dialog-clock {
-  color: white;
-  font-weight: 300;
-  text-align: center;
-  spacing: 24px;
-  padding-bottom: 2.5em;
-}
-
-.unlock-dialog-clock-time {
-  font-size: 64pt;
-  padding-top: 42px;
-  font-feature-settings: "tnum";
-}
-
-.unlock-dialog-clock-date {
-  font-size: 16pt;
-  font-weight: normal;
-}
-
-.unlock-dialog-clock-hint {
-  font-weight: normal;
-  padding-top: 48px;
-}
-
-.unlock-dialog-notifications-container {
-  margin: 12px 0;
-  spacing: 6px;
-  width: 23em;
-  background-color: transparent;
-
-  .summary-notification-stack-scrollview {
-    padding-top: 0;
-    padding-bottom: 0;
-  }
-
-  .notification,
-  .unlock-dialog-notification-source {
-    padding: 12px 6px;
-    border: none;
-    background-color: $dark_bg_color;
-    color: $light_fg_color;
-    border-radius: $bt_radius;
-
-    &.critical { background-color: $alt_dark_bg_color; }
-  }
-}
-
-.unlock-dialog-notification-label {
-  padding: 0px 0px 0px 12px;
-}
-
-.unlock-dialog-notification-count-text {
-  weight: bold;
-  padding: 0 6px;
-  color: white;
-  background-color: $primary_color;
-  border-radius: 99px;
-  margin-right: 12px;
-}