Fixed #55

.gitignore

@@ -1 +1,12 @@
 *-temp.scss
+src/main/cinnamon/cinnamon-light.css
+src/main/cinnamon/cinnamon-dark.css
+src/main/gnome-shell/gnome-shell-dark.css
+src/main/gnome-shell/gnome-shell-light.css
+src/main/gnome-shell/gnome-shell.css
+src/main/gtk-3.0/gtk-dark.css
+src/main/gtk-3.0/gtk.css
+src/main/gtk-4.0/gtk-light.css
+src/main/gtk-4.0/gtk.css
+src/main/gtk-4.0/gtk-dark.css
+src/main/gtk-3.0/gtk-light.css

build.sh

@@ -22,22 +22,21 @@ fi
 
 SASSC_OPT="-M -t expanded"
 
-_COLOR_VARIANTS=('' '-light' '-dark')
+_COLOR_VARIANTS=('' '-Light' '-Dark')
 if [ ! -z "${COLOR_VARIANTS:-}" ]; then
   IFS=', ' read -r -a _COLOR_VARIANTS <<< "${COLOR_VARIANTS:-}"
 fi
 
 cp -rf src/sass/_tweaks.scss src/sass/_tweaks-temp.scss
+cp -rf src/sass/gnome-shell/_common.scss src/sass/gnome-shell/_common-temp.scss
 
 for color in "${_COLOR_VARIANTS[@]}"; do
   sassc $SASSC_OPT src/main/gtk-3.0/gtk${color}.{scss,css}
   echo "==> Generating the 3.0 gtk${color}.css..."
   sassc $SASSC_OPT src/main/gtk-4.0/gtk${color}.{scss,css}
   echo "==> Generating the 4.0 gtk${color}.css..."
-  sassc $SASSC_OPT src/main/gnome-shell/shell-3-28/gnome-shell${color}.{scss,css}
+  sassc $SASSC_OPT src/main/gnome-shell/gnome-shell${color}.{scss,css}
-  echo "==> Generating the 3.28 gnome-shell${color}.css..."
+  echo "==> Generating the gnome-shell${color}.css..."
-  sassc $SASSC_OPT src/main/gnome-shell/shell-40-0/gnome-shell${color}.{scss,css}
-  echo "==> Generating the 40.0 gnome-shell${color}.css..."
   sassc $SASSC_OPT src/main/cinnamon/cinnamon${color}.{scss,css}
   echo "==> Generating the cinnamon${color}.css..."
 done

clean-old-theme.sh

@@ -0,0 +1,55 @@
+#! /usr/bin/env bash
+
+ROOT_UID=0
+DEST_DIR=
+
+# Destination directory
+if [ "$UID" -eq "$ROOT_UID" ]; then
+  DEST_DIR="/usr/share/themes"
+else
+  DEST_DIR="$HOME/.themes"
+fi
+
+THEME_NAME=Colloid
+THEME_VARIANTS=('' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-teal' '-grey')
+COLOR_VARIANTS=('' '-light' '-dark')
+SIZE_VARIANTS=('' '-compact')
+TYPE_VARIANTS=('' '-nord' '-dracula')
+SCREEN_VARIANTS=('' '-hdpi' '-xhdpi')
+
+clean() {
+  local dest=${1}
+  local name=${2}
+  local theme=${3}
+  local color=${4}
+  local size=${5}
+  local type=${6}
+  local screen=${7}
+
+  local THEME_DIR=${dest}/${name}${theme}${color}${size}${type}${screen}
+
+  if [[ ${theme} == '' && ${color} == '' && ${size} == '' && ${type} == '' ]]; then
+    cleantheme='none'
+  elif [[ -d ${THEME_DIR} ]]; then
+    rm -rf ${THEME_DIR}
+    echo -e "Find: ${THEME_DIR} ! removing it ..."
+  fi
+}
+
+clean_theme() {
+  for theme in "${themes[@]-${THEME_VARIANTS[@]}}"; do
+    for color in "${colors[@]-${COLOR_VARIANTS[@]}}"; do
+      for size in "${sizes[@]-${SIZE_VARIANTS[@]}}"; do
+        for type in "${types[@]-${TYPE_VARIANTS[@]}}"; do
+          for screen in "${screens[@]-${SCREEN_VARIANTS[@]}}"; do
+            clean "${dest:-${DEST_DIR}}" "${name:-${THEME_NAME}}" "${theme}" "${color}" "${size}" "${type}" "${screen}"
+          done
+        done
+      done
+    done
+  done
+}
+
+clean_theme
+
+exit 0

gtkrc.sh

@@ -7,102 +7,102 @@ make_gtkrc() {
   local ctype="${6}"
   local window="${7}"
 
-  [[ "${color}" == '-light' ]] && local ELSE_LIGHT="${color}"
+  [[ "${color}" == '-Light' ]] && local ELSE_LIGHT="${color}"
-  [[ "${color}" == '-dark' ]] && local ELSE_DARK="${color}"
+  [[ "${color}" == '-Dark' ]] && local ELSE_DARK="${color}"
 
   local GTKRC_DIR="${SRC_DIR}/main/gtk-2.0"
   local THEME_DIR="${1}/${2}${3}${4}${5}${6}"
 
-  if [[ "${color}" != '-dark' ]]; then
+  if [[ "${color}" != '-Dark' ]]; then
     case "$theme" in
       '')
         theme_color='#3c84f7'
         ;;
-      -purple)
+      -Purple)
         theme_color='#AB47BC'
         ;;
-      -pink)
+      -Pink)
         theme_color='#EC407A'
         ;;
-      -red)
+      -Red)
         theme_color='#E53935'
         ;;
-      -orange)
+      -Orange)
         theme_color='#F57C00'
         ;;
-      -yellow)
+      -Yellow)
         theme_color='#FBC02D'
         ;;
-      -green)
+      -Green)
         theme_color='#4CAF50'
         ;;
-      -teal)
+      -Teal)
         theme_color='#009688'
         ;;
-      -grey)
+      -Grey)
         theme_color='#464646'
         ;;
     esac
 
-    if [[ "$ctype" == '-nord' ]]; then
+    if [[ "$ctype" == '-Nord' ]]; then
       case "$theme" in
         '')
           theme_color='#5e81ac'
           ;;
-        -purple)
+        -Purple)
           theme_color='#b57daa'
           ;;
-        -pink)
+        -Pink)
           theme_color='#cd7092'
           ;;
-        -red)
+        -Red)
           theme_color='#c35b65'
           ;;
-        -orange)
+        -Orange)
           theme_color='#d0846c'
           ;;
-        -yellow)
+        -Yellow)
           theme_color='#e4b558'
           ;;
-        -green)
+        -Green)
           theme_color='#82ac5d'
           ;;
-        -teal)
+        -Teal)
           theme_color='#83b9b8'
           ;;
-        -grey)
+        -Grey)
           theme_color='#3a4150'
           ;;
       esac
     fi
 
-    if [[ "$ctype" == '-dracula' ]]; then
+    if [[ "$ctype" == '-Dracula' ]]; then
       case "$theme" in
         '')
           theme_color='#a679ec'
           ;;
-        -purple)
+        -Purple)
           theme_color='#a679ec'
           ;;
-        -pink)
+        -Pink)
           theme_color='#f04cab'
           ;;
-        -red)
+        -Red)
           theme_color='#f44d4d'
           ;;
-        -orange)
+        -Orange)
           theme_color='#f8a854'
           ;;
-        -yellow)
+        -Yellow)
           theme_color='#e8f467'
           ;;
-        -green)
+        -Green)
           theme_color='#4be772'
           ;;
-        -teal)
+        -Teal)
           theme_color='#20eed9'
           ;;
-        -grey)
+        -Grey)
           theme_color='#3c3f51'
           ;;
       esac
@@ -112,91 +112,91 @@ make_gtkrc() {
       '')
         theme_color='#5b9bf8'
         ;;
-      -purple)
+      -Purple)
         theme_color='#BA68C8'
         ;;
-      -pink)
+      -Pink)
         theme_color='#F06292'
         ;;
-      -red)
+      -Red)
         theme_color='#F44336'
         ;;
-      -orange)
+      -Orange)
         theme_color='#FB8C00'
         ;;
-      -yellow)
+      -Yellow)
         theme_color='#FFD600'
         ;;
-      -green)
+      -Green)
         theme_color='#66BB6A'
         ;;
-      -teal)
+      -Teal)
         theme_color='#4DB6AC'
         ;;
-      -grey)
+      -Grey)
         theme_color='#DDDDDD'
         ;;
     esac
 
-    if [[ "$ctype" == '-nord' ]]; then
+    if [[ "$ctype" == '-Nord' ]]; then
       case "$theme" in
         '')
           theme_color='#89a3c2'
           ;;
-        -purple)
+        -Purple)
           theme_color='#c89dbf'
           ;;
-        -pink)
+        -Pink)
           theme_color='#dc98b1'
           ;;
-        -red)
+        -Red)
           theme_color='#d4878f'
           ;;
-        -orange)
+        -Orange)
           theme_color='#dca493'
           ;;
-        -yellow)
+        -Yellow)
           theme_color='#eac985'
           ;;
-        -green)
+        -Green)
           theme_color='#a0c082'
           ;;
-        -teal)
+        -Teal)
           theme_color='#83b9b8'
           ;;
-        -grey)
+        -Grey)
           theme_color='#d9dce3'
           ;;
       esac
     fi
 
-    if [[ "$ctype" == '-dracula' ]]; then
+    if [[ "$ctype" == '-Dracula' ]]; then
       case "$theme" in
         '')
           theme_color='#bd93f9'
           ;;
-        -purple)
+        -Purple)
           theme_color='#bd93f9'
           ;;
-        -pink)
+        -Pink)
           theme_color='#ff79c6'
           ;;
-        -red)
+        -Red)
           theme_color='#ff5555'
           ;;
-        -orange)
+        -Orange)
           theme_color='#ffb86c'
           ;;
-        -yellow)
+        -Yellow)
           theme_color='#f1fa8c'
           ;;
-        -green)
+        -Green)
           theme_color='#50fa7b'
           ;;
-        -teal)
+        -Teal)
           theme_color='#50fae9'
           ;;
-        -grey)
+        -Grey)
           theme_color='#d9dae3'
           ;;
       esac
@@ -213,7 +213,7 @@ make_gtkrc() {
         titlebar_light='#F2F2F2'
         titlebar_dark='#030303'
         ;;
-      -nord)
+      -Nord)
         background_light='#f8fafc'
         background_dark='#0d0e11'
         background_darker='#0f1115'
@@ -221,7 +221,7 @@ make_gtkrc() {
         titlebar_light='#f0f1f4'
         titlebar_dark='#020203'
         ;;
-      -dracula)
+      -Dracula)
         background_light='#f9f9fb'
         background_dark='#0d0d11'
         background_darker='#0f1015'
@@ -240,7 +240,7 @@ make_gtkrc() {
         titlebar_light='#F2F2F2'
         titlebar_dark='#242424'
         ;;
-      -nord)
+      -Nord)
         background_light='#f8fafc'
         background_dark='#242932'
         background_darker='#333a47'
@@ -248,7 +248,7 @@ make_gtkrc() {
         titlebar_light='#f0f1f4'
         titlebar_dark='#1e222a'
         ;;
-      -dracula)
+      -Dracula)
         background_light='#f9f9fb'
         background_dark='#242632'
         background_darker='#343746'
@@ -264,7 +264,7 @@ make_gtkrc() {
   sed -i "s/#2C2C2C/${background_dark}/g"                                       "${THEME_DIR}/gtk-2.0/gtkrc"
   sed -i "s/#464646/${background_alt}/g"                                        "${THEME_DIR}/gtk-2.0/gtkrc"
 
-  if [[ "${color}" == '-dark' ]]; then
+  if [[ "${color}" == '-Dark' ]]; then
     sed -i "s/#5b9bf8/${theme_color}/g"                                         "${THEME_DIR}/gtk-2.0/gtkrc"
     sed -i "s/#3C3C3C/${background_darker}/g"                                   "${THEME_DIR}/gtk-2.0/gtkrc"
     sed -i "s/#242424/${titlebar_dark}/g"                                       "${THEME_DIR}/gtk-2.0/gtkrc"

install.sh

@@ -23,20 +23,23 @@ fi
 SASSC_OPT="-M -t expanded"
 
 THEME_NAME=Colloid
-THEME_VARIANTS=('' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-teal' '-grey')
+THEME_VARIANTS=('' '-Purple' '-Pink' '-Red' '-Orange' '-Yellow' '-Green' '-Teal' '-Grey')
-COLOR_VARIANTS=('' '-light' '-dark')
+COLOR_VARIANTS=('' '-Light' '-Dark')
-SIZE_VARIANTS=('' '-compact')
+SIZE_VARIANTS=('' '-Compact')
 
 if [[ "$(command -v gnome-shell)" ]]; then
+  gnome-shell --version
   SHELL_VERSION="$(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f -1)"
-  if [[ "${SHELL_VERSION:-}" -ge "40" ]]; then
+  if [[ "${SHELL_VERSION:-}" -ge "42" ]]; then
-    GS_VERSION="new"
+    GS_VERSION="42-0"
+  elif [[ "${SHELL_VERSION:-}" -ge "40" ]]; then
+    GS_VERSION="40-0"
   else
-    GS_VERSION="old"
+    GS_VERSION="3-28"
   fi
   else
     echo "'gnome-shell' not found, using styles for last gnome-shell version available."
-    GS_VERSION="new"
+    GS_VERSION="42-0"
 fi
 
 usage() {
@@ -50,9 +53,9 @@ OPTIONS:
 
   -t, --theme VARIANT     Specify theme color variant(s) [default|purple|pink|red|orange|yellow|green|teal|grey|all] (Default: blue)
 
-  -c, --color VARIANT     Specify color variant(s) [standard|light|dark] (Default: All variants)s)
+  -c, --color VARIANT     Specify color variant(s) [standard|light|dark] (Default: All variants))
 
-  -s, --size VARIANT      Specify size variant [standard|compact] (Default: standard variants)
+  -s, --size VARIANT      Specify size variant [standard|compact] (Default: standard variant)
 
   --tweaks                Specify versions for tweaks [nord|dracula|black|rimless|normal] (only nord and dracula can not mix use with!)
                           1. nord:     Nord ColorScheme version
@@ -74,8 +77,8 @@ install() {
   local ctype="${6}"
   local window="${7}"
 
-  [[ "${color}" == '-light' ]] && local ELSE_LIGHT="${color}"
+  [[ "${color}" == '-Light' ]] && local ELSE_LIGHT="${color}"
-  [[ "${color}" == '-dark' ]] && local ELSE_DARK="${color}"
+  [[ "${color}" == '-Dark' ]] && local ELSE_DARK="${color}"
 
   local THEME_DIR="${1}/${2}${3}${4}${5}${6}"
 
@@ -102,20 +105,7 @@ install() {
 
   mkdir -p                                                                                   "${THEME_DIR}/gnome-shell"
   cp -r "${SRC_DIR}/main/gnome-shell/pad-osd.css"                                            "${THEME_DIR}/gnome-shell"
-
+  sassc $SASSC_OPT "${SRC_DIR}/main/gnome-shell/gnome-shell${color}.scss"                    "${THEME_DIR}/gnome-shell/gnome-shell.css"
-  if [[ "$tweaks" == 'true' ]]; then
-    if [[ "${GS_VERSION:-}" == 'new' ]]; then
-      sassc $SASSC_OPT "${SRC_DIR}/main/gnome-shell/shell-40-0/gnome-shell${color}.scss"     "${THEME_DIR}/gnome-shell/gnome-shell.css"
-    else
-      sassc $SASSC_OPT "${SRC_DIR}/main/gnome-shell/shell-3-28/gnome-shell${color}.scss"     "${THEME_DIR}/gnome-shell/gnome-shell.css"
-    fi
-  else
-    if [[ "${GS_VERSION:-}" == 'new' ]]; then
-      cp -r "${SRC_DIR}/main/gnome-shell/shell-40-0/gnome-shell${color}.css"                 "${THEME_DIR}/gnome-shell/gnome-shell.css"
-    else
-      cp -r "${SRC_DIR}/main/gnome-shell/shell-3-28/gnome-shell${color}.css"                 "${THEME_DIR}/gnome-shell/gnome-shell.css"
-    fi
-  fi
 
   cp -r "${SRC_DIR}/assets/gnome-shell/common-assets"                                        "${THEME_DIR}/gnome-shell/assets"
   cp -r "${SRC_DIR}/assets/gnome-shell/assets${ELSE_DARK:-}/"*.svg                           "${THEME_DIR}/gnome-shell/assets"
@@ -136,39 +126,28 @@ install() {
   cp -r "${SRC_DIR}/assets/gtk/assets${theme}${ctype}"                                       "${THEME_DIR}/gtk-3.0/assets"
   cp -r "${SRC_DIR}/assets/gtk/scalable"                                                     "${THEME_DIR}/gtk-3.0/assets"
   cp -r "${SRC_DIR}/assets/gtk/thumbnails/thumbnail${theme}${ctype}${ELSE_DARK:-}.png"       "${THEME_DIR}/gtk-3.0/thumbnail.png"
-
+  sassc $SASSC_OPT "${SRC_DIR}/main/gtk-3.0/gtk${color}.scss"                                "${THEME_DIR}/gtk-3.0/gtk.css"
-  if [[ "$tweaks" == 'true' ]]; then
+  sassc $SASSC_OPT "${SRC_DIR}/main/gtk-3.0/gtk-Dark.scss"                                   "${THEME_DIR}/gtk-3.0/gtk-dark.css"
-    sassc $SASSC_OPT "${SRC_DIR}/main/gtk-3.0/gtk${color}.scss"                              "${THEME_DIR}/gtk-3.0/gtk.css"
-    sassc $SASSC_OPT "${SRC_DIR}/main/gtk-3.0/gtk-dark.scss"                                 "${THEME_DIR}/gtk-3.0/gtk-dark.css"
-  else
-    cp -r "${SRC_DIR}/main/gtk-3.0/gtk${color}.css"                                          "${THEME_DIR}/gtk-3.0/gtk.css"
-    cp -r "${SRC_DIR}/main/gtk-3.0/gtk-dark.css"                                             "${THEME_DIR}/gtk-3.0"
-  fi
 
   mkdir -p                                                                                   "${THEME_DIR}/gtk-4.0"
   cp -r "${SRC_DIR}/assets/gtk/assets${theme}${ctype}"                                       "${THEME_DIR}/gtk-4.0/assets"
   cp -r "${SRC_DIR}/assets/gtk/scalable"                                                     "${THEME_DIR}/gtk-4.0/assets"
   cp -r "${SRC_DIR}/assets/gtk/thumbnails/thumbnail${theme}${ctype}${ELSE_DARK:-}.png"       "${THEME_DIR}/gtk-4.0/thumbnail.png"
+  sassc $SASSC_OPT "${SRC_DIR}/main/gtk-4.0/gtk${color}.scss"                                "${THEME_DIR}/gtk-4.0/gtk.css"
+  sassc $SASSC_OPT "${SRC_DIR}/main/gtk-4.0/gtk-Dark.scss"                                   "${THEME_DIR}/gtk-4.0/gtk-dark.css"
 
-  if [[ "$tweaks" == 'true' ]]; then
+  # link gtk4.0 for libadwaita
-    sassc $SASSC_OPT "${SRC_DIR}/main/gtk-4.0/gtk${color}.scss"                              "${THEME_DIR}/gtk-4.0/gtk.css"
+  mkdir -p                                                                                   "${HOME}/.config/gtk-4.0"
-    sassc $SASSC_OPT "${SRC_DIR}/main/gtk-4.0/gtk-dark.scss"                                 "${THEME_DIR}/gtk-4.0/gtk-dark.css"
+  rm -rf "${HOME}/.config/gtk-4.0/"{assets,gtk.css,gtk-dark.css}
-  else
+  ln -sf "${THEME_DIR}/gtk-4.0/assets"                                                       "${HOME}/.config/gtk-4.0/assets"
-    cp -r "${SRC_DIR}/main/gtk-4.0/gtk${color}.css"                                          "${THEME_DIR}/gtk-4.0/gtk.css"
+  ln -sf "${THEME_DIR}/gtk-4.0/gtk.css"                                                      "${HOME}/.config/gtk-4.0/gtk.css"
-    cp -r "${SRC_DIR}/main/gtk-4.0/gtk-dark.css"                                             "${THEME_DIR}/gtk-4.0"
+  ln -sf "${THEME_DIR}/gtk-4.0/gtk-dark.css"                                                 "${HOME}/.config/gtk-4.0/gtk-dark.css"
-  fi
 
   mkdir -p                                                                                   "${THEME_DIR}/cinnamon"
   cp -r "${SRC_DIR}/assets/cinnamon/common-assets"                                           "${THEME_DIR}/cinnamon/assets"
   cp -r "${SRC_DIR}/assets/cinnamon/assets${ELSE_DARK:-}/"*'.svg'                            "${THEME_DIR}/cinnamon/assets"
   cp -r "${SRC_DIR}/assets/cinnamon/theme${theme}${ctype}/"*'.svg'                           "${THEME_DIR}/cinnamon/assets"
-
+  sassc $SASSC_OPT "${SRC_DIR}/main/cinnamon/cinnamon${color}.scss"                          "${THEME_DIR}/cinnamon/cinnamon.css"
-  if [[ "$tweaks" == 'true' ]]; then
-    sassc $SASSC_OPT "${SRC_DIR}/main/cinnamon/cinnamon${color}.scss"                        "${THEME_DIR}/cinnamon/cinnamon.css"
-  else
-    cp -r "${SRC_DIR}/main/cinnamon/cinnamon${color}.css"                                    "${THEME_DIR}/cinnamon/cinnamon.css"
-  fi
-
   cp -r "${SRC_DIR}/assets/cinnamon/thumbnails/thumbnail${theme}${ctype}${color}.png"        "${THEME_DIR}/cinnamon/thumbnail.png"
 
   mkdir -p                                                                                   "${THEME_DIR}/metacity-1"
@@ -190,10 +169,10 @@ install() {
   sed -i "s/button_offset=6/button_offset=12/"                                               "${THEME_DIR}-xhdpi/xfwm4/themerc"
 
   mkdir -p                                                                                   "${THEME_DIR}/plank"
-  if [[ "$color" == '-light' ]]; then
+  if [[ "$color" == '-Light' ]]; then
-    cp -r "${SRC_DIR}/main/plank/theme-light/"*                                              "${THEME_DIR}/plank"
+    cp -r "${SRC_DIR}/main/plank/theme-Light${ctype}/"*                                      "${THEME_DIR}/plank"
   else
-    cp -r "${SRC_DIR}/main/plank/theme-dark/"*                                               "${THEME_DIR}/plank"
+    cp -r "${SRC_DIR}/main/plank/theme-Dark${ctype}/"*                                       "${THEME_DIR}/plank"
   fi
 }
 
@@ -328,13 +307,13 @@ while [[ $# -gt 0 ]]; do
         case "$variant" in
           nord)
             nord="true"
-            ctype="-nord"
+            ctype="-Nord"
             echo -e "Install Nord ColorScheme version! ..."
             shift
             ;;
           dracula)
             dracula="true"
-            ctype="-dracula"
+            ctype="-Dracula"
             echo -e "Install Dracula ColorScheme version! ..."
             shift
             ;;
@@ -350,7 +329,7 @@ while [[ $# -gt 0 ]]; do
             ;;
           normal)
             normal="true"
-            window="-normal"
+            window="-Normal"
             echo -e "Install Normal window button version! ..."
             shift
             ;;
@@ -442,44 +421,50 @@ normal_winbutton() {
   sed -i "/\$window_button:/s/mac/normal/" ${SRC_DIR}/sass/_tweaks-temp.scss
 }
 
+gnome_shell_version() {
+  cp -rf ${SRC_DIR}/sass/gnome-shell/_common.scss ${SRC_DIR}/sass/gnome-shell/_common-temp.scss
+
+  sed -i "/\widgets/s/40-0/${GS_VERSION}/" ${SRC_DIR}/sass/gnome-shell/_common-temp.scss
+
+  if [[ "${GS_VERSION}" == '3-28' ]]; then
+    sed -i "/\extensions/s/40-0/${GS_VERSION}/" ${SRC_DIR}/sass/gnome-shell/_common-temp.scss
+  fi
+}
+
 theme_color() {
   if [[ "$theme" != '' ]]; then
     case "$theme" in
-      -purple)
+      -Purple)
         theme_color='purple'
         ;;
-      -pink)
+      -Pink)
         theme_color='pink'
         ;;
-      -red)
+      -Red)
         theme_color='red'
         ;;
-      -orange)
+      -Orange)
         theme_color='orange'
         ;;
-      -yellow)
+      -Yellow)
         theme_color='yellow'
         ;;
-      -green)
+      -Green)
         theme_color='green'
         ;;
-      -teal)
+      -Teal)
         theme_color='teal'
         ;;
-      -grey)
+      -Grey)
         theme_color='grey'
         ;;
     esac
+    tweaks_temp
     sed -i "/\$theme:/s/default/${theme_color}/" ${SRC_DIR}/sass/_tweaks-temp.scss
   fi
 }
 
 theme_tweaks() {
-  if [[ "$accent" == 'true' || "$compact" == 'true' || "$nord" == 'true' || "$dracula" == 'true' || "$rimless" == 'true' || "$blackness" == 'true' || "$normal" == 'true' ]]; then
-    tweaks='true'
-    install_package; tweaks_temp
-  fi
-
   if [[ "$accent" = "true" ]] ; then
     theme_color
   fi
@@ -524,7 +509,9 @@ install_theme() {
   fi
 }
 
-install_theme
+./clean-old-theme.sh
+
+install_package && tweaks_temp && gnome_shell_version && install_theme
 
 echo
 echo Done.

src/assets/cinnamon/make-assets.sh

@@ -1,122 +1,122 @@
 #! /usr/bin/env bash
 
-for theme in '' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-teal' '-grey'; do
+for theme in '' '-Purple' '-Pink' '-Red' '-Orange' '-Yellow' '-Green' '-Teal' '-Grey'; do
-  for type in '' '-nord' '-dracula'; do
+  for type in '' '-Nord' '-Dracula'; do
     case "$theme" in
       '')
         theme_color_dark='#3c84f7'
         theme_color_light='#5b9bf8'
         ;;
-      -purple)
+      -Purple)
         theme_color_dark='#AB47BC'
         theme_color_light='#BA68C8'
         ;;
-      -pink)
+      -Pink)
         theme_color_dark='#EC407A'
         theme_color_light='#F06292'
         ;;
-      -red)
+      -Red)
         theme_color_dark='#E53935'
         theme_color_light='#F44336'
         ;;
-      -orange)
+      -Orange)
         theme_color_dark='#F57C00'
         theme_color_light='#FB8C00'
         ;;
-      -yellow)
+      -Yellow)
         theme_color_dark='#FBC02D'
         theme_color_light='#FFD600'
         ;;
-      -green)
+      -Green)
         theme_color_dark='#4CAF50'
         theme_color_light='#66BB6A'
         ;;
-      -teal)
+      -Teal)
         theme_color_dark='#009688'
         theme_color_light='#4DB6AC'
         ;;
-      -grey)
+      -Grey)
         theme_color_dark='#464646'
         theme_color_light='#DDDDDD'
         ;;
     esac
 
-    if [[ "$type" == '-nord' ]]; then
+    if [[ "$type" == '-Nord' ]]; then
       case "$theme" in
         '')
           theme_color_dark='#5e81ac'
           theme_color_light='#89a3c2'
           ;;
-        -purple)
+        -Purple)
           theme_color_dark='#b57daa'
           theme_color_light='#c89dbf'
           ;;
-        -pink)
+        -Pink)
           theme_color_dark='#cd7092'
           theme_color_light='#dc98b1'
           ;;
-        -red)
+        -Red)
           theme_color_dark='#c35b65'
           theme_color_light='#d4878f'
           ;;
-        -orange)
+        -Orange)
           theme_color_dark='#d0846c'
           theme_color_light='#dca493'
           ;;
-        -yellow)
+        -Yellow)
           theme_color_dark='#e4b558'
           theme_color_light='#eac985'
           ;;
-        -green)
+        -Green)
           theme_color_dark='#82ac5d'
           theme_color_light='#a0c082'
           ;;
-        -teal)
+        -Teal)
           theme_color_dark='#63a6a5'
           theme_color_light='#83b9b8'
           ;;
-        -grey)
+        -Grey)
           theme_color_dark='#3a4150'
           theme_color_light='#d9dce3'
           ;;
       esac
     fi
 
-    if [[ "$type" == '-dracula' ]]; then
+    if [[ "$type" == '-Dracula' ]]; then
       case "$theme" in
         '')
           theme_color_dark='#a679ec'
           theme_color_light='#bd93f9'
           ;;
-        -purple)
+        -Purple)
           theme_color_dark='#a679ec'
           theme_color_light='#bd93f9'
           ;;
-        -pink)
+        -Pink)
           theme_color_dark='#f04cab'
           theme_color_light='#ff79c6'
           ;;
-        -red)
+        -Red)
           theme_color_dark='#f44d4d'
           theme_color_light='#ff5555'
           ;;
-        -orange)
+        -Orange)
           theme_color_dark='#f8a854'
           theme_color_light='#ffb86c'
           ;;
-        -yellow)
+        -Yellow)
           theme_color_dark='#e8f467'
           theme_color_light='#f1fa8c'
           ;;
-        -green)
+        -Green)
           theme_color_dark='#4be772'
           theme_color_light='#50fa7b'
           ;;
-        -teal)
+        -Teal)
           theme_color_dark='#20eed9'
           theme_color_light='#50fae9'
           ;;
-        -grey)
+        -Grey)
           theme_color_dark='#3c3f51'
           theme_color_light='#d9dae3'
           ;;