diff --git a/clean-old-theme.sh b/clean-old-theme.sh
deleted file mode 100755
index 0b2e58a..0000000
--- a/clean-old-theme.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /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=Orchis
-THEME_VARIANTS=('' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-grey')
-COLOR_VARIANTS=('' '-light' '-dark')
-SIZE_VARIANTS=('' '-compact')
-
-clean() {
-  local dest="$1"
-  local name="$2"
-  local theme="$3"
-  local color="$4"
-  local size="$5"
-
-  local THEME_DIR="$dest/$name$theme$color$size"
-
-  if [[ "${theme}" == '' && "${color}" == '' && "${size}" == '' ]]; then
-    todo='nothing'
-  elif [[ -d "${THEME_DIR}" ]]; then
-    rm -rf "${THEME_DIR}"
-    echo -e "Find: ${THEME_DIR} ! removing it ..."
-  fi
-}
-
-themes=()
-colors=()
-sizes=()
-
-if [[ "${#themes[@]}" -eq 0 ]] ; then
-  themes=("${THEME_VARIANTS[@]}")
-fi
-
-if [[ "${#colors[@]}" -eq 0 ]] ; then
-  colors=("${COLOR_VARIANTS[@]}")
-fi
-
-if [[ "${#sizes[@]}" -eq 0 ]] ; then
-  sizes=("${SIZE_VARIANTS[@]}")
-fi
-
-clean_theme() {
-  for theme in "${themes[@]}"; do
-    for color in "${colors[@]}"; do
-      for size in "${sizes[@]}"; do
-        clean "${dest:-$DEST_DIR}" "${_name:-$THEME_NAME}" "$theme" "$color" "$size"
-      done
-    done
-  done
-}
-
-clean_theme
-
-exit 0
diff --git a/core.sh b/core.sh
index 7fc6f01..9501c5c 100755
--- a/core.sh
+++ b/core.sh
@@ -19,6 +19,11 @@ THEME_VARIANTS=('' '-Purple' '-Pink' '-Red' '-Orange' '-Yellow' '-Green' '-Grey'
 COLOR_VARIANTS=('' '-Light' '-Dark')
 SIZE_VARIANTS=('' '-Compact')
 
+# Old name variants
+OLD_THEME_VARIANTS=('' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-grey')
+OLD_COLOR_VARIANTS=('' '-light' '-dark')
+OLD_SIZE_VARIANTS=('' '-compact')
+
 # Check command availability
 function has_command() {
   command -v $1 > /dev/null
@@ -157,6 +162,23 @@ uninstall() {
   [[ -d "$THEME_DIR" ]] && rm -rf "$THEME_DIR" && echo -e "Uninstalling "$THEME_DIR" ..."
 }
 
+clean() {
+  local dest="$1"
+  local name="$2"
+  local theme="$3"
+  local color="$4"
+  local size="$5"
+
+  local THEME_DIR="$dest/$name$theme$color$size"
+
+  if [[ "${theme}" == '' && "${color}" == '' && "${size}" == '' ]]; then
+    todo='nothing'
+  elif [[ -d "${THEME_DIR}" ]]; then
+    rm -rf "${THEME_DIR}"
+    echo -e "Find: ${THEME_DIR} ! removing it ..."
+  fi
+}
+
 uninstall_link() {
   [[ -L "${HOME}/.config/gtk-4.0/assets" ]] && rm -rf "${HOME}/.config/gtk-4.0/assets" && echo -e "Removing ${HOME}/.config/gtk-4.0/assets"
   [[ -L "${HOME}/.config/gtk-4.0/gtk.css" ]] && rm -rf "${HOME}/.config/gtk-4.0/gtk.css" && echo -e "Removing ${HOME}/.config/gtk-4.0/gtk.css"
@@ -328,6 +350,16 @@ uninstall_theme() {
   done
 }
 
+clean_theme() {
+  for theme in "${othemes[@]}"; do
+    for color in "${ocolors[@]}"; do
+      for size in "${osizes[@]}"; do
+        clean "${dest:-$DEST_DIR}" "${_name:-$THEME_NAME}" "$theme" "$color" "$size"
+      done
+    done
+  done
+}
+
 link_theme() {
   for theme in "${themes[@]}"; do
     for color in "${COLOR_VARIANTS[2]}"; do
diff --git a/install.sh b/install.sh
index e9eac21..8f24f38 100755
--- a/install.sh
+++ b/install.sh
@@ -38,6 +38,9 @@ EOF
 themes=()
 colors=()
 sizes=()
+othemes=()
+ocolors=()
+osizes=()
 
 while [[ "$#" -gt 0 ]]; do
   case "${1:-}" in
@@ -242,7 +245,19 @@ if [[ "${#sizes[@]}" -eq 0 ]] ; then
   sizes=("${SIZE_VARIANTS[@]}")
 fi
 
-./clean-old-theme.sh
+if [[ "${#othemes[@]}" -eq 0 ]] ; then
+  othemes=("${OLD_THEME_VARIANTS[@]}")
+fi
+
+if [[ "${#ocolors[@]}" -eq 0 ]] ; then
+  ocolors=("${OLD_COLOR_VARIANTS[@]}")
+fi
+
+if [[ "${#osizes[@]}" -eq 0 ]] ; then
+  osizes=("${OLD_SIZE_VARIANTS[@]}")
+fi
+
+clean_theme
 
 if [[ ${remove} == 'true' ]]; then
   if [[ "$libadwaita" == 'true' ]]; then
diff --git a/src/_sass/gtk/_common-3.20.scss b/src/_sass/gtk/_common-3.20.scss
index f8ff386..a3244aa 100644
--- a/src/_sass/gtk/_common-3.20.scss
+++ b/src/_sass/gtk/_common-3.20.scss
@@ -1818,6 +1818,40 @@ notebook {
 
   &:focus tab:checked { box-shadow: none; }
 
+  > header {
+    &.top {
+      > tabs {
+        > tab {
+          border-radius: $corner-radius / 2 $corner-radius / 2 0 0;
+        }
+      }
+    }
+
+    &.bottom {
+      > tabs {
+        > tab {
+          border-radius: 0 0 $corner-radius / 2 $corner-radius / 2;
+        }
+      }
+    }
+
+    &.left {
+      > tabs {
+        > tab {
+          border-radius: $corner-radius / 2 0 0 $corner-radius / 2;
+        }
+      }
+    }
+
+    &.right {
+      > tabs {
+        > tab {
+          border-radius: 0 $corner-radius / 2 $corner-radius / 2 0;
+        }
+      }
+    }
+  }
+
   .background.csd & > header {
     &.top {
       border-radius: $corner-radius $corner-radius 0 0;
diff --git a/src/_sass/gtk/_common-4.0.scss b/src/_sass/gtk/_common-4.0.scss
index 71cc796..56f4b5c 100644
--- a/src/_sass/gtk/_common-4.0.scss
+++ b/src/_sass/gtk/_common-4.0.scss
@@ -3602,6 +3602,7 @@ paned {
     background-image: image($divider);
     background-size: 1px 1px;
     background-clip: content-box; // avoids borders image being rendered twice (?)
+    box-shadow: none;
 
     &.wide {
       min-width: 6px;
diff --git a/src/gtk/3.0/gtk-Compact.css b/src/gtk/3.0/gtk-Compact.css
index b9b52ef..4c7bbdf 100644
--- a/src/gtk/3.0/gtk-Compact.css
+++ b/src/gtk/3.0/gtk-Compact.css
@@ -3262,6 +3262,22 @@ notebook:focus tab:checked {
   box-shadow: none;
 }
 
+notebook > header.top > tabs > tab {
+  border-radius: 5px 5px 0 0;
+}
+
+notebook > header.bottom > tabs > tab {
+  border-radius: 0 0 5px 5px;
+}
+
+notebook > header.left > tabs > tab {
+  border-radius: 5px 0 0 5px;
+}
+
+notebook > header.right > tabs > tab {
+  border-radius: 0 5px 5px 0;
+}
+
 .background.csd notebook > header.top {
   border-radius: 10px 10px 0 0;
 }
diff --git a/src/gtk/3.0/gtk-Dark-Compact.css b/src/gtk/3.0/gtk-Dark-Compact.css
index c9cfe81..d67698f 100644
--- a/src/gtk/3.0/gtk-Dark-Compact.css
+++ b/src/gtk/3.0/gtk-Dark-Compact.css
@@ -3262,6 +3262,22 @@ notebook:focus tab:checked {
   box-shadow: none;
 }
 
+notebook > header.top > tabs > tab {
+  border-radius: 5px 5px 0 0;
+}
+
+notebook > header.bottom > tabs > tab {
+  border-radius: 0 0 5px 5px;
+}
+
+notebook > header.left > tabs > tab {
+  border-radius: 5px 0 0 5px;
+}
+
+notebook > header.right > tabs > tab {
+  border-radius: 0 5px 5px 0;
+}
+
 .background.csd notebook > header.top {
   border-radius: 10px 10px 0 0;
 }
diff --git a/src/gtk/3.0/gtk-Dark.css b/src/gtk/3.0/gtk-Dark.css
index 10a7997..fcc250a 100644
--- a/src/gtk/3.0/gtk-Dark.css
+++ b/src/gtk/3.0/gtk-Dark.css
@@ -3262,6 +3262,22 @@ notebook:focus tab:checked {
   box-shadow: none;
 }
 
+notebook > header.top > tabs > tab {
+  border-radius: 6px 6px 0 0;
+}
+
+notebook > header.bottom > tabs > tab {
+  border-radius: 0 0 6px 6px;
+}
+
+notebook > header.left > tabs > tab {
+  border-radius: 6px 0 0 6px;
+}
+
+notebook > header.right > tabs > tab {
+  border-radius: 0 6px 6px 0;
+}
+
 .background.csd notebook > header.top {
   border-radius: 12px 12px 0 0;
 }
diff --git a/src/gtk/3.0/gtk-Light-Compact.css b/src/gtk/3.0/gtk-Light-Compact.css
index 1c3a1db..2881b3c 100644
--- a/src/gtk/3.0/gtk-Light-Compact.css
+++ b/src/gtk/3.0/gtk-Light-Compact.css
@@ -3262,6 +3262,22 @@ notebook:focus tab:checked {
   box-shadow: none;
 }
 
+notebook > header.top > tabs > tab {
+  border-radius: 5px 5px 0 0;
+}
+
+notebook > header.bottom > tabs > tab {
+  border-radius: 0 0 5px 5px;
+}
+
+notebook > header.left > tabs > tab {
+  border-radius: 5px 0 0 5px;
+}
+
+notebook > header.right > tabs > tab {
+  border-radius: 0 5px 5px 0;
+}
+
 .background.csd notebook > header.top {
   border-radius: 10px 10px 0 0;
 }
diff --git a/src/gtk/3.0/gtk-Light.css b/src/gtk/3.0/gtk-Light.css
index 20ad783..bd9a404 100644
--- a/src/gtk/3.0/gtk-Light.css
+++ b/src/gtk/3.0/gtk-Light.css
@@ -3262,6 +3262,22 @@ notebook:focus tab:checked {
   box-shadow: none;
 }
 
+notebook > header.top > tabs > tab {
+  border-radius: 6px 6px 0 0;
+}
+
+notebook > header.bottom > tabs > tab {
+  border-radius: 0 0 6px 6px;
+}
+
+notebook > header.left > tabs > tab {
+  border-radius: 6px 0 0 6px;
+}
+
+notebook > header.right > tabs > tab {
+  border-radius: 0 6px 6px 0;
+}
+
 .background.csd notebook > header.top {
   border-radius: 12px 12px 0 0;
 }
diff --git a/src/gtk/3.0/gtk.css b/src/gtk/3.0/gtk.css
index d966e2c..9225c73 100644
--- a/src/gtk/3.0/gtk.css
+++ b/src/gtk/3.0/gtk.css
@@ -3262,6 +3262,22 @@ notebook:focus tab:checked {
   box-shadow: none;
 }
 
+notebook > header.top > tabs > tab {
+  border-radius: 6px 6px 0 0;
+}
+
+notebook > header.bottom > tabs > tab {
+  border-radius: 0 0 6px 6px;
+}
+
+notebook > header.left > tabs > tab {
+  border-radius: 6px 0 0 6px;
+}
+
+notebook > header.right > tabs > tab {
+  border-radius: 0 6px 6px 0;
+}
+
 .background.csd notebook > header.top {
   border-radius: 12px 12px 0 0;
 }
diff --git a/src/gtk/4.0/gtk-Compact.css b/src/gtk/4.0/gtk-Compact.css
index 9175e8a..1e1f922 100644
--- a/src/gtk/4.0/gtk-Compact.css
+++ b/src/gtk/4.0/gtk-Compact.css
@@ -3952,6 +3952,7 @@ paned > separator {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 1px 1px;
   background-clip: content-box;
+  box-shadow: none;
 }
 
 paned > separator.wide {
diff --git a/src/gtk/4.0/gtk-Dark-Compact.css b/src/gtk/4.0/gtk-Dark-Compact.css
index 7487766..72bfd98 100644
--- a/src/gtk/4.0/gtk-Dark-Compact.css
+++ b/src/gtk/4.0/gtk-Dark-Compact.css
@@ -3952,6 +3952,7 @@ paned > separator {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 1px 1px;
   background-clip: content-box;
+  box-shadow: none;
 }
 
 paned > separator.wide {
diff --git a/src/gtk/4.0/gtk-Dark.css b/src/gtk/4.0/gtk-Dark.css
index 77a0898..47f2d3e 100644
--- a/src/gtk/4.0/gtk-Dark.css
+++ b/src/gtk/4.0/gtk-Dark.css
@@ -3952,6 +3952,7 @@ paned > separator {
   background-image: image(rgba(255, 255, 255, 0.12));
   background-size: 1px 1px;
   background-clip: content-box;
+  box-shadow: none;
 }
 
 paned > separator.wide {
diff --git a/src/gtk/4.0/gtk-Light-Compact.css b/src/gtk/4.0/gtk-Light-Compact.css
index 89eea5c..a2f4078 100644
--- a/src/gtk/4.0/gtk-Light-Compact.css
+++ b/src/gtk/4.0/gtk-Light-Compact.css
@@ -3952,6 +3952,7 @@ paned > separator {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 1px 1px;
   background-clip: content-box;
+  box-shadow: none;
 }
 
 paned > separator.wide {
diff --git a/src/gtk/4.0/gtk-Light.css b/src/gtk/4.0/gtk-Light.css
index 7e74d31..d904f30 100644
--- a/src/gtk/4.0/gtk-Light.css
+++ b/src/gtk/4.0/gtk-Light.css
@@ -3952,6 +3952,7 @@ paned > separator {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 1px 1px;
   background-clip: content-box;
+  box-shadow: none;
 }
 
 paned > separator.wide {
diff --git a/src/gtk/4.0/gtk.css b/src/gtk/4.0/gtk.css
index ab74972..cf99789 100644
--- a/src/gtk/4.0/gtk.css
+++ b/src/gtk/4.0/gtk.css
@@ -3952,6 +3952,7 @@ paned > separator {
   background-image: image(rgba(0, 0, 0, 0.12));
   background-size: 1px 1px;
   background-clip: content-box;
+  box-shadow: none;
 }
 
 paned > separator.wide {