update

README.md

@@ -29,9 +29,12 @@ Run the following commands in the terminal:
 ```
 -d, --dest DIR          Specify destination directory (Default: /usr/share/themes)
 -n, --name NAME         Specify theme name (Default: Orchis)
--t, --theme VARIANT...  Specify theme color variant(s) [default|purple|pink|red|orange|yellow|green|grey|all] (Default: blue)
+-t, --theme VARIANT...  Specify theme color variant(s) [default|purple|pink|red|orange|yellow|green|grey] (Default: blue)
 -c, --color VARIANT...  Specify color variant(s) [standard|light|dark] (Default: All variants)
---tweaks                Specify versions for tweaks [solid|compact|black] (solid: no transparency variant, compact: no floating panel, black: pure black version)
+--tweaks                Specify versions for tweaks [solid|compact|black] (Options can mix use)
+                        1. solid:    no transparency panel variant
+                        2. compact:  no floating panel variant
+                        3. black:    full black variant
 --radio-color           Change radio button checked color to default primary color (Default is Green)
 -h, --help              Show help
 ```

install.sh

@@ -39,14 +39,14 @@ Usage: $0 [OPTION]...
 OPTIONS:
   -d, --dest DIR          Specify destination directory (Default: $DEST_DIR)
   -n, --name NAME         Specify theme name (Default: $THEME_NAME)
-  -t, --theme VARIANT     Specify theme color variant(s) [default|purple|pink|red|orange|yellow|green|grey|all] (Default: blue)
+  -t, --theme VARIANT     Specify theme color variant(s) [default|purple|pink|red|orange|yellow|green|grey] (Default: blue)
   -c, --color VARIANT...  Specify color variant(s) [standard|light|dark] (Default: All variants)s)
   -s, --size VARIANT      Specify size variant [standard|compact] (Default: All variants)
-  --tweaks                Specify versions for tweaks [solid|compact|black] (Options can mix use)
-                          1. solid:    no transparency variant
+  --tweaks                Specify versions for tweaks [solid|compact|black|primary] (Options can mix)
+                          1. solid:    no transparency panel variant
                           2. compact:  no floating panel variant
                           3. black:    full black variant
-  --radio-color           Change radio button checked color to default primary color (Default is Green)
+                          4. primary:  Change radio icon checked color to primary theme color (Default is Green)
   -h, --help              Show help
 
 INSTALLATION EXAMPLES:
@@ -94,25 +94,31 @@ install() {
   mkdir -p                                                                      "$THEME_DIR/gnome-shell"
   cp -r "$SRC_DIR/gnome-shell/pad-osd.css"                                      "$THEME_DIR/gnome-shell"
 
-  if [[ "$panel" == 'compact' || "$opacity" == 'solid' || "$blackness" == 'true' ]]; then
+  if [[ "$panel" == 'compact' || "$opacity" == 'solid' || "$blackness" == 'true' || "$theme" != 'default' ]]; then
     if [[ "${GS_VERSION:-}" == 'new' ]]; then
-      sassc $SASSC_OPT "$SRC_DIR/gnome-shell/shell-40-0/gnome-shell$theme${ELSE_DARK:-}$size.scss" "$THEME_DIR/gnome-shell/gnome-shell.css"
+      sassc $SASSC_OPT "$SRC_DIR/gnome-shell/shell-40-0/gnome-shell${ELSE_DARK:-}$size.scss" "$THEME_DIR/gnome-shell/gnome-shell.css"
     else
-      sassc $SASSC_OPT "$SRC_DIR/gnome-shell/shell-3-28/gnome-shell$theme${ELSE_DARK:-}$size.scss" "$THEME_DIR/gnome-shell/gnome-shell.css"
+      sassc $SASSC_OPT "$SRC_DIR/gnome-shell/shell-3-28/gnome-shell${ELSE_DARK:-}$size.scss" "$THEME_DIR/gnome-shell/gnome-shell.css"
     fi
   else
     if [[ "${GS_VERSION:-}" == 'new' ]]; then
-      cp -r "$SRC_DIR/gnome-shell/shell-40-0/gnome-shell$theme${ELSE_DARK:-}$size.css"    "$THEME_DIR/gnome-shell/gnome-shell.css"
+      cp -r "$SRC_DIR/gnome-shell/shell-40-0/gnome-shell${ELSE_DARK:-}$size.css"    "$THEME_DIR/gnome-shell/gnome-shell.css"
     else
-      cp -r "$SRC_DIR/gnome-shell/shell-3-28/gnome-shell$theme${ELSE_DARK:-}$size.css"    "$THEME_DIR/gnome-shell/gnome-shell.css"
+      cp -r "$SRC_DIR/gnome-shell/shell-3-28/gnome-shell${ELSE_DARK:-}$size.css"    "$THEME_DIR/gnome-shell/gnome-shell.css"
     fi
   fi
 
   cp -r "$SRC_DIR/gnome-shell/common-assets"                                    "$THEME_DIR/gnome-shell/assets"
   cp -r "$SRC_DIR/gnome-shell/assets${ELSE_DARK:-}/"*.svg                       "$THEME_DIR/gnome-shell/assets"
-  cp -r "$SRC_DIR/gnome-shell/theme$theme/checkbox${ELSE_DARK:-}.svg"           "$THEME_DIR/gnome-shell/assets/checkbox.svg"
-  cp -r "$SRC_DIR/gnome-shell/theme$theme/more-results${ELSE_DARK:-}.svg"       "$THEME_DIR/gnome-shell/assets/more-results.svg"
-  cp -r "$SRC_DIR/gnome-shell/theme$theme/toggle-on${ELSE_DARK:-}.svg"          "$THEME_DIR/gnome-shell/assets/toggle-on.svg"
+
+  if [[ "$primary" == 'true' ]]; then
+    cp -r "$SRC_DIR/gnome-shell/theme$theme/checkbox${ELSE_DARK:-}.svg"         "$THEME_DIR/gnome-shell/assets/checkbox.svg"
+  fi
+
+  if [[ "$theme" != '' ]]; then
+    cp -r "$SRC_DIR/gnome-shell/theme$theme/more-results${ELSE_DARK:-}.svg"     "$THEME_DIR/gnome-shell/assets/more-results.svg"
+    cp -r "$SRC_DIR/gnome-shell/theme$theme/toggle-on${ELSE_DARK:-}.svg"        "$THEME_DIR/gnome-shell/assets/toggle-on.svg"
+  fi
 
   cd "$THEME_DIR/gnome-shell"
   ln -s assets/no-events.svg no-events.svg
@@ -129,28 +135,28 @@ install() {
   cp -r "$SRC_DIR/gtk/scalable"                                                 "$THEME_DIR/gtk-3.0/assets"
   cp -r "$SRC_DIR/gtk/thumbnail${ELSE_DARK:-}.png"                              "$THEME_DIR/gtk-3.0/thumbnail.png"
 
-  if [[ "$opacity" == 'solid' || "$blackness" == 'true' ]]; then
-    sassc $SASSC_OPT "$SRC_DIR/gtk/3.0/gtk$theme$color$size.scss"               "$THEME_DIR/gtk-3.0/gtk.css"
+  if [[ "$opacity" == 'solid' || "$blackness" == 'true' || "$accent" == 'true' || "$primary" == 'true' ]]; then
+    sassc $SASSC_OPT "$SRC_DIR/gtk/3.0/gtk$color$size.scss"                     "$THEME_DIR/gtk-3.0/gtk.css"
     [[ "$color" != '-dark' ]] && \
-    sassc $SASSC_OPT "$SRC_DIR/gtk/3.0/gtk$theme-dark$size.scss"                "$THEME_DIR/gtk-3.0/gtk-dark.css"
+    sassc $SASSC_OPT "$SRC_DIR/gtk/3.0/gtk-dark$size.scss"                      "$THEME_DIR/gtk-3.0/gtk-dark.css"
   else
-    cp -r "$SRC_DIR/gtk/3.0/gtk$theme$color$size.css"                           "$THEME_DIR/gtk-3.0/gtk.css"
+    cp -r "$SRC_DIR/gtk/3.0/gtk$color$size.css"                                 "$THEME_DIR/gtk-3.0/gtk.css"
     [[ "$color" != '-dark' ]] && \
-    cp -r "$SRC_DIR/gtk/3.0/gtk$theme-dark$size.css"                            "$THEME_DIR/gtk-3.0/gtk-dark.css"
+    cp -r "$SRC_DIR/gtk/3.0/gtk-dark$size.css"                                  "$THEME_DIR/gtk-3.0/gtk-dark.css"
   fi
 
   mkdir -p                                                                      "$THEME_DIR/gtk-4.0"
   cp -r "$SRC_DIR/gtk/assets$theme"                                             "$THEME_DIR/gtk-4.0/assets"
   cp -r "$SRC_DIR/gtk/scalable"                                                 "$THEME_DIR/gtk-4.0/assets"
 
-  if [[ "$opacity" == 'solid' ]]; then
-    sassc $SASSC_OPT "$SRC_DIR/gtk/4.0/gtk$theme$color$size.scss"               "$THEME_DIR/gtk-4.0/gtk.css"
+  if [[ "$opacity" == 'solid' || "$blackness" == 'true' || "$accent" == 'true' || "$primary" == 'true' ]]; then
+    sassc $SASSC_OPT "$SRC_DIR/gtk/4.0/gtk$color$size.scss"                     "$THEME_DIR/gtk-4.0/gtk.css"
     [[ "$color" != '-dark' ]] && \
-    sassc $SASSC_OPT "$SRC_DIR/gtk/4.0/gtk$theme-dark$size.scss"                "$THEME_DIR/gtk-4.0/gtk-dark.css"
+    sassc $SASSC_OPT "$SRC_DIR/gtk/4.0/gtk-dark$size.scss"                      "$THEME_DIR/gtk-4.0/gtk-dark.css"
   else
-    cp -r "$SRC_DIR/gtk/4.0/gtk$theme$color$size.css"                           "$THEME_DIR/gtk-4.0/gtk.css"
+    cp -r "$SRC_DIR/gtk/4.0/gtk$color$size.css"                                 "$THEME_DIR/gtk-4.0/gtk.css"
     [[ "$color" != '-dark' ]] && \
-    cp -r "$SRC_DIR/gtk/4.0/gtk$theme-dark$size.css"                            "$THEME_DIR/gtk-4.0/gtk-dark.css"
+    cp -r "$SRC_DIR/gtk/4.0/gtk-dark$size.css"                                  "$THEME_DIR/gtk-4.0/gtk-dark.css"
   fi
 
   mkdir -p                                                                      "$THEME_DIR/xfwm4"
@@ -161,7 +167,7 @@ install() {
   cp -r "$SRC_DIR/cinnamon/common-assets"                                       "$THEME_DIR/cinnamon/assets"
   cp -r "$SRC_DIR/cinnamon/assets${ELSE_DARK:-}/"*.svg                          "$THEME_DIR/cinnamon/assets"
 
-  if [[ "$opacity" == 'solid' || "$blackness" == 'true' ]]; then
+  if [[ "$opacity" == 'solid' || "$blackness" == 'true' || "$accent" == 'true' ]]; then
     sassc $SASSC_OPT "$SRC_DIR/cinnamon/cinnamon${ELSE_DARK:-}.scss"            "$THEME_DIR/cinnamon/cinnamon.css"
   else
     cp -r "$SRC_DIR/cinnamon/cinnamon${ELSE_DARK:-}.css"                        "$THEME_DIR/cinnamon/cinnamon.css"
@@ -211,21 +217,21 @@ while [[ "$#" -gt 0 ]]; do
             blackness="true"
             shift
             ;;
+          primary)
+            primary="true"
+            shift
+            ;;
           -*)
             break
             ;;
           *)
-            echo "ERROR: Unrecognized panel variant '$1'."
+            echo "ERROR: Unrecognized tweaks variant '$1'."
             echo "Try '$0 --help' for more information."
             exit 1
             ;;
         esac
       done
       ;;
-    --radio-color)
-      radio="true"
-      shift
-      ;;
     -t|--theme)
       accent='true'
       shift
@@ -233,45 +239,49 @@ while [[ "$#" -gt 0 ]]; do
         case "$variant" in
           default)
             themes+=("${THEME_VARIANTS[0]}")
+            theme_color='default'
             shift
             ;;
           purple)
             themes+=("${THEME_VARIANTS[1]}")
+            theme_color='purple'
             shift
             ;;
           pink)
             themes+=("${THEME_VARIANTS[2]}")
+            theme_color='pink'
             shift
             ;;
           red)
             themes+=("${THEME_VARIANTS[3]}")
+            theme_color='red'
             shift
             ;;
           orange)
             themes+=("${THEME_VARIANTS[4]}")
+            theme_color='orange'
             shift
             ;;
           yellow)
             themes+=("${THEME_VARIANTS[5]}")
+            theme_color='yellow'
             shift
             ;;
           green)
             themes+=("${THEME_VARIANTS[6]}")
+            theme_color='green'
             shift
             ;;
           grey)
             themes+=("${THEME_VARIANTS[7]}")
-            shift
-            ;;
-          all)
-            themes+=("${THEME_VARIANTS[@]}")
+            theme_color='grey'
             shift
             ;;
           -*)
             break
             ;;
           *)
-            echo "ERROR: Unrecognized color variant '$1'."
+            echo "ERROR: Unrecognized theme variant '$1'."
             echo "Try '$0 --help' for more information."
             exit 1
             ;;
@@ -340,19 +350,6 @@ while [[ "$#" -gt 0 ]]; do
   esac
 done
 
-parse_sass() {
-  cd ${REPO_DIR} && ./parse-sass.sh
-}
-
-change_radio_color() {
-  if [[ "${radio:-}" == 'true' ]]; then
-    cd $SRC_DIR/_sass/gtk
-    sed -i.bak "/\$check_radio_primary/s/success/primary/" _common-3.20.scss
-    echo "Change radio color ..."
-    parse_sass
-  fi
-}
-
 #  Install needed packages
 install_package() {
   if [ ! "$(which sassc 2> /dev/null)" ]; then
@@ -371,6 +368,23 @@ install_package() {
   fi
 }
 
+change_radio_color() {
+  cd ${SRC_DIR}/_sass
+  cp -an _tweaks.scss _tweaks.scss.bak
+  sed -i "/\$check_radio:/s/default/primary/" _tweaks.scss
+  echo "Change radio color ..."
+}
+
+install_theme_color() {
+  cd ${SRC_DIR}/gnome-shell/sass
+  cp -an _tweaks.scss _tweaks.scss.bak
+  sed -i "/\$theme:/s/default/${theme_color}/" _tweaks.scss
+  cd ${SRC_DIR}/_sass
+  cp -an _tweaks.scss _tweaks.scss.bak
+  sed -i "/\$theme:/s/default/${theme_color}/" _tweaks.scss
+  echo -e "Install ${theme_color} color version ..."
+}
+
 install_compact_panel() {
   cd ${SRC_DIR}/gnome-shell/sass
   cp -an _tweaks.scss _tweaks.scss.bak
@@ -411,16 +425,6 @@ restore_tweaks() {
   fi
 }
 
-restore_files() {
-  if [[ -f $SRC_DIR/_sass/gtk/_common-3.20.scss.bak ]]; then
-    cd $SRC_DIR/_sass/gtk
-    rm -rf _common-3.20.scss
-    mv -f _common-3.20.scss.bak _common-3.20.scss
-    echo "Restore _common-3.20.scss file ..."
-    parse_sass
-  fi
-}
-
 install_theme() {
   for theme in "${themes[@]}"; do
     for color in "${colors[@]}"; do
@@ -443,19 +447,27 @@ if [[ "${#sizes[@]}" -eq 0 ]] ; then
   sizes=("${SIZE_VARIANTS[@]}")
 fi
 
-if [[ "$panel" = "compact" ]] ; then
+if [[ "$accent" == 'true' ]] ; then
+  install_package && install_theme_color
+fi
+
+if [[ "$panel" == "compact" ]] ; then
   install_package && install_compact_panel
 fi
 
-if [[ "$opacity" = "solid" ]] ; then
+if [[ "$opacity" == "solid" ]] ; then
   install_package && install_solid
 fi
 
-if [[ "$blackness" = "true" ]] ; then
+if [[ "$blackness" == "true" ]] ; then
   install_package && install_black
 fi
 
-change_radio_color && install_theme && restore_files && restore_tweaks
+if [[ "$primary" == "true" ]] ; then
+  install_package && change_radio_color
+fi
+
+install_theme && restore_tweaks
 
 echo
 echo "Done."

parse-sass.sh

@@ -10,11 +10,6 @@ SASSC_OPT=('-M' '-t' 'expanded')
 _COLOR_VARIANTS=('' '-light' '-dark')
 _GCOLOR_VARIANTS=('' '-dark')
 _SIZE_VARIANTS=('' '-compact')
-_THEME_VARIANTS=('' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-grey')
-
-if [[ -n "${THEME_VARIANTS:-}" ]]; then
-  IFS=', ' read -r -a _THEME_VARIANTS <<< "${THEME_VARIANTS:-}"
-fi
 
 if [[ -n "${COLOR_VARIANTS:-}" ]]; then
   IFS=', ' read -r -a _COLOR_VARIANTS <<< "${COLOR_VARIANTS:-}"
@@ -30,22 +25,18 @@ fi
 
 echo "== Generating the CSS..."
 
-for theme in "${_THEME_VARIANTS[@]}"; do
 for color in "${_COLOR_VARIANTS[@]}"; do
   for size in "${_SIZE_VARIANTS[@]}"; do
-    sassc "${SASSC_OPT[@]}" "src/gtk/3.0/gtk$theme$color$size."{scss,css}
-    sassc "${SASSC_OPT[@]}" "src/gtk/4.0/gtk$theme$color$size."{scss,css}
+    sassc "${SASSC_OPT[@]}" "src/gtk/3.0/gtk$color$size."{scss,css}
+    sassc "${SASSC_OPT[@]}" "src/gtk/4.0/gtk$color$size."{scss,css}
   done
 done
-done
 
-for theme in "${_THEME_VARIANTS[@]}"; do
 for color in "${_GCOLOR_VARIANTS[@]}"; do
   for size in "${_SIZE_VARIANTS[@]}"; do
-    sassc "${SASSC_OPT[@]}" "src/gnome-shell/shell-3-28/gnome-shell$theme$color$size."{scss,css}
-    sassc "${SASSC_OPT[@]}" "src/gnome-shell/shell-40-0/gnome-shell$theme$color$size."{scss,css}
+    sassc "${SASSC_OPT[@]}" "src/gnome-shell/shell-3-28/gnome-shell$color$size."{scss,css}
+    sassc "${SASSC_OPT[@]}" "src/gnome-shell/shell-40-0/gnome-shell$color$size."{scss,css}
   done
 done
-done
 
 echo "== done!"

release/make-release.sh

@@ -7,6 +7,7 @@ THEME_NAME=Orchis
 _COLOR_VARIANTS=('' '-light' '-dark')
 _COMPA_VARIANTS=('' '-compact')
 _THEME_VARIANTS=('' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-grey')
+_THEME_COLOR=('default' 'purple' 'pink' 'red' 'orange' 'yellow' 'green' 'grey')
 
 if [ ! -z "${COMPA_VARIANTS:-}" ]; then
   IFS=', ' read -r -a _COMPA_VARIANTS <<< "${COMPA_VARIANTS:-}"
@@ -40,7 +41,11 @@ for theme in "${_THEME_VARIANTS[@]}"; do
 done
 }
 
-cd .. && ./install.sh -d $THEME_DIR -t all
+cd ..
+
+for theme_color in "${_THEME_COLOR[@]}"; do
+  ./install.sh -d $THEME_DIR -t $theme_color
+done
 
 cd $THEME_DIR && Tar_themes && Clear_theme
 

src/_sass/_colors.scss

@@ -125,6 +125,8 @@ $success:                               if($variant == 'light', #0F9D58, #81C995
 $suggested:                             $primary;
 $destructive:                           $error;
 
+$check_radio_primary:                   if($check_radio == 'default', $success, $primary);
+
 $frame:                                 if($variant == 'light', rgba(black, 0.08), rgba(black, 0.16)); // instead of shadows
 $solid-border:                          if($variant == 'light', darken($background, 8%), lighten($background, 12%));
 $border-alt:                            rgba(black, 0.16); // darker border color for Chrome and Firefox

src/_sass/_tweaks.scss

@@ -6,3 +6,9 @@ $opacity: 'default';
 
 // blackness
 $blackness: 'false';
+
+// Theme primary color
+$theme: 'default';
+
+// Check and radio primary color
+$check_radio: 'default';

src/_sass/gtk/_apps-4.0.scss

@@ -1,6 +1 @@
-@import 'apps/gnome-40.0';
-@import 'apps/misc';
-//@import 'apps/mate';
-//@import 'apps/budgie';
-//@import 'apps/xfce';
-//@import 'apps/nemo';
+@import 'apps/gnome-4.0';

src/_sass/gtk/_common-3.20.scss

@@ -2231,7 +2231,6 @@ radiobutton.text-button {
 }
 
 $check_radio_size: 40px;
-$check_radio_primary: $success;
 
 check,
 radio {

src/_sass/gtk/_common-4.0.scss

@@ -2249,7 +2249,6 @@ radiobutton.text-button {
 }
 
 $check_radio_size: 40px;
-$check_radio_primary: $success;
 $check_radio_icon_size: ($container-padding + 6px) * 2;
 
 check,

src/_sass/gtk/apps/_gnome-4.0.scss

@@ -0,0 +1,67 @@
+
+ %circular_list {
+   border-radius: $corner-radius + 1px;
+   box-shadow: none;
+   border: 1px solid $divider;
+ }
+
+ %circular_row {
+   &:first-child {
+     border-top-left-radius: $corner-radius;
+     border-top-right-radius: $corner-radius;
+   }
+
+   &:last-child { // Not use ?
+     border-bottom-left-radius: $corner-radius;
+     border-bottom-right-radius: $corner-radius;
+   }
+
+   &:only-child {
+     border-radius: $corner-radius;
+   }
+
+   &:focus {
+     box-shadow: inset 0 0 0 2px $overlay-focus;
+   }
+ }
+
+/**************
+ * Extensions *
+ **************/
+window.background.csd {
+  > stack, // GameMode setting
+  > stack > scrolledwindow > viewport > box, // User Themes (Workspace) setting
+  > box > stack > scrolledwindow > viewport > box {
+    > list {
+      @extend %circular_list;
+
+      row.activatable { @extend %circular_row; }
+    }
+  }
+
+  stack stack stack frame, // ArcMenu setting
+  > stack > stack > box > frame, // Night Theme Switcher setting
+  > stack > stack > box > box > frame, // Night Theme Switcher setting bottom lists
+  > stack > box > stack > box > frame, // ArcMenu setting
+  > stack > box > stack > scrolledwindow > viewport frame, // ArcMenu setting
+  > stack > box > stack > box > scrolledwindow > viewport > frame, // ArcMenu setting
+  > stack > grid > scrolledwindow > viewport > box > frame { // GSConnect setting
+    > border { border: none; }
+
+    > list {
+      @extend %circular_list;
+
+      row.activatable { @extend %circular_row; }
+    }
+  }
+
+  > stack > box > box > list,
+  > stack > box > stack > scrolledwindow > viewport > list { // ArcMenu setting sidebar
+    border-bottom-left-radius: $window-radius;
+  }
+
+  > stack > box > .sidebar > scrolledwindow > viewport > list {
+    padding: 0 0;
+  }
+}
+

src/gnome-shell/assets-dark/checkbox-off.svg

@@ -1,3 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#FFFFFF" opacity="0.7">
-  <path d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" fill="#FFFFFF" opacity=".7" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm0 2a8 8 0 0 1 8 8 8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8z" fill="#fff" opacity=".7" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.6667"/>
 </svg>

src/gnome-shell/assets-dark/checkbox.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm5.5898 4.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#81c995"/>
+</svg>

src/gnome-shell/assets-dark/close.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#FFFFFF" opacity="0.7">
-  <path d="M 17,8.41 15.59,7 12,10.59 8.41,7 7,8.41 10.59,12 7,15.59 8.41,17 12,13.41 15.59,17 17,15.59 13.41,12 Z"/>
-</svg>

src/gnome-shell/assets/checkbox-off.svg

@@ -1,3 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#000000" opacity="0.54">
-  <path d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" fill="#FFFFFF" opacity=".7" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm0 2a8 8 0 0 1 8 8 8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8z" fill="#000" opacity=".7" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.6667"/>
 </svg>

src/gnome-shell/assets/checkbox.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm5.5898 4.5801 1.4102 1.4199-9 9-5-5 1.4102-1.4102 3.5898 3.5801z" fill="#0f9d58"/>
+</svg>

src/gnome-shell/assets/close.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#000000" opacity="0.54">
-  <path d="M 17,8.41 15.59,7 12,10.59 8.41,7 7,8.41 10.59,12 7,15.59 8.41,17 12,13.41 15.59,17 17,15.59 13.41,12 Z"/>
-</svg>

src/gnome-shell/sass/_colors.scss

@@ -78,9 +78,9 @@ $alt_primary_color:     darken($primary_color, 3%);
 $accent_color:          lighten($primary_color, 3%);
 
 $panel_bg:              if($blackness == 'true', #000000, #202020);
-$panel_bg_color:        if($trans == 'true', rgba(black, 0.5), $panel_bg);
+$panel_bg_color:        if($opacity == 'default', rgba(black, 0.5), $panel_bg);
 $panel_fg_color:        if($panel == 'dark', #dedede, #dedede);
-$menu_bg_color:         if($trans == 'true', rgba($base_color, 0.95), $base_color);
+$menu_bg_color:         if($opacity == 'default', rgba($base_color, 0.95), $base_color);
 $system_bg_color:       if($blackness == 'true' and $variant == 'dark', #121212, #222222);
 
 $link_color:            $primary_color;

src/gnome-shell/sass/_tweaks.scss

@@ -6,3 +6,6 @@ $opacity: 'default';
 
 // blackness
 $blackness: 'false';
+
+// Theme primary color
+$theme: 'default';

src/gnome-shell/shell-3-28/gnome-shell-compact.scss

@@ -1,8 +1,6 @@
 $variant: 'light';
 $laptop: 'true';
-$panel: 'light';
-$trans: 'true';
-$theme: 'default';
+$panel: 'dark';
 
 @import '../sass/variables';
 @import '../sass/colors';

src/gnome-shell/shell-3-28/gnome-shell-dark-compact.scss

@@ -1,8 +1,6 @@
 $variant: 'dark';
 $laptop: 'true';
 $panel: 'dark';
-$trans: 'true';
-$theme: 'default';
 
 @import '../sass/variables';
 @import '../sass/colors';

src/gnome-shell/shell-3-28/gnome-shell-dark.scss

@@ -1,8 +1,6 @@
 $variant: 'dark';
 $laptop: 'false';
 $panel: 'dark';
-$trans: 'true';
-$theme: 'default';
 
 @import '../sass/variables';
 @import '../sass/colors';

src/gnome-shell/shell-3-28/gnome-shell-green-compact.scss

@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$panel: 'light';
-$trans: 'true';
-$theme: 'green';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-green-dark-compact.scss

@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$panel: 'dark';
-$trans: 'true';
-$theme: 'green';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-green-dark.scss

@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'false';
-$panel: 'dark';
-$trans: 'true';
-$theme: 'green';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-green.scss

@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'false';
-$panel: 'light';
-$trans: 'true';
-$theme: 'green';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-grey-compact.scss

@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$panel: 'light';
-$trans: 'true';
-$theme: 'grey';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-grey-dark-compact.scss

@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$panel: 'dark';
-$trans: 'true';
-$theme: 'grey';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-grey-dark.scss

@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'false';
-$panel: 'dark';
-$trans: 'true';
-$theme: 'grey';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-grey.scss

@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'false';
-$panel: 'light';
-$trans: 'true';
-$theme: 'grey';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-orange-compact.scss

@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$panel: 'light';
-$trans: 'true';
-$theme: 'orange';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-orange-dark-compact.scss

@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$panel: 'dark';
-$trans: 'true';
-$theme: 'orange';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-orange-dark.scss

@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'false';
-$panel: 'dark';
-$trans: 'true';
-$theme: 'orange';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-orange.scss

@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'false';
-$panel: 'light';
-$trans: 'true';
-$theme: 'orange';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-pink-compact.scss

@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$panel: 'light';
-$trans: 'true';
-$theme: 'pink';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-pink-dark-compact.scss

@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$panel: 'dark';
-$trans: 'true';
-$theme: 'pink';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-pink-dark.scss

@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'false';
-$panel: 'dark';
-$trans: 'true';
-$theme: 'pink';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-pink.scss

@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'false';
-$panel: 'light';
-$trans: 'true';
-$theme: 'pink';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-purple-compact.scss

@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$panel: 'light';
-$trans: 'true';
-$theme: 'purple';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-purple-dark-compact.scss

@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$panel: 'dark';
-$trans: 'true';
-$theme: 'purple';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-purple-dark.scss

@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'false';
-$panel: 'dark';
-$trans: 'true';
-$theme: 'purple';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-purple.scss

@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'false';
-$panel: 'light';
-$trans: 'true';
-$theme: 'purple';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-red-compact.scss

@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$panel: 'light';
-$trans: 'true';
-$theme: 'red';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-red-dark-compact.scss

@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$panel: 'dark';
-$trans: 'true';
-$theme: 'red';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-red-dark.scss

@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'false';
-$panel: 'dark';
-$trans: 'true';
-$theme: 'red';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-red.scss

@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'false';
-$panel: 'light';
-$trans: 'true';
-$theme: 'red';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-theme.gresource.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/shell/theme">
-    <file>assets/dash/bottom-running1.svg</file>
-    <file>assets/dash/bottom-running1-focused.svg</file>
-    <file>assets/dash/bottom-running2.svg</file>
-    <file>assets/dash/bottom-running2-focused.svg</file>
-    <file>assets/dash/bottom-running3.svg</file>
-    <file>assets/dash/bottom-running3-focused.svg</file>
-    <file>assets/dash/bottom-running4.svg</file>
-    <file>assets/dash/bottom-running4-focused.svg</file>
-    <file>assets/dash/left-running1.svg</file>
-    <file>assets/dash/left-running1-focused.svg</file>
-    <file>assets/dash/left-running2.svg</file>
-    <file>assets/dash/left-running2-focused.svg</file>
-    <file>assets/dash/left-running3.svg</file>
-    <file>assets/dash/left-running3-focused.svg</file>
-    <file>assets/dash/left-running4.svg</file>
-    <file>assets/dash/left-running4-focused.svg</file>
-    <file>assets/dash/right-running1.svg</file>
-    <file>assets/dash/right-running1-focused.svg</file>
-    <file>assets/dash/right-running2.svg</file>
-    <file>assets/dash/right-running2-focused.svg</file>
-    <file>assets/dash/right-running3.svg</file>
-    <file>assets/dash/right-running3-focused.svg</file>
-    <file>assets/dash/right-running4.svg</file>
-    <file>assets/dash/right-running4-focused.svg</file>
-    <file>assets/dash/top-running1.svg</file>
-    <file>assets/dash/top-running1-focused.svg</file>
-    <file>assets/dash/top-running2.svg</file>
-    <file>assets/dash/top-running2-focused.svg</file>
-    <file>assets/dash/top-running3.svg</file>
-    <file>assets/dash/top-running3-focused.svg</file>
-    <file>assets/dash/top-running4.svg</file>
-    <file>assets/dash/top-running4-focused.svg</file>
-    <file>assets/calendar-arrow-left.svg</file>
-    <file>assets/calendar-arrow-right.svg</file>
-    <file>assets/calendar-today.svg</file>
-    <file>assets/checkbox.svg</file>
-    <file>assets/checkbox-off.svg</file>
-    <file>assets/close.svg</file>
-    <file>assets/dash-placeholder.svg</file>
-    <file>assets/more-results.svg</file>
-    <file>assets/noise-texture.svg</file>
-    <file>assets/toggle-off.svg</file>
-    <file>assets/toggle-on.svg</file>
-    <file>assets/window-close.svg</file>
-    <file>assets/window-close-active.svg</file>
-    <file>assets/activities.svg</file>
-    <file>extensions/workspaces-to-dock/workspaces-to-dock.css</file>
-    <file>gnome-shell.css</file>
-    <file alias="icons/message-indicator-symbolic.svg">message-indicator-symbolic.svg</file>
-    <file>no-events.svg</file>
-    <file>no-notifications.svg</file>
-    <file>pad-osd.css</file>
-    <file>process-working.svg</file>
-  </gresource>
-</gresources>

src/gnome-shell/shell-3-28/gnome-shell-yellow-compact.scss

@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$panel: 'light';
-$trans: 'true';
-$theme: 'yellow';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-yellow-dark-compact.scss

@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$panel: 'dark';
-$trans: 'true';
-$theme: 'yellow';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-yellow-dark.scss

@@ -1,11 +0,0 @@
-$variant: 'dark';
-$laptop: 'false';
-$panel: 'dark';
-$trans: 'true';
-$theme: 'yellow';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell-yellow.scss

@@ -1,11 +0,0 @@
-$variant: 'light';
-$laptop: 'false';
-$panel: 'light';
-$trans: 'true';
-$theme: 'yellow';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-3-28';
-@import '../sass/extensions-3-28';

src/gnome-shell/shell-3-28/gnome-shell.scss

@@ -1,8 +1,6 @@
 $variant: 'light';
 $laptop: 'false';
-$panel: 'light';
-$trans: 'true';
-$theme: 'default';
+$panel: 'dark';
 
 @import '../sass/variables';
 @import '../sass/colors';

src/gnome-shell/shell-40-0/gnome-shell-compact.scss

@@ -1,8 +1,6 @@
 $variant: 'light';
 $laptop: 'true';
-$panel: 'light';
-$trans: 'true';
-$theme: 'default';
+$panel: 'dark';
 
 @import '../sass/variables';
 @import '../sass/colors';

src/gnome-shell/shell-40-0/gnome-shell-dark-compact.scss

@@ -1,8 +1,6 @@
 $variant: 'dark';
 $laptop: 'true';
 $panel: 'dark';
-$trans: 'true';
-$theme: 'default';
 
 @import '../sass/variables';
 @import '../sass/colors';

src/gnome-shell/shell-40-0/gnome-shell-dark.scss

@@ -1,8 +1,6 @@
 $variant: 'dark';
 $laptop: 'false';
 $panel: 'dark';
-$trans: 'true';
-$theme: 'default';
 
 @import '../sass/variables';
 @import '../sass/colors';

src/gnome-shell/shell-40-0/gnome-shell-green-compact.scss

@@ -1,12 +0,0 @@
-$variant: 'light';
-$laptop: 'true';
-$panel: 'light';
-$trans: 'true';
-$theme: 'green';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-40-0';
-@import '../sass/widgets';
-@import '../sass/extensions-40-0';

src/gnome-shell/shell-40-0/gnome-shell-green-dark-compact.scss

@@ -1,12 +0,0 @@
-$variant: 'dark';
-$laptop: 'true';
-$panel: 'dark';
-$trans: 'true';
-$theme: 'green';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-40-0';
-@import '../sass/widgets';
-@import '../sass/extensions-40-0';

src/gnome-shell/shell-40-0/gnome-shell-green-dark.scss

@@ -1,12 +0,0 @@
-$variant: 'dark';
-$laptop: 'false';
-$panel: 'dark';
-$trans: 'true';
-$theme: 'green';
-
-@import '../sass/variables';
-@import '../sass/colors';
-@import '../sass/drawing';
-@import '../sass/common-40-0';
-@import '../sass/widgets';
-@import '../sass/extensions-40-0';