diff --git a/.gitignore b/.gitignore index 420b7401..43a8f1bf 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,10 @@ _theme-options-temp.scss *.css.map src/main/gtk-3.0/gtk*.css +src/main/gtk-4.0/gtk*.css src/main/cinnamon/cinnamon*.css src/main/gnome-shell/gnome-shell*.css src/main/gnome-shell/gdm3*.css src/other/dash-to-dock/stylesheet.css src/other/dash-to-dock/stylesheet-dark.css +parse-sass.sh diff --git a/lib-install.sh b/lib-install.sh index 282fa508..a2b9a522 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -71,7 +71,8 @@ install_darky() { local opacity="$(destify ${1})" local theme="$(destify ${2})" - sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-3.0/gtk-dark${opacity}${theme}.scss" "${WHITESUR_TMP_DIR}/darky${opacity}${theme}.css" + sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-3.0/gtk-dark${opacity}${theme}.scss" "${WHITESUR_TMP_DIR}/darky-3${opacity}${theme}.css" + sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk-dark${opacity}${theme}.scss" "${WHITESUR_TMP_DIR}/darky-4${opacity}${theme}.css" } install_shelly() { @@ -128,7 +129,8 @@ install_theemy() { local icon="$(destify ${5})" local TARGET_DIR="${dest}/${name}${color}${opacity}${alt}${theme}" - local TMP_DIR="${WHITESUR_TMP_DIR}/gtk${color}${opacity}${alt}${theme}" + local TMP_DIR_T="${WHITESUR_TMP_DIR}/gtk-3.0${color}${opacity}${alt}${theme}" + local TMP_DIR_F="${WHITESUR_TMP_DIR}/gtk-4.0${color}${opacity}${alt}${theme}" mkdir -p "${TARGET_DIR}" local desktop_entry=" @@ -146,30 +148,50 @@ install_theemy() { ButtonLayout=close,minimize,maximize:menu" echo "${desktop_entry}" > "${TARGET_DIR}/index.theme" - #----------------------GTK-----------------------# + #--------------------GTK-3.0--------------------# - mkdir -p "${TMP_DIR}" - cp -r "${THEME_SRC_DIR}/assets/gtk-3.0/common-assets/assets" "${TMP_DIR}" - cp -r "${THEME_SRC_DIR}/assets/gtk-3.0/common-assets/sidebar-assets/"*".png" "${TMP_DIR}/assets" - cp -r "${THEME_SRC_DIR}/assets/gtk-3.0/windows-assets/titlebutton${alt}" "${TMP_DIR}/windows-assets" + mkdir -p "${TMP_DIR_T}" + cp -r "${THEME_SRC_DIR}/assets/gtk/common-assets/assets" "${TMP_DIR_T}" + cp -r "${THEME_SRC_DIR}/assets/gtk/common-assets/sidebar-assets/"*".png" "${TMP_DIR_T}/assets" + cp -r "${THEME_SRC_DIR}/assets/gtk/windows-assets/titlebutton${alt}" "${TMP_DIR_T}/windows-assets" if [[ "${theme}" != '' ]]; then - cp -r "${THEME_SRC_DIR}/assets/gtk-3.0/common-assets/assets${theme}/"*".png" "${TMP_DIR}/assets" + cp -r "${THEME_SRC_DIR}/assets/gtk/common-assets/assets${theme}/"*".png" "${TMP_DIR_T}/assets" fi if [[ "${color}" == '-light' ]]; then - sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-3.0/gtk-light${opacity}${theme}.scss" "${TMP_DIR}/gtk.css" + sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-3.0/gtk-light${opacity}${theme}.scss" "${TMP_DIR_T}/gtk.css" else - cp -r "${WHITESUR_TMP_DIR}/darky${opacity}${theme}.css" "${TMP_DIR}/gtk.css" + cp -r "${WHITESUR_TMP_DIR}/darky-3${opacity}${theme}.css" "${TMP_DIR_T}/gtk.css" fi - cp -r "${WHITESUR_TMP_DIR}/darky${opacity}${theme}.css" "${TMP_DIR}/gtk-dark.css" + cp -r "${WHITESUR_TMP_DIR}/darky-3${opacity}${theme}.css" "${TMP_DIR_T}/gtk-dark.css" mkdir -p "${TARGET_DIR}/gtk-3.0" - cp -r "${THEME_SRC_DIR}/assets/gtk-3.0/thumbnails/thumbnail${color}${theme}.png" "${TARGET_DIR}/gtk-3.0/thumbnail.png" + cp -r "${THEME_SRC_DIR}/assets/gtk/thumbnails/thumbnail${color}${theme}.png" "${TARGET_DIR}/gtk-3.0/thumbnail.png" echo '@import url("resource:///org/gnome/theme/gtk.css");' > "${TARGET_DIR}/gtk-3.0/gtk.css" echo '@import url("resource:///org/gnome/theme/gtk-dark.css");' > "${TARGET_DIR}/gtk-3.0/gtk-dark.css" - glib-compile-resources --sourcedir="${TMP_DIR}" --target="${TARGET_DIR}/gtk-3.0/gtk.gresource" "${THEME_SRC_DIR}/main/gtk-3.0/gtk.gresource.xml" + glib-compile-resources --sourcedir="${TMP_DIR_T}" --target="${TARGET_DIR}/gtk-3.0/gtk.gresource" "${THEME_SRC_DIR}/main/gtk-3.0/gtk.gresource.xml" + + #--------------------GTK-4.0--------------------# + + mkdir -p "${TMP_DIR_F}" + cp -r "${TMP_DIR_T}/assets" "${TMP_DIR_F}" + cp -r "${TMP_DIR_T}/windows-assets" "${TMP_DIR_F}" + + if [[ "${color}" == '-light' ]]; then + sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk-light${opacity}${theme}.scss" "${TMP_DIR_F}/gtk.css" + else + cp -r "${WHITESUR_TMP_DIR}/darky-4${opacity}${theme}.css" "${TMP_DIR_F}/gtk.css" + fi + + cp -r "${WHITESUR_TMP_DIR}/darky-4${opacity}${theme}.css" "${TMP_DIR_F}/gtk-dark.css" + + mkdir -p "${TARGET_DIR}/gtk-4.0" + cp -r "${THEME_SRC_DIR}/assets/gtk/thumbnails/thumbnail${color}${theme}.png" "${TARGET_DIR}/gtk-4.0/thumbnail.png" + echo '@import url("resource:///org/gnome/theme/gtk.css");' > "${TARGET_DIR}/gtk-4.0/gtk.css" + echo '@import url("resource:///org/gnome/theme/gtk-dark.css");' > "${TARGET_DIR}/gtk-4.0/gtk-dark.css" + glib-compile-resources --sourcedir="${TMP_DIR_F}" --target="${TARGET_DIR}/gtk-4.0/gtk.gresource" "${THEME_SRC_DIR}/main/gtk-4.0/gtk.gresource.xml" #----------------Cinnamon-----------------# diff --git a/src/assets/gnome-shell/icons/scalable/status/window-close-24-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/window-close-24-symbolic.svg new file mode 100644 index 00000000..955c09e0 --- /dev/null +++ b/src/assets/gnome-shell/icons/scalable/status/window-close-24-symbolic.svg @@ -0,0 +1,13 @@ + + + + + + image/svg+xml + + + + + + + diff --git a/src/assets/gtk-3.0/common-assets/assets-blue.svg b/src/assets/gtk/common-assets/assets-blue.svg similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue.svg rename to src/assets/gtk/common-assets/assets-blue.svg diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/checkbox-checked-dark.png b/src/assets/gtk/common-assets/assets-blue/checkbox-checked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/checkbox-checked-dark.png rename to src/assets/gtk/common-assets/assets-blue/checkbox-checked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/checkbox-checked-dark@2.png b/src/assets/gtk/common-assets/assets-blue/checkbox-checked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/checkbox-checked-dark@2.png rename to src/assets/gtk/common-assets/assets-blue/checkbox-checked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/checkbox-checked-selectionmode-dark.png b/src/assets/gtk/common-assets/assets-blue/checkbox-checked-selectionmode-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/checkbox-checked-selectionmode-dark.png rename to src/assets/gtk/common-assets/assets-blue/checkbox-checked-selectionmode-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/checkbox-checked-selectionmode-dark@2.png b/src/assets/gtk/common-assets/assets-blue/checkbox-checked-selectionmode-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/checkbox-checked-selectionmode-dark@2.png rename to src/assets/gtk/common-assets/assets-blue/checkbox-checked-selectionmode-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/checkbox-checked-selectionmode.png b/src/assets/gtk/common-assets/assets-blue/checkbox-checked-selectionmode.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/checkbox-checked-selectionmode.png rename to src/assets/gtk/common-assets/assets-blue/checkbox-checked-selectionmode.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/checkbox-checked-selectionmode@2.png b/src/assets/gtk/common-assets/assets-blue/checkbox-checked-selectionmode@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/checkbox-checked-selectionmode@2.png rename to src/assets/gtk/common-assets/assets-blue/checkbox-checked-selectionmode@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/checkbox-checked.png b/src/assets/gtk/common-assets/assets-blue/checkbox-checked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/checkbox-checked.png rename to src/assets/gtk/common-assets/assets-blue/checkbox-checked.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/checkbox-checked@2.png b/src/assets/gtk/common-assets/assets-blue/checkbox-checked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/checkbox-checked@2.png rename to src/assets/gtk/common-assets/assets-blue/checkbox-checked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/checkbox-mixed-dark.png b/src/assets/gtk/common-assets/assets-blue/checkbox-mixed-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/checkbox-mixed-dark.png rename to src/assets/gtk/common-assets/assets-blue/checkbox-mixed-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/checkbox-mixed-dark@2.png b/src/assets/gtk/common-assets/assets-blue/checkbox-mixed-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/checkbox-mixed-dark@2.png rename to src/assets/gtk/common-assets/assets-blue/checkbox-mixed-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/checkbox-mixed.png b/src/assets/gtk/common-assets/assets-blue/checkbox-mixed.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/checkbox-mixed.png rename to src/assets/gtk/common-assets/assets-blue/checkbox-mixed.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/checkbox-mixed@2.png b/src/assets/gtk/common-assets/assets-blue/checkbox-mixed@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/checkbox-mixed@2.png rename to src/assets/gtk/common-assets/assets-blue/checkbox-mixed@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/radio-checked-dark.png b/src/assets/gtk/common-assets/assets-blue/radio-checked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/radio-checked-dark.png rename to src/assets/gtk/common-assets/assets-blue/radio-checked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/radio-checked-dark@2.png b/src/assets/gtk/common-assets/assets-blue/radio-checked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/radio-checked-dark@2.png rename to src/assets/gtk/common-assets/assets-blue/radio-checked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/radio-checked.png b/src/assets/gtk/common-assets/assets-blue/radio-checked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/radio-checked.png rename to src/assets/gtk/common-assets/assets-blue/radio-checked.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/radio-checked@2.png b/src/assets/gtk/common-assets/assets-blue/radio-checked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/radio-checked@2.png rename to src/assets/gtk/common-assets/assets-blue/radio-checked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/radio-mixed-dark.png b/src/assets/gtk/common-assets/assets-blue/radio-mixed-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/radio-mixed-dark.png rename to src/assets/gtk/common-assets/assets-blue/radio-mixed-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/radio-mixed-dark@2.png b/src/assets/gtk/common-assets/assets-blue/radio-mixed-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/radio-mixed-dark@2.png rename to src/assets/gtk/common-assets/assets-blue/radio-mixed-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/radio-mixed.png b/src/assets/gtk/common-assets/assets-blue/radio-mixed.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/radio-mixed.png rename to src/assets/gtk/common-assets/assets-blue/radio-mixed.png diff --git a/src/assets/gtk-3.0/common-assets/assets-blue/radio-mixed@2.png b/src/assets/gtk/common-assets/assets-blue/radio-mixed@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-blue/radio-mixed@2.png rename to src/assets/gtk/common-assets/assets-blue/radio-mixed@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green.svg b/src/assets/gtk/common-assets/assets-green.svg similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green.svg rename to src/assets/gtk/common-assets/assets-green.svg diff --git a/src/assets/gtk-3.0/common-assets/assets-green/checkbox-checked-dark.png b/src/assets/gtk/common-assets/assets-green/checkbox-checked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/checkbox-checked-dark.png rename to src/assets/gtk/common-assets/assets-green/checkbox-checked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/checkbox-checked-dark@2.png b/src/assets/gtk/common-assets/assets-green/checkbox-checked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/checkbox-checked-dark@2.png rename to src/assets/gtk/common-assets/assets-green/checkbox-checked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/checkbox-checked-selectionmode-dark.png b/src/assets/gtk/common-assets/assets-green/checkbox-checked-selectionmode-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/checkbox-checked-selectionmode-dark.png rename to src/assets/gtk/common-assets/assets-green/checkbox-checked-selectionmode-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/checkbox-checked-selectionmode-dark@2.png b/src/assets/gtk/common-assets/assets-green/checkbox-checked-selectionmode-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/checkbox-checked-selectionmode-dark@2.png rename to src/assets/gtk/common-assets/assets-green/checkbox-checked-selectionmode-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/checkbox-checked-selectionmode.png b/src/assets/gtk/common-assets/assets-green/checkbox-checked-selectionmode.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/checkbox-checked-selectionmode.png rename to src/assets/gtk/common-assets/assets-green/checkbox-checked-selectionmode.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/checkbox-checked-selectionmode@2.png b/src/assets/gtk/common-assets/assets-green/checkbox-checked-selectionmode@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/checkbox-checked-selectionmode@2.png rename to src/assets/gtk/common-assets/assets-green/checkbox-checked-selectionmode@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/checkbox-checked.png b/src/assets/gtk/common-assets/assets-green/checkbox-checked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/checkbox-checked.png rename to src/assets/gtk/common-assets/assets-green/checkbox-checked.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/checkbox-checked@2.png b/src/assets/gtk/common-assets/assets-green/checkbox-checked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/checkbox-checked@2.png rename to src/assets/gtk/common-assets/assets-green/checkbox-checked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/checkbox-mixed-dark.png b/src/assets/gtk/common-assets/assets-green/checkbox-mixed-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/checkbox-mixed-dark.png rename to src/assets/gtk/common-assets/assets-green/checkbox-mixed-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/checkbox-mixed-dark@2.png b/src/assets/gtk/common-assets/assets-green/checkbox-mixed-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/checkbox-mixed-dark@2.png rename to src/assets/gtk/common-assets/assets-green/checkbox-mixed-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/checkbox-mixed.png b/src/assets/gtk/common-assets/assets-green/checkbox-mixed.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/checkbox-mixed.png rename to src/assets/gtk/common-assets/assets-green/checkbox-mixed.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/checkbox-mixed@2.png b/src/assets/gtk/common-assets/assets-green/checkbox-mixed@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/checkbox-mixed@2.png rename to src/assets/gtk/common-assets/assets-green/checkbox-mixed@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/radio-checked-dark.png b/src/assets/gtk/common-assets/assets-green/radio-checked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/radio-checked-dark.png rename to src/assets/gtk/common-assets/assets-green/radio-checked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/radio-checked-dark@2.png b/src/assets/gtk/common-assets/assets-green/radio-checked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/radio-checked-dark@2.png rename to src/assets/gtk/common-assets/assets-green/radio-checked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/radio-checked.png b/src/assets/gtk/common-assets/assets-green/radio-checked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/radio-checked.png rename to src/assets/gtk/common-assets/assets-green/radio-checked.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/radio-checked@2.png b/src/assets/gtk/common-assets/assets-green/radio-checked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/radio-checked@2.png rename to src/assets/gtk/common-assets/assets-green/radio-checked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/radio-mixed-dark.png b/src/assets/gtk/common-assets/assets-green/radio-mixed-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/radio-mixed-dark.png rename to src/assets/gtk/common-assets/assets-green/radio-mixed-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/radio-mixed-dark@2.png b/src/assets/gtk/common-assets/assets-green/radio-mixed-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/radio-mixed-dark@2.png rename to src/assets/gtk/common-assets/assets-green/radio-mixed-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/radio-mixed.png b/src/assets/gtk/common-assets/assets-green/radio-mixed.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/radio-mixed.png rename to src/assets/gtk/common-assets/assets-green/radio-mixed.png diff --git a/src/assets/gtk-3.0/common-assets/assets-green/radio-mixed@2.png b/src/assets/gtk/common-assets/assets-green/radio-mixed@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-green/radio-mixed@2.png rename to src/assets/gtk/common-assets/assets-green/radio-mixed@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey.svg b/src/assets/gtk/common-assets/assets-grey.svg similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey.svg rename to src/assets/gtk/common-assets/assets-grey.svg diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/checkbox-checked-dark.png b/src/assets/gtk/common-assets/assets-grey/checkbox-checked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/checkbox-checked-dark.png rename to src/assets/gtk/common-assets/assets-grey/checkbox-checked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/checkbox-checked-dark@2.png b/src/assets/gtk/common-assets/assets-grey/checkbox-checked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/checkbox-checked-dark@2.png rename to src/assets/gtk/common-assets/assets-grey/checkbox-checked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/checkbox-checked-selectionmode-dark.png b/src/assets/gtk/common-assets/assets-grey/checkbox-checked-selectionmode-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/checkbox-checked-selectionmode-dark.png rename to src/assets/gtk/common-assets/assets-grey/checkbox-checked-selectionmode-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/checkbox-checked-selectionmode-dark@2.png b/src/assets/gtk/common-assets/assets-grey/checkbox-checked-selectionmode-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/checkbox-checked-selectionmode-dark@2.png rename to src/assets/gtk/common-assets/assets-grey/checkbox-checked-selectionmode-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/checkbox-checked-selectionmode.png b/src/assets/gtk/common-assets/assets-grey/checkbox-checked-selectionmode.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/checkbox-checked-selectionmode.png rename to src/assets/gtk/common-assets/assets-grey/checkbox-checked-selectionmode.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/checkbox-checked-selectionmode@2.png b/src/assets/gtk/common-assets/assets-grey/checkbox-checked-selectionmode@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/checkbox-checked-selectionmode@2.png rename to src/assets/gtk/common-assets/assets-grey/checkbox-checked-selectionmode@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/checkbox-checked.png b/src/assets/gtk/common-assets/assets-grey/checkbox-checked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/checkbox-checked.png rename to src/assets/gtk/common-assets/assets-grey/checkbox-checked.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/checkbox-checked@2.png b/src/assets/gtk/common-assets/assets-grey/checkbox-checked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/checkbox-checked@2.png rename to src/assets/gtk/common-assets/assets-grey/checkbox-checked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/checkbox-mixed-dark.png b/src/assets/gtk/common-assets/assets-grey/checkbox-mixed-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/checkbox-mixed-dark.png rename to src/assets/gtk/common-assets/assets-grey/checkbox-mixed-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/checkbox-mixed-dark@2.png b/src/assets/gtk/common-assets/assets-grey/checkbox-mixed-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/checkbox-mixed-dark@2.png rename to src/assets/gtk/common-assets/assets-grey/checkbox-mixed-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/checkbox-mixed.png b/src/assets/gtk/common-assets/assets-grey/checkbox-mixed.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/checkbox-mixed.png rename to src/assets/gtk/common-assets/assets-grey/checkbox-mixed.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/checkbox-mixed@2.png b/src/assets/gtk/common-assets/assets-grey/checkbox-mixed@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/checkbox-mixed@2.png rename to src/assets/gtk/common-assets/assets-grey/checkbox-mixed@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/radio-checked-dark.png b/src/assets/gtk/common-assets/assets-grey/radio-checked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/radio-checked-dark.png rename to src/assets/gtk/common-assets/assets-grey/radio-checked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/radio-checked-dark@2.png b/src/assets/gtk/common-assets/assets-grey/radio-checked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/radio-checked-dark@2.png rename to src/assets/gtk/common-assets/assets-grey/radio-checked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/radio-checked.png b/src/assets/gtk/common-assets/assets-grey/radio-checked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/radio-checked.png rename to src/assets/gtk/common-assets/assets-grey/radio-checked.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/radio-checked@2.png b/src/assets/gtk/common-assets/assets-grey/radio-checked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/radio-checked@2.png rename to src/assets/gtk/common-assets/assets-grey/radio-checked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/radio-mixed-dark.png b/src/assets/gtk/common-assets/assets-grey/radio-mixed-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/radio-mixed-dark.png rename to src/assets/gtk/common-assets/assets-grey/radio-mixed-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/radio-mixed-dark@2.png b/src/assets/gtk/common-assets/assets-grey/radio-mixed-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/radio-mixed-dark@2.png rename to src/assets/gtk/common-assets/assets-grey/radio-mixed-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/radio-mixed.png b/src/assets/gtk/common-assets/assets-grey/radio-mixed.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/radio-mixed.png rename to src/assets/gtk/common-assets/assets-grey/radio-mixed.png diff --git a/src/assets/gtk-3.0/common-assets/assets-grey/radio-mixed@2.png b/src/assets/gtk/common-assets/assets-grey/radio-mixed@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-grey/radio-mixed@2.png rename to src/assets/gtk/common-assets/assets-grey/radio-mixed@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange.svg b/src/assets/gtk/common-assets/assets-orange.svg similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange.svg rename to src/assets/gtk/common-assets/assets-orange.svg diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/checkbox-checked-dark.png b/src/assets/gtk/common-assets/assets-orange/checkbox-checked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/checkbox-checked-dark.png rename to src/assets/gtk/common-assets/assets-orange/checkbox-checked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/checkbox-checked-dark@2.png b/src/assets/gtk/common-assets/assets-orange/checkbox-checked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/checkbox-checked-dark@2.png rename to src/assets/gtk/common-assets/assets-orange/checkbox-checked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/checkbox-checked-selectionmode-dark.png b/src/assets/gtk/common-assets/assets-orange/checkbox-checked-selectionmode-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/checkbox-checked-selectionmode-dark.png rename to src/assets/gtk/common-assets/assets-orange/checkbox-checked-selectionmode-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/checkbox-checked-selectionmode-dark@2.png b/src/assets/gtk/common-assets/assets-orange/checkbox-checked-selectionmode-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/checkbox-checked-selectionmode-dark@2.png rename to src/assets/gtk/common-assets/assets-orange/checkbox-checked-selectionmode-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/checkbox-checked-selectionmode.png b/src/assets/gtk/common-assets/assets-orange/checkbox-checked-selectionmode.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/checkbox-checked-selectionmode.png rename to src/assets/gtk/common-assets/assets-orange/checkbox-checked-selectionmode.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/checkbox-checked-selectionmode@2.png b/src/assets/gtk/common-assets/assets-orange/checkbox-checked-selectionmode@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/checkbox-checked-selectionmode@2.png rename to src/assets/gtk/common-assets/assets-orange/checkbox-checked-selectionmode@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/checkbox-checked.png b/src/assets/gtk/common-assets/assets-orange/checkbox-checked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/checkbox-checked.png rename to src/assets/gtk/common-assets/assets-orange/checkbox-checked.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/checkbox-checked@2.png b/src/assets/gtk/common-assets/assets-orange/checkbox-checked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/checkbox-checked@2.png rename to src/assets/gtk/common-assets/assets-orange/checkbox-checked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/checkbox-mixed-dark.png b/src/assets/gtk/common-assets/assets-orange/checkbox-mixed-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/checkbox-mixed-dark.png rename to src/assets/gtk/common-assets/assets-orange/checkbox-mixed-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/checkbox-mixed-dark@2.png b/src/assets/gtk/common-assets/assets-orange/checkbox-mixed-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/checkbox-mixed-dark@2.png rename to src/assets/gtk/common-assets/assets-orange/checkbox-mixed-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/checkbox-mixed.png b/src/assets/gtk/common-assets/assets-orange/checkbox-mixed.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/checkbox-mixed.png rename to src/assets/gtk/common-assets/assets-orange/checkbox-mixed.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/checkbox-mixed@2.png b/src/assets/gtk/common-assets/assets-orange/checkbox-mixed@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/checkbox-mixed@2.png rename to src/assets/gtk/common-assets/assets-orange/checkbox-mixed@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/radio-checked-dark.png b/src/assets/gtk/common-assets/assets-orange/radio-checked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/radio-checked-dark.png rename to src/assets/gtk/common-assets/assets-orange/radio-checked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/radio-checked-dark@2.png b/src/assets/gtk/common-assets/assets-orange/radio-checked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/radio-checked-dark@2.png rename to src/assets/gtk/common-assets/assets-orange/radio-checked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/radio-checked.png b/src/assets/gtk/common-assets/assets-orange/radio-checked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/radio-checked.png rename to src/assets/gtk/common-assets/assets-orange/radio-checked.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/radio-checked@2.png b/src/assets/gtk/common-assets/assets-orange/radio-checked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/radio-checked@2.png rename to src/assets/gtk/common-assets/assets-orange/radio-checked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/radio-mixed-dark.png b/src/assets/gtk/common-assets/assets-orange/radio-mixed-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/radio-mixed-dark.png rename to src/assets/gtk/common-assets/assets-orange/radio-mixed-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/radio-mixed-dark@2.png b/src/assets/gtk/common-assets/assets-orange/radio-mixed-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/radio-mixed-dark@2.png rename to src/assets/gtk/common-assets/assets-orange/radio-mixed-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/radio-mixed.png b/src/assets/gtk/common-assets/assets-orange/radio-mixed.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/radio-mixed.png rename to src/assets/gtk/common-assets/assets-orange/radio-mixed.png diff --git a/src/assets/gtk-3.0/common-assets/assets-orange/radio-mixed@2.png b/src/assets/gtk/common-assets/assets-orange/radio-mixed@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-orange/radio-mixed@2.png rename to src/assets/gtk/common-assets/assets-orange/radio-mixed@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink.svg b/src/assets/gtk/common-assets/assets-pink.svg similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink.svg rename to src/assets/gtk/common-assets/assets-pink.svg diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/checkbox-checked-dark.png b/src/assets/gtk/common-assets/assets-pink/checkbox-checked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/checkbox-checked-dark.png rename to src/assets/gtk/common-assets/assets-pink/checkbox-checked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/checkbox-checked-dark@2.png b/src/assets/gtk/common-assets/assets-pink/checkbox-checked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/checkbox-checked-dark@2.png rename to src/assets/gtk/common-assets/assets-pink/checkbox-checked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/checkbox-checked-selectionmode-dark.png b/src/assets/gtk/common-assets/assets-pink/checkbox-checked-selectionmode-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/checkbox-checked-selectionmode-dark.png rename to src/assets/gtk/common-assets/assets-pink/checkbox-checked-selectionmode-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/checkbox-checked-selectionmode-dark@2.png b/src/assets/gtk/common-assets/assets-pink/checkbox-checked-selectionmode-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/checkbox-checked-selectionmode-dark@2.png rename to src/assets/gtk/common-assets/assets-pink/checkbox-checked-selectionmode-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/checkbox-checked-selectionmode.png b/src/assets/gtk/common-assets/assets-pink/checkbox-checked-selectionmode.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/checkbox-checked-selectionmode.png rename to src/assets/gtk/common-assets/assets-pink/checkbox-checked-selectionmode.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/checkbox-checked-selectionmode@2.png b/src/assets/gtk/common-assets/assets-pink/checkbox-checked-selectionmode@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/checkbox-checked-selectionmode@2.png rename to src/assets/gtk/common-assets/assets-pink/checkbox-checked-selectionmode@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/checkbox-checked.png b/src/assets/gtk/common-assets/assets-pink/checkbox-checked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/checkbox-checked.png rename to src/assets/gtk/common-assets/assets-pink/checkbox-checked.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/checkbox-checked@2.png b/src/assets/gtk/common-assets/assets-pink/checkbox-checked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/checkbox-checked@2.png rename to src/assets/gtk/common-assets/assets-pink/checkbox-checked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/checkbox-mixed-dark.png b/src/assets/gtk/common-assets/assets-pink/checkbox-mixed-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/checkbox-mixed-dark.png rename to src/assets/gtk/common-assets/assets-pink/checkbox-mixed-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/checkbox-mixed-dark@2.png b/src/assets/gtk/common-assets/assets-pink/checkbox-mixed-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/checkbox-mixed-dark@2.png rename to src/assets/gtk/common-assets/assets-pink/checkbox-mixed-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/checkbox-mixed.png b/src/assets/gtk/common-assets/assets-pink/checkbox-mixed.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/checkbox-mixed.png rename to src/assets/gtk/common-assets/assets-pink/checkbox-mixed.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/checkbox-mixed@2.png b/src/assets/gtk/common-assets/assets-pink/checkbox-mixed@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/checkbox-mixed@2.png rename to src/assets/gtk/common-assets/assets-pink/checkbox-mixed@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/radio-checked-dark.png b/src/assets/gtk/common-assets/assets-pink/radio-checked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/radio-checked-dark.png rename to src/assets/gtk/common-assets/assets-pink/radio-checked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/radio-checked-dark@2.png b/src/assets/gtk/common-assets/assets-pink/radio-checked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/radio-checked-dark@2.png rename to src/assets/gtk/common-assets/assets-pink/radio-checked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/radio-checked.png b/src/assets/gtk/common-assets/assets-pink/radio-checked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/radio-checked.png rename to src/assets/gtk/common-assets/assets-pink/radio-checked.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/radio-checked@2.png b/src/assets/gtk/common-assets/assets-pink/radio-checked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/radio-checked@2.png rename to src/assets/gtk/common-assets/assets-pink/radio-checked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/radio-mixed-dark.png b/src/assets/gtk/common-assets/assets-pink/radio-mixed-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/radio-mixed-dark.png rename to src/assets/gtk/common-assets/assets-pink/radio-mixed-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/radio-mixed-dark@2.png b/src/assets/gtk/common-assets/assets-pink/radio-mixed-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/radio-mixed-dark@2.png rename to src/assets/gtk/common-assets/assets-pink/radio-mixed-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/radio-mixed.png b/src/assets/gtk/common-assets/assets-pink/radio-mixed.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/radio-mixed.png rename to src/assets/gtk/common-assets/assets-pink/radio-mixed.png diff --git a/src/assets/gtk-3.0/common-assets/assets-pink/radio-mixed@2.png b/src/assets/gtk/common-assets/assets-pink/radio-mixed@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-pink/radio-mixed@2.png rename to src/assets/gtk/common-assets/assets-pink/radio-mixed@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple.svg b/src/assets/gtk/common-assets/assets-purple.svg similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple.svg rename to src/assets/gtk/common-assets/assets-purple.svg diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/checkbox-checked-dark.png b/src/assets/gtk/common-assets/assets-purple/checkbox-checked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/checkbox-checked-dark.png rename to src/assets/gtk/common-assets/assets-purple/checkbox-checked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/checkbox-checked-dark@2.png b/src/assets/gtk/common-assets/assets-purple/checkbox-checked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/checkbox-checked-dark@2.png rename to src/assets/gtk/common-assets/assets-purple/checkbox-checked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/checkbox-checked-selectionmode-dark.png b/src/assets/gtk/common-assets/assets-purple/checkbox-checked-selectionmode-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/checkbox-checked-selectionmode-dark.png rename to src/assets/gtk/common-assets/assets-purple/checkbox-checked-selectionmode-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/checkbox-checked-selectionmode-dark@2.png b/src/assets/gtk/common-assets/assets-purple/checkbox-checked-selectionmode-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/checkbox-checked-selectionmode-dark@2.png rename to src/assets/gtk/common-assets/assets-purple/checkbox-checked-selectionmode-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/checkbox-checked-selectionmode.png b/src/assets/gtk/common-assets/assets-purple/checkbox-checked-selectionmode.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/checkbox-checked-selectionmode.png rename to src/assets/gtk/common-assets/assets-purple/checkbox-checked-selectionmode.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/checkbox-checked-selectionmode@2.png b/src/assets/gtk/common-assets/assets-purple/checkbox-checked-selectionmode@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/checkbox-checked-selectionmode@2.png rename to src/assets/gtk/common-assets/assets-purple/checkbox-checked-selectionmode@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/checkbox-checked.png b/src/assets/gtk/common-assets/assets-purple/checkbox-checked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/checkbox-checked.png rename to src/assets/gtk/common-assets/assets-purple/checkbox-checked.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/checkbox-checked@2.png b/src/assets/gtk/common-assets/assets-purple/checkbox-checked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/checkbox-checked@2.png rename to src/assets/gtk/common-assets/assets-purple/checkbox-checked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/checkbox-mixed-dark.png b/src/assets/gtk/common-assets/assets-purple/checkbox-mixed-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/checkbox-mixed-dark.png rename to src/assets/gtk/common-assets/assets-purple/checkbox-mixed-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/checkbox-mixed-dark@2.png b/src/assets/gtk/common-assets/assets-purple/checkbox-mixed-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/checkbox-mixed-dark@2.png rename to src/assets/gtk/common-assets/assets-purple/checkbox-mixed-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/checkbox-mixed.png b/src/assets/gtk/common-assets/assets-purple/checkbox-mixed.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/checkbox-mixed.png rename to src/assets/gtk/common-assets/assets-purple/checkbox-mixed.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/checkbox-mixed@2.png b/src/assets/gtk/common-assets/assets-purple/checkbox-mixed@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/checkbox-mixed@2.png rename to src/assets/gtk/common-assets/assets-purple/checkbox-mixed@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/radio-checked-dark.png b/src/assets/gtk/common-assets/assets-purple/radio-checked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/radio-checked-dark.png rename to src/assets/gtk/common-assets/assets-purple/radio-checked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/radio-checked-dark@2.png b/src/assets/gtk/common-assets/assets-purple/radio-checked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/radio-checked-dark@2.png rename to src/assets/gtk/common-assets/assets-purple/radio-checked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/radio-checked.png b/src/assets/gtk/common-assets/assets-purple/radio-checked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/radio-checked.png rename to src/assets/gtk/common-assets/assets-purple/radio-checked.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/radio-checked@2.png b/src/assets/gtk/common-assets/assets-purple/radio-checked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/radio-checked@2.png rename to src/assets/gtk/common-assets/assets-purple/radio-checked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/radio-mixed-dark.png b/src/assets/gtk/common-assets/assets-purple/radio-mixed-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/radio-mixed-dark.png rename to src/assets/gtk/common-assets/assets-purple/radio-mixed-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/radio-mixed-dark@2.png b/src/assets/gtk/common-assets/assets-purple/radio-mixed-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/radio-mixed-dark@2.png rename to src/assets/gtk/common-assets/assets-purple/radio-mixed-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/radio-mixed.png b/src/assets/gtk/common-assets/assets-purple/radio-mixed.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/radio-mixed.png rename to src/assets/gtk/common-assets/assets-purple/radio-mixed.png diff --git a/src/assets/gtk-3.0/common-assets/assets-purple/radio-mixed@2.png b/src/assets/gtk/common-assets/assets-purple/radio-mixed@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-purple/radio-mixed@2.png rename to src/assets/gtk/common-assets/assets-purple/radio-mixed@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red.svg b/src/assets/gtk/common-assets/assets-red.svg similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red.svg rename to src/assets/gtk/common-assets/assets-red.svg diff --git a/src/assets/gtk-3.0/common-assets/assets-red/checkbox-checked-dark.png b/src/assets/gtk/common-assets/assets-red/checkbox-checked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/checkbox-checked-dark.png rename to src/assets/gtk/common-assets/assets-red/checkbox-checked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/checkbox-checked-dark@2.png b/src/assets/gtk/common-assets/assets-red/checkbox-checked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/checkbox-checked-dark@2.png rename to src/assets/gtk/common-assets/assets-red/checkbox-checked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/checkbox-checked-selectionmode-dark.png b/src/assets/gtk/common-assets/assets-red/checkbox-checked-selectionmode-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/checkbox-checked-selectionmode-dark.png rename to src/assets/gtk/common-assets/assets-red/checkbox-checked-selectionmode-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/checkbox-checked-selectionmode-dark@2.png b/src/assets/gtk/common-assets/assets-red/checkbox-checked-selectionmode-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/checkbox-checked-selectionmode-dark@2.png rename to src/assets/gtk/common-assets/assets-red/checkbox-checked-selectionmode-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/checkbox-checked-selectionmode.png b/src/assets/gtk/common-assets/assets-red/checkbox-checked-selectionmode.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/checkbox-checked-selectionmode.png rename to src/assets/gtk/common-assets/assets-red/checkbox-checked-selectionmode.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/checkbox-checked-selectionmode@2.png b/src/assets/gtk/common-assets/assets-red/checkbox-checked-selectionmode@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/checkbox-checked-selectionmode@2.png rename to src/assets/gtk/common-assets/assets-red/checkbox-checked-selectionmode@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/checkbox-checked.png b/src/assets/gtk/common-assets/assets-red/checkbox-checked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/checkbox-checked.png rename to src/assets/gtk/common-assets/assets-red/checkbox-checked.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/checkbox-checked@2.png b/src/assets/gtk/common-assets/assets-red/checkbox-checked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/checkbox-checked@2.png rename to src/assets/gtk/common-assets/assets-red/checkbox-checked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/checkbox-mixed-dark.png b/src/assets/gtk/common-assets/assets-red/checkbox-mixed-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/checkbox-mixed-dark.png rename to src/assets/gtk/common-assets/assets-red/checkbox-mixed-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/checkbox-mixed-dark@2.png b/src/assets/gtk/common-assets/assets-red/checkbox-mixed-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/checkbox-mixed-dark@2.png rename to src/assets/gtk/common-assets/assets-red/checkbox-mixed-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/checkbox-mixed.png b/src/assets/gtk/common-assets/assets-red/checkbox-mixed.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/checkbox-mixed.png rename to src/assets/gtk/common-assets/assets-red/checkbox-mixed.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/checkbox-mixed@2.png b/src/assets/gtk/common-assets/assets-red/checkbox-mixed@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/checkbox-mixed@2.png rename to src/assets/gtk/common-assets/assets-red/checkbox-mixed@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/radio-checked-dark.png b/src/assets/gtk/common-assets/assets-red/radio-checked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/radio-checked-dark.png rename to src/assets/gtk/common-assets/assets-red/radio-checked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/radio-checked-dark@2.png b/src/assets/gtk/common-assets/assets-red/radio-checked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/radio-checked-dark@2.png rename to src/assets/gtk/common-assets/assets-red/radio-checked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/radio-checked.png b/src/assets/gtk/common-assets/assets-red/radio-checked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/radio-checked.png rename to src/assets/gtk/common-assets/assets-red/radio-checked.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/radio-checked@2.png b/src/assets/gtk/common-assets/assets-red/radio-checked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/radio-checked@2.png rename to src/assets/gtk/common-assets/assets-red/radio-checked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/radio-mixed-dark.png b/src/assets/gtk/common-assets/assets-red/radio-mixed-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/radio-mixed-dark.png rename to src/assets/gtk/common-assets/assets-red/radio-mixed-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/radio-mixed-dark@2.png b/src/assets/gtk/common-assets/assets-red/radio-mixed-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/radio-mixed-dark@2.png rename to src/assets/gtk/common-assets/assets-red/radio-mixed-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/radio-mixed.png b/src/assets/gtk/common-assets/assets-red/radio-mixed.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/radio-mixed.png rename to src/assets/gtk/common-assets/assets-red/radio-mixed.png diff --git a/src/assets/gtk-3.0/common-assets/assets-red/radio-mixed@2.png b/src/assets/gtk/common-assets/assets-red/radio-mixed@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-red/radio-mixed@2.png rename to src/assets/gtk/common-assets/assets-red/radio-mixed@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow.svg b/src/assets/gtk/common-assets/assets-yellow.svg similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow.svg rename to src/assets/gtk/common-assets/assets-yellow.svg diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-checked-dark.png b/src/assets/gtk/common-assets/assets-yellow/checkbox-checked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-checked-dark.png rename to src/assets/gtk/common-assets/assets-yellow/checkbox-checked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-checked-dark@2.png b/src/assets/gtk/common-assets/assets-yellow/checkbox-checked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-checked-dark@2.png rename to src/assets/gtk/common-assets/assets-yellow/checkbox-checked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-checked-selectionmode-dark.png b/src/assets/gtk/common-assets/assets-yellow/checkbox-checked-selectionmode-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-checked-selectionmode-dark.png rename to src/assets/gtk/common-assets/assets-yellow/checkbox-checked-selectionmode-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-checked-selectionmode-dark@2.png b/src/assets/gtk/common-assets/assets-yellow/checkbox-checked-selectionmode-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-checked-selectionmode-dark@2.png rename to src/assets/gtk/common-assets/assets-yellow/checkbox-checked-selectionmode-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-checked-selectionmode.png b/src/assets/gtk/common-assets/assets-yellow/checkbox-checked-selectionmode.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-checked-selectionmode.png rename to src/assets/gtk/common-assets/assets-yellow/checkbox-checked-selectionmode.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-checked-selectionmode@2.png b/src/assets/gtk/common-assets/assets-yellow/checkbox-checked-selectionmode@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-checked-selectionmode@2.png rename to src/assets/gtk/common-assets/assets-yellow/checkbox-checked-selectionmode@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-checked.png b/src/assets/gtk/common-assets/assets-yellow/checkbox-checked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-checked.png rename to src/assets/gtk/common-assets/assets-yellow/checkbox-checked.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-checked@2.png b/src/assets/gtk/common-assets/assets-yellow/checkbox-checked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-checked@2.png rename to src/assets/gtk/common-assets/assets-yellow/checkbox-checked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-mixed-dark.png b/src/assets/gtk/common-assets/assets-yellow/checkbox-mixed-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-mixed-dark.png rename to src/assets/gtk/common-assets/assets-yellow/checkbox-mixed-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-mixed-dark@2.png b/src/assets/gtk/common-assets/assets-yellow/checkbox-mixed-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-mixed-dark@2.png rename to src/assets/gtk/common-assets/assets-yellow/checkbox-mixed-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-mixed.png b/src/assets/gtk/common-assets/assets-yellow/checkbox-mixed.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-mixed.png rename to src/assets/gtk/common-assets/assets-yellow/checkbox-mixed.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-mixed@2.png b/src/assets/gtk/common-assets/assets-yellow/checkbox-mixed@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/checkbox-mixed@2.png rename to src/assets/gtk/common-assets/assets-yellow/checkbox-mixed@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/radio-checked-dark.png b/src/assets/gtk/common-assets/assets-yellow/radio-checked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/radio-checked-dark.png rename to src/assets/gtk/common-assets/assets-yellow/radio-checked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/radio-checked-dark@2.png b/src/assets/gtk/common-assets/assets-yellow/radio-checked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/radio-checked-dark@2.png rename to src/assets/gtk/common-assets/assets-yellow/radio-checked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/radio-checked.png b/src/assets/gtk/common-assets/assets-yellow/radio-checked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/radio-checked.png rename to src/assets/gtk/common-assets/assets-yellow/radio-checked.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/radio-checked@2.png b/src/assets/gtk/common-assets/assets-yellow/radio-checked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/radio-checked@2.png rename to src/assets/gtk/common-assets/assets-yellow/radio-checked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/radio-mixed-dark.png b/src/assets/gtk/common-assets/assets-yellow/radio-mixed-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/radio-mixed-dark.png rename to src/assets/gtk/common-assets/assets-yellow/radio-mixed-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/radio-mixed-dark@2.png b/src/assets/gtk/common-assets/assets-yellow/radio-mixed-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/radio-mixed-dark@2.png rename to src/assets/gtk/common-assets/assets-yellow/radio-mixed-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/radio-mixed.png b/src/assets/gtk/common-assets/assets-yellow/radio-mixed.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/radio-mixed.png rename to src/assets/gtk/common-assets/assets-yellow/radio-mixed.png diff --git a/src/assets/gtk-3.0/common-assets/assets-yellow/radio-mixed@2.png b/src/assets/gtk/common-assets/assets-yellow/radio-mixed@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets-yellow/radio-mixed@2.png rename to src/assets/gtk/common-assets/assets-yellow/radio-mixed@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets.svg b/src/assets/gtk/common-assets/assets.svg similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets.svg rename to src/assets/gtk/common-assets/assets.svg diff --git a/src/assets/gtk-3.0/common-assets/assets.txt b/src/assets/gtk/common-assets/assets.txt similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets.txt rename to src/assets/gtk/common-assets/assets.txt diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-dark.png b/src/assets/gtk/common-assets/assets/checkbox-checked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-checked-dark.png rename to src/assets/gtk/common-assets/assets/checkbox-checked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-dark@2.png b/src/assets/gtk/common-assets/assets/checkbox-checked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-checked-dark@2.png rename to src/assets/gtk/common-assets/assets/checkbox-checked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-dark.png b/src/assets/gtk/common-assets/assets/checkbox-checked-insensitive-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-dark.png rename to src/assets/gtk/common-assets/assets/checkbox-checked-insensitive-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-dark@2.png b/src/assets/gtk/common-assets/assets/checkbox-checked-insensitive-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-dark@2.png rename to src/assets/gtk/common-assets/assets/checkbox-checked-insensitive-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-selected.png b/src/assets/gtk/common-assets/assets/checkbox-checked-insensitive-selected.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-selected.png rename to src/assets/gtk/common-assets/assets/checkbox-checked-insensitive-selected.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-selected@2.png b/src/assets/gtk/common-assets/assets/checkbox-checked-insensitive-selected@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-selected@2.png rename to src/assets/gtk/common-assets/assets/checkbox-checked-insensitive-selected@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive.png b/src/assets/gtk/common-assets/assets/checkbox-checked-insensitive.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive.png rename to src/assets/gtk/common-assets/assets/checkbox-checked-insensitive.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive@2.png b/src/assets/gtk/common-assets/assets/checkbox-checked-insensitive@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive@2.png rename to src/assets/gtk/common-assets/assets/checkbox-checked-insensitive@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selected.png b/src/assets/gtk/common-assets/assets/checkbox-checked-selected.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selected.png rename to src/assets/gtk/common-assets/assets/checkbox-checked-selected.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selected@2.png b/src/assets/gtk/common-assets/assets/checkbox-checked-selected@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selected@2.png rename to src/assets/gtk/common-assets/assets/checkbox-checked-selected@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode-dark.png b/src/assets/gtk/common-assets/assets/checkbox-checked-selectionmode-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode-dark.png rename to src/assets/gtk/common-assets/assets/checkbox-checked-selectionmode-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode-dark@2.png b/src/assets/gtk/common-assets/assets/checkbox-checked-selectionmode-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode-dark@2.png rename to src/assets/gtk/common-assets/assets/checkbox-checked-selectionmode-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode.png b/src/assets/gtk/common-assets/assets/checkbox-checked-selectionmode.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode.png rename to src/assets/gtk/common-assets/assets/checkbox-checked-selectionmode.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode@2.png b/src/assets/gtk/common-assets/assets/checkbox-checked-selectionmode@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode@2.png rename to src/assets/gtk/common-assets/assets/checkbox-checked-selectionmode@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked.png b/src/assets/gtk/common-assets/assets/checkbox-checked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-checked.png rename to src/assets/gtk/common-assets/assets/checkbox-checked.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked@2.png b/src/assets/gtk/common-assets/assets/checkbox-checked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-checked@2.png rename to src/assets/gtk/common-assets/assets/checkbox-checked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-dark.png b/src/assets/gtk/common-assets/assets/checkbox-mixed-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-dark.png rename to src/assets/gtk/common-assets/assets/checkbox-mixed-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-dark@2.png b/src/assets/gtk/common-assets/assets/checkbox-mixed-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-dark@2.png rename to src/assets/gtk/common-assets/assets/checkbox-mixed-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-dark.png b/src/assets/gtk/common-assets/assets/checkbox-mixed-insensitive-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-dark.png rename to src/assets/gtk/common-assets/assets/checkbox-mixed-insensitive-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-dark@2.png b/src/assets/gtk/common-assets/assets/checkbox-mixed-insensitive-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-dark@2.png rename to src/assets/gtk/common-assets/assets/checkbox-mixed-insensitive-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-selected.png b/src/assets/gtk/common-assets/assets/checkbox-mixed-insensitive-selected.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-selected.png rename to src/assets/gtk/common-assets/assets/checkbox-mixed-insensitive-selected.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-selected@2.png b/src/assets/gtk/common-assets/assets/checkbox-mixed-insensitive-selected@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-selected@2.png rename to src/assets/gtk/common-assets/assets/checkbox-mixed-insensitive-selected@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive.png b/src/assets/gtk/common-assets/assets/checkbox-mixed-insensitive.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive.png rename to src/assets/gtk/common-assets/assets/checkbox-mixed-insensitive.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive@2.png b/src/assets/gtk/common-assets/assets/checkbox-mixed-insensitive@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive@2.png rename to src/assets/gtk/common-assets/assets/checkbox-mixed-insensitive@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-selected.png b/src/assets/gtk/common-assets/assets/checkbox-mixed-selected.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-selected.png rename to src/assets/gtk/common-assets/assets/checkbox-mixed-selected.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-selected@2.png b/src/assets/gtk/common-assets/assets/checkbox-mixed-selected@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-selected@2.png rename to src/assets/gtk/common-assets/assets/checkbox-mixed-selected@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed.png b/src/assets/gtk/common-assets/assets/checkbox-mixed.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-mixed.png rename to src/assets/gtk/common-assets/assets/checkbox-mixed.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed@2.png b/src/assets/gtk/common-assets/assets/checkbox-mixed@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-mixed@2.png rename to src/assets/gtk/common-assets/assets/checkbox-mixed@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode-dark.png b/src/assets/gtk/common-assets/assets/checkbox-selectionmode-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode-dark.png rename to src/assets/gtk/common-assets/assets/checkbox-selectionmode-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode-dark@2.png b/src/assets/gtk/common-assets/assets/checkbox-selectionmode-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode-dark@2.png rename to src/assets/gtk/common-assets/assets/checkbox-selectionmode-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode.png b/src/assets/gtk/common-assets/assets/checkbox-selectionmode.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode.png rename to src/assets/gtk/common-assets/assets/checkbox-selectionmode.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode@2.png b/src/assets/gtk/common-assets/assets/checkbox-selectionmode@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode@2.png rename to src/assets/gtk/common-assets/assets/checkbox-selectionmode@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-dark.png b/src/assets/gtk/common-assets/assets/checkbox-unchecked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-dark.png rename to src/assets/gtk/common-assets/assets/checkbox-unchecked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-dark@2.png b/src/assets/gtk/common-assets/assets/checkbox-unchecked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-dark@2.png rename to src/assets/gtk/common-assets/assets/checkbox-unchecked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-dark.png b/src/assets/gtk/common-assets/assets/checkbox-unchecked-insensitive-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-dark.png rename to src/assets/gtk/common-assets/assets/checkbox-unchecked-insensitive-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-dark@2.png b/src/assets/gtk/common-assets/assets/checkbox-unchecked-insensitive-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-dark@2.png rename to src/assets/gtk/common-assets/assets/checkbox-unchecked-insensitive-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-selected.png b/src/assets/gtk/common-assets/assets/checkbox-unchecked-insensitive-selected.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-selected.png rename to src/assets/gtk/common-assets/assets/checkbox-unchecked-insensitive-selected.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-selected@2.png b/src/assets/gtk/common-assets/assets/checkbox-unchecked-insensitive-selected@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-selected@2.png rename to src/assets/gtk/common-assets/assets/checkbox-unchecked-insensitive-selected@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive.png b/src/assets/gtk/common-assets/assets/checkbox-unchecked-insensitive.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive.png rename to src/assets/gtk/common-assets/assets/checkbox-unchecked-insensitive.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive@2.png b/src/assets/gtk/common-assets/assets/checkbox-unchecked-insensitive@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive@2.png rename to src/assets/gtk/common-assets/assets/checkbox-unchecked-insensitive@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-selected.png b/src/assets/gtk/common-assets/assets/checkbox-unchecked-selected.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-selected.png rename to src/assets/gtk/common-assets/assets/checkbox-unchecked-selected.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-selected@2.png b/src/assets/gtk/common-assets/assets/checkbox-unchecked-selected@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-selected@2.png rename to src/assets/gtk/common-assets/assets/checkbox-unchecked-selected@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked.png b/src/assets/gtk/common-assets/assets/checkbox-unchecked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked.png rename to src/assets/gtk/common-assets/assets/checkbox-unchecked.png diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked@2.png b/src/assets/gtk/common-assets/assets/checkbox-unchecked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked@2.png rename to src/assets/gtk/common-assets/assets/checkbox-unchecked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/combobox-arrow-dark.png b/src/assets/gtk/common-assets/assets/combobox-arrow-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/combobox-arrow-dark.png rename to src/assets/gtk/common-assets/assets/combobox-arrow-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets/combobox-arrow-dark@2.png b/src/assets/gtk/common-assets/assets/combobox-arrow-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/combobox-arrow-dark@2.png rename to src/assets/gtk/common-assets/assets/combobox-arrow-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/combobox-arrow.png b/src/assets/gtk/common-assets/assets/combobox-arrow.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/combobox-arrow.png rename to src/assets/gtk/common-assets/assets/combobox-arrow.png diff --git a/src/assets/gtk-3.0/common-assets/assets/combobox-arrow@2.png b/src/assets/gtk/common-assets/assets/combobox-arrow@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/combobox-arrow@2.png rename to src/assets/gtk/common-assets/assets/combobox-arrow@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/paned-separator-dark.png b/src/assets/gtk/common-assets/assets/paned-separator-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/paned-separator-dark.png rename to src/assets/gtk/common-assets/assets/paned-separator-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets/paned-separator-dark@2.png b/src/assets/gtk/common-assets/assets/paned-separator-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/paned-separator-dark@2.png rename to src/assets/gtk/common-assets/assets/paned-separator-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/paned-separator.png b/src/assets/gtk/common-assets/assets/paned-separator.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/paned-separator.png rename to src/assets/gtk/common-assets/assets/paned-separator.png diff --git a/src/assets/gtk-3.0/common-assets/assets/paned-separator@2.png b/src/assets/gtk/common-assets/assets/paned-separator@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/paned-separator@2.png rename to src/assets/gtk/common-assets/assets/paned-separator@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-dark.png b/src/assets/gtk/common-assets/assets/radio-checked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-checked-dark.png rename to src/assets/gtk/common-assets/assets/radio-checked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-dark@2.png b/src/assets/gtk/common-assets/assets/radio-checked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-checked-dark@2.png rename to src/assets/gtk/common-assets/assets/radio-checked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-dark.png b/src/assets/gtk/common-assets/assets/radio-checked-insensitive-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-dark.png rename to src/assets/gtk/common-assets/assets/radio-checked-insensitive-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-dark@2.png b/src/assets/gtk/common-assets/assets/radio-checked-insensitive-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-dark@2.png rename to src/assets/gtk/common-assets/assets/radio-checked-insensitive-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-selected.png b/src/assets/gtk/common-assets/assets/radio-checked-insensitive-selected.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-selected.png rename to src/assets/gtk/common-assets/assets/radio-checked-insensitive-selected.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-selected@2.png b/src/assets/gtk/common-assets/assets/radio-checked-insensitive-selected@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-selected@2.png rename to src/assets/gtk/common-assets/assets/radio-checked-insensitive-selected@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive.png b/src/assets/gtk/common-assets/assets/radio-checked-insensitive.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive.png rename to src/assets/gtk/common-assets/assets/radio-checked-insensitive.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive@2.png b/src/assets/gtk/common-assets/assets/radio-checked-insensitive@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive@2.png rename to src/assets/gtk/common-assets/assets/radio-checked-insensitive@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-selected.png b/src/assets/gtk/common-assets/assets/radio-checked-selected.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-checked-selected.png rename to src/assets/gtk/common-assets/assets/radio-checked-selected.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-selected@2.png b/src/assets/gtk/common-assets/assets/radio-checked-selected@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-checked-selected@2.png rename to src/assets/gtk/common-assets/assets/radio-checked-selected@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked.png b/src/assets/gtk/common-assets/assets/radio-checked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-checked.png rename to src/assets/gtk/common-assets/assets/radio-checked.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked@2.png b/src/assets/gtk/common-assets/assets/radio-checked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-checked@2.png rename to src/assets/gtk/common-assets/assets/radio-checked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-dark.png b/src/assets/gtk/common-assets/assets/radio-mixed-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-mixed-dark.png rename to src/assets/gtk/common-assets/assets/radio-mixed-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-dark@2.png b/src/assets/gtk/common-assets/assets/radio-mixed-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-mixed-dark@2.png rename to src/assets/gtk/common-assets/assets/radio-mixed-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-dark.png b/src/assets/gtk/common-assets/assets/radio-mixed-insensitive-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-dark.png rename to src/assets/gtk/common-assets/assets/radio-mixed-insensitive-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-dark@2.png b/src/assets/gtk/common-assets/assets/radio-mixed-insensitive-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-dark@2.png rename to src/assets/gtk/common-assets/assets/radio-mixed-insensitive-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-selected.png b/src/assets/gtk/common-assets/assets/radio-mixed-insensitive-selected.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-selected.png rename to src/assets/gtk/common-assets/assets/radio-mixed-insensitive-selected.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-selected@2.png b/src/assets/gtk/common-assets/assets/radio-mixed-insensitive-selected@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-selected@2.png rename to src/assets/gtk/common-assets/assets/radio-mixed-insensitive-selected@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive.png b/src/assets/gtk/common-assets/assets/radio-mixed-insensitive.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive.png rename to src/assets/gtk/common-assets/assets/radio-mixed-insensitive.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive@2.png b/src/assets/gtk/common-assets/assets/radio-mixed-insensitive@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive@2.png rename to src/assets/gtk/common-assets/assets/radio-mixed-insensitive@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-selected.png b/src/assets/gtk/common-assets/assets/radio-mixed-selected.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-mixed-selected.png rename to src/assets/gtk/common-assets/assets/radio-mixed-selected.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-selected@2.png b/src/assets/gtk/common-assets/assets/radio-mixed-selected@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-mixed-selected@2.png rename to src/assets/gtk/common-assets/assets/radio-mixed-selected@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed.png b/src/assets/gtk/common-assets/assets/radio-mixed.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-mixed.png rename to src/assets/gtk/common-assets/assets/radio-mixed.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed@2.png b/src/assets/gtk/common-assets/assets/radio-mixed@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-mixed@2.png rename to src/assets/gtk/common-assets/assets/radio-mixed@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-dark.png b/src/assets/gtk/common-assets/assets/radio-unchecked-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-unchecked-dark.png rename to src/assets/gtk/common-assets/assets/radio-unchecked-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-dark@2.png b/src/assets/gtk/common-assets/assets/radio-unchecked-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-unchecked-dark@2.png rename to src/assets/gtk/common-assets/assets/radio-unchecked-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive-dark.png b/src/assets/gtk/common-assets/assets/radio-unchecked-insensitive-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive-dark.png rename to src/assets/gtk/common-assets/assets/radio-unchecked-insensitive-dark.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive-dark@2.png b/src/assets/gtk/common-assets/assets/radio-unchecked-insensitive-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive-dark@2.png rename to src/assets/gtk/common-assets/assets/radio-unchecked-insensitive-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive-selected.png b/src/assets/gtk/common-assets/assets/radio-unchecked-insensitive-selected.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive-selected.png rename to src/assets/gtk/common-assets/assets/radio-unchecked-insensitive-selected.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive-selected@2.png b/src/assets/gtk/common-assets/assets/radio-unchecked-insensitive-selected@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive-selected@2.png rename to src/assets/gtk/common-assets/assets/radio-unchecked-insensitive-selected@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive.png b/src/assets/gtk/common-assets/assets/radio-unchecked-insensitive.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive.png rename to src/assets/gtk/common-assets/assets/radio-unchecked-insensitive.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive@2.png b/src/assets/gtk/common-assets/assets/radio-unchecked-insensitive@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive@2.png rename to src/assets/gtk/common-assets/assets/radio-unchecked-insensitive@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-selected.png b/src/assets/gtk/common-assets/assets/radio-unchecked-selected.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-unchecked-selected.png rename to src/assets/gtk/common-assets/assets/radio-unchecked-selected.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-selected@2.png b/src/assets/gtk/common-assets/assets/radio-unchecked-selected@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-unchecked-selected@2.png rename to src/assets/gtk/common-assets/assets/radio-unchecked-selected@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked.png b/src/assets/gtk/common-assets/assets/radio-unchecked.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-unchecked.png rename to src/assets/gtk/common-assets/assets/radio-unchecked.png diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked@2.png b/src/assets/gtk/common-assets/assets/radio-unchecked@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/radio-unchecked@2.png rename to src/assets/gtk/common-assets/assets/radio-unchecked@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-active.png b/src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-above-active.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-active.png rename to src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-above-active.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-active@2.png b/src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-above-active@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-active@2.png rename to src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-above-active@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-hover.png b/src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-above-hover.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-hover.png rename to src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-above-hover.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-hover@2.png b/src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-above-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-hover@2.png rename to src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-above-hover@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-insensitive.png b/src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-above-insensitive.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-insensitive.png rename to src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-above-insensitive.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-insensitive@2.png b/src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-above-insensitive@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-insensitive@2.png rename to src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-above-insensitive@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above.png b/src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-above.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above.png rename to src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-above.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above@2.png b/src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-above@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above@2.png rename to src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-above@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-active.png b/src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-below-active.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-active.png rename to src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-below-active.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-active@2.png b/src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-below-active@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-active@2.png rename to src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-below-active@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-hover.png b/src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-below-hover.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-hover.png rename to src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-below-hover.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-hover@2.png b/src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-below-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-hover@2.png rename to src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-below-hover@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-insensitive.png b/src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-below-insensitive.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-insensitive.png rename to src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-below-insensitive.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-insensitive@2.png b/src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-below-insensitive@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-insensitive@2.png rename to src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-below-insensitive@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below.png b/src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-below.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below.png rename to src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-below.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below@2.png b/src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-below@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below@2.png rename to src/assets/gtk/common-assets/assets/slider-horz-scale-has-marks-below@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-active.png b/src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-above-active.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-active.png rename to src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-above-active.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-active@2.png b/src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-above-active@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-active@2.png rename to src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-above-active@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-hover.png b/src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-above-hover.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-hover.png rename to src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-above-hover.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-hover@2.png b/src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-above-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-hover@2.png rename to src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-above-hover@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-insensitive.png b/src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-above-insensitive.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-insensitive.png rename to src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-above-insensitive.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-insensitive@2.png b/src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-above-insensitive@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-insensitive@2.png rename to src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-above-insensitive@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above.png b/src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-above.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above.png rename to src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-above.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above@2.png b/src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-above@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above@2.png rename to src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-above@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-active.png b/src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-below-active.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-active.png rename to src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-below-active.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-active@2.png b/src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-below-active@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-active@2.png rename to src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-below-active@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-hover.png b/src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-below-hover.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-hover.png rename to src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-below-hover.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-hover@2.png b/src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-below-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-hover@2.png rename to src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-below-hover@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-insensitive.png b/src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-below-insensitive.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-insensitive.png rename to src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-below-insensitive.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-insensitive@2.png b/src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-below-insensitive@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-insensitive@2.png rename to src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-below-insensitive@2.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below.png b/src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-below.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below.png rename to src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-below.png diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below@2.png b/src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-below@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below@2.png rename to src/assets/gtk/common-assets/assets/slider-vert-scale-has-marks-below@2.png diff --git a/src/assets/gtk-3.0/common-assets/render-assets.sh b/src/assets/gtk/common-assets/render-assets.sh similarity index 100% rename from src/assets/gtk-3.0/common-assets/render-assets.sh rename to src/assets/gtk/common-assets/render-assets.sh diff --git a/src/assets/gtk-3.0/common-assets/render-sidebar-assets.sh b/src/assets/gtk/common-assets/render-sidebar-assets.sh similarity index 100% rename from src/assets/gtk-3.0/common-assets/render-sidebar-assets.sh rename to src/assets/gtk/common-assets/render-sidebar-assets.sh diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets.svg b/src/assets/gtk/common-assets/sidebar-assets.svg similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets.svg rename to src/assets/gtk/common-assets/sidebar-assets.svg diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets.txt b/src/assets/gtk/common-assets/sidebar-assets.txt similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets.txt rename to src/assets/gtk/common-assets/sidebar-assets.txt diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-200px-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px-dark.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-200px-dark.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-200px-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px-dark@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-200px-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-200px.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-200px.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-200px@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-200px@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-200px@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-220px-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px-dark.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-220px-dark.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-220px-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px-dark@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-220px-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-220px.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-220px.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-220px@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-220px@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-220px@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-240px-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px-dark.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-240px-dark.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-240px-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px-dark@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-240px-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-240px.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-240px.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-240px@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-240px@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-240px@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-260px-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px-dark.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-260px-dark.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-260px-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px-dark@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-260px-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-260px.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-260px.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-260px@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-260px@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-260px@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-280px-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px-dark.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-280px-dark.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-280px-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px-dark@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-280px-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-280px.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-280px.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-280px@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-active-280px@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-280px@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-200px-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px-dark.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-200px-dark.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-200px-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px-dark@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-200px-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-200px.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-200px.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-200px@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-200px@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-200px@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-220px-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px-dark.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-220px-dark.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-220px-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px-dark@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-220px-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-220px.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-220px.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-220px@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-220px@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-220px@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-240px-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px-dark.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-240px-dark.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-240px-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px-dark@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-240px-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-240px.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-240px.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-240px@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-240px@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-240px@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-260px-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px-dark.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-260px-dark.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-260px-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px-dark@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-260px-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-260px.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-260px.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-260px@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-260px@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-260px@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-280px-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px-dark.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-280px-dark.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-280px-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px-dark@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-280px-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-280px.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-280px.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-280px@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-checked-280px@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-280px@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-200px-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px-dark.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-200px-dark.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-200px-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px-dark@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-200px-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-200px.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-200px.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-200px@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-200px@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-200px@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-220px-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px-dark.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-220px-dark.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-220px-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px-dark@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-220px-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-220px.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-220px.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-220px@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-220px@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-220px@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-240px-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px-dark.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-240px-dark.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-240px-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px-dark@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-240px-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-240px.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-240px.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-240px@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-240px@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-240px@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-260px-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px-dark.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-260px-dark.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-260px-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px-dark@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-260px-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-260px.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-260px.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-260px@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-260px@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-260px@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-280px-dark.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px-dark.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-280px-dark.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-280px-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px-dark@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-280px-dark@2.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-280px.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-280px.png diff --git a/src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-280px@2.png similarity index 100% rename from src/assets/gtk-3.0/common-assets/sidebar-assets/sidebar-view-hover-280px@2.png rename to src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-280px@2.png diff --git a/src/assets/gtk-3.0/common-assets/theme_assets.txt b/src/assets/gtk/common-assets/theme_assets.txt similarity index 100% rename from src/assets/gtk-3.0/common-assets/theme_assets.txt rename to src/assets/gtk/common-assets/theme_assets.txt diff --git a/src/assets/gtk-3.0/thumbnails/render-thumbnails.sh b/src/assets/gtk/thumbnails/render-thumbnails.sh similarity index 100% rename from src/assets/gtk-3.0/thumbnails/render-thumbnails.sh rename to src/assets/gtk/thumbnails/render-thumbnails.sh diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail-dark-blue.png b/src/assets/gtk/thumbnails/thumbnail-dark-blue.png similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail-dark-blue.png rename to src/assets/gtk/thumbnails/thumbnail-dark-blue.png diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail-dark-green.png b/src/assets/gtk/thumbnails/thumbnail-dark-green.png similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail-dark-green.png rename to src/assets/gtk/thumbnails/thumbnail-dark-green.png diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail-dark-grey.png b/src/assets/gtk/thumbnails/thumbnail-dark-grey.png similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail-dark-grey.png rename to src/assets/gtk/thumbnails/thumbnail-dark-grey.png diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail-dark-orange.png b/src/assets/gtk/thumbnails/thumbnail-dark-orange.png similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail-dark-orange.png rename to src/assets/gtk/thumbnails/thumbnail-dark-orange.png diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail-dark-pink.png b/src/assets/gtk/thumbnails/thumbnail-dark-pink.png similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail-dark-pink.png rename to src/assets/gtk/thumbnails/thumbnail-dark-pink.png diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail-dark-purple.png b/src/assets/gtk/thumbnails/thumbnail-dark-purple.png similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail-dark-purple.png rename to src/assets/gtk/thumbnails/thumbnail-dark-purple.png diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail-dark-red.png b/src/assets/gtk/thumbnails/thumbnail-dark-red.png similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail-dark-red.png rename to src/assets/gtk/thumbnails/thumbnail-dark-red.png diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail-dark-yellow.png b/src/assets/gtk/thumbnails/thumbnail-dark-yellow.png similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail-dark-yellow.png rename to src/assets/gtk/thumbnails/thumbnail-dark-yellow.png diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail-dark.png b/src/assets/gtk/thumbnails/thumbnail-dark.png similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail-dark.png rename to src/assets/gtk/thumbnails/thumbnail-dark.png diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail-light-blue.png b/src/assets/gtk/thumbnails/thumbnail-light-blue.png similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail-light-blue.png rename to src/assets/gtk/thumbnails/thumbnail-light-blue.png diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail-light-green.png b/src/assets/gtk/thumbnails/thumbnail-light-green.png similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail-light-green.png rename to src/assets/gtk/thumbnails/thumbnail-light-green.png diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail-light-grey.png b/src/assets/gtk/thumbnails/thumbnail-light-grey.png similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail-light-grey.png rename to src/assets/gtk/thumbnails/thumbnail-light-grey.png diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail-light-orange.png b/src/assets/gtk/thumbnails/thumbnail-light-orange.png similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail-light-orange.png rename to src/assets/gtk/thumbnails/thumbnail-light-orange.png diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail-light-pink.png b/src/assets/gtk/thumbnails/thumbnail-light-pink.png similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail-light-pink.png rename to src/assets/gtk/thumbnails/thumbnail-light-pink.png diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail-light-purple.png b/src/assets/gtk/thumbnails/thumbnail-light-purple.png similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail-light-purple.png rename to src/assets/gtk/thumbnails/thumbnail-light-purple.png diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail-light-red.png b/src/assets/gtk/thumbnails/thumbnail-light-red.png similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail-light-red.png rename to src/assets/gtk/thumbnails/thumbnail-light-red.png diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail-light-yellow.png b/src/assets/gtk/thumbnails/thumbnail-light-yellow.png similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail-light-yellow.png rename to src/assets/gtk/thumbnails/thumbnail-light-yellow.png diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail-light.png b/src/assets/gtk/thumbnails/thumbnail-light.png similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail-light.png rename to src/assets/gtk/thumbnails/thumbnail-light.png diff --git a/src/assets/gtk-3.0/thumbnails/thumbnail.svg b/src/assets/gtk/thumbnails/thumbnail.svg similarity index 100% rename from src/assets/gtk-3.0/thumbnails/thumbnail.svg rename to src/assets/gtk/thumbnails/thumbnail.svg diff --git a/src/assets/gtk-3.0/windows-assets/assets.txt b/src/assets/gtk/windows-assets/assets.txt similarity index 100% rename from src/assets/gtk-3.0/windows-assets/assets.txt rename to src/assets/gtk/windows-assets/assets.txt diff --git a/src/assets/gtk-3.0/windows-assets/render-alt-assets.sh b/src/assets/gtk/windows-assets/render-alt-assets.sh similarity index 100% rename from src/assets/gtk-3.0/windows-assets/render-alt-assets.sh rename to src/assets/gtk/windows-assets/render-alt-assets.sh diff --git a/src/assets/gtk-3.0/windows-assets/render-alt-small-assets.sh b/src/assets/gtk/windows-assets/render-alt-small-assets.sh similarity index 100% rename from src/assets/gtk-3.0/windows-assets/render-alt-small-assets.sh rename to src/assets/gtk/windows-assets/render-alt-small-assets.sh diff --git a/src/assets/gtk-3.0/windows-assets/render-assets.sh b/src/assets/gtk/windows-assets/render-assets.sh similarity index 100% rename from src/assets/gtk-3.0/windows-assets/render-assets.sh rename to src/assets/gtk/windows-assets/render-assets.sh diff --git a/src/assets/gtk-3.0/windows-assets/render-small-assets.sh b/src/assets/gtk/windows-assets/render-small-assets.sh similarity index 100% rename from src/assets/gtk-3.0/windows-assets/render-small-assets.sh rename to src/assets/gtk/windows-assets/render-small-assets.sh diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-active-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-active-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-active-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-active-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-active-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-active-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-active-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-active-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-active.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-active.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-active.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-active.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-active@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-active@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-active@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-active@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-hover.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-hover.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-backdrop@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-hover.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-hover.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-close@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-close@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-active-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-active-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-active-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-active-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-active-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-active-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-active-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-active-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-active.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-active.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-active.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-active.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-active@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-active@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-active@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-active@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-hover.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-hover.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-backdrop@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-hover.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-hover.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-maximize@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-maximize@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-active-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-active-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-active-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-active-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-active-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-active-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-active-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-active-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-active.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-active.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-active.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-active.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-active@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-active@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-active@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-active@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-hover.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-hover.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-backdrop@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-hover.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-hover.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-minimize@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-minimize@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-active-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-active-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-active-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-active-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-active-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-active-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-active-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-active-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-active.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-active.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-active.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-active.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-active@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-active@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-active@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-active@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-hover.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-hover.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-backdrop@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-hover.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-hover.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore@2.png b/src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt-small/titlebutton-restore@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt-small/titlebutton-restore@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-active-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-active-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-active-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-active-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-active-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-active-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-active-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-active-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-active.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-active.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-active.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-active.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-active@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-active@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-active@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-active@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-backdrop-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-backdrop-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-backdrop-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-backdrop-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-backdrop-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-backdrop-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-backdrop-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-backdrop-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-backdrop-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-backdrop-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-backdrop-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-backdrop-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-backdrop-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-backdrop-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-backdrop-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-backdrop-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-backdrop-hover.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-backdrop-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-backdrop-hover.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-backdrop-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-backdrop-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-backdrop-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-backdrop-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-backdrop-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-backdrop.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-backdrop.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-backdrop.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-backdrop.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-backdrop@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-backdrop@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-backdrop@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-backdrop@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-hover.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-hover.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-close@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-close@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-active-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-active-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-active-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-active-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-active-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-active-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-active-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-active-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-active.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-active.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-active.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-active.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-active@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-active@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-active@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-active@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-hover.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-hover.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-backdrop@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-hover.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-hover.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-maximize@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-maximize@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-active-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-active-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-active-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-active-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-active-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-active-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-active-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-active-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-active.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-active.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-active.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-active.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-active@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-active@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-active@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-active@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-hover.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-hover.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-backdrop@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-hover.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-hover.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-minimize@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-minimize@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-active-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-active-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-active-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-active-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-active-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-active-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-active-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-active-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-active.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-active.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-active.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-active.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-active@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-active@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-active@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-active@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-hover.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-hover.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-backdrop-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-backdrop.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-backdrop.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-backdrop.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-backdrop.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-backdrop@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-backdrop@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-backdrop@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-backdrop@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-hover.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-hover.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore@2.png b/src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-alt/titlebutton-restore@2.png rename to src/assets/gtk/windows-assets/titlebutton-alt/titlebutton-restore@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-active-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-active-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-active-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-active-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-active-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-active-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-active-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-active-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-active.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-active.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-active.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-active.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-active@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-active@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-active@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-active@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-backdrop-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-backdrop-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-backdrop-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-backdrop-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-backdrop-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-backdrop-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-backdrop-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-backdrop-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-backdrop-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-backdrop-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-backdrop-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-backdrop-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-backdrop-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-backdrop-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-backdrop-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-backdrop-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-backdrop-hover.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-backdrop-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-backdrop-hover.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-backdrop-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-backdrop-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-backdrop-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-backdrop-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-backdrop-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-backdrop.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-backdrop.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-backdrop.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-backdrop.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-backdrop@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-backdrop@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-backdrop@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-backdrop@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-hover.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-hover.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-close@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-close@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-active-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-active-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-active-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-active-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-active-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-active-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-active-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-active-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-active.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-active.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-active.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-active.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-active@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-active@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-active@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-active@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-hover.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-hover.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-backdrop-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-backdrop.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-backdrop.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-backdrop.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-backdrop.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-backdrop@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-backdrop@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-backdrop@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-backdrop@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-hover.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-hover.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-maximize@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-maximize@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-active-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-active-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-active-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-active-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-active-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-active-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-active-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-active-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-active.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-active.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-active.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-active.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-active@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-active@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-active@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-active@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-hover.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-hover.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-backdrop-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-backdrop.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-backdrop.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-backdrop.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-backdrop.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-backdrop@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-backdrop@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-backdrop@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-backdrop@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-hover.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-hover.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-minimize@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-minimize@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-active-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-active-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-active-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-active-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-active-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-active-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-active-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-active-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-active.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-active.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-active.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-active.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-active@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-active@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-active@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-active@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-backdrop-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-backdrop-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-backdrop-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-backdrop-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-backdrop-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-backdrop-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-backdrop-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-backdrop-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-backdrop-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-backdrop-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-backdrop-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-backdrop-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-backdrop-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-backdrop-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-backdrop-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-backdrop-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-backdrop-hover.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-backdrop-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-backdrop-hover.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-backdrop-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-backdrop-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-backdrop-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-backdrop-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-backdrop-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-backdrop.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-backdrop.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-backdrop.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-backdrop.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-backdrop@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-backdrop@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-backdrop@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-backdrop@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-hover.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-hover.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-hover@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore@2.png b/src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton-small/titlebutton-restore@2.png rename to src/assets/gtk/windows-assets/titlebutton-small/titlebutton-restore@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-active-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close-active-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-active-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close-active-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-active-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close-active-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-active-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close-active-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-active.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close-active.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-active.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close-active.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-active@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close-active@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-active@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close-active@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-backdrop-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close-backdrop-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-backdrop-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close-backdrop-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-backdrop-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close-backdrop-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-backdrop-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close-backdrop-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-backdrop-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close-backdrop-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-backdrop-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close-backdrop-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-backdrop-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close-backdrop-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-backdrop-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close-backdrop-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-backdrop-hover.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close-backdrop-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-backdrop-hover.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close-backdrop-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-backdrop-hover@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close-backdrop-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-backdrop-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close-backdrop-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-backdrop.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close-backdrop.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-backdrop.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close-backdrop.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-backdrop@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close-backdrop@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-backdrop@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close-backdrop@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-hover.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-hover.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-hover@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-close@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-close@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-close@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-active-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-active-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-active-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-active-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-active-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-active-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-active-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-active-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-active.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-active.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-active.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-active.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-active@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-active@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-active@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-active@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-backdrop-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-backdrop-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-backdrop-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-backdrop-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-backdrop-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-backdrop-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-backdrop-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-backdrop-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-backdrop-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-backdrop-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-backdrop-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-backdrop-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-backdrop-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-backdrop-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-backdrop-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-backdrop-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-backdrop-hover.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-backdrop-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-backdrop-hover.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-backdrop-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-backdrop-hover@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-backdrop-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-backdrop-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-backdrop-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-backdrop.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-backdrop.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-backdrop.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-backdrop.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-backdrop@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-backdrop@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-backdrop@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-backdrop@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-hover.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-hover.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-hover@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-maximize@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-maximize@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-active-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-active-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-active-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-active-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-active-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-active-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-active-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-active-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-active.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-active.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-active.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-active.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-active@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-active@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-active@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-active@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-backdrop-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-backdrop-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-backdrop-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-backdrop-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-backdrop-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-backdrop-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-backdrop-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-backdrop-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-backdrop-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-backdrop-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-backdrop-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-backdrop-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-backdrop-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-backdrop-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-backdrop-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-backdrop-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-backdrop-hover.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-backdrop-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-backdrop-hover.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-backdrop-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-backdrop-hover@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-backdrop-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-backdrop-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-backdrop-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-backdrop.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-backdrop.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-backdrop.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-backdrop.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-backdrop@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-backdrop@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-backdrop@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-backdrop@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-hover.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-hover.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-hover@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-minimize@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-minimize@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-active-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-active-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-active-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-active-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-active-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-active-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-active-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-active-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-active.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-active.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-active.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-active.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-active@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-active@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-active@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-active@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-backdrop-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-backdrop-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-backdrop-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-backdrop-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-backdrop-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-backdrop-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-backdrop-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-backdrop-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-backdrop-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-backdrop-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-backdrop-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-backdrop-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-backdrop-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-backdrop-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-backdrop-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-backdrop-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-backdrop-hover.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-backdrop-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-backdrop-hover.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-backdrop-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-backdrop-hover@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-backdrop-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-backdrop-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-backdrop-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-backdrop.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-backdrop.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-backdrop.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-backdrop.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-backdrop@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-backdrop@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-backdrop@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-backdrop@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-hover-dark.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-hover-dark.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-hover-dark.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-hover-dark.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-hover-dark@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-hover-dark@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-hover-dark@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-hover-dark@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-hover.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-hover.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-hover.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-hover.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-hover@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-hover@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore-hover@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore-hover@2.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore.png diff --git a/src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore@2.png b/src/assets/gtk/windows-assets/titlebutton/titlebutton-restore@2.png similarity index 100% rename from src/assets/gtk-3.0/windows-assets/titlebutton/titlebutton-restore@2.png rename to src/assets/gtk/windows-assets/titlebutton/titlebutton-restore@2.png diff --git a/src/assets/gtk-3.0/windows-assets/windows-assets.svg b/src/assets/gtk/windows-assets/windows-assets.svg similarity index 100% rename from src/assets/gtk-3.0/windows-assets/windows-assets.svg rename to src/assets/gtk/windows-assets/windows-assets.svg diff --git a/src/main/gnome-shell/gnome-shell-theme.gresource.xml b/src/main/gnome-shell/gnome-shell-theme.gresource.xml index 4474173e..f8e3b0cb 100644 --- a/src/main/gnome-shell/gnome-shell-theme.gresource.xml +++ b/src/main/gnome-shell/gnome-shell-theme.gresource.xml @@ -26,6 +26,7 @@ icons/scalable/status/keyboard-layout-filled-symbolic.svg icons/scalable/status/keyboard-shift-filled-symbolic.svg icons/scalable/status/message-indicator-symbolic.svg + icons/scalable/status/window-close-24-symbolic.svg icons/scalable/actions/pointer-double-click-symbolic.svg icons/scalable/actions/pointer-drag-symbolic.svg icons/scalable/actions/pointer-primary-click-symbolic.svg 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 index 2ea334a3..a13ef653 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'blue'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 8be7e086..4bba431c 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'green'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 25e5c00a..75ba3d63 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'grey'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index cffe0e20..2fda1b50 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'orange'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 6d879cb1..b5b35008 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'pink'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 77eb0ec9..2a0d83e0 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'purple'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index ace25ae3..0c998c17 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'red'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index e8efeaae..c9956bf7 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'yellow'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 6320110a..c49a3952 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'default'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 2ea334a3..a13ef653 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'blue'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 8be7e086..4bba431c 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'green'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 25e5c00a..75ba3d63 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'grey'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index cffe0e20..2fda1b50 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'orange'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 6d879cb1..b5b35008 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'pink'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 77eb0ec9..2a0d83e0 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'purple'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index ace25ae3..0c998c17 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'red'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 0f95fc68..7050ef5d 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'blue'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 90197b4f..dc809a95 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'green'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index d7d3aa81..c5555a99 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'grey'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index c4028435..33500c1c 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'orange'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 58a3df7a..6d180755 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'pink'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index b7e7adb5..2196ffba 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'purple'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 10811e80..d0bdc4da 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'red'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 62381576..01042369 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'yellow'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 4bdf3c88..d557e05a 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'default'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 0f95fc68..7050ef5d 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'blue'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 90197b4f..dc809a95 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'green'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index d7d3aa81..c5555a99 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'grey'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index c4028435..33500c1c 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'orange'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 58a3df7a..6d180755 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'pink'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index b7e7adb5..2196ffba 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'purple'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 10811e80..d0bdc4da 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'red'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 62381576..01042369 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'yellow'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 4bdf3c88..d557e05a 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'default'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index e8efeaae..c9956bf7 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'yellow'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 6320110a..c49a3952 100644 --- a/src/main/gnome-shell/shell-3-28/gnome-shell-dark.scss +++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark.scss @@ -8,4 +8,4 @@ $theme: 'default'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 397e4237..359a77d3 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'blue'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 8a2c9a4a..7f6644d6 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'green'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 33f73f60..fe01955a 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'grey'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index bb1d34b7..3d28733b 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'orange'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index b6cc62bf..09751de2 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'pink'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 2df37415..d6ac06ac 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'purple'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index f74220b5..8ae142dd 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'red'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 6e682c8a..d89ec6b3 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'yellow'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 967e362b..7df35207 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'default'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index a4874a34..18681c00 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'blue'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 12c38580..7d45716b 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'green'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 5e64119d..ec8127b8 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'grey'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index d849d16e..7451f595 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'orange'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 11c7a4f8..368b0ac8 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'pink'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 82cbe6d2..ca52d06b 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'purple'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 796d04a9..7b8c8558 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'red'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 4298957c..21fa13e1 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'blue'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index a8b3847e..6ee833fb 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'green'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 6888c5ee..b14c74bc 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'grey'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 2312d044..92c11008 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'orange'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 0bdafde2..c1bebbdd 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'pink'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 418b4253..f28c5098 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'purple'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 4ee4c608..c77f29bc 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'red'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 2312d044..92c11008 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'orange'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 4c3e4fc4..a64e7f1d 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'default'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 4298957c..21fa13e1 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'blue'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index a8b3847e..6ee833fb 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'green'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 6888c5ee..b14c74bc 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'grey'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 2312d044..92c11008 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'orange'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 0bdafde2..c1bebbdd 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'pink'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 418b4253..f28c5098 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'purple'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 4ee4c608..c77f29bc 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'red'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 6eb4a4f0..952e52d8 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'yellow'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 4c3e4fc4..a64e7f1d 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'default'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index a5cb0fd0..c164d046 100644 --- 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 @@ -8,4 +8,4 @@ $theme: 'yellow'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index f4083f6e..05b29ee7 100644 --- a/src/main/gnome-shell/shell-3-28/gnome-shell-light.scss +++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light.scss @@ -8,4 +8,4 @@ $theme: 'default'; @import '../../../sass/variables'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/widgets-3-28'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-3-28'; 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 index 0dfb9477..5d398995 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'blue'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 70344d04..eb5ae385 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'green'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 7056768a..bcbc6679 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'grey'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index a723f39c..55be114c 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'orange'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 5d4fa6ce..908786bb 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'pink'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 31e32a59..17cbdfae 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'purple'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 8f4947dc..c7dfa8e7 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'red'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 21b5f47a..76213763 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'yellow'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index ba9adc4c..d7620b95 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'default'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 0dfb9477..5d398995 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'blue'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 70344d04..eb5ae385 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'green'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 7056768a..bcbc6679 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'grey'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index a723f39c..55be114c 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'orange'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 5d4fa6ce..908786bb 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'pink'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 31e32a59..17cbdfae 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'purple'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 8f4947dc..c7dfa8e7 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'red'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 67ff5cdc..d8a9daf0 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'blue'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index a7e51111..b99d6724 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'green'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 23e28250..f52f67f2 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'grey'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 17bc9a80..43f2ba3b 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'orange'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 7c26f1d7..7caec2ee 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'pink'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index d810e56c..97203066 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'purple'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index bba262e6..732b91de 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'red'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index c392d5a7..8cab9c33 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'yellow'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 23b6954c..7b902e28 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'default'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 67ff5cdc..d8a9daf0 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'blue'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index a7e51111..b99d6724 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'green'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 23e28250..f52f67f2 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'grey'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 17bc9a80..43f2ba3b 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'orange'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 7c26f1d7..7caec2ee 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'pink'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index d810e56c..97203066 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'purple'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index bba262e6..732b91de 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'red'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index c392d5a7..8cab9c33 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'yellow'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 23b6954c..7b902e28 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'default'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 21b5f47a..76213763 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'yellow'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index ba9adc4c..d7620b95 100644 --- a/src/main/gnome-shell/shell-40-0/gnome-shell-dark.scss +++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark.scss @@ -9,4 +9,4 @@ $theme: 'default'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 2a307a19..04a47848 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'blue'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index f75fd833..3be45d46 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'green'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 2246e1af..639266e4 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'grey'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 40507695..dda6a470 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'orange'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 371c6def..c3e69f3f 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'pink'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index a91eb511..11c91ae2 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'purple'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index fa1465bc..2d9eec44 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'red'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 17c4d6c3..62f14090 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'yellow'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 6d19a393..04864e91 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'default'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index b951b5a4..6df831d3 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'blue'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index a0724f4b..a0595608 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'green'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions';; +@import '../../../sass/gnome-shell/extensions-40-0';; 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 index 6fb12d6d..d7ae7b3c 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'grey'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index bc938128..dfdf9593 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'orange'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 3f342c67..6d655c74 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'pink'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 3e2e136a..507c093f 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'purple'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 7e6f2e58..97a1203a 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'red'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 96c72783..145ebedd 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'blue'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 27100349..aca78300 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'green'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 165caebc..0fd8d4e1 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'grey'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions';; +@import '../../../sass/gnome-shell/extensions-40-0';; 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 index 1f041f9a..a4b2d0c8 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'orange'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 4d3ffaa5..767abc89 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'pink'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 41dd0a1a..5b8f43bf 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'purple'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index a487f84f..a330f5ee 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'red'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 1f041f9a..a4b2d0c8 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'orange'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 19decaa5..c9d891f8 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'default'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 96c72783..145ebedd 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'blue'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 27100349..aca78300 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'green'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index f4016d54..628f4b9f 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'grey'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 1f041f9a..a4b2d0c8 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'orange'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 4d3ffaa5..767abc89 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'pink'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 41dd0a1a..5b8f43bf 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'purple'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index a487f84f..a330f5ee 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'red'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 762581a5..9b7c79cd 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'yellow'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 19decaa5..c9d891f8 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'default'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 880de832..9a59fb09 100644 --- 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 @@ -9,4 +9,4 @@ $theme: 'yellow'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; 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 index 2c2d807b..dc8e732e 100644 --- a/src/main/gnome-shell/shell-40-0/gnome-shell-light.scss +++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light.scss @@ -9,4 +9,4 @@ $theme: 'default'; @import '../../../sass/gnome-shell/drawing'; @import '../../../sass/gnome-shell/common'; @import '../../../sass/gnome-shell/widgets-40-0'; -@import '../../../sass/gnome-shell/extensions'; +@import '../../../sass/gnome-shell/extensions-40-0'; diff --git a/src/main/gtk-3.0/gtk-dark-blue.scss b/src/main/gtk-3.0/gtk-dark-blue.scss index 21eabbac..b7dff020 100644 --- a/src/main/gtk-3.0/gtk-dark-blue.scss +++ b/src/main/gtk-3.0/gtk-dark-blue.scss @@ -7,7 +7,7 @@ $theme: 'blue'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-dark-green.scss b/src/main/gtk-3.0/gtk-dark-green.scss index cbfd8e40..acb954e4 100644 --- a/src/main/gtk-3.0/gtk-dark-green.scss +++ b/src/main/gtk-3.0/gtk-dark-green.scss @@ -7,7 +7,7 @@ $theme: 'green'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-dark-grey.scss b/src/main/gtk-3.0/gtk-dark-grey.scss index e33bd6c3..80436fce 100644 --- a/src/main/gtk-3.0/gtk-dark-grey.scss +++ b/src/main/gtk-3.0/gtk-dark-grey.scss @@ -7,7 +7,7 @@ $theme: 'grey'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-dark-orange.scss b/src/main/gtk-3.0/gtk-dark-orange.scss index dac272bd..384e917f 100644 --- a/src/main/gtk-3.0/gtk-dark-orange.scss +++ b/src/main/gtk-3.0/gtk-dark-orange.scss @@ -7,7 +7,7 @@ $theme: 'orange'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-dark-pink.scss b/src/main/gtk-3.0/gtk-dark-pink.scss index 9fc191e2..6f62cae3 100644 --- a/src/main/gtk-3.0/gtk-dark-pink.scss +++ b/src/main/gtk-3.0/gtk-dark-pink.scss @@ -7,7 +7,7 @@ $theme: 'pink'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-dark-purple.scss b/src/main/gtk-3.0/gtk-dark-purple.scss index 4fc05421..46d9e4cf 100644 --- a/src/main/gtk-3.0/gtk-dark-purple.scss +++ b/src/main/gtk-3.0/gtk-dark-purple.scss @@ -7,7 +7,7 @@ $theme: 'purple'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-dark-red.scss b/src/main/gtk-3.0/gtk-dark-red.scss index eca95e4e..59d80ca0 100644 --- a/src/main/gtk-3.0/gtk-dark-red.scss +++ b/src/main/gtk-3.0/gtk-dark-red.scss @@ -7,7 +7,7 @@ $theme: 'red'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-dark-solid-blue.scss b/src/main/gtk-3.0/gtk-dark-solid-blue.scss index d1987979..f59b82d9 100644 --- a/src/main/gtk-3.0/gtk-dark-solid-blue.scss +++ b/src/main/gtk-3.0/gtk-dark-solid-blue.scss @@ -7,7 +7,7 @@ $theme: 'blue'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-dark-solid-green.scss b/src/main/gtk-3.0/gtk-dark-solid-green.scss index be92cc4a..2b135ed9 100644 --- a/src/main/gtk-3.0/gtk-dark-solid-green.scss +++ b/src/main/gtk-3.0/gtk-dark-solid-green.scss @@ -7,7 +7,7 @@ $theme: 'green'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-dark-solid-grey.scss b/src/main/gtk-3.0/gtk-dark-solid-grey.scss index bddfad08..8d352e32 100644 --- a/src/main/gtk-3.0/gtk-dark-solid-grey.scss +++ b/src/main/gtk-3.0/gtk-dark-solid-grey.scss @@ -7,7 +7,7 @@ $theme: 'grey'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-dark-solid-orange.scss b/src/main/gtk-3.0/gtk-dark-solid-orange.scss index 54a039d2..991c25bb 100644 --- a/src/main/gtk-3.0/gtk-dark-solid-orange.scss +++ b/src/main/gtk-3.0/gtk-dark-solid-orange.scss @@ -7,7 +7,7 @@ $theme: 'orange'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-dark-solid-pink.scss b/src/main/gtk-3.0/gtk-dark-solid-pink.scss index b38620e8..c70df811 100644 --- a/src/main/gtk-3.0/gtk-dark-solid-pink.scss +++ b/src/main/gtk-3.0/gtk-dark-solid-pink.scss @@ -7,7 +7,7 @@ $theme: 'pink'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-dark-solid-purple.scss b/src/main/gtk-3.0/gtk-dark-solid-purple.scss index 8b39910a..ab1f605c 100644 --- a/src/main/gtk-3.0/gtk-dark-solid-purple.scss +++ b/src/main/gtk-3.0/gtk-dark-solid-purple.scss @@ -7,7 +7,7 @@ $theme: 'purple'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-dark-solid-red.scss b/src/main/gtk-3.0/gtk-dark-solid-red.scss index 246574d4..6bcb400e 100644 --- a/src/main/gtk-3.0/gtk-dark-solid-red.scss +++ b/src/main/gtk-3.0/gtk-dark-solid-red.scss @@ -7,7 +7,7 @@ $theme: 'red'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-dark-solid-yellow.scss b/src/main/gtk-3.0/gtk-dark-solid-yellow.scss index c44ad0a0..186024ea 100644 --- a/src/main/gtk-3.0/gtk-dark-solid-yellow.scss +++ b/src/main/gtk-3.0/gtk-dark-solid-yellow.scss @@ -7,7 +7,7 @@ $theme: 'yellow'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-dark-solid.scss b/src/main/gtk-3.0/gtk-dark-solid.scss index 415d7159..a35a8f3b 100644 --- a/src/main/gtk-3.0/gtk-dark-solid.scss +++ b/src/main/gtk-3.0/gtk-dark-solid.scss @@ -7,7 +7,7 @@ $theme: 'default'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-dark-yellow.scss b/src/main/gtk-3.0/gtk-dark-yellow.scss index 51fd3129..1afcb26b 100644 --- a/src/main/gtk-3.0/gtk-dark-yellow.scss +++ b/src/main/gtk-3.0/gtk-dark-yellow.scss @@ -7,7 +7,7 @@ $theme: 'yellow'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-dark.scss b/src/main/gtk-3.0/gtk-dark.scss index 5cffa6af..a0d73504 100644 --- a/src/main/gtk-3.0/gtk-dark.scss +++ b/src/main/gtk-3.0/gtk-dark.scss @@ -7,7 +7,7 @@ $theme: 'default'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-light-blue.scss b/src/main/gtk-3.0/gtk-light-blue.scss index de8e62e6..69555531 100644 --- a/src/main/gtk-3.0/gtk-light-blue.scss +++ b/src/main/gtk-3.0/gtk-light-blue.scss @@ -7,7 +7,7 @@ $theme: 'blue'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-light-green.scss b/src/main/gtk-3.0/gtk-light-green.scss index 0f366105..0451fdc2 100644 --- a/src/main/gtk-3.0/gtk-light-green.scss +++ b/src/main/gtk-3.0/gtk-light-green.scss @@ -7,7 +7,7 @@ $theme: 'green'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-light-grey.scss b/src/main/gtk-3.0/gtk-light-grey.scss index c1e229ec..6f6f40ef 100644 --- a/src/main/gtk-3.0/gtk-light-grey.scss +++ b/src/main/gtk-3.0/gtk-light-grey.scss @@ -7,7 +7,7 @@ $theme: 'grey'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-light-orange.scss b/src/main/gtk-3.0/gtk-light-orange.scss index abcf63dd..8dab2ba5 100644 --- a/src/main/gtk-3.0/gtk-light-orange.scss +++ b/src/main/gtk-3.0/gtk-light-orange.scss @@ -7,7 +7,7 @@ $theme: 'orange'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-light-pink.scss b/src/main/gtk-3.0/gtk-light-pink.scss index a47be087..e509951e 100644 --- a/src/main/gtk-3.0/gtk-light-pink.scss +++ b/src/main/gtk-3.0/gtk-light-pink.scss @@ -7,7 +7,7 @@ $theme: 'pink'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-light-purple.scss b/src/main/gtk-3.0/gtk-light-purple.scss index d0e0d579..006a0324 100644 --- a/src/main/gtk-3.0/gtk-light-purple.scss +++ b/src/main/gtk-3.0/gtk-light-purple.scss @@ -7,7 +7,7 @@ $theme: 'purple'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-light-red.scss b/src/main/gtk-3.0/gtk-light-red.scss index 17366202..19725a73 100644 --- a/src/main/gtk-3.0/gtk-light-red.scss +++ b/src/main/gtk-3.0/gtk-light-red.scss @@ -7,7 +7,7 @@ $theme: 'red'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-light-solid-blue.scss b/src/main/gtk-3.0/gtk-light-solid-blue.scss index 580d123c..b83d0a64 100644 --- a/src/main/gtk-3.0/gtk-light-solid-blue.scss +++ b/src/main/gtk-3.0/gtk-light-solid-blue.scss @@ -7,7 +7,7 @@ $theme: 'blue'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-light-solid-green.scss b/src/main/gtk-3.0/gtk-light-solid-green.scss index fb69def4..3b6e8414 100644 --- a/src/main/gtk-3.0/gtk-light-solid-green.scss +++ b/src/main/gtk-3.0/gtk-light-solid-green.scss @@ -7,7 +7,7 @@ $theme: 'green'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-light-solid-grey.scss b/src/main/gtk-3.0/gtk-light-solid-grey.scss index 1f804284..a468532d 100644 --- a/src/main/gtk-3.0/gtk-light-solid-grey.scss +++ b/src/main/gtk-3.0/gtk-light-solid-grey.scss @@ -7,7 +7,7 @@ $theme: 'grey'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-light-solid-orange.scss b/src/main/gtk-3.0/gtk-light-solid-orange.scss index bcbbcd77..1705c8bb 100644 --- a/src/main/gtk-3.0/gtk-light-solid-orange.scss +++ b/src/main/gtk-3.0/gtk-light-solid-orange.scss @@ -7,7 +7,7 @@ $theme: 'orange'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-light-solid-pink.scss b/src/main/gtk-3.0/gtk-light-solid-pink.scss index 48f81aa1..790156ad 100644 --- a/src/main/gtk-3.0/gtk-light-solid-pink.scss +++ b/src/main/gtk-3.0/gtk-light-solid-pink.scss @@ -7,7 +7,7 @@ $theme: 'pink'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-light-solid-purple.scss b/src/main/gtk-3.0/gtk-light-solid-purple.scss index 056ba421..20433dc9 100644 --- a/src/main/gtk-3.0/gtk-light-solid-purple.scss +++ b/src/main/gtk-3.0/gtk-light-solid-purple.scss @@ -7,7 +7,7 @@ $theme: 'purple'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-light-solid-red.scss b/src/main/gtk-3.0/gtk-light-solid-red.scss index 54a66825..fc4e3cc4 100644 --- a/src/main/gtk-3.0/gtk-light-solid-red.scss +++ b/src/main/gtk-3.0/gtk-light-solid-red.scss @@ -7,7 +7,7 @@ $theme: 'red'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-light-solid-yellow.scss b/src/main/gtk-3.0/gtk-light-solid-yellow.scss index 530734f9..a0fa3c60 100644 --- a/src/main/gtk-3.0/gtk-light-solid-yellow.scss +++ b/src/main/gtk-3.0/gtk-light-solid-yellow.scss @@ -7,7 +7,7 @@ $theme: 'yellow'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-light-solid.scss b/src/main/gtk-3.0/gtk-light-solid.scss index a41210e4..dca496d9 100644 --- a/src/main/gtk-3.0/gtk-light-solid.scss +++ b/src/main/gtk-3.0/gtk-light-solid.scss @@ -7,7 +7,7 @@ $theme: 'default'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-light-yellow.scss b/src/main/gtk-3.0/gtk-light-yellow.scss index 7fd7d17b..ecb8b103 100644 --- a/src/main/gtk-3.0/gtk-light-yellow.scss +++ b/src/main/gtk-3.0/gtk-light-yellow.scss @@ -7,7 +7,7 @@ $theme: 'yellow'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-3.0/gtk-light.scss b/src/main/gtk-3.0/gtk-light.scss index c4310efb..aecfb69f 100644 --- a/src/main/gtk-3.0/gtk-light.scss +++ b/src/main/gtk-3.0/gtk-light.scss @@ -7,7 +7,7 @@ $theme: 'default'; @import '../../sass/colors'; @import '../../sass/variables'; @import '../../sass/gtk/drawing'; -@import '../../sass/gtk/common'; +@import '../../sass/gtk/common-3.0'; @import '../../sass/gtk/applications'; @import '../../sass/gtk/unity'; @import '../../sass/gtk/granite'; diff --git a/src/main/gtk-4.0/gtk-dark-blue.scss b/src/main/gtk-4.0/gtk-dark-blue.scss new file mode 100644 index 00000000..8301c11f --- /dev/null +++ b/src/main/gtk-4.0/gtk-dark-blue.scss @@ -0,0 +1,16 @@ +$variant: 'dark'; +$laptop: 'false'; +$trans: 'true'; +$black: 'false'; +$theme: 'blue'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-dark-green.scss b/src/main/gtk-4.0/gtk-dark-green.scss new file mode 100644 index 00000000..642e4a69 --- /dev/null +++ b/src/main/gtk-4.0/gtk-dark-green.scss @@ -0,0 +1,16 @@ +$variant: 'dark'; +$laptop: 'false'; +$trans: 'true'; +$black: 'false'; +$theme: 'green'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-dark-grey.scss b/src/main/gtk-4.0/gtk-dark-grey.scss new file mode 100644 index 00000000..6ddb133d --- /dev/null +++ b/src/main/gtk-4.0/gtk-dark-grey.scss @@ -0,0 +1,16 @@ +$variant: 'dark'; +$laptop: 'false'; +$trans: 'true'; +$black: 'false'; +$theme: 'grey'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-dark-orange.scss b/src/main/gtk-4.0/gtk-dark-orange.scss new file mode 100644 index 00000000..f66977a8 --- /dev/null +++ b/src/main/gtk-4.0/gtk-dark-orange.scss @@ -0,0 +1,16 @@ +$variant: 'dark'; +$laptop: 'false'; +$trans: 'true'; +$black: 'false'; +$theme: 'orange'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-dark-pink.scss b/src/main/gtk-4.0/gtk-dark-pink.scss new file mode 100644 index 00000000..1a83df72 --- /dev/null +++ b/src/main/gtk-4.0/gtk-dark-pink.scss @@ -0,0 +1,16 @@ +$variant: 'dark'; +$laptop: 'false'; +$trans: 'true'; +$black: 'false'; +$theme: 'pink'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-dark-purple.scss b/src/main/gtk-4.0/gtk-dark-purple.scss new file mode 100644 index 00000000..293b3361 --- /dev/null +++ b/src/main/gtk-4.0/gtk-dark-purple.scss @@ -0,0 +1,16 @@ +$variant: 'dark'; +$laptop: 'false'; +$trans: 'true'; +$black: 'false'; +$theme: 'purple'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-dark-red.scss b/src/main/gtk-4.0/gtk-dark-red.scss new file mode 100644 index 00000000..5e2c6686 --- /dev/null +++ b/src/main/gtk-4.0/gtk-dark-red.scss @@ -0,0 +1,16 @@ +$variant: 'dark'; +$laptop: 'false'; +$trans: 'true'; +$black: 'false'; +$theme: 'red'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-dark-solid-blue.scss b/src/main/gtk-4.0/gtk-dark-solid-blue.scss new file mode 100644 index 00000000..e2297dc4 --- /dev/null +++ b/src/main/gtk-4.0/gtk-dark-solid-blue.scss @@ -0,0 +1,16 @@ +$variant: 'dark'; +$laptop: 'false'; +$trans: 'false'; +$black: 'false'; +$theme: 'blue'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-dark-solid-green.scss b/src/main/gtk-4.0/gtk-dark-solid-green.scss new file mode 100644 index 00000000..fc6d66bd --- /dev/null +++ b/src/main/gtk-4.0/gtk-dark-solid-green.scss @@ -0,0 +1,16 @@ +$variant: 'dark'; +$laptop: 'false'; +$trans: 'false'; +$black: 'false'; +$theme: 'green'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-dark-solid-grey.scss b/src/main/gtk-4.0/gtk-dark-solid-grey.scss new file mode 100644 index 00000000..12ada0d3 --- /dev/null +++ b/src/main/gtk-4.0/gtk-dark-solid-grey.scss @@ -0,0 +1,16 @@ +$variant: 'dark'; +$laptop: 'false'; +$trans: 'false'; +$black: 'false'; +$theme: 'grey'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-dark-solid-orange.scss b/src/main/gtk-4.0/gtk-dark-solid-orange.scss new file mode 100644 index 00000000..24d13301 --- /dev/null +++ b/src/main/gtk-4.0/gtk-dark-solid-orange.scss @@ -0,0 +1,16 @@ +$variant: 'dark'; +$laptop: 'false'; +$trans: 'false'; +$black: 'false'; +$theme: 'orange'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-dark-solid-pink.scss b/src/main/gtk-4.0/gtk-dark-solid-pink.scss new file mode 100644 index 00000000..8c7057c8 --- /dev/null +++ b/src/main/gtk-4.0/gtk-dark-solid-pink.scss @@ -0,0 +1,16 @@ +$variant: 'dark'; +$laptop: 'false'; +$trans: 'false'; +$black: 'false'; +$theme: 'pink'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-dark-solid-purple.scss b/src/main/gtk-4.0/gtk-dark-solid-purple.scss new file mode 100644 index 00000000..6f5a9fe9 --- /dev/null +++ b/src/main/gtk-4.0/gtk-dark-solid-purple.scss @@ -0,0 +1,16 @@ +$variant: 'dark'; +$laptop: 'false'; +$trans: 'false'; +$black: 'false'; +$theme: 'purple'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-dark-solid-red.scss b/src/main/gtk-4.0/gtk-dark-solid-red.scss new file mode 100644 index 00000000..d31f9ee6 --- /dev/null +++ b/src/main/gtk-4.0/gtk-dark-solid-red.scss @@ -0,0 +1,16 @@ +$variant: 'dark'; +$laptop: 'false'; +$trans: 'false'; +$black: 'false'; +$theme: 'red'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-dark-solid-yellow.scss b/src/main/gtk-4.0/gtk-dark-solid-yellow.scss new file mode 100644 index 00000000..d79b99cc --- /dev/null +++ b/src/main/gtk-4.0/gtk-dark-solid-yellow.scss @@ -0,0 +1,16 @@ +$variant: 'dark'; +$laptop: 'false'; +$trans: 'false'; +$black: 'false'; +$theme: 'yellow'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-dark-solid.scss b/src/main/gtk-4.0/gtk-dark-solid.scss new file mode 100644 index 00000000..af3832c1 --- /dev/null +++ b/src/main/gtk-4.0/gtk-dark-solid.scss @@ -0,0 +1,16 @@ +$variant: 'dark'; +$laptop: 'false'; +$trans: 'false'; +$black: 'false'; +$theme: 'default'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-dark-yellow.scss b/src/main/gtk-4.0/gtk-dark-yellow.scss new file mode 100644 index 00000000..36359886 --- /dev/null +++ b/src/main/gtk-4.0/gtk-dark-yellow.scss @@ -0,0 +1,16 @@ +$variant: 'dark'; +$laptop: 'false'; +$trans: 'true'; +$black: 'false'; +$theme: 'yellow'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-dark.scss b/src/main/gtk-4.0/gtk-dark.scss new file mode 100644 index 00000000..7940ef32 --- /dev/null +++ b/src/main/gtk-4.0/gtk-dark.scss @@ -0,0 +1,16 @@ +$variant: 'dark'; +$laptop: 'false'; +$trans: 'true'; +$black: 'false'; +$theme: 'default'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-light-blue.scss b/src/main/gtk-4.0/gtk-light-blue.scss new file mode 100644 index 00000000..ddb6a289 --- /dev/null +++ b/src/main/gtk-4.0/gtk-light-blue.scss @@ -0,0 +1,16 @@ +$variant: 'light'; +$laptop: 'false'; +$trans: 'true'; +$black: 'false'; +$theme: 'blue'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-light-green.scss b/src/main/gtk-4.0/gtk-light-green.scss new file mode 100644 index 00000000..0f8a9f3a --- /dev/null +++ b/src/main/gtk-4.0/gtk-light-green.scss @@ -0,0 +1,16 @@ +$variant: 'light'; +$laptop: 'false'; +$trans: 'true'; +$black: 'false'; +$theme: 'green'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-light-grey.scss b/src/main/gtk-4.0/gtk-light-grey.scss new file mode 100644 index 00000000..be399738 --- /dev/null +++ b/src/main/gtk-4.0/gtk-light-grey.scss @@ -0,0 +1,16 @@ +$variant: 'light'; +$laptop: 'false'; +$trans: 'true'; +$black: 'false'; +$theme: 'grey'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-light-orange.scss b/src/main/gtk-4.0/gtk-light-orange.scss new file mode 100644 index 00000000..f9e11d3c --- /dev/null +++ b/src/main/gtk-4.0/gtk-light-orange.scss @@ -0,0 +1,16 @@ +$variant: 'light'; +$laptop: 'false'; +$trans: 'true'; +$black: 'false'; +$theme: 'orange'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-light-pink.scss b/src/main/gtk-4.0/gtk-light-pink.scss new file mode 100644 index 00000000..2c636d1f --- /dev/null +++ b/src/main/gtk-4.0/gtk-light-pink.scss @@ -0,0 +1,16 @@ +$variant: 'light'; +$laptop: 'false'; +$trans: 'true'; +$black: 'false'; +$theme: 'pink'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-light-purple.scss b/src/main/gtk-4.0/gtk-light-purple.scss new file mode 100644 index 00000000..7d51fb6e --- /dev/null +++ b/src/main/gtk-4.0/gtk-light-purple.scss @@ -0,0 +1,16 @@ +$variant: 'light'; +$laptop: 'false'; +$trans: 'true'; +$black: 'false'; +$theme: 'purple'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-light-red.scss b/src/main/gtk-4.0/gtk-light-red.scss new file mode 100644 index 00000000..ddba1f3e --- /dev/null +++ b/src/main/gtk-4.0/gtk-light-red.scss @@ -0,0 +1,16 @@ +$variant: 'light'; +$laptop: 'false'; +$trans: 'true'; +$black: 'false'; +$theme: 'red'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-light-solid-blue.scss b/src/main/gtk-4.0/gtk-light-solid-blue.scss new file mode 100644 index 00000000..d4bd669c --- /dev/null +++ b/src/main/gtk-4.0/gtk-light-solid-blue.scss @@ -0,0 +1,16 @@ +$variant: 'light'; +$laptop: 'false'; +$trans: 'false'; +$black: 'true'; +$theme: 'blue'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-light-solid-green.scss b/src/main/gtk-4.0/gtk-light-solid-green.scss new file mode 100644 index 00000000..a177c0a5 --- /dev/null +++ b/src/main/gtk-4.0/gtk-light-solid-green.scss @@ -0,0 +1,16 @@ +$variant: 'light'; +$laptop: 'false'; +$trans: 'false'; +$black: 'true'; +$theme: 'green'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-light-solid-grey.scss b/src/main/gtk-4.0/gtk-light-solid-grey.scss new file mode 100644 index 00000000..665f5d27 --- /dev/null +++ b/src/main/gtk-4.0/gtk-light-solid-grey.scss @@ -0,0 +1,16 @@ +$variant: 'light'; +$laptop: 'false'; +$trans: 'false'; +$black: 'true'; +$theme: 'grey'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-light-solid-orange.scss b/src/main/gtk-4.0/gtk-light-solid-orange.scss new file mode 100644 index 00000000..6a5cfbde --- /dev/null +++ b/src/main/gtk-4.0/gtk-light-solid-orange.scss @@ -0,0 +1,16 @@ +$variant: 'light'; +$laptop: 'false'; +$trans: 'false'; +$black: 'true'; +$theme: 'orange'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-light-solid-pink.scss b/src/main/gtk-4.0/gtk-light-solid-pink.scss new file mode 100644 index 00000000..668db59d --- /dev/null +++ b/src/main/gtk-4.0/gtk-light-solid-pink.scss @@ -0,0 +1,16 @@ +$variant: 'light'; +$laptop: 'false'; +$trans: 'false'; +$black: 'true'; +$theme: 'pink'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-light-solid-purple.scss b/src/main/gtk-4.0/gtk-light-solid-purple.scss new file mode 100644 index 00000000..6978ba8e --- /dev/null +++ b/src/main/gtk-4.0/gtk-light-solid-purple.scss @@ -0,0 +1,16 @@ +$variant: 'light'; +$laptop: 'false'; +$trans: 'false'; +$black: 'true'; +$theme: 'purple'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-light-solid-red.scss b/src/main/gtk-4.0/gtk-light-solid-red.scss new file mode 100644 index 00000000..e5cc0f64 --- /dev/null +++ b/src/main/gtk-4.0/gtk-light-solid-red.scss @@ -0,0 +1,16 @@ +$variant: 'light'; +$laptop: 'false'; +$trans: 'false'; +$black: 'true'; +$theme: 'red'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-light-solid-yellow.scss b/src/main/gtk-4.0/gtk-light-solid-yellow.scss new file mode 100644 index 00000000..f68fb433 --- /dev/null +++ b/src/main/gtk-4.0/gtk-light-solid-yellow.scss @@ -0,0 +1,16 @@ +$variant: 'light'; +$laptop: 'false'; +$trans: 'false'; +$black: 'true'; +$theme: 'yellow'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-light-solid.scss b/src/main/gtk-4.0/gtk-light-solid.scss new file mode 100644 index 00000000..a0b7ea6d --- /dev/null +++ b/src/main/gtk-4.0/gtk-light-solid.scss @@ -0,0 +1,16 @@ +$variant: 'light'; +$laptop: 'false'; +$trans: 'false'; +$black: 'true'; +$theme: 'default'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-light-yellow.scss b/src/main/gtk-4.0/gtk-light-yellow.scss new file mode 100644 index 00000000..ab4f252a --- /dev/null +++ b/src/main/gtk-4.0/gtk-light-yellow.scss @@ -0,0 +1,16 @@ +$variant: 'light'; +$laptop: 'false'; +$trans: 'true'; +$black: 'false'; +$theme: 'yellow'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk-light.scss b/src/main/gtk-4.0/gtk-light.scss new file mode 100644 index 00000000..72775c4a --- /dev/null +++ b/src/main/gtk-4.0/gtk-light.scss @@ -0,0 +1,16 @@ +$variant: 'light'; +$laptop: 'false'; +$trans: 'true'; +$black: 'false'; +$theme: 'default'; + +@import '../../sass/colors'; +@import '../../sass/variables'; +@import '../../sass/gtk/drawing'; +@import '../../sass/gtk/common-4.0'; +@import '../../sass/gtk/applications'; +// @import '../../sass/gtk/unity'; +// @import '../../sass/gtk/granite'; +// @import '../../sass/gtk/lightdm'; +// @import '../../sass/gtk/budgie.scss'; +@import '../../sass/gtk/colors-public'; diff --git a/src/main/gtk-4.0/gtk.gresource.xml b/src/main/gtk-4.0/gtk.gresource.xml new file mode 100644 index 00000000..fc02016d --- /dev/null +++ b/src/main/gtk-4.0/gtk.gresource.xml @@ -0,0 +1,267 @@ + + + + assets/checkbox-checked.png + assets/checkbox-checked@2.png + assets/checkbox-checked-insensitive.png + assets/checkbox-checked-insensitive@2.png + assets/checkbox-unchecked.png + assets/checkbox-unchecked@2.png + assets/checkbox-unchecked-insensitive.png + assets/checkbox-unchecked-insensitive@2.png + assets/checkbox-mixed.png + assets/checkbox-mixed@2.png + assets/checkbox-mixed-insensitive.png + assets/checkbox-mixed-insensitive@2.png + assets/radio-checked.png + assets/radio-checked@2.png + assets/radio-checked-insensitive.png + assets/radio-checked-insensitive@2.png + assets/radio-unchecked.png + assets/radio-unchecked@2.png + assets/radio-unchecked-insensitive.png + assets/radio-unchecked-insensitive@2.png + assets/radio-mixed.png + assets/radio-mixed@2.png + assets/radio-mixed-insensitive.png + assets/radio-mixed-insensitive@2.png + assets/checkbox-checked-selected.png + assets/checkbox-checked-selected@2.png + assets/checkbox-checked-insensitive-selected.png + assets/checkbox-checked-insensitive-selected@2.png + assets/checkbox-unchecked-selected.png + assets/checkbox-unchecked-selected@2.png + assets/checkbox-unchecked-insensitive-selected.png + assets/checkbox-unchecked-insensitive-selected@2.png + assets/checkbox-mixed-selected.png + assets/checkbox-mixed-selected@2.png + assets/checkbox-mixed-insensitive-selected.png + assets/checkbox-mixed-insensitive-selected@2.png + assets/checkbox-checked-selectionmode.png + assets/checkbox-checked-selectionmode@2.png + assets/checkbox-selectionmode.png + assets/checkbox-selectionmode@2.png + assets/radio-checked-selected.png + assets/radio-checked-selected@2.png + assets/radio-checked-insensitive-selected.png + assets/radio-checked-insensitive-selected@2.png + assets/radio-unchecked-selected.png + assets/radio-unchecked-selected@2.png + assets/radio-unchecked-insensitive-selected.png + assets/radio-unchecked-insensitive-selected@2.png + assets/radio-mixed-selected.png + assets/radio-mixed-selected@2.png + assets/radio-mixed-insensitive-selected.png + assets/radio-mixed-insensitive-selected@2.png + assets/slider-horz-scale-has-marks-below.png + assets/slider-horz-scale-has-marks-below@2.png + assets/slider-horz-scale-has-marks-below-hover.png + assets/slider-horz-scale-has-marks-below-hover@2.png + assets/slider-horz-scale-has-marks-below-active.png + assets/slider-horz-scale-has-marks-below-active@2.png + assets/slider-horz-scale-has-marks-below-insensitive.png + assets/slider-horz-scale-has-marks-below-insensitive@2.png + assets/slider-vert-scale-has-marks-below.png + assets/slider-vert-scale-has-marks-below@2.png + assets/slider-vert-scale-has-marks-below-hover.png + assets/slider-vert-scale-has-marks-below-hover@2.png + assets/slider-vert-scale-has-marks-below-active.png + assets/slider-vert-scale-has-marks-below-active@2.png + assets/slider-vert-scale-has-marks-below-insensitive.png + assets/slider-vert-scale-has-marks-below-insensitive@2.png + assets/slider-horz-scale-has-marks-above.png + assets/slider-horz-scale-has-marks-above@2.png + assets/slider-horz-scale-has-marks-above-hover.png + assets/slider-horz-scale-has-marks-above-hover@2.png + assets/slider-horz-scale-has-marks-above-active.png + assets/slider-horz-scale-has-marks-above-active@2.png + assets/slider-horz-scale-has-marks-above-insensitive.png + assets/slider-horz-scale-has-marks-above-insensitive@2.png + assets/slider-vert-scale-has-marks-above.png + assets/slider-vert-scale-has-marks-above@2.png + assets/slider-vert-scale-has-marks-above-hover.png + assets/slider-vert-scale-has-marks-above-hover@2.png + assets/slider-vert-scale-has-marks-above-active.png + assets/slider-vert-scale-has-marks-above-active@2.png + assets/slider-vert-scale-has-marks-above-insensitive.png + assets/slider-vert-scale-has-marks-above-insensitive@2.png + assets/checkbox-checked-dark.png + assets/checkbox-checked-dark@2.png + assets/checkbox-checked-insensitive-dark.png + assets/checkbox-checked-insensitive-dark@2.png + assets/checkbox-unchecked-dark.png + assets/checkbox-unchecked-dark@2.png + assets/checkbox-unchecked-insensitive-dark.png + assets/checkbox-unchecked-insensitive-dark@2.png + assets/checkbox-mixed-dark.png + assets/checkbox-mixed-dark@2.png + assets/checkbox-mixed-insensitive-dark.png + assets/checkbox-mixed-insensitive-dark@2.png + assets/checkbox-checked-selectionmode-dark.png + assets/checkbox-checked-selectionmode-dark@2.png + assets/checkbox-selectionmode-dark.png + assets/checkbox-selectionmode-dark@2.png + assets/radio-checked-dark.png + assets/radio-checked-dark@2.png + assets/radio-checked-insensitive-dark.png + assets/radio-checked-insensitive-dark@2.png + assets/radio-unchecked-dark.png + assets/radio-unchecked-dark@2.png + assets/radio-unchecked-insensitive-dark.png + assets/radio-unchecked-insensitive-dark@2.png + assets/radio-mixed-dark.png + assets/radio-mixed-dark@2.png + assets/radio-mixed-insensitive-dark.png + assets/radio-mixed-insensitive-dark@2.png + assets/combobox-arrow.png + assets/combobox-arrow@2.png + assets/combobox-arrow-dark.png + assets/combobox-arrow-dark@2.png + assets/paned-separator.png + assets/paned-separator@2.png + assets/paned-separator-dark.png + assets/paned-separator-dark@2.png + assets/sidebar-view-hover-200px.png + assets/sidebar-view-hover-200px@2.png + assets/sidebar-view-active-200px.png + assets/sidebar-view-active-200px@2.png + assets/sidebar-view-checked-200px.png + assets/sidebar-view-checked-200px@2.png + assets/sidebar-view-hover-200px-dark.png + assets/sidebar-view-hover-200px-dark@2.png + assets/sidebar-view-active-200px-dark.png + assets/sidebar-view-active-200px-dark@2.png + assets/sidebar-view-checked-200px-dark.png + assets/sidebar-view-checked-200px-dark@2.png + assets/sidebar-view-hover-220px.png + assets/sidebar-view-hover-220px@2.png + assets/sidebar-view-active-220px.png + assets/sidebar-view-active-220px@2.png + assets/sidebar-view-checked-220px.png + assets/sidebar-view-checked-220px@2.png + assets/sidebar-view-hover-220px-dark.png + assets/sidebar-view-hover-220px-dark@2.png + assets/sidebar-view-active-220px-dark.png + assets/sidebar-view-active-220px-dark@2.png + assets/sidebar-view-checked-220px-dark.png + assets/sidebar-view-checked-220px-dark@2.png + assets/sidebar-view-hover-240px.png + assets/sidebar-view-hover-240px@2.png + assets/sidebar-view-active-240px.png + assets/sidebar-view-active-240px@2.png + assets/sidebar-view-checked-240px.png + assets/sidebar-view-checked-240px@2.png + assets/sidebar-view-hover-240px-dark.png + assets/sidebar-view-hover-240px-dark@2.png + assets/sidebar-view-active-240px-dark.png + assets/sidebar-view-active-240px-dark@2.png + assets/sidebar-view-checked-240px-dark.png + assets/sidebar-view-checked-240px-dark@2.png + assets/sidebar-view-hover-260px.png + assets/sidebar-view-hover-260px@2.png + assets/sidebar-view-active-260px.png + assets/sidebar-view-active-260px@2.png + assets/sidebar-view-checked-260px.png + assets/sidebar-view-checked-260px@2.png + assets/sidebar-view-hover-260px-dark.png + assets/sidebar-view-hover-260px-dark@2.png + assets/sidebar-view-active-260px-dark.png + assets/sidebar-view-active-260px-dark@2.png + assets/sidebar-view-checked-260px-dark.png + assets/sidebar-view-checked-260px-dark@2.png + assets/sidebar-view-hover-280px.png + assets/sidebar-view-hover-280px@2.png + assets/sidebar-view-active-280px.png + assets/sidebar-view-active-280px@2.png + assets/sidebar-view-checked-280px.png + assets/sidebar-view-checked-280px@2.png + assets/sidebar-view-hover-280px-dark.png + assets/sidebar-view-hover-280px-dark@2.png + assets/sidebar-view-active-280px-dark.png + assets/sidebar-view-active-280px-dark@2.png + assets/sidebar-view-checked-280px-dark.png + assets/sidebar-view-checked-280px-dark@2.png + windows-assets/titlebutton-close.png + windows-assets/titlebutton-close@2.png + windows-assets/titlebutton-close-dark.png + windows-assets/titlebutton-close-dark@2.png + windows-assets/titlebutton-close-backdrop.png + windows-assets/titlebutton-close-backdrop@2.png + windows-assets/titlebutton-close-backdrop-dark.png + windows-assets/titlebutton-close-backdrop-dark@2.png + windows-assets/titlebutton-close-backdrop-hover.png + windows-assets/titlebutton-close-backdrop-hover@2.png + windows-assets/titlebutton-close-backdrop-hover-dark.png + windows-assets/titlebutton-close-backdrop-hover-dark@2.png + windows-assets/titlebutton-close-hover.png + windows-assets/titlebutton-close-hover@2.png + windows-assets/titlebutton-close-hover-dark.png + windows-assets/titlebutton-close-hover-dark@2.png + windows-assets/titlebutton-close-active.png + windows-assets/titlebutton-close-active@2.png + windows-assets/titlebutton-close-active-dark.png + windows-assets/titlebutton-close-active-dark@2.png + windows-assets/titlebutton-maximize.png + windows-assets/titlebutton-maximize@2.png + windows-assets/titlebutton-maximize-dark.png + windows-assets/titlebutton-maximize-dark@2.png + windows-assets/titlebutton-maximize-backdrop.png + windows-assets/titlebutton-maximize-backdrop@2.png + windows-assets/titlebutton-maximize-backdrop-dark.png + windows-assets/titlebutton-maximize-backdrop-dark@2.png + windows-assets/titlebutton-maximize-backdrop-hover.png + windows-assets/titlebutton-maximize-backdrop-hover@2.png + windows-assets/titlebutton-maximize-backdrop-hover-dark.png + windows-assets/titlebutton-maximize-backdrop-hover-dark@2.png + windows-assets/titlebutton-maximize-hover.png + windows-assets/titlebutton-maximize-hover@2.png + windows-assets/titlebutton-maximize-hover-dark.png + windows-assets/titlebutton-maximize-hover-dark@2.png + windows-assets/titlebutton-maximize-active.png + windows-assets/titlebutton-maximize-active@2.png + windows-assets/titlebutton-maximize-active-dark.png + windows-assets/titlebutton-maximize-active-dark@2.png + windows-assets/titlebutton-minimize.png + windows-assets/titlebutton-minimize@2.png + windows-assets/titlebutton-minimize-dark.png + windows-assets/titlebutton-minimize-dark@2.png + windows-assets/titlebutton-minimize-backdrop.png + windows-assets/titlebutton-minimize-backdrop@2.png + windows-assets/titlebutton-minimize-backdrop-dark.png + windows-assets/titlebutton-minimize-backdrop-dark@2.png + windows-assets/titlebutton-minimize-backdrop-hover.png + windows-assets/titlebutton-minimize-backdrop-hover@2.png + windows-assets/titlebutton-minimize-backdrop-hover-dark.png + windows-assets/titlebutton-minimize-backdrop-hover-dark@2.png + windows-assets/titlebutton-minimize-hover.png + windows-assets/titlebutton-minimize-hover@2.png + windows-assets/titlebutton-minimize-hover-dark.png + windows-assets/titlebutton-minimize-hover-dark@2.png + windows-assets/titlebutton-minimize-active.png + windows-assets/titlebutton-minimize-active@2.png + windows-assets/titlebutton-minimize-active-dark.png + windows-assets/titlebutton-minimize-active-dark@2.png + windows-assets/titlebutton-restore.png + windows-assets/titlebutton-restore@2.png + windows-assets/titlebutton-restore-dark.png + windows-assets/titlebutton-restore-dark@2.png + windows-assets/titlebutton-restore-backdrop.png + windows-assets/titlebutton-restore-backdrop@2.png + windows-assets/titlebutton-restore-backdrop-dark.png + windows-assets/titlebutton-restore-backdrop-dark@2.png + windows-assets/titlebutton-restore-backdrop-hover.png + windows-assets/titlebutton-restore-backdrop-hover@2.png + windows-assets/titlebutton-restore-backdrop-hover-dark.png + windows-assets/titlebutton-restore-backdrop-hover-dark@2.png + windows-assets/titlebutton-restore-hover.png + windows-assets/titlebutton-restore-hover@2.png + windows-assets/titlebutton-restore-hover-dark.png + windows-assets/titlebutton-restore-hover-dark@2.png + windows-assets/titlebutton-restore-active.png + windows-assets/titlebutton-restore-active@2.png + windows-assets/titlebutton-restore-active-dark.png + windows-assets/titlebutton-restore-active-dark@2.png + gtk.css + gtk-dark.css + + diff --git a/src/main/gtk-4.0/make_gresource_xml.sh b/src/main/gtk-4.0/make_gresource_xml.sh new file mode 100755 index 00000000..0aa37744 --- /dev/null +++ b/src/main/gtk-4.0/make_gresource_xml.sh @@ -0,0 +1,41 @@ +#! /bin/bash + +INDEX="../../assets/gtk-3.0/common-assets/assets.txt" +SINDEX="../../assets/gtk-3.0/common-assets/sidebar-assets.txt" +WINDEX="../../assets/gtk-3.0/windows-assets/assets.txt" + +if [ -f gtk.gresource.xml ]; then + rm -rf gtk.gresource.xml +fi + +echo '' >> gtk.gresource.xml +echo "" >> gtk.gresource.xml +echo ' ' >> gtk.gresource.xml + +for i in `cat $INDEX` +do + echo " assets/$i.png" >> gtk.gresource.xml + echo " assets/$i@2.png" >> gtk.gresource.xml +done + +for i in `cat $SINDEX` +do + echo " assets/$i.png" >> gtk.gresource.xml + echo " assets/$i@2.png" >> gtk.gresource.xml +done + +for i in `cat $WINDEX` +do + echo " windows-assets/$i.png" >> gtk.gresource.xml + echo " windows-assets/$i@2.png" >> gtk.gresource.xml + echo " windows-assets/$i-dark.png" >> gtk.gresource.xml + echo " windows-assets/$i-dark@2.png" >> gtk.gresource.xml +done + +echo " gtk.css" >> gtk.gresource.xml +echo " gtk-dark.css" >> gtk.gresource.xml + +echo " " >> gtk.gresource.xml +echo "" >> gtk.gresource.xml + +exit 0 diff --git a/src/sass/gnome-shell/_extensions-3-28.scss b/src/sass/gnome-shell/_extensions-3-28.scss new file mode 100644 index 00000000..b7ce94e4 --- /dev/null +++ b/src/sass/gnome-shell/_extensions-3-28.scss @@ -0,0 +1,2 @@ +@import 'extensions-3-28/dash-to-dock'; +@import 'extensions-3-28/misc'; diff --git a/src/sass/gnome-shell/_extensions-40-0.scss b/src/sass/gnome-shell/_extensions-40-0.scss new file mode 100644 index 00000000..0fca3bb7 --- /dev/null +++ b/src/sass/gnome-shell/_extensions-40-0.scss @@ -0,0 +1 @@ +@import 'extensions-40-0/dash-to-dock'; diff --git a/src/sass/gnome-shell/_extensions.scss b/src/sass/gnome-shell/_extensions.scss deleted file mode 100644 index e225b707..00000000 --- a/src/sass/gnome-shell/_extensions.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import 'extensions/dash-to-dock'; -@import 'extensions/misc'; diff --git a/src/sass/gnome-shell/extensions/_dash-to-dock.scss b/src/sass/gnome-shell/extensions-3-28/_dash-to-dock.scss similarity index 100% rename from src/sass/gnome-shell/extensions/_dash-to-dock.scss rename to src/sass/gnome-shell/extensions-3-28/_dash-to-dock.scss diff --git a/src/sass/gnome-shell/extensions/_misc.scss b/src/sass/gnome-shell/extensions-3-28/_misc.scss similarity index 100% rename from src/sass/gnome-shell/extensions/_misc.scss rename to src/sass/gnome-shell/extensions-3-28/_misc.scss diff --git a/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss b/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss new file mode 100644 index 00000000..acbdacd8 --- /dev/null +++ b/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss @@ -0,0 +1,218 @@ +// Dash to Dock + +$dash_panel_bg: if($variant == 'light', rgba(#f1f1f1, 0.35), rgba(#222222, 0.75)); +$dash_panel_fg: if($variant == 'light', black, white); +$dash_radius: 18px; + +// Scrollview style +.bottom #dashtodockDashScrollview, +.top #dashtodockDashScrollview { + -st-hfade-offset: 24px; +} + +.left #dashtodockDashScrollview, +.right #dashtodockDashScrollview { + -st-vfade-offset: 24px; +} + +#dashtodockContainer { + background-color: transparent; + + .app-well-app-running-dot { + background-color: $dash_panel_fg; + } + + .number-overlay { + color: $light_fg_color; + background-color: rgba(black, 0.75); + text-align: center; + } + + .notification-badge { + color: $light_fg_color; + background-color: $primary_color; + box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.25); + border-radius: 1000px; + margin: 2px; + padding: 0.2em 0.6em; + font-weight: bold; + text-align: center; + } + + &.dashtodock #dash .dash-background, + &.dashtodock:overview #dash .dash-background, + &.extended #dash .dash-background, + &.extended:overview #dash .dash-background { + border: 1px solid if($variant == 'light', rgba(black, 0.08), rgba(black, 0.75)); + } + + &.straight-corner #dash .dash-background, + &.shrink.straight-corner #dash .dash-background { + border-radius: 0; + margin: 0; + } + + @each $_dock, $_radius, $_shadow in (top, $dash_radius, 0 -1px), + (bottom, $dash_radius, 0 1px), + (left, $dash_radius, -1px 0), + (right, $dash_radius, 1px 0) { + &.#{$_dock}.dashtodock #dash .dash-background, + &.#{$_dock}.dashtodock:overview #dash .dash-background { + border-radius: #{$_radius}; + box-shadow: inset 0 0 0 1px rgba(white, 0.05); + } + + &.#{$_dock}.shrink #dash .dash-background { + border-#{$_dock}-width: 0; + } + + &.#{$_dock}.extended #dash .dash-background, + &.#{$_dock}.extended:overview #dash .dash-background { + margin: 0 0; + border-radius: 0; + box-shadow: inset #{$_shadow} rgba(white, 0.05); + } + } + + &.extended.top, + &.extended.bottom { + #dash { + border-left: 0; + border-right: 0; + padding-top: 0; + padding-bottom: 0; + margin-top: 0; + } + + .dash-background { + margin-bottom: 0; + } + } + + &.extended.right, + &.extended.left { + #dash { + border-top: 0; + border-bottom: 0; + padding-top: 0; + padding-bottom: 0; + margin-top: 0; + } + + .dash-background { + margin-bottom: 0; + } + } + + &.dashtodock #dash { background: none; } + + #dash { // default-mode + background: none; + + .app-well-app-running-dot { + background-color: rgba($dash_panel_fg, 0.85); + } + + StWidget.focused .app-well-app-running-dot { + background-color: $primary_color; + } + } + + .dash-background { + background-color: $dash_panel_bg; + } + + .dash-separator { + width: 0 !important; + margin: 0 0 !important; + background: none; + } + + &:overview #dash { // overview-mode #1 + background: none; + + .dash-background { + background-color: $light_divider_color; + } + + .app-well-app-running-dot { + background-color: $light_alt_fg_color; + } + + StWidget.focused .app-well-app-running-dot { + background-color: $primary_color; + } + } + + &.opaque:overview, + &.transparent:overview { // overview-mode #2 + #dash { + background-color: transparent !important; + box-shadow: none !important; + } + + .dash-background { + background-color: transparent !important; + } + } + + &.extended:overview, // overview-mode #3 + &.opaque.extended:overview, + &.transparent.extended:overview { + #dash { + background: none; + } + + .dash-background { + background-color: $light_divider_color; + } + } + + &.running-dots, + &.dashtodock { + .dash-item-container > StButton { + transition-duration: 250ms; + background-size: contain; + } + } + + &.shrink, + &.dashtodock { + .dash-item-container > StButton { + padding: 1px 2px; + } + } + + .app-well-app, + .show-apps { + .overview-icon { + padding: 8px; + background-size: contain; + } + } + + &.extended, + &.extended:overview { + .app-well-app, + .show-apps { + .overview-icon { + border-radius: $bt_radius; + } + } + } + + .metro .overview-icon { + border-radius: 0; + } +} + +.dashtodock-app-well-preview-menu-item { + padding: 1em 1em 0.5em 1em; +} + +#dashtodockPreviewSeparator.popup-separator-menu-item-horizontal { + width: 1px; + height: auto; + border-right-width: 1px; + margin: 32px 0; +} diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss index b861a0dd..4992e033 100644 --- a/src/sass/gtk/_applications.scss +++ b/src/sass/gtk/_applications.scss @@ -754,8 +754,8 @@ $disk_space_free: darken($bg_color, 3%); &.frame { border-width: 0; } .places-treeview { - -NemoPlacesTreeView-disk-full-bg-color: $dark_solid_borders_color; - -NemoPlacesTreeView-disk-full-fg-color: lighten($progress_color, 5%); + // -NemoPlacesTreeView-disk-full-bg-color: $dark_solid_borders_color; + // -NemoPlacesTreeView-disk-full-fg-color: lighten($progress_color, 5%); } } @@ -980,7 +980,7 @@ window.org-gnome-gedit { padding: 0; margin: 0 6px; border-radius: 100px; - -gtk-outline-radius: 100px; + // -gtk-outline-radius: 100px; image { color: inherit; @@ -1111,7 +1111,6 @@ layouttab { layout { border: 1px solid $borders_color; - -PnlDockBin-handle-size: 1; } eggsearchbar box.search-bar { @@ -1159,7 +1158,6 @@ docktabstrip { dockbin { border: 1px solid $borders_color; - -PnlDockBin-handle-size: 1; } dockpaned { @@ -1620,70 +1618,6 @@ button.documents-favorite:active:hover { // // Gnome Tweak Tool ( Gnome tweaks ) // -%side_headerbar_left { - background-image: none; - background-color: rgba($dark_sidebar_bg, 1); - box-shadow: inset 0 1px $highlight_color; - border: none; -} - -%side_headerbar_right { - background-image: none; - background-color: rgba($base_color, 1); - box-shadow: inset 0 1px $highlight_color; - border: none; -} - -%side_searchbar { - background-color: rgba($dark_sidebar_bg, 1); - - > revealer > box { - border-color: if($variant == 'light', $solid_borders_color, $header_border); - } -} - -%side_separator { - &, &:backdrop { - background-image: if($variant == 'light', image($solid_borders_color), image($header_border)); - background-color: transparent; - border-right: none; - } -} - -$list_shadow: if($variant == 'light', - (inset 0 0 8px rgba(black, 0.02), inset 0 0 3px rgba(black, 0.01), inset 0 0 0 1px rgba(black, 0.04), inset 0 1px rgba(black, 0.05)), - (inset 0 0 8px rgba(white, 0.03), inset 0 0 3px rgba(white, 0.02), inset 0 0 0 1px rgba(white, 0.04), inset 0 1px rgba(white, 0.06))); - -%circular_list { - border-radius: $wm_radius; - box-shadow: $list_shadow; - background-color: if($variant == 'light', rgba(black, 0.03), rgba(white, 0.05)); - border: none; - - > separator { background: none; min-height: 0; } -} - -%circular_row { - &:first-child { - border-top-left-radius: $wm_radius; - border-top-right-radius: $wm_radius; - } - - &:last-child { // Not use ? - border-bottom-left-radius: $wm_radius; - border-bottom-right-radius: $wm_radius; - } - - &:only-child { - border-radius: $wm_radius; - } -} - -%sidebar_row { - margin: 2px 4px; - border-radius: $wm_radius - 4px; - -gtk-outline-radius : $wm_radius - 6px; -} hdyleaflet, leaflet, box.horizontal > stack.background { frame > border { border: none; } @@ -2575,7 +2509,7 @@ popover.background:not(.emoji-picker) > box.vertical > stack > box.vertical { padding: 4px; // Same as of image.sidebar-icon // margin: 0 4px; border-radius: 100px; - -gtk-outline-radius: 100px; + // -gtk-outline-radius: 100px; } } } @@ -2880,11 +2814,6 @@ panel-toplevel.background { background-color: $selected_bg_color; } } - - na-tray-applet { - -NaTrayApplet-icon-padding: 0; - -NaTrayApplet-icon-size: 16px; - } } // @@ -3065,7 +2994,6 @@ $text_shadow: 0 0 1px rgba(0, 0, 0, 0.26), menu { font-weight: 400; // for enforcing regular weight text-shadow: none; - -gtk-icon-effect: none; } menubar.-vala-panel-appmenu-private { // xfce4 appmenu plugin @@ -3706,7 +3634,7 @@ widget > box.terminal-titlebar { min-height: 24px; min-width: 24px; border-radius: $bt_radius; - -gtk-outline-radius: $bt_radius; + // -gtk-outline-radius: $bt_radius; } } } @@ -3720,7 +3648,7 @@ list.tilix-session-sidebar { min-width: 20px; padding: 0; border-radius: 100px; - -gtk-outline-radius: 100px; + // -gtk-outline-radius: 100px; background-color: $destructive_color; &, &:hover, &:active, &:checked { color: white; } @@ -3892,7 +3820,6 @@ button.flat.-panel-icon-button { .unpinned button.flat.-panel-icon-button { border-radius: 0; - &:hover { -gtk-icon-effect: highlight; } &:hover, &:active, &:checked { @@ -3908,7 +3835,6 @@ button.flat.-panel-icon-button { background-position: bottom center; } - &:hover { -gtk-icon-effect: highlight; } &:hover, &:active, &:checked { diff --git a/src/sass/gtk/_budgie.scss b/src/sass/gtk/_budgie.scss index 9b002a97..16949ae0 100644 --- a/src/sass/gtk/_budgie.scss +++ b/src/sass/gtk/_budgie.scss @@ -84,7 +84,7 @@ $raven_padding: 8px; button { border-radius: $bt_radius; - -gtk-outline-radius: $bt_radius; + // -gtk-outline-radius: $bt_radius; @extend %budgie_button; } @@ -708,7 +708,7 @@ $raven_shadow: 0 0 3px 0 rgba(black, 0.2), 0 0 8px 0 rgba(black, 0.15), 0 0 16px &.image-button { border-radius: 100px; - -gtk-outline-radius: 100px; + // -gtk-outline-radius: 100px; } } } @@ -873,7 +873,8 @@ $raven_shadow: 0 0 3px 0 rgba(black, 0.2), 0 0 8px 0 rgba(black, 0.15), 0 0 16px .expander-button { border-radius: 100px; - -gtk-outline-radius: 100px; } + // -gtk-outline-radius: 100px; + } .raven-background { &.middle { border-bottom-style: none; } // applet background between two headers @@ -1140,7 +1141,7 @@ window.budgie-switcher-window { flowboxchild { // icon-tiles margin: 2px; border-radius: $wm_radius; - -gtk-outline-radius: $wm_radius; + // -gtk-outline-radius: $wm_radius; // background-color: transparent; background-image: none; } diff --git a/src/sass/gtk/_common.scss b/src/sass/gtk/_common-3.0.scss similarity index 98% rename from src/sass/gtk/_common.scss rename to src/sass/gtk/_common-3.0.scss index 75df8b51..fb189654 100644 --- a/src/sass/gtk/_common.scss +++ b/src/sass/gtk/_common-3.0.scss @@ -1,4 +1,69 @@ +%side_headerbar_left { + background-image: none; + background-color: rgba($dark_sidebar_bg, 1); + box-shadow: inset 0 1px $highlight_color; + border: none; +} + +%side_headerbar_right { + background-image: none; + background-color: rgba($base_color, 1); + box-shadow: inset 0 1px $highlight_color; + border: none; +} + +%side_searchbar { + background-color: rgba($dark_sidebar_bg, 1); + + > revealer > box { + border-color: if($variant == 'light', $solid_borders_color, $header_border); + } +} + +%side_separator { + &, &:backdrop { + background-image: if($variant == 'light', image($solid_borders_color), image($header_border)); + background-color: transparent; + border-right: none; + } +} + +$list_shadow: if($variant == 'light', + (inset 0 0 8px rgba(black, 0.02), inset 0 0 3px rgba(black, 0.01), inset 0 0 0 1px rgba(black, 0.04), inset 0 1px rgba(black, 0.05)), + (inset 0 0 8px rgba(white, 0.03), inset 0 0 3px rgba(white, 0.02), inset 0 0 0 1px rgba(white, 0.04), inset 0 1px rgba(white, 0.06))); + +%circular_list { + border-radius: $wm_radius; + box-shadow: $list_shadow; + background-color: if($variant == 'light', rgba(black, 0.03), rgba(white, 0.05)); + border: none; + + > separator { background: none; min-height: 0; } +} + +%circular_row { + &:first-child { + border-top-left-radius: $wm_radius; + border-top-right-radius: $wm_radius; + } + + &:last-child { // Not use ? + border-bottom-left-radius: $wm_radius; + border-bottom-right-radius: $wm_radius; + } + + &:only-child { + border-radius: $wm_radius; + } +} + +%sidebar_row { + margin: 2px 4px; + border-radius: $wm_radius - 4px; + -gtk-outline-radius : $wm_radius - 6px; +} + * { padding: 0; background-clip: padding-box; diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss new file mode 100644 index 00000000..0b060444 --- /dev/null +++ b/src/sass/gtk/_common-4.0.scss @@ -0,0 +1,4493 @@ + +%side_headerbar_left { + background-image: none; + background-color: rgba($dark_sidebar_bg, 1); + box-shadow: inset 0 1px $highlight_color; + border: none; +} + +%side_headerbar_right { + background-image: none; + background-color: rgba($base_color, 1); + box-shadow: inset 0 1px $highlight_color; + border: none; +} + +%side_searchbar { + background-color: rgba($dark_sidebar_bg, 1); + + > revealer > box { + border-color: if($variant == 'light', $solid_borders_color, $header_border); + } +} + +%side_separator { + &, &:backdrop { + background-image: if($variant == 'light', image($solid_borders_color), image($header_border)); + background-color: transparent; + border-right: none; + } +} + +$list_shadow: if($variant == 'light', + (inset 0 0 8px rgba(black, 0.02), inset 0 0 3px rgba(black, 0.01)), + (inset 0 0 8px rgba(white, 0.03), inset 0 0 3px rgba(white, 0.02))); + +%circular_list { + border-radius: $wm_radius; + box-shadow: $list_shadow; + background-color: if($variant == 'light', rgba(black, 0.03), rgba(white, 0.05)); + border: none; + + > separator { background: none; min-height: 0; } +} + +%circular_row { + &:first-child { + border-top-left-radius: $wm_radius; + border-top-right-radius: $wm_radius; + } + + &:last-child { // Not use ? + border-bottom-left-radius: $wm_radius; + border-bottom-right-radius: $wm_radius; + } + + &:only-child { + border-radius: $wm_radius; + } +} + +%sidebar_row { + margin: 2px 4px; + border-radius: $wm_radius - 4px; +} + +// +// Base States +// +.background { + // border-radius: 0 0 $wm_radius $wm_radius; + color: $fg_color; + background-color: rgba($bg_color, 1); + + // > box > stack { background-color: $bg_color; } + + &.csd { + border-radius: $wm_radius; // Set csd windows botttom border radius + + &.maximized, &.tiled, &.fullscreen { + border-radius: $maximized_radius; // Set csd windows botttom border radius + } + } + + &.solid-csd { border-radius: 0; } +} + +dnd { + color: $fg_color; +} + +.normal-icons { + -gtk-icon-size: 16px; +} + +.large-icons { + -gtk-icon-size: 32px; +} + +spinner:disabled, +arrow:disabled, +scrollbar:disabled, +check:disabled, +radio:disabled, +treeview.expander:disabled { -gtk-icon-filter: opacity(0.5); } + +%view, .view { + color: $text_color; + background-color: $base_color; + transition: all 200ms $ease-out-quad; + + // &:hover { background-color: if($variant=='light', darken($base_color, 3%), lighten($base_color, 3%)); } + + &:selected { + color: $selected_fg_color; + background-color: $selected_bg_color; + transition: all 350ms $ease-out-quad; + + &:focus { + @extend %selected_items; + } + } +} + +textview { + background-color: $base_color; // This will get overridden by .view, needed by gedit line numbers + + > text { + background-color: $base_color; + // @extend %view; + selection { &:focus, & { @extend %selected_items; }} + } + + border { + background-color: mix($bg_color, $base_color, 50%); + } + + &:drop(active) { + caret-color: $drop_target_color; + } +} + +iconview { + @extend %view; + + &, &:hover, &:selected { border-radius: $bt_radius; } +} + +%rubberband, +rubberband { + border: 1px solid darken($selected_bg_color, 10%); + background-color: transparentize(darken($selected_bg_color, 10%), 0.8); +} + +flowbox { + > rubberband { @extend %rubberband; } + + > flowboxchild { + padding: 3px; + border-radius: $bt_radius; + + &:selected { + @extend %selected_items; + + outline-offset: -2px; + } + } + + &.search-bar { border-bottom: 1px solid $header_border; } +} + +gridview { + > rubberband { @extend rubberband; } + + > child { + padding: 3px; + + &:selected { + outline-color: darken($selected_bg_color, 15%); + + @extend %selected_items; + } + + box { //cells + border-spacing: 8px; //label separation + margin: 12px; + } + } +} + +coverflow cover { + color: $text_color; + background-color: $base_color; + border: 1px solid black; +} + +label { + &.separator { + @extend %dim-label; + + color: $fg_color; + } + + row:selected &, + &:selected { @extend %nobg_selected_items; } + + > selection { + color: $selected_fg_color; + background-color: $selected_bg_color; + } + + &:disabled { + color: $disabled_fg_color; + selection { @extend %selected_items, :disabled; } + } +} + +%dim-label, .dim-label { + opacity: 0.55; + text-shadow: none; +} + +window.assistant { + // min-height: 38px; + .sidebar { + background-color: $base_color; + border-top: 1px solid $borders_color; + } + + &.csd .sidebar { border-top-style: none; } + + .sidebar > label { padding: 6px 12px; } + + .sidebar > label.highlight { + background-color: $selected_bg_color; + color: $selected_fg_color; + } +} + +%osd { + color: $osd_fg_color; + border: none; + background-color: $osd_bg_color; + background-clip: padding-box; + border-radius: $bt_radius; +} + +.osd { + @extend %osd; + padding: $container_padding; + margin: $container_padding; + box-shadow: 0 3px 8px rgba(black, 0.35); + + &.circular { border-radius: 100%; } +} + +// +// Spinner Animations +// +@keyframes spin { + to { transform: rotate(1turn); } +} + +spinner { + background: none; + opacity: 0; // non spinning spinner makes no sense + -gtk-icon-source: -gtk-icontheme('process-working-symbolic'); + + &:checked { + opacity: 1; + animation: spin 1s linear infinite; + + &:disabled { + opacity: 0.5; + } + } +} + +// General Typography +.large-title { + font-weight: 300; + font-size: 24pt; +} + +.title { + &-1 { + font-weight: 800; + font-size: 20pt; + } + + &-2 { + font-weight: 800; + font-size: 15pt; + } + + &-3 { + font-weight: 700; + font-size: 15pt; + } + + &-4 { + font-weight: 700; + font-size: 13pt; + } +} + +.heading { + font-weight: 700; + font-size: 11pt; +} + +.body { + font-weight: 400; + font-size: 11pt; +} + +.caption { + font-weight: 400; + font-size: 9pt; + + &-heading { + font-weight: 700; + font-size: 9pt; + } +} + +// +// Text Entries +// +%Linked_entrys { + @include entry(normal); + border: none; + + &:focus { + @include entry(focus); + } + + &:disabled { + @include entry(insensitive); + } +} + +%entry, +entry { + min-height: 24px; + border: none; + padding: 2px 8px; + border-radius: $bt_radius; + caret-color: currentColor; + + &.search { border-radius: $bt_radius; } + + @include entry(normal); + + > image { // icons inside the entry + color: mix($fg_color, $base_color, 80%); + + &.left { padding-left: 0; padding-right: 5px; } + &.right { padding-right: 0; padding-left: 5px; } + } + + > text > placeholder { + @extend .dim-label; + } + + @at-root %flat_entry, &.flat { + &:focus-within, &:backdrop, &:disabled, &:backdrop:disabled, & { + min-height: 0; + background-image: none; + border-color: transparent; + border-radius: 0; + } + } + + &:hover { + @include entry(hover); + } + + &:focus-within { + @include entry(focus); + + > placeholder { + opacity: 0; // We hide placeholders on focus + } + } + + &:disabled { + @include entry(insensitive); + } + + > text > selection { @extend %selected_items; } + + // error and warning style + @each $e_type, $e_color, $e_fg_color in (warning, $warning_color, $light_fg_color), + (error, $error_color, $light_fg_color), + (search-missing, $error_color, $light_fg_color) { // entry.search-missing for Gnome-Builder + &.#{$e_type} { + color: $e_fg_color; + background-color: mix($e_color, $base_color, 60%); + border-image: none; + + image { color: $e_fg_color; } + + &:focus-within { + color: $e_fg_color; + background-color: $e_color; + box-shadow: none; + } + + > selection { + background-color: $e_fg_color; + color: $e_color; + } + } + } + + &:drop(active) { + &:focus, & { + border-color: $drop_target_color; + box-shadow: none; + border-image: none; + } + } + + .osd & { + @include entry(osd); + border-image: none; + &:focus { @include entry(osd-focus); border-image: none; } + &:disabled { @include entry(osd-insensitive); border-image: none; } + + selection { + &:focus, & { + color: $selected_bg_color; + background-color: $selected_fg_color; + } + } + } + + > progress { + margin: 0 -6px; + border-radius: 0; + border-width: 0 0 2px; + border-color: $progress_color; + border-style: solid; + background-image: none; + background-color: transparent; + box-shadow: none; + } + + progress > trough > progress { + background-color: transparent; + background-image: none; + border-radius: 0; + border-width: 0 0 2px; + border-color: $progress_color; + border-style: solid; + box-shadow: none; + } + + // linked entries + .linked:not(.vertical) > &, + .linked:not(.vertical) > &:focus-within { + @extend %linked; + min-height: 20px; + } + + .linked.vertical > &, + .linked.vertical > &:focus-within { + @extend %linked_vertical; + } + + .linked > &:not(:only-child) { + @extend %Linked_entrys; + } + + .linked:not(.vertical) > & + button.combo { padding-left: 0; } + .linked.vertical > & + button.combo { padding: 0; } +} + +.entry-tag { + $tag_height: 24px; + $tag_margin: 8px; + + margin: $tag_margin; // instead of min-height: $tag_height; + border-radius: 50px; + box-shadow: none; + background-color: $destructive_color; + color: $light_fg_color; + border: none; + + &:hover { box-shadow: 0 0 0 1px $borders_color; } + + // side margins: compensate the entry padding with a negative margin + // then the negative margin itself + :dir(ltr) & { + margin-left: 8px; + margin-right: $tag_margin - 8px; + padding-left: 8px; + padding-right: ($tag_height - 16px) / 2; + } + + :dir(rtl) & { + margin-left: $tag_margin - 8px; + margin-right: 8px; + padding-left: ($tag_height - 16px) / 2; + padding-right: 8px; + } + + // seems any sizing doesn't work + &.button { + box-shadow: none; + border: none; + background-color: transparent; + + &:not(:hover):not(:active) { color: $disabled_fg_color; } + } +} + +treeview entry { + &:focus-within { + &:dir(rtl), &:dir(ltr) { // specificity bump hack + background-color: $base_color; + transition-property: color, background; + } + } + + &.flat, & { + border-radius: 0; + background-image: none; + background-color: $base_color; + + &:focus-within { border-color: $selected_bg_color; } + } +} + +// Editable Labels +editablelabel > stack > text { + @include entry(normal); +} + +// +// Buttons +// +// stuff for .needs-attention +$_dot_color: if($variant=='light', $selected_bg_color, + lighten($selected_bg_color, 15%)); +@keyframes needs_attention { + from { background-image: radial-gradient(farthest-side, $_dot_color 0%, transparentize($_dot_color, 1) 0%); } + to { background-image: radial-gradient(farthest-side, $_dot_color 95%, transparentize($_dot_color, 1)); } +} + +%needs_attention { + // the dot is drawn by using two radial gradient, the first one is the actual dot, the other + // simulates the shadow labels and icons normally have in buttons. + animation: needs_attention 150ms ease-in; + + background-image: radial-gradient(farthest-side, $_dot_color 96%, transparentize($_dot_color,1 )); + background-size: 6px 6px, 6px 6px; + background-repeat: no-repeat; + + @if $variant == 'light' { background-position: right 3px, right 4px; } + + @else { background-position: right 3px, right 2px; } + + &:backdrop { background-size: 6px 6px, 0 0;} + + &:dir(rtl) { + @if $variant == 'light' { background-position: left 3px, left 4px; } + + @else { background-position: left 3px, left 2px; } + } +} + +%flat_button { + @include button(flat-normal); + &:hover { @include button(flat-hover); } + &:active { @include button(flat-active); } + &:checked { @include button(flat-checked); } + &:disabled { @include button(flat-insensitive); } +} + +%button, +button { + min-height: 20px; + min-width: 16px; + transition: $button_transition; + border: 1px solid; + border-radius: $bt_radius; + padding: 0 8px; + background-clip: if($variant=='light', border-box, padding-box); + @include button(normal); + + separator { margin: 4px 1px; } + + &.flat { + @extend %flat_button; + min-height: if($variant =='light', 24px, 24px); + transition: none; + + &:hover { + transition: $button_transition; + transition-duration: 350ms; + + &:active { transition: $button_transition; } + } + + &:checked:hover { background-image: none; } + + &.toggle.popup { + min-width: 20px; + } + } + + &:hover { + @include button(hover); + background-clip: if($variant=='light', border-box, padding-box); + -gtk-icon-filter: brightness(1.2); + } + + &:active, &:checked { + @include button(active); + + background-clip: if($variant=='light', border-box, padding-box); + transition-duration: 200ms; + + &:not(:disabled) label:disabled { color: inherit; opacity: 0.6; } + } + + &:active { color: $fg_color; } + &:active:hover, &:checked { color: $selected_fg_color; } + + &:disabled { + @include button(insensitive); + background-clip: if($variant=='light', border-box, padding-box); + + &:active, &:checked { + @include button(insensitive-active); + background-clip: if($variant=='light', border-box, padding-box); + } + } + + &.image-button { + min-height: 22px; + padding-left: 8px; + padding-right: 8px; + } + + &.text-button { + min-height: 22px; + padding-left: 12px; + padding-right: 12px; + } + + &.text-button.image-button { + min-height: 22px; + padding-left: 6px; + padding-right: 6px; + + label { + &:first-child { + padding-left: 8px; + padding-right: 2px; + } + + &:last-child { + padding-right: 8px; + padding-left: 2px; + } + + &:only-child { + padding-left: 8px; + padding-right: 8px; + } + } + + &.popup { padding-right: 6px; padding-left: 6px; } + } + + &.close { // The Bloody Circul Button + @extend %circular_button; + } + + @at-root %button_basic_drop_active, + &:drop(active) { + color: $drop_target_color; + border-color: $drop_target_color; + box-shadow: inset 0 0 0 1px $drop_target_color; + } + + // big standalone buttons like in Documents pager + &.osd { + color: $osd_fg_color; + background-color: $osd_bg_color; + border-color: darken($osd_bg_color, 8%); + + &.image-button { + padding: 0; + min-height: 42px; + min-width: 42px; + } + + &:hover { + color: $selected_bg_color; + box-shadow: none; + background-color: $osd_button_bg; + } + + &:active, &:checked {@include button(osd-active); } + &:disabled { @include button(osd-insensitive); } + } + + //overlay / OSD style + @at-root %osd_button, + .osd & { + @include button(osd); + + &:hover { @include button(osd-hover); } + &:active, &:checked { @include button(osd-active); } + &:disabled { @include button(osd-insensitive); } + + &.flat { + @include button(undecorated); + box-shadow: none; + + &:hover { @include button(osd-hover); } + + &:disabled { + @include button(osd-insensitive); + background-image: none; + } + + &:active, &:checked { @include button(osd-active); } + } + } + + .osd .linked:not(.vertical):not(.path-bar) > &:hover:not(:checked):not(:active):not(:only-child), + .osd .linked:not(.vertical):not(.path-bar) > &:hover:not(:checked):not(:active) + &:not(:checked):not(:active) { box-shadow: none; } + + // Suggested and Destructive Action buttons + @each $b_type, $b_color, $b_fg in (suggested-action, $suggested_color, $light_fg_color), + (destructive-action, $destructive_color, $light_fg_color) { + &.#{$b_type} { + @include button(suggested_destructive, $b_color, $b_fg); + + &.flat { + @include button(undecorated); + color: $b_color; + } + + &:hover { + @include button(suggested_destructive, lighten($b_color, 5%), $b_fg); + } + + &:active, &:checked { + @include button(suggested_destructive, lighten($b_color, 10%), $b_fg); + box-shadow: none; + } + + &.flat:disabled { + @include button(undecorated); + color: $disabled_fg_color; + } + + &:disabled { @include button(insensitive); } + } + } + + .stack-switcher > & { + // to position the needs attention dot, padding is added to the button + // child, a label needs just lateral padding while an icon needs vertical + // padding added too. + + outline-offset: -3px; // needs to be set or it gets overridden by GtkRadioButton outline-offset + + > label { + padding-left: 6px; // label padding + padding-right: 6px; // + } + > image { + padding-left: 6px; + padding-right: 6px; + } + &.text-button { + padding-left: 10px; + padding-right: 10px; + } + &.image-button { + padding-left: 2px; + padding-right: 2px; + } + + &.needs-attention { + > label, > image { @extend %needs_attention; } + + &:active, &:checked { + > label, > image { + animation: none; + background-image: none; + } + } + } + } + + // hide separators + &.font, + &.file { separator { background-color: transparent; }} + + .linked:not(.vertical) > & { @extend %linked; } + + .linked.vertical > & { @extend %linked_vertical; } +} + +// Some crazy linking stuff +@mixin linking_rules($a:0.7, $var:$variant, $vert:'false', $entry_rules:'true', $button_rules:'true', + $e_border:$entry_border, $b_border:$button_border) { + + $_border: if($vert=='false', left, top); + + @if $entry_rules=='true' { + @each $e_type, $e_color in (':focus-within', $entry_highlight), + (':drop(active)', $drop_target_color), + ('.warning:focus-within', $warning_color), + ('.error:focus-within', $error_color) { + + > entry#{$e_type}:not(:only-child) { + box-shadow: inset 0 0 0 2px $e_color; + } + } + } + + @if $button_rules=='true' { + $_uncolored_button: 'button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action)'; + + > button + button { border-#{$_border}-style: none; } + } +} + +// special case, because path-bars are bugged +@mixin pathbar_linking_rules ($sep_color: $button_border, $button_rules: 'true') { + + @if $button_rules == 'true' { + > button + button { + border-left-style: none; + } + } + + @if $button_rules == 'header' { + > button:first-child { border-left-style: if($variant == 'light', solid, none); } + > button + button { border-left-style: solid; } + + @if $variant == 'light' { + > button:active + button { + border-left-color: mix(black, $header_button_active_bg, 15%); + } + + > button:active + button:checked, + > button:checked + button { + border-left-color: mix(black, $header_button_checked_bg, 15%); + } + } + } +} + +// Apply the rules defined above +.linked:not(.vertical) { + &:not(.path-bar) { @include linking_rules(); } + &.path-bar { @include pathbar_linking_rules(); } +} + +.linked.vertical { @include linking_rules($vert:'true'); } + +%linked_middle { + border-radius: 0; + border-right-style: none; +} + +%linked { + @extend %linked_middle; + &:first-child { + border-top-left-radius: $bt_radius; + border-bottom-left-radius: $bt_radius; + } + &:last-child { + border-top-right-radius: $bt_radius; + border-bottom-right-radius: $bt_radius; + border-right-style: solid; + } + &:only-child { + border-radius: $bt_radius; + border-style: solid; + } +} + +%linked-flat { + @extend %linked_middle; + &:first-child { + border-top-left-radius: $bt_radius; + border-bottom-left-radius: 0; + } + &:last-child { + border-top-right-radius: $bt_radius; + border-bottom-right-radius: 0; + border-right-style: solid; + } + &:only-child { + border-radius: $bt_radius $bt_radius 0 0; + border-style: solid; + } +} + +%linked_vertical_middle { + border-radius: 0; + border-bottom-style: none; +} + +%linked_vertical{ + @extend %linked_vertical_middle; + &:first-child { + border-top-left-radius: $bt_radius; + border-top-right-radius: $bt_radius; + } + &:last-child { + border-bottom-left-radius: $bt_radius; + border-bottom-right-radius: $bt_radius; + border-bottom-style: solid; + } + &:only-child { + border-radius: $bt_radius; + border-style: solid; + } +} + +%undecorated_button { + border-color: transparent; + background-color: transparent; + background-image: none; + box-shadow: none; +} + +// menu buttons +modelbutton.flat { + transition: $shorter_transition; + min-height: 26px; + padding-left: 8px; + padding-right: 8px; + outline-offset: -3px; + border-radius: $bt_radius; + @extend %undecorated_button; + + &:hover { + background-color: if($variant=='light', mix($fg_color,$bg_color,5%), mix($fg_color,$bg_color,10%)); + transition-duration: 50ms; + } + + &:active, &:selected { + &, arrow { + @extend %selected_items; + transition: none; + animation: none; + } + } + + &:checked { color: $fg_color; } + &:disabled { color: $disabled_fg_color; } + + // FIXME: temporary workaround + check:last-child, + radio:last-child { margin-left: 8px; } + + check:first-child, + radio:first-child { margin-right: 8px; } +} + +modelbutton.flat arrow { + background: none; + min-width: 16px; + min-height: 16px; + opacity: 0.3; //dim icon + + &:hover, &:selected, &:focus { background: none; } + + &.left { -gtk-icon-source: -gtk-icontheme("go-previous-symbolic"); } + + &.right { -gtk-icon-source: -gtk-icontheme("go-next-symbolic"); } +} + +%list_button, +list > row button.image-button:not(.flat) { + @extend %undecorated_button; + border: 1px solid transparentize($borders_color, .5); + &:hover { @include button(hover); } + &:active, + &:checked { @include button(active); } + + @each $b_type, $b_color in (suggested-action, $selected_bg_color), + (destructive-action, $destructive_color) { + &.#{$b_type} { // allow colored buttons in lists #3643 + @include button(suggested_destructive, $b_color, white); + } + } +} + +// +// Links +// +link, %links { + color: $link_color; + + &:visited { + color: $link_visited_color; + *:selected & { color: mix($selected_fg_color, $selected_bg_color, 60%); } + } + &:hover { + color: lighten($link_color,10%); + *:selected & { color: mix($selected_fg_color, $selected_bg_color, 90%); } + } + &:active { + color: $link_color; + *:selected & { color: mix($selected_fg_color, $selected_bg_color, 80%); } + } + + @at-root %link_selected, + &:selected, + *:selected & { color: mix($selected_fg_color, $selected_bg_color, 80%); } +} + +button.link { + @extend %links; + + &, &:hover, &:active, &:checked { + @extend %undecorated_button; + } + + > label { text-decoration-line: underline; } +} + +// +// Spinbuttons +// +spinbutton { + &:drop(active) { box-shadow: none; } + + button:active { color: $selected_fg_color; } + &:disabled { color: $disabled_fg_color; } + + > text { + padding: 6px; + @extend %Linked_entrys; + border: 1px solid $dark_borders_color; + + &:focus-within { + border-color: $entry_highlight; + @if $variant == 'dark' { box-shadow: inset 0 0 0 1px $entry_highlight; } + @if $variant == 'light' { box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px $entry_highlight; } + } + + &:drop(active) { + border-color: $drop_target_color; + @if $variant == 'dark' { box-shadow: inset 0 0 0 1px $drop_target_color; } + @if $variant == 'light' { box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px $drop_target_color; } + } + } + + &:not(.vertical) { + padding: 0; + border-spacing: 0; + + > text { + padding-top: 2px; + padding-bottom: 2px; + min-width: 28px; + } + + > button, > text { @extend %linked; min-height: 20px; } + + &:dir(ltr) > text, + &:dir(rtl) > button.up { border-radius: $bt_radius 0 0 $bt_radius; } + + > button + button { border-left-style: none; } + + > button:hover:not(:active), + > button:hover + button { box-shadow: inset 1px 0 $button_border; } + + > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), + > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { box-shadow: inset 1px 0 transparentize($button_border, 0.5); } + + > button:first-child:hover:not(:active), + > button.up:dir(rtl):hover:not(:active), + > text + button:not(:active):hover { box-shadow: none; } + + > text:focus + button { border-left-color: $entry_highlight; } + > text:drop(active) + button { border-left-color: $drop_target_color; } + + .osd & { + &, &:focus, &:drop(active) { border-image: none; } + > button:hover:not(:active), + > button:hover + button { box-shadow: inset 1px 0 $osd_button_border; } + + > button:first-child:hover:not(:active), + > button.up:dir(rtl):hover:not(:active), + > text + button:not(:active):hover { box-shadow: none; } + + > text:focus + button { border-left-color: $entry_highlight; } + } + } + + &.vertical { + > button, > text { + padding-left: 4px; + padding-right: 4px; + min-width: 0; + + @extend %linked_vertical; + } + + > button.up { border-radius: $bt_radius $bt_radius 0 0; } + + > text:focus + button { border-top-color: $entry_highlight; } + > text:drop(active) + button { border-top-color: $drop_target_color; } + } + + // Misc + treeview &:not(.vertical), + row &:not(.vertical) { + min-height: 0; + padding: 0 3px; + border-style: none; + border-radius: $bt_radius; + background-color: rgba($fg_color, 0.08); + + &:focus, &:hover, &:selected { background-color: rgba($fg_color, 0.12); } + + > text { + &, &:hover, &:focus { + background: none; + border: none; + box-shadow: none; + } + } + + > button.up, + > button.down { + border: none; + border-color: transparent; + box-shadow: none; + border-radius: 100px; + min-height: 22px; + min-width: 22px; + padding: 0; + margin: 4px 2px; + background-color: transparent; + + &:hover { background-color: rgba($fg_color, 0.1); } + &:active { background-color: rgba($fg_color, 0.15); color: $fg_color; } + } + + > button:hover:not(:active), + > button:hover + button { box-shadow: none; } + + > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), + > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { box-shadow: none; } + + > text:focus + button { border-left-color: transparent; } + > text:drop(active) + button { border-left-color: transparent; } + } + + font-feature-settings: "tnum"; +} + +// +// Comboboxes +// + +dropdown > popover.menu.background > contents { padding: 0; } + +dropdown > button > box { + border-spacing: 6px; +} + +dropdown, +combobox { + min-height: 24px; + + button.combo { + min-width: 0; // otherwise the arrow placement is unsymmetric + min-height: 20px; + // margin: 0; + padding-left: 12px; + padding-right: 12px; + } + + // align menu labels with the button label + > popover.menu > contents modelbutton { + padding-left: 9px; + padding-right: 9px; + } + + arrow { + -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); + min-height: 16px; + min-width: 16px; + } + + .background & button.combo arrow { + @include button(active); + -gtk-icon-source: -gtk-scaled( + url("assets/combobox-arrow-dark.png"), + url("assets/combobox-arrow-dark@2.png")); + min-height: 16px; + min-width: 18px; + padding: 0; + margin: 2px -10px 2px 0; + border-radius: $bt_radius - 1px; + border: none; + + @if $variant == 'dark' { + box-shadow: inset 0 1px $button_highlight, 0 0 0 1px $dark_borders_color, 0 1px 2px 0 rgba(black, 0.05); + } + } + + decoration, + button.combo:checked, + .background & button.combo:checked { transition: none; } // workaround for menuitem selection + + &:drop(active) button.combo { + color: $drop_target_color; + border-color: $drop_target_color; + box-shadow: none; + } + + // newstyle + popover { + margin-top: 4px; + padding: 0; + + listview { + margin: 6px 0; + + & > row { + padding: 6px; + + &:selected { + color: $selected_fg_color; + background-color: $selected_bg_color; + } + } + } + + // drodowns with searchboxes on top + .dropdown-searchbar { + padding: 6px; + border-bottom: 1px solid $borders_color; + } + } + + .linked:not(.vertical) > entry + button.combo, + .linked:not(.vertical) > & > box > button.combo { + arrow { + background-color: transparent; + box-shadow: none; + -gtk-icon-source: -gtk-scaled( + url("assets/combobox-arrow#{$asset_suffix}.png"), + url("assets/combobox-arrow#{$asset_suffix}@2.png")); + } + } + + .linked:not(.vertical) > entry + button.combo:checked, + .linked:not(.vertical) > & > box > button.combo:checked { + arrow { + border-radius: 0; + background-color: transparent; + -gtk-icon-source: -gtk-scaled( + url("assets/combobox-arrow-dark.png"), + url("assets/combobox-arrow-dark@2.png")); + } + } + + .linked:not(.vertical) > & > box > button.combo { + // the combobox is a composite widget so the way we do button linking doesn't + // work, special case needed. + &:dir(ltr), + &:dir(rtl) { @extend %linked_middle; } // specificity bump + } + + .linked:not(.vertical) > &:first-child > box > button.combo { + border-top-left-radius: $bt_radius; + border-bottom-left-radius: $bt_radius + } + + .linked:not(.vertical) > &:last-child > box > button.combo { + border-top-right-radius: $bt_radius; + border-bottom-right-radius: $bt_radius; + border-right: 1px solid $button_borders; + } + + .linked:not(.vertical) > &:only-child > box > button.combo { + border-radius: $bt_radius; + } + + // .linked.vertical > & > box > button.combo { @extend %linked_vertical_middle; } + .linked.vertical > &:first-child > box > button.combo { + border-top-left-radius: $bt_radius; + border-top-right-radius: $bt_radius; + } + + .linked.vertical > &:last-child > box > button.combo { + border-bottom-left-radius: $bt_radius; + border-bottom-right-radius: $bt_radius; + } + + .linked.vertical > &:only-child > box > button.combo { + border-radius: $bt_radius; + } +} + +// +// Toolbars +// + +%toolbar { + padding: 2px 6px; + border-spacing: 4px; + background-color: $header_bg; + border-bottom: 1px solid $borders_color; +} + +.toolbar, +toolbar { + @extend %toolbar; + + &.horizontal { border-bottom: 1px solid $borders_color; } + + separator { background: none; } + &.horizontal separator { margin: 0 6px; } + &.vertical separator { margin: 6px 0; } + + .osd & { background-color: transparent; } + + &.osd { + padding: 8px; + border: none; + border-radius: $bt_radius + 4px; + background-color: $osd_bg_color; + box-shadow: $shadow_4; + + &.toolbar { + padding: 0; + margin: 6px 8px 10px; + box-shadow: none; + background: none; + + > box.horizontal { + padding: 8px; + border-radius: $bt_radius + 4px; + background-color: $osd_bg_color; + box-shadow: $shadow_4; + } + } + + &.left, + &.right, + &.top, + &.bottom { border-radius: 0; } // positional classes for `attached` osd toolbars + + &.top { border-width: 0 0 1px 0; } + &.bottom { border-width: 1px 0 0 0; } + &.left { border-width: 0 1px 0 0; } + &.right { border-width: 0 0 0 1px; } + } +} + +// oldstyle toolbar buttons +.toolbar button { + margin: 1px; + @extend %flat_button; +} + +searchbar { + > revealer > box { + padding: 6px; + border-spacing: 6px; + border-style: solid; + border-color: $solid_borders_color; + background-color: $bg_color; + border-width: 0 0 1px; + } + + .linked:not(.vertical) { + > entry { + margin-top: 0; + margin-bottom: 0; + } + } + + // Close button on searchbar + button.flat { + @extend %circular_button; + } +} + +actionbar > revealer > box { + padding: 6px; + border-top: 1px solid $borders_color; + background-color: darken($bg_color, 3%); + + .background.csd revealer > & { + border-radius: 0 0 $wm_radius $wm_radius; + } +} + +// +// Headerbars +// + +headerbar { + min-height: 40px; + padding: 0 16px; + color: $header_fg; + background-color: $header_bg; + border-bottom: 1px solid $header_border; + + &:backdrop { + transition: $backdrop_transition; + color: transparentize($header_fg, 0.3); + background-color: $header_bg_backdrop; + border-color: if($variant=='light', lighten($header_border, 5%), darken($header_border, 3%)); + } + + .title { + padding-left: 12px; + padding-right: 12px; + } + + .subtitle { + font-size: smaller; + padding-left: 12px; + padding-right: 12px; + margin-top: -3px; + @extend %dim-label; + } + + entry { @extend %headerbar_entrys; } + + button { @extend %headerbar_buttons; } + + button, spinbutton { + margin-top: 8px; + margin-bottom: 8px; + } + + // button.toggle.popup { margin-right: 3px; } // Nautilus 3.30 popup button + + // Reset linked buttons + .linked.raised > & { + min-width: 16px; + border-radius: $bt_radius; + border: none; + box-shadow: none; + + &:disabled { background: none; } + } + + stackswitcher.linked:not(.vertical) > button { + min-height: 20px; + min-width: 24px; + border-radius: $bt_radius; + } + + // Reset linking entrys + .linked:not(.vertical) > entry { + @include entry(header-normal); + margin: 8px 3px; + padding: 0 8px; + border-radius: $bt_radius; + border: none; + + &:focus { + border-radius: $bt_radius; + @include entry(header-focus); + } + + &:disabled { + border-radius: $bt_radius; + @include entry(header-insensitive); + } + + &:backdrop { opacity: 0.65; background-image: none; } + } + + stackswitcher { + box-shadow: inset 0 0 0 1px $light_borders_color; + border-radius: $bt_radius; + margin: 8px 0; + padding: 0; + + > button { + min-height: 26px; + margin: 0; + font-weight: 500; + + &:not(:first-child) { + border-width: 0 0 0 1px; + border-style: none solid none none; + border-radius: 0; + border-image: linear-gradient(to bottom, + transparent 16%, + $light_borders_color 16%, + $light_borders_color 84%, + transparent 84%) 0 0 0 1 / 0 0 0 1px stretch; + } + + &:checked { + border-image: none; + } + } + + button:checked + button { border-image: none; } + } + + // Headerbar Switches + switch { + margin-top: 10px; + margin-bottom: 10px; + + &:backdrop { opacity: 0.75; } + } + + &.titlebar headerbar:not(.titlebar) { + background: none; + box-shadow: none; + } + + &.windowhandle { + viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) { + border-radius: 0; + margin-top: 0; + margin-bottom: 0; + } + + > button.popup { + &:hover { + @include button(header-hover); + } + + &:active, &:active:hover { + @include button(header-active); + } + + &:checked { + @include button(header-checked); + } + } + } + + // Selectionmode + .selection-mode &, + &.selection-mode { + color: $light_fg_color; + background-color: $selection_mode_bg; + border-color: darken($selection_mode_bg, 4%); + box-shadow: none; + background-image: none; + text-shadow: none; + + &:backdrop { + background-color: $selection_mode_bg; + color: transparentize($light_fg_color, 0.4); + border-color: darken($selection_mode_bg, 4%); + } + + button { + @include button(undecorated); + @extend %selected-button; + } + + .subtitle:link { @extend %link_selected; } + + .selection-menu { + box-shadow: none; + padding-left: 10px; + padding-right: 10px; + + .arrow { + -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); + } + } + + .maximized & { background-color: $selection_mode_bg; } + } + + .tiled &, .tiled &:backdrop, + .maximized &, .maximized &:backdrop { + border-radius: $maximized_radius $maximized_radius 0 0; // squared corners when the window is max'd or tiled + box-shadow: none; + } + + .maximized & { + background-color: $header_bg; + border-color: opacify($header_border, 1); + box-shadow: none; + + &:backdrop { + background-color: $header_bg_backdrop; + border-color: if($variant=='light', lighten($header_border, 15%), darken($header_border, 3%)); + } + } + + &.default-decoration { + min-height: 32px; + padding: 0 12px; + background-color: $header_bg; + + .tiled &, + .maximized &, + .fullscreen & { box-shadow: none; } + + windowcontrols { + button, + menubutton { + border: none; + min-width: 16px; + min-height: 16px; + margin: 0; + padding: 0; + } + + menubutton button { + min-height: 20px; + min-width: 20px; + margin: 0; + padding: 4px; + } + } + } + + &.default-decoration, + .csd &.default-decoration, // needed under wayland, since all gtk3 windows are csd windows + &.default-decoration:backdrop, + .csd &.default-decoration:backdrop { + // box-shadow: none; + border: none; + } + + separator.titlebutton { @extend %header_separator; } + + // Fixes split headerbars + separator:first-child + &, + &:first-child { + &, &:backdrop { + border-top-left-radius: $wm_radius; + + .maximized &, + .tiled & { border-top-left-radius: $maximized_radius; } + } + } + + &:last-child { + &, &:backdrop { + border-top-right-radius: $wm_radius; + + .maximized &, + .tiled & { border-top-right-radius: $maximized_radius; } + } + } + + stack & { // tackles the stacked headerbars case + &:first-child, &:last-child { + border-top-left-radius: $wm_radius; + border-top-right-radius: $wm_radius; + } + } + + window separator:first-child + &, + window &:first-child { &:backdrop, & { border-top-left-radius: $wm_radius; }} + window &:last-child { &:backdrop, & { border-top-right-radius: $wm_radius; }} + + window stack & { // tackles the stacked headerbars case + &:first-child, &:last-child { + &:backdrop, & { + border-top-left-radius: $wm_radius; + border-top-right-radius: $wm_radius; + } + } + } + + window.tiled &, + window.tiled-top &, + window.tiled-right &, + window.tiled-bottom &, + window.tiled-left &, + window.maximized & { + &, + &:first-child, + &:last-child, + &:only-child { + border-top-left-radius: $maximized_radius; + border-top-right-radius: $maximized_radius; + } + } + + window.fullscreen &, + .solid-csd & { + &, + &:first-child, + &:last-child, + &:only-child { + border-top-left-radius: 0; + border-top-right-radius: 0; + } + } +} + +.titlebar { + &, &.background { + border-top-left-radius: $wm_radius; + border-top-right-radius: $wm_radius; + } + + &, & headerbar { + box-shadow: inset 0 1px $highlight_color; + + .tiled &, + .maximized &, + .fullscreen & { + box-shadow: none; + + &, &.background { + border-top-left-radius: $maximized_radius; + border-top-right-radius: $maximized_radius; + } + } + } + + > box.left.horizontal, + > box.right.horizontal { + padding: 0 6px; + } +} + +window.background > box.vertical > headerbar:not(.titlebar) { // reset headerbar style for not CSD window + border-radius: 0 0 0 0; + box-shadow: none; + + // Fixes split headerbars + separator:first-child + &, + &:first-child { + &, &:backdrop { + border-top-left-radius: 0; + } + } + + &:last-child { + &, &:backdrop { + border-top-right-radius: 0; + } + } +} + +// Fixes split headerbars too +.titlebar:not(headerbar) { + window > &, + window.csd > & { + &, &:backdrop { + padding: 0; + background: none; + border: none; + box-shadow: none; + } + } + + > separator { + min-width: 1px; + @extend %side_separator; + } +} + +headerbar { + > windowhandle > box { + &, + > box.start, + > box.end { + border-spacing: 6px; + } + } + + button { + min-height: 26px; + min-width: 22px; + } + + entry { // Reset entrys + min-height: 22px; + margin-top: 8px; + margin-bottom: 8px; + margin-left: 0; + margin-right: 0; + padding: 2px 8px; + } +} + +%header_separator { + min-width: 0; + min-height: 0; + background-color: transparent; + border: none; + + &:backdrop { opacity: 0.65; } +} + +// Headerbar Entries +%headerbar_entrys { + min-height: 22px; + @include entry(header-normal); + + &:backdrop { opacity: 0.65; background-image: none; } + + &:hover { + @include entry(header-hover); + } + + &:focus { + @include entry(header-focus); + } + + &:disabled { + @include entry(header-insensitive); + } + + selection:focus { + background-color: $selected_bg_color; + color: $selected_fg_color; + } + + progress { + border-color: $progress_color; + background-image: none; + background-color: transparent; + } + + @each $e_type, $e_color, $e_fg_color in (warning, $warning_color, $light_fg_color), + (error, $error_color, $light_fg_color) { + &.#{$e_type} { + color: $e_fg_color; + border-color: if($variant=='light', $e_color, $entry_border); + background-color: mix($e_color, $header_bg, 60%); + + &:focus { + color: $e_fg_color; + background-color: $e_color; + } + + selection, selection:focus { + background-color: $e_fg_color; + color: $e_color; + } + } + } +} + +// Headerbar Buttons +%headerbar_buttons { + min-height: 24px; + min-width: 16px; + padding: 2px 6px; + @include button(header-normal); + + &:backdrop { opacity: 0.65; background-image: none; } + + &:hover { + @include button(header-hover); + transition: $button_transition; + } + + &:active, &:active:hover { + @include button(header-active); + transition: $button_transition; + transition-duration: 300ms; + } + + &:active:hover, &:checked { color: $header_fg; } + + &:checked { + @include button(header-checked); + transition: $button_transition; + transition-duration: 300ms; + + &:hover { background-image: none; } + } + + &:disabled { + &, &:checked, &:active { @include button(header-insensitive); } + } + + &.flat { + @include button(undecorated); + } +} + +// +// Pathbars +// +.path-bar > button { + min-width: 12px; + min-height: if($variant == 'light', 24px, 26px); + + &.text-button, &.image-button, & { + padding-left: 6px; + padding-right: 6px; + } + + &:hover { box-shadow: none; } + + &:active, &:checked { + @include button(header-checked); + border-color: $button_borders; + } + + &:disabled { + border-color: $button_borders; + } + + &.text-button.image-button label { padding-left: 0; padding-right: 0; } + + &.text-button.image-button, & { + label:last-child { padding-right: 10px; } + label:first-child { padding-left: 10px; } + } + + &.slider-button, + &:not(.image-button):not(.text-button) { + padding-left: 1px; + padding-right: 1px; + } + + image { + padding-left: 4px; + padding-right: 4px; + } +} + +// +// Tree Views +// +@mixin viewwy($c) { + background-color: $c; + border-radius: 0; + margin: 0 0; + + border-left-color: rgba($fg_color, 0.15); // this is actually the tree lines color, + border-top-color: $borders_color; // while this is the grid lines color, better then nothing + + > rubberband { @extend %rubberband; } // to avoid borders being overridden by the previously set props + + acceleditor > label { background-color: $selected_bg_color; } + + &:selected { + &, &:focus { + border-radius: 0; + border-left-color: mix($selected_fg_color, $selected_bg_color, 50%); + border-top-color: rgba($fg_color, 0.15); // doesn't work unfortunately + + @extend %selected_items; + } + } + + &:disabled { + color: $disabled_fg_color; + + &:selected { + color: mix($selected_fg_color, $selected_bg_color, 40%); + } + } + + &.separator { + min-height: 2px; + color: $borders_color; + } + + &:drop(active) { + border-style: solid none; + border-width: 1px; + border-color: mix($fg_color, $selected_bg_color, 50%); + + &.after { border-top-style: none; } + &.before { border-bottom-style: none; } + } + + > dndtarget:drop(active) { + border-style: solid none; + border-width: 1px; + border-color: $selected_borders_color; + + &.after { border-top-style: none; } + + &.before { border-bottom-style: none; } + } + + &.expander { + -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); + + &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); } + + color: mix($fg_color, $base_color, 50%); + + &:hover { color: $fg_color; } + + &:selected { + color: mix($selected_fg_color, $selected_bg_color, 70%); + &:hover { color: $selected_fg_color; } + } + + &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } + } + + &.progressbar, &.progressbar:focus { // progress bar in treeviews + color: $selected_fg_color; + border-radius: $bt_radius; + background-color: $progress_color; + + &:selected, &:selected:focus { + color: $selected_bg_color; + box-shadow: none; + background-color: $selected_fg_color; + } + } + + &.trough { // progress bar trough in treeviews + color: $fg_color; + background-color: $button_border; + border-radius: $bt_radius; + border-width: 0; + + &:selected, &:selected:focus { + color: $selected_fg_color; + background-color: transparentize(black, 0.8); + border-radius: $bt_radius; + border-width: 0; + } + } + + > header { + > button { + $_column_header_color: mix($fg_color,$base_color,80%); + + min-height: if($variant =='light', 24px, 26px); + min-width: 38px; + padding: 0 6px; + font-weight: bold; + + color: $_column_header_color; + background-color: $base_color; + background-image: none; + box-shadow: none; + border-style: none solid none none; + border-radius: 0; + border-image: linear-gradient(to bottom, + $base_color 20%, + transparentize(if($variant == 'light', black, white), 0.89) 20%, + transparentize(if($variant == 'light', black, white), 0.89) 80%, + $base_color 80%) 0 1 0 0 / 0 1px 0 0 stretch; + + &:hover { color: $selected_bg_color; } + &:active { color: $fg_color; } + + &:active, &:hover { background-color: $base_color; } + &:active:hover { color: $fg_color; } + + &:disabled { + border-color: $bg_color; + background-image: none; + } + + &:last-child { + border-right-style: none; + border-image: none; + } + } + } + + button.dnd, + header.button.dnd { + &, &:selected, &:hover, &:active { + padding: 0 6px; + transition: none; + color: $selected_fg_color; + background-color: $selected_bg_color; + border-radius: 0; + border-style: none; + } + } +} + +columnview.view, +treeview.view { + @include viewwy($base_color); +} + +// +// Menus +// + +menubar { + padding: 0; + background-color: $header_bg; + color: $header_fg; + box-shadow: inset 0 -1px $borders_color; + + &:backdrop { + color: transparentize($header_fg, 0.2); + // background-image: none; + // background-color: opacify($header_bg_backdrop, 1); + } + + > item { + transition: all 0.2s cubic-bezier(0.0, 0.0, 0.2, 1); + padding: 4px 8px; + border: none; + border-radius: $bt_radius / 2; + + &:hover { //Seems like it :hover even with keyboard focus + transition: none; + @include button(header-hover); + } + + &:disabled { + color: transparentize($header_fg, 0.6); + } + } + + & > item popover.menu.background > contents { + padding: 5px; + border-radius: $mn_radius; + } + + //nested submenus + & > item popover.menu popover.menu { + padding: 0 0 4px 0; + } + + & > item popover.menu.background popover.menu.background > contents { + margin: 0; + border-radius: $mn_radius; //including top + } +} + +// +// Popovers +// +popover.background { + font: initial; // Decouple the font of popovers from their entry/textview + + > arrow, + > contents { + padding: 0; + background-clip: border-box; + background-color: $menu_bg; + box-shadow: 0 3px 6px 0 if($variant=='light', transparentize(black, 0.85), transparentize(black, 0.85)), + 0 0 0 1px if($variant=='light', rgba($borders_color, 0.03), rgba($dark_borders_color, 0.55)); + border-radius: $wm_radius; + border: 1px solid if($variant=='light', rgba($borders_color, 0.2), lighten($menu_bg, 6%)); + } + + &, &:backdrop { + background-color: transparent; + } + + > contents { + padding: 6px; + border-radius: $mn_radius; + + > list, + > .view, + > toolbar { + border-style: none; + background-color: transparent; + } + + separator { + background-color: $menu_bd; + margin: 3px; + } + + list separator { margin: 0; } + } + + label.separator { + @extend %dim-label; + color: $fg_color; + } + + entry { + background-color: mix($fg_color, $menu_bg, 5%); + } + + > list, + > .view, + > toolbar, + > scrolledwindow > viewport > list { + border-style: none; + background-color: transparent; + } + + > scrolledwindow > viewport > list { + margin: $container_padding; + + row { + padding: 6px 12px; + border-radius: $bt_radius; + } + } + + &, .csd & { + &.osd, &.magnifier { @extend %osd; } + &.touch-selection { font: initial; } + + &.osd { @extend %osd; } + } + + &.touch-selection, + &.magnifier { + button { @extend %osd_button; } + } +} + +magnifier { + background-color: $base_color; +} + +//touch selection handlebars for the Popover.osd above +cursor-handle { + background-color: transparent; + background-image: none; + box-shadow: none; + border-style: none; + &.top { -gtk-icon-source: -gtk-icontheme('selection-start-symbolic'); } + &.bottom { -gtk-icon-source: -gtk-icontheme('selection-end-symbolic'); } +} + +// +// Popover Base Menus +// + +popover.menu { + padding: 0; + + box.inline-buttons { + padding: 0 $container_padding; + + button.image-button.model { + @include button(undecorated); + min-height: 30px; + min-width: 30px; + padding: 0; + border: none; + outline: none; + transition: none; + + &:selected { + color: $selected_fg_color; + background-image: image($selected_bg_color); + } + } + } + + box.circular-buttons { + padding: $container_padding; + + button.circular.image-button.model { + @extend %list_button; + padding: 10px; + border: none; + + &:focus { + background-color: $light_borders_color; + } + + &:active:focus { + color: $selected_fg_color; + background-color: $selected_bg_color; + } + } + } + + & > arrow, + &.background > contents { + background-color: $menu_bg; + padding: 5px; + } + + &.background separator { + margin: 6px 0; + } + + accelerator { + color: gtkalpha(currentColor, 0.55); + + &:dir(ltr) { margin-left: $container_padding; } + &:dir(rtl) { margin-right: $container_padding; } + } + + arrow.left, + radio.left, + check.left { + margin-left: -2px; + margin-right: 6px; + } + + arrow.right, + radio.right, + check.right { + margin-left: 6px; + margin-right: -2px; + } + + modelbutton { + min-height: $menuitem_size - $container_padding; + min-width: 38px; + padding: 0 $container_padding; + border-radius: $mn_radius - $container_padding / 2; + + &:selected { + color: $selected_fg_color; + background-color: $selected_bg_color; + } + + &:selected:active { + color: $selected_fg_color; + background-color: darken($selected_bg_color, 5%); // matching buttons + } + } + + label.title { + font-weight: bold; + padding: 4px ($container_padding + 20px); //this will fall apart with font sizing + } +} + +// +// Notebooks and Tabs +// + +%tabs_tab { + color: $disabled_fg_color; + background-color: transparentize($base_color, 1); + border: 1px solid transparent; + transition: all 150ms ease-out; + + &:hover:not(:checked) { + color: mix($fg_color, $disabled_fg_color, 50%); + background-color: if($variant == 'light', rgba(white, 0.2), rgba(white, 0.05)); + border-color: if($variant == 'light', darken($header_bg, 15%), lighten($header_bg, 5%)); + } + + &:checked { + color: $fg_color; + background-color: $header_bg; + border-color: if($variant == 'light', darken($header_bg, 15%), lighten($header_bg, 5%)); + } +} + +notebook { + padding: 0; + // margin-top: -1px; + + &.frame { + border: 1px solid $solid_borders_color; + } + + > stack:not(:only-child) { // the :not(:only-child) is for "hidden" notebooks + background-color: $base_color; + } + + .csd &:not(.frame), .csd &:not(.frame) > stack { + border-radius: 0 0 $wm_radius $wm_radius; + } + + > header { + padding: 0; + background-color: darken($header_bg, 10%); + + // Set box-shadow to make the header frame color more easy to see + // Set margin to hide the ugly borders around the header + &.top { + box-shadow: inset 0 1px $solid_borders_color, inset 0 -1px $borders_color; + @if $variant=='light' { + box-shadow: inset 0 1px $borders_color, + inset 0 -1px $borders_color, + 1px 0 $borders_color, + -1px 0 $borders_color; + } + margin-top: -1px; + } + + &.bottom { + box-shadow: inset 0 1px $borders_color, inset 0 -1px $solid_borders_color; + @if $variant=='light' { + box-shadow: inset 0 1px $borders_color, + inset 0 -1px $borders_color, + 1px 0 $borders_color, + -1px 0 $borders_color; + } + margin-bottom: -1px; + } + + &.right { + box-shadow: inset 1px 0 $borders_color, inset -1px 0 $solid_borders_color; + @if $variant=='light' { + box-shadow: inset 1px 0 $borders_color, + inset -1px 0 $borders_color, + 0 1px $borders_color, + 0 -1px $borders_color; + } + margin-right: -1px; + } + + &.left { + box-shadow: inset 1px 0 $solid_borders_color, inset -1px 0 $borders_color; + @if $variant=='light' { + box-shadow: inset 1px 0 $borders_color, + inset -1px 0 $borders_color, + 0 1px $borders_color, + 0 -1px $borders_color; + } + margin-left: -1px; + } + + button.flat.toggle.popup { + min-width: 28px; + border-radius: 0; + padding: 0; + border: none; + box-shadow: none; + margin: 0; + + &:active, &:checked { + color: $fg_color; + background-color: if($variant=='light', rgba(black, 0.20), rgba(white, 0.15)); + } + } + + @each $_pos, $_bpos in (top, bottom), (bottom, top), (right, left), (left, right) { + // sizing and borders + &.#{$_pos} { + padding: 0; + + tab { + padding: 2px 10px; + min-width: 24px; + min-height: 24px; + border-radius: 0; + outline-offset: -4px; + // border-#{$_pos}: none; + + // tab overlap + + tab { + @if $_pos==top or $_pos==bottom { margin-left: -1px; } + @else { margin-top: -1px; } + } + } + } + } + + // overflow arrows + &.top, &.bottom { + > tabs > arrow.up { + -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); + &:last-child { margin-left: 2px; } + } + + > tabs > arrow.down { + -gtk-icon-source: -gtk-icontheme('pan-start-symbolic'); + &:first-child { margin-right: 2px; } + } + } + + &.left, &.right { + > tabs > arrow.up { + -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); + &:last-child { margin-top: 2px; } + } + + > tabs > arrow.down { + -gtk-icon-source: -gtk-icontheme('pan-up-symbolic'); + &:first-child { margin-bottom: 2px; } + } + } + + > tabs > arrow { + color: $disabled_fg_color; + + &:hover { color: mix($fg_color, $disabled_fg_color, 50%); } + &:active { color: $fg_color; } + &:disabled { color: transparentize($disabled_fg_color,0.3); } + } + + &.top, + &.bottom { + tabs > tab { + &:first-child { border-left-style: none; } + &:last-child { border-right-style: none; } + } + } + + &.left, + &.right { + tabs > tab { + &:first-child { border-top-style: none; } + &:last-child { border-bottom-style: none; } + } + } + + > tabs > tab { + @extend %tabs_tab; + + // close button + button.flat { + min-height: 20px; + min-width: 20px; + border-radius: 3px; + padding: 0; + margin-top: 2px; + margin-bottom: 2px; + color: mix($bg_color, $fg_color, 35%); + + &:hover { + @extend %undecorated_button; + color: $fg_color; + background-color: rgba($borders_color, 0.1); + } + + &:active, &:active:hover { + @extend %undecorated_button; + color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%)); + background-color: rgba($borders_color, 0.2); + } + } + } + } +} + +// +// Scrollbars +// +$_scrollbar_bg_color: if($variant == 'light', darken($base_color, 1%), lighten($base_color, 1%)); + +scrollbar { + $_slider_min_length: 40px; + + background-color: transparent; + transition: 300ms $ease-out-quad; + + // scrollbar border + // &.top { border-bottom: 1px solid $borders_color; } + // &.bottom { border-top: 1px solid $borders_color; } + // &.left { border-right: 1px solid $borders_color; } + // &.right { border-left: 1px solid $borders_color; } + + border: none; + + button { border: none; } + + &.vertical button { + &.down { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } + &.up { -gtk-icon-source: -gtk-icontheme('pan-up-symbolic'); } + } + + &.horizontal button { + &.down { -gtk-icon-source: -gtk-icontheme('pan-right-symbolic'); } + &.up { -gtk-icon-source: -gtk-icontheme('pan-left-symbolic'); } + } + + // slider + > range > trough > slider { + min-width: 4px; + min-height: 4px; + margin: -1px; + border: 4px solid transparent; + border-radius: 8px; + background-clip: padding-box; + background-color: mix($fg_color, $bg_color, 40%); + + &:hover { background-color: mix($fg_color, $bg_color, 30%); } + &:hover:active { background-color: $header_button_checked_bg; } + &:disabled { background-color: transparent; } + } + + > range.fine-tune { + > trough > slider { + min-width: 4px; + min-height: 4px; + } + + &.horizontal > trough > slider { border-width: 5px 4px; } + &.vertical > trough > slider { border-width: 4px 5px; } + } + + &.overlay-indicator { + &:not(.dragging):not(.hovering) { + opacity: 0.4; + border-color: transparent; + background-color: transparent; + + > range > trough > slider { + margin: 0; + min-width: 4px; + min-height: 4px; + background-color: mix($fg_color, $bg_color, 70%); + border: 1px solid $borders_color; + } + + &.horizontal > range > trough > slider { + margin: 0 3px; + min-width: $_slider_min_length; + } + + &.vertical > range > trough > slider { + margin: 3px 0; + min-height: $_slider_min_length; + } + } + + &.dragging, + &.hovering { opacity: 0.99; } + } + + &.horizontal > range > trough > slider { min-width: $_slider_min_length; } + &.vertical > range > trough > slider { min-height: $_slider_min_length; } +} + +// treeview ~ scrollbar.vertical { +// border-top: 1px solid $borders_color; +// margin-top: -1px; +// } + +// +// Switches +// + +$switch_image: linear-gradient(0deg, rgba($fg_color, 0.25) 0%, rgba($fg_color, 0.35) 100%); +$switch_disabled_image: linear-gradient(0deg, rgba($fg_color, 0.1) 0%, rgba($fg_color, 0.15) 100%); +$switch_checked_image: linear-gradient(0deg, lighten($selected_bg_color, 10%) 0%, $selected_bg_color 100%); +$switch_checked_disabled_image: linear-gradient(0deg, lighten($selected_bg_color, 35%) 0%, lighten($selected_bg_color, 25%) 100%); +$switch_animation: switch_ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1); + +@keyframes switch_ripple_effect { + from { + background-image: $switch_image, radial-gradient(circle farthest-corner at center, + transparent 0%, + transparent 0%); + } + + to { + background-image: $switch_checked_image, radial-gradient(circle farthest-corner at center, + rgba($selected_bg_color, 0.75) 100%, + rgba($selected_bg_color, 0.0) 0%); + } +} + +switch { + transition: $longer_transition; + border-radius: $circular_radius; + background-color: transparent; + background-clip: padding-box; + color: transparent; + min-width: 40px; + min-height: 24px; + font-size: 0; + box-shadow: inset 0 1px 2px rgba(black, 0.1); + background-image: $switch_image, radial-gradient(circle farthest-corner at center, transparent 0%, transparent 0%); + + &:disabled { + color: transparent; + background-color: transparent; + background-image: $switch_disabled_image; + } + + &:checked { + animation: $switch_animation; + background-color: transparent; + color: transparent; + box-shadow: inset 0 1px 2px rgba(black, 0.15); + transition: background-image 0.3s, box-shadow 0; + background-image: $switch_checked_image, radial-gradient(circle farthest-corner at center, rgba($selected_bg_color, 0.75) 100%, transparent 0%); + + &:disabled { + background-color: transparent; + background-image: $switch_checked_disabled_image; + color: transparent; + } + } + + > slider { + transition: $longer_transition, $shadow_transition, margin 0; + min-width: 22px; + min-height: 22px; + margin: 1px 0 1px 1px; + border-radius: $circular_radius; + background-color: white; + box-shadow: 0 1px 2px rgba(black, 0.15); + } + + &, > slider { + outline-color: transparent; + color: transparent; + border: none; + } + + &:hover > slider { box-shadow: $shadow_5; } + + &:checked > slider { + margin: 1px 1px 1px 0; + background-color: $selected_fg_color; + } + + &:disabled > slider { @include entry(disabled); } + + &:checked:disabled > slider { animation: none; } +} + +// +// Check and Radio items +// +@each $w,$a in ('check', 'checkbox'), + ('radio','radio') { + + //standard checks and radios + @each $s,$as in ('','-unchecked'), + (':disabled','-unchecked-insensitive'), + (':indeterminate', '-mixed'), + (':indeterminate:disabled', '-mixed-insensitive'), + (':checked', '-checked'), + (':checked:disabled','-checked-insensitive') { + .#{$w}#{$s}, + #{$w}#{$s}, + treeview.#{$w}#{$s} { + -gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}#{$asset_suffix}.png"), + url("assets/#{$a}#{$as}#{$asset_suffix}@2.png")); + } + + .osd, + %osd_check_radio { + #{$w}#{$s} { + -gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}-dark.png"), + url("assets/#{$a}#{$as}-dark@2.png")); + } + } + + // the borders of checks and radios are + // too similar in luminosity to the selected background color, hence + // we need special casing. + + // menuitem #{$w}#{$s}:hover, + // .view #{$w}#{$s}:selected, + // treeview.#{$w}#{$s}:selected, + // row:selected #{$w}#{$s}, + infobar #{$w}#{$s} { + -gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}-selected.png"), + url("assets/#{$a}#{$as}-selected@2.png")); + } + } +} + +// Selectionmode +@each $s,$as in ('','-selectionmode'), + (':checked', '-checked-selectionmode') { + .view.content-view.check#{$s}:not(list) { + -gtk-icon-source: -gtk-scaled(url("assets/checkbox#{$as}#{$asset_suffix}.png"), + url("assets/checkbox#{$as}#{$asset_suffix}@2.png")); + background-color: transparent; + } +} + +checkbutton, radiobutton { + // this is for a nice focus on check and radios text + &.text-button { + padding: 2px 0; + outline-offset: 0; + &:hover { color: darken($fg_color, 15%); } + &:disabled { color: $disabled_fg_color; } + } + + label:not(:only-child) { + &:first-child { margin-left: 4px; } + &:last-child { margin-right: 4px; } + } +} + +check, +radio { + min-width: 16px; + min-height: 16px; + margin: 0 2px; + + &:only-child, + menu menuitem & { margin: 0; } +} + +// +// GtkScale +// +scale { + $_marks_length: 3px; + $_marks_distance: 1px; + + min-height: 15px; + min-width: 15px; + padding: 3px; + + &.horizontal { + trough { padding: 0 4px; } + highlight, fill { margin: 0 -4px; } + } + + &.vertical { + trough { padding: 4px 0; } + highlight, fill { margin: -4px 0; } + } + + // The slider is inside the trough, negative margin to make it bigger + slider { + min-height: 15px; + min-width: 15px; + margin: -7px; + } + + // Click-and-hold the slider to activate + &.fine-tune { + // Make the trough grow in fine-tune mode + slider { margin: -4px; } + + fill, + highlight, + trough { + border-radius: 5px; + } + } + + // Trough + > trough { + $_scale_trough_bg: rgba(black, 0.2); + + outline-offset: 2px; + + border-radius: $bt_radius; + background-color: $_scale_trough_bg; + + &:disabled { background-color: rgba($_scale_trough_bg, 0.12); } + + //OSD troughs + .osd & { + background-color: $_scale_trough_bg; + + highlight { + background-color: $selected_bg_color; + + &:disabled { } + } + + &:disabled { } + } + + // Troughs in selected list-rows and infobars + menuitem:hover &, + row:selected &, + infobar & { + background-color: transparentize(black, 0.8); + + > trough > highlight { + background-color: $selected_fg_color; + + &:disabled { background-color: mix($selected_fg_color, $selected_bg_color, 55%); } + } + + &:disabled { background-color: transparentize(black, 0.9); } + } + } + + // The colored part of trough + > trough > highlight { + border-radius: $bt_radius; + background-color: $selected_bg_color; + + &:disabled { background-color: transparentize($selected_bg_color, 0.45); } + } + + // this is another differently styled part of the trough, the most relevant use case is for example + // in media player to indicate how much video stream as been cached + > trough > fill { + border-radius: $bt_radius; + background-color: transparentize($selected_bg_color, 0.5); + + &:disabled { background-color: transparent; } + } + + > trough > slider { + $_slider_border: if($variant=='light', transparentize(darken($button_border, 0%), 0), transparentize($button_border, 0)); + + background-color: $selected_fg_color; + border: 1px solid $_slider_border; + border-radius: 100%; + box-shadow: $shadow_2; + + transition: $button_transition; + transition-property: background, border; + + &:hover { + background-color: lighten($selected_fg_color, 3%); + border-color: $_slider_border; + box-shadow: $shadow_0; + } + + &:active { + background-clip: border-box; + background-color: $selected_fg_color; + border-color: $_slider_border; + box-shadow: $shadow_3; + } + + &:disabled { + background-color: darken($selected_fg_color, 5%); + border-color: darken($_slider_border, 5%); + } + + // Selected list-row and infobar sliders + menuitem:hover &, + row:selected &, + infobar & { + background-clip: border-box; + background-color: $selected_fg_color; + border-color: $selected_fg_color; + + &:hover { + background-color: mix($selected_fg_color, $selected_bg_color, 85%); + border-color: mix($selected_fg_color, $selected_bg_color, 85%); + } + &:active { + background-color: mix($selected_fg_color, $selected_bg_color, 50%); + border-color: mix($selected_fg_color, $selected_bg_color, 50%); + } + &:disabled{ + background-color: mix($selected_fg_color, $selected_bg_color, 55%); + border-color: mix($selected_fg_color, $selected_bg_color, 55%); + } + } + + // OSD sliders + .osd & { + background-clip: border-box; + background-color: $selected_fg_color; + border-color: $_slider_border; + + &:hover { + background-color: lighten($selected_fg_color, 3%); + border-color: $_slider_border; + box-shadow: $shadow_0; + } + + &:active { + background-color: darken($selected_fg_color, 3%); + border-color: $_slider_border; + box-shadow: $shadow_3; + } + + &:disabled { } + } + } + + > value { color: gtkalpha(currentColor, 0.4); } + + > marks { + color: gtkalpha(currentColor, 0.4); + + @each $marks_class, $marks_pos, $marks_margin in (top, top, bottom), + (bottom, bottom, top), + (top, left, right), + (bottom, right, left) { + &.#{$marks_class} { + margin-#{$marks_margin}: $_marks_distance; + margin-#{$marks_pos}: -($_marks_distance + $_marks_length); + } + } + } + + &.fine-tune > marks { + @each $marks_class, $marks_pos, $marks_margin in (top, top, bottom), + (bottom, bottom, top), + (top, left, right), + (bottom, right, left) { + &.#{$marks_class} { + margin-#{$marks_margin}: ($_marks_distance - 1px); + margin-#{$marks_pos}: -($_marks_distance + $_marks_length - 2px); + } + } + } + &.horizontal { + indicator { + min-height: $_marks_length; + min-width: 1px; + } + + &.fine-tune indicator { min-height: ($_marks_length - 1px); } + } + &.vertical { + indicator { + min-height: 1px; + min-width: $_marks_length; + } + + &.fine-tune indicator { min-width: ($_marks_length - 1px); } + } + + // *WARNING* scale with marks madness following + + // FIXME: OSD and selected list rows missing, I don't feel like adding the other 144 assets needed for those... +// $suffix: if($variant == 'light', '', '-dark'); + + @each $dir_class, $dir_infix in ('horizontal', 'horz'), + ('vertical', 'vert') { + @each $marks_infix, $marks_class in ('scale-has-marks-above', 'marks-before:not(.marks-after)'), + ('scale-has-marks-below', 'marks-after:not(.marks-before)') { + @each $state, $state_infix in ('', ''), + (':hover', '-hover'), + (':active', '-active'), + (':disabled', '-insensitive') { + &.#{$dir_class}.#{$marks_class} { + + slider { + &#{$state} { + // an asymmetric slider asset is used here, so the margins are uneven, the smaller + // margin is set on the point side. + margin: -10px; + $_scale_asset: 'assets/slider-#{$dir_infix}-#{$marks_infix}#{$state_infix}'; + border-style: none; + border-radius: 0; + + background-color: transparent; + background-image: -gtk-scaled(url('#{$_scale_asset}.png'), url('#{$_scale_asset}@2.png')); + + $_scale_slider_bg_pos: bottom; + + @if $dir_class == 'horizontal' { + min-height: 26px; + min-width: 24px; + + @if $marks_infix == 'scale-has-marks-above' { + margin-top: -14px; + + $_scale_slider_bg_pos: top; + } + + @else { margin-bottom: -14px; } + } + + @else { + min-height: 24px; + min-width: 26px; + + @if $marks_infix == 'scale-has-marks-above' { + margin-left: -14px; + + $_scale_slider_bg_pos: left bottom; + } + + @else { + margin-right: -14px; + + $_scale_slider_bg_pos: right bottom; + } + } + + background-position: $_scale_slider_bg_pos; + background-repeat: no-repeat; + box-shadow: none; + } + } + + &.fine-tune slider { + // bigger negative margins to make the trough grow here as well + margin: -7px; + + @if $dir_class == 'horizontal' { + @if $marks_infix == 'scale-has-marks-above' { margin-top: -11px; } + + @else { margin-bottom: -11px; } + } + + @else { + @if $marks_infix == 'scale-has-marks-above' { margin-left: -11px; } + + @else { margin-right: -11px; } + } + } + } + } + } + } +} + + +// +// Progress bars +// +progressbar { + padding: 0; + font-size: smaller; + color: transparentize($fg_color, 0.3); + font-feature-settings: "tnum"; + + // sizing + &.horizontal { + > trough { + min-width: 150px; + &, > progress { + min-height: 4px; + border-radius: 2px; + } + } + } + + &.vertical { + > trough { + min-height: 80px; + &, > progress { + min-width: 4px; + border-radius: 2px; + } + } + } + + &.horizontal > trough > progress { margin: 0 -1px; } // the progress node is positioned after the trough border + &.vertical > trough > progress { margin: -1px 0; } // this moves it over it. + + &.osd { + min-width: 3px; + min-height: 3px; + background-color: transparent; + + > trough { + border-style: none; + background-color: transparent; + box-shadow: none; + } + + > progress { + border-style: none; + border-radius: 0; + } + } + + // Moving bit + > trough > progress { + min-height: 4px; + min-width: 4px; + background-color: $progress_color; + border: none; + border-radius: $bt_radius; + box-shadow: none; //needed for clipping + + row:selected &, + infobar & { background-color: $selected_fg_color; } + } + + // Trough + > trough { + min-height: 4px; + min-width: 4px; + border: none; + border-radius: $bt_radius; + background-color: if($variant == 'light', $button_border, darken($bg_color, 5%)); + + row:selected &, + infobar & { background-color: transparentize(black, 0.8); } + } +} + +// +// Level Bar +// +levelbar { + block { + min-width: 32px; + min-height: 1px; + } + + &.vertical block { + min-width: 1px; + min-height: 32px; + } + + trough { + border: none; + padding: 3px; + border-radius: $bt_radius; + background-color: if($variant == 'light', $button_border, darken($bg_color, 5%)); + } + + &.horizontal.discrete block { margin: 0 1px; } + &.vertical.discrete block { margin: 1px 0; } + + block:not(.empty) { + border: 1px solid $selected_bg_color; + background-color: $selected_bg_color; + border-radius: $bt_radius; + } + block.low { + border-color: $warning_color; + background-color: $warning_color; + } + block.high { + border-color: $selected_bg_color; + background-color: $selected_bg_color; + } + block.full { + border-color: $success_color; + background-color: $success_color; + } + block.empty { + background-color: if($variant=='light', transparentize($fg_color,0.8), $base_color); + border-color: if($variant=='light', transparentize($fg_color,0.8), $base_color); + } +} + +// +// Print dialog +// +window.dialog.print { + drawing { + color: $fg_color; + background: none; + border: none; + padding: 0; + + paper { + border: 1px solid $borders_color; + background: $base_color; + padding: 0; + } + } + + .dialog-action-box { margin: 12px; } +} + +// +// Frames +// +frame, +.frame { + border: 1px solid $borders_color; + + > list { border: none; } +} + +frame { + border-radius: $wm_radius; + + > label { + margin: 4px; + } +} + +scrolledwindow { + viewport.frame { // avoid double borders when viewport inside scrolled window + border-style: none; + } + + // This is used by GtkScrolledWindow, when content is touch-dragged past boundaries. + // This draws a box on top of the content, the size changes programmatically. + > overshoot { + &.top { @include overshoot(top); } + &.bottom { @include overshoot(bottom); } + &.left { @include overshoot(left); } + &.right { @include overshoot(right); } + } + + // Overflow indication, works similarly to the overshoot, the size if fixed tho. + > undershoot { + &.top { @include undershoot(top); } + &.bottom { @include undershoot(bottom); } + &.left { @include undershoot(left); } + &.right { @include undershoot(right); } + + padding: $wm_radius/2; + } + + > junction { // the small square between two scrollbars + border-style: solid none none solid; + border-width: 1px; + border-color: $borders_color; + background-color: $_scrollbar_bg_color; + + &:dir(rtl) { border-style: solid solid none none; } + } +} + +//vbox and hbox separators +separator { + background-color: $borders_color; + min-width: 1px; + min-height: 1px; + + // &.vertical { + // background-color: if($variant=='light', $borders_color, $header_border); + // } +} + +// +// Lists +// +listview, +list { + background-color: $base_color; + border-color: $borders_color; + // border-radius: $wm_radius; + + > row { + padding: 2px; + + // &:first-child { border-radius: $bt_radius $bt_radius 0 0; } + // &:last-child { border-radius: 0 0 $bt_radius $bt_radius; } + } + + // .sidebar & { + // > row { + // &:first-child { border-radius: $bt_radius; } + // &:last-child { border-radius: $bt_radius; } + // } + // } + + > row.expander { padding: 0px; } + > row.expander .row-header { padding: 2px; } +} + +%row_activatable { + &.has-open-popup, + &:hover { background-color: if($variant == 'light', rgba(black, 0.05), rgba(white, 0.05)); } + + &:active { + color: $fg_color; + background-color: if($variant == 'light', rgba(black, 0.2), rgba(white, 0.2)); + transition-duration: 200ms; + } + + &:disabled { + color: $disabled_fg_color; + image { color: inherit; } + } + + &:selected { + &, &:active { + color: $fg_color; + background-color: if($variant == 'light', rgba(black, 0.15), rgba(white, 0.15)); + + label { color: $fg_color; } + } + + &.has-open-popup, + &:hover { background-color: if($variant == 'light', rgba(black, 0.2), rgba(white, 0.2)); } + } +} + +row { + &:not(:hover) { transition: all 300ms $ease-out-quad; } + + button.circular { @extend %circular_button; } + + &:selected { + color: $fg_color; + background-color: if($variant == 'light', rgba(black, 0.15), rgba(white, 0.15)); + + label { color: $fg_color; } + + // button { @extend %selected-button; } + } + + &.activatable { + @extend %row_activatable; + } +} + +columnview { + // move padding to child cells + > listview > row { + padding: 0; + + // align horizontal sizing with header buttons + > cell { + padding: 8px 6px; + + &:not(:first-child) { + border-left: 1px solid transparent; + } + } + } + + // make column separators visible when :show-column-separators is true + &.column-separators > listview > row > cell { + border-left-color: $borders_color; + } + + // shrink vertically for .data-table + &.data-table > listview > row > cell { + padding-top: 2px; + padding-bottom: 2px; + } +} + +treeexpander { + border-spacing: 4px; +} + +columnview row:not(:selected) cell editablelabel:not(.editing):focus-within { + outline: 2px solid $borders_color; +} + +columnview row:not(:selected) cell editablelabel.editing:focus-within { + outline: 2px solid $selected_bg_color; +} + +columnview row:not(:selected) cell editablelabel.editing text selection { + color: $selected_fg_color; + background-color: $selected_bg_color; +} + +.rich-list { /* rich lists usually containing other widgets than just labels/text */ + & > row { + padding: 8px 12px; + min-height: 32px; /* should be tall even when only containing a label */ + + & > box { + border-spacing: 12px; + } + } +} + +// +// App Notifications +// +.app-notification { + padding: 16px; + margin: 0 8px 8px 8px; + color: $fg_color; + background-color: rgba($header_bg, 0.85); + // background-image: linear-gradient(0deg, $bg_color 0%, $bg_color 85%, darken($bg_color, 5%) 95%, darken($bg_color, 15%) 100%); + border-radius: 0 0 $bt_radius $bt_radius; + border: none; + box-shadow: $shadow_5, 0 0 0 1px if($variant=='light', rgba(black, 0.12), rgba(black, 0.75)); + + border { border: none; } + + button { + @extend %undecorated_button; + + &:not(.text-button).image-button { + @extend %circular_button; + } + + &:hover { @include button(flat-hover); } + &:active, &:checked { @include button(flat-active); } + &:disabled { @include button(flat-insensitive); } + } +} + +// +// Expanders +// +expander { + min-width: 16px; + min-height: 16px; + -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); + + &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); } + &:hover { color: lighten($fg_color,30%); } //only lightens the arrow + &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } +} + +expander-widget { + > box > title { + border-radius: $bt_radius; + + &:hover > expander { + color: lighten($fg_color, 30%); //only lightens the icon + } + } +} + +.navigation-sidebar, +placessidebar, +stackswitcher, +expander-widget { + &:not(decoration):not(window):drop(active):focus, + &:not(decoration):not(window):drop(active) { + box-shadow: none; + } +} + +// +// Calendar +// +%calendar, +calendar { + color: $fg_color; + border: 1px solid $borders_color; + border-radius: $bt_radius; + padding: 2px 6px; + margin: 0; + + > header { + color: $fg_color; + border-bottom: 1px solid $borders_color; + + > button { + border: none; + box-shadow: none; + background: none; + border-radius: 0; + + &:hover { background-color: rgba($fg_color, 0.1); } + &:active { background-color: $selected_bg_color; } + } + + > button:backdrop { + background: none; + } + } + + > grid { + > label.today { + background-color: rgba($fg_color, 0.15); + border-radius: 3px; + + &:selected { + box-shadow: none; + } + } + + > label:focus { + outline-color: $borders_color; + outline-offset: -2px; + outline-width: 2px; + outline-style: solid; + } + + > label.day-number { + padding: 4px; + + &:selected { + @extend %selected_items; + border-radius: $bt_radius; + } + } + + > label.day-number.other-month { + color: gtkalpha(currentColor, 0.3); + } + } +} + +// +// Dialogs +// + +window.dialog.message { // Message Dialog styling + &.background { background-color: rgba($bg_color, 0.95); } + + .titlebar { + min-height: 28px; + background-color: rgba($bg_color, 0.95); + border: none; + } + + box.dialog-vbox.vertical { + border-spacing: 10px; + } + + & label.title { + font-weight: 800; + font-size: 15pt; + } + + .dialog-action-area { + padding: 6px; + + > button { + min-height: 20px; + padding: 4px 8px; + box-shadow: none; + border-radius: $bt_radius; + margin: 0 3px 3px 3px; + border: none; + + &:not(.suggested-action):not(.destructive-action) { + border-radius: $bt_radius; + background-color: transparent; + + &:hover { + @include button(flat-hover); + transition: $button_transition; + } + + &:active, &:checked { + + @if $variant == 'light' { + background-color: $selected_bg_color; + color: $selected_fg_color; + } + + @else { + @include button(active); + } + } + } + + &.suggested-action, &.destructive-action { + border-radius: $bt_radius; + } + } + } + + &.csd { // rounded bottom border styling for csd version + &.background { + border-bottom-left-radius: $wm_radius; + border-bottom-right-radius: $wm_radius; + border: none; + } + } +} + +// +// Filechooser +// +filechooser { + .csd & { + background-color: $base_color; + border-radius: 0 0 $wm_radius $wm_radius; + + stack.view { + background-color: transparent; + + scrolledwindow { + background-color: transparent; + border-radius: 0 0 $wm_radius $wm_radius; + + list { background-color: transparent; } + + treeview.view { + @extend %view; + background-color: transparent; + } + } + } + } + + > box.vertical > paned.horizontal > separator { + border: none; + min-width: 1px; + background-image: image(if($variant=='light', $solid_borders_color, $header_border)); + + // &:dir(ltr) { margin-left: -1px; } + // &:dir(rtl) { margin-right: -1px; } + } + + #pathbarbox { border-bottom: 1px solid transparentize($borders_color, 0.5); } +} + +filechooserbutton > button > box { + border-spacing: 6px; +} + +filechooserbutton:drop(active) { + box-shadow: none; + border-color: transparent; +} + +// +// Sidebar +// +%sidebar_left { + border-right: 1px solid $borders_color; + border-left-style: none; +} + +%sidebar_right { + border-left: 1px solid $borders_color; + border-right-style: none; +} + +.sidebar { + border-style: none; + background-color: $bg_color; + + list { + background-color: transparent; + + > separator { + min-height: 0; + background: none; + border: none; + } + } + + paned & { &.left, &.right, &.left:dir(rtl), &:dir(rtl), &:dir(ltr), & { border: none; }} +} + +stacksidebar { + list.separators:not(.horizontal) > row:not(.separator) { + border-bottom: none; + } + + &.sidebar { + &:dir(ltr) list, + &.left list, + &.left:dir(rtl) list { @extend %sidebar_left; } + + &:dir(rtl) list, + &.right list { @extend %sidebar_right; } + } + + row { + padding: 4px 4px; + + > label { + padding-left: 6px; + padding-right: 6px; + } + + &.needs-attention > label { + @extend %needs_attention; + background-size: 6px 6px, 0 0; + } + } +} + +// Navigation Sidebar +.navigation-sidebar { + padding: 3px 0; //only vertical padding. horizontal row size would clip + + > separator { + margin: 3px; + } + + > row { + min-height: 36px; + padding: 0 8px; + border-radius: $bt_radius; + margin: 0 3px 2px; + + &:hover, + &:focus-visible:focus-within { + background-color: rgba($fg_color, 0.1); + } + + &:active { + color: $fg_color; + background-color: rgba($fg_color, 0.2); + } + + &:selected { + color: $fg_color; + background-color: rgba($fg_color, 0.15); + + label { color: $fg_color; } + + &:hover { + background-color: rgba($fg_color, 0.2); + } + + &:focus-visible:focus-within { + outline-width: 0; + color: $selected_fg_color; + background-color: $selected_bg_color; + &:hover { background-color: darken($selected_bg_color,10%); } + } + } + + &:disabled { color: $disabled_fg_color; } + } +} + +placessidebar { + > viewport.frame { border-style: none; } + + .navigation-sidebar > row { + // Needs overriding of the GtkListBoxRow padding + min-height: 24px; + padding: 2px 10px; + // Using margins/padding directly in the SidebarRow + // will make the animation of the new bookmark row jump + > revealer { + padding: 0 10px; + } + + image.sidebar-icon { + &:dir(ltr) { padding-right: 6px; } + &:dir(rtl) { padding-left: 6px; } + } + + label.sidebar-label { + &:dir(ltr) { padding-right: 6px; } + &:dir(rtl) { padding-left: 6px; } + } + + button.sidebar-button { + min-width: 22px; + min-height: 22px; + margin-top: 2px; + margin-bottom: 2px; + padding: 0; + border-radius: 100px; + + > image { opacity: 0.85 }; + + &:active, &:checked { + @include button(flat-active); + border-color: if($variant=='light', rgba(black, 0.3), $dark_borders_color); + } + + &:not(:hover):not(:active) > image { opacity: 0.65 }; + } + + &:selected button.sidebar-button { + @include button(normal); + + &:active, &:checked { + @include button(flat-active); + border-color: if($variant=='light', rgba(black, 0.25), rgba(black, 0.15)); + } + } + + &.sidebar-placeholder-row { + padding: 0 8px; + min-height: 2px; + background-image: _solid($drop_target_color); + background-clip: content-box; + } + + &.sidebar-new-bookmark-row { color: $selected_bg_color; } + + &:drop(active):not(:disabled) { + &, label, image { color: $drop_target_color; } + + box-shadow: inset 0 1px $drop_target_color, + inset 0 -1px $drop_target_color; + + &:selected { + &, label, image { color: $dark_sidebar_fg; } + background-color: $drop_target_color; + } + } + } +} + +// +// Placesview +// +placesview { + .server-list-button > image { + -gtk-icon-transform: rotate(0turn); + } + + .server-list-button:checked > image { + transition: 200ms $ease-out-quad; + -gtk-icon-transform: rotate(-0.5turn); + } + + // this selects the "connect to server" label + > actionbar > revealer > box > label { + padding-left: 8px; + padding-right: 8px; + } +} + +// +// Paned +// +paned { + > separator { + min-width: 1px; + min-height: 1px; + -gtk-icon-source: none; + border-style: none; + background-color: transparent; + background-image: _solid($borders_color); + background-size: 1px 1px; + + &:selected { background-image: _solid($selected_bg_color); } + + &.wide { + min-width: 5px; + min-height: 5px; + background-color: $bg_color; + background-image: _solid($solid_borders_color), _solid($solid_borders_color); + background-size: 1px 1px, 1px 1px; + } + } + + &.horizontal > separator { + background-repeat: repeat-y; + &:dir(ltr) { + margin: 0 -8px 0 0; + padding: 0 8px 0 0; + background-position: left; + } + &:dir(rtl) { + margin: 0 0 0 -8px; + padding: 0 0 0 8px; + background-position: right; + } + + &.wide { + margin: 0; + padding: 0; + background-repeat: repeat-y, repeat-y; + background-position: left, right; + } + } + + &.vertical > separator { + margin: 0 0 -8px 0; + padding: 0 0 8px 0; + background-repeat: repeat-x; + background-position: top; + + &.wide { + margin: 0; + padding: 0; + background-repeat: repeat-x, repeat-x; + background-position: bottom, top; + } + } +} + +// +// GtkVideo +// + +video { + & image.osd { + min-width: 64px; + min-height: 64px; + border-radius: 32px; + } + + background: black; +} + +// +// GtkInfoBar +// + +infobar { + border-style: none; + + &.info { + & > revealer > box, + &:backdrop > revealer > box { + background-color: $selected_bg_color; + selection { color: $selected_bg_color; } + } + } + + &.question { + & > revealer > box, + &:backdrop > revealer > box { + background-color: $suggested_color; + selection { color: $suggested_color; } + } + } + + &.warning { + & > revealer > box, + &:backdrop > revealer > box { + background-color: $warning_color; + selection { color: $warning_color; } + } + } + + &.error { + & > revealer > box, + &:backdrop > revealer > box { + background-color: $error_color; + selection { color: $error_color; } + } + } + + &.info, + &.question, + &.warning, + &.error { + & > revealer > box, + &:hover > revealer > box, + &:backdrop > revealer > box { + color: $selected_fg_color; + caret-color: currentColor; + + button { + min-height: 28px; + @extend %selected-button; + } + + selection { + background-color: $selected_fg_color; + } + + *:link { @extend %link_selected; } + } + } +} + +infobar .close, +searchbar .close { + @include button(undecorated); + min-width: 16px; + min-height: 16px; + padding: 4px; + border-radius: 1000px; + + &:hover { @include button(flat-hover); } +} + +// +// Buttons on selected backgrounds +// + +%selected-button { + color: $selected_fg_color; + background-color: transparentize($selected_fg_color, 1); + border-color: transparentize($selected_fg_color, 0.5); + background-image: none; + box-shadow: none; + + &.flat { + @include button(undecorated); + color: $selected_fg_color; + background-color: transparentize($selected_fg_color, 1); + background-image: none; + } + + &.flat:disabled { + &, label { color: transparentize($selected_fg_color, 0.6); } + } + + &:hover { + color: $selected_fg_color; + background-color: transparentize($selected_fg_color, 0.8); + border-color: transparentize($selected_fg_color, 0.5); + box-shadow: none; + } + + &:active, &:active:hover, &:checked { + color: $selected_fg_color; + background-color: transparentize($selected_fg_color, 0.6); + border-color: transparentize($selected_fg_color, 0.5); + box-shadow: none; + } + + &:disabled { + &, label { color: transparentize($selected_fg_color, 0.5); } + background-color: transparentize($selected_fg_color, 1); + border-color: transparentize($selected_fg_color, 0.6); + box-shadow: none; + } + + &:disabled:active, &:disabled:checked { + color: $selected_bg_color; + background-color: transparentize($selected_fg_color, 0.5); + border-color: transparentize($selected_fg_color, 0.6); + } +} + +%normal_selected_button { + color: $selected_fg_color; + background-color: transparentize($selected_fg_color, 1); + border-color: transparentize($selected_fg_color, 0.5); + background-image: none; +} + +// +// Tooltips +// +tooltip { + &.background { + // background-color needs to be set this way otherwise it gets drawn twice + // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details. + background-color: lighten($osd_bg_color, 10%); + background-clip: padding-box; + border-radius: $bt_radius; + + label { padding: 4px; } + } + + border-radius: $bt_radius; + box-shadow: none; + + > box { + border-spacing: 6px; + } +} + +// +// Color Chooser +// +colorswatch { + // This widget is made of two boxes one on top of the other, the lower box is GtkColorSwatch {} the other one + // is GtkColorSwatch .overlay {}, GtkColorSwatch has the programmatically set background, so most of the style + // is applied to the overlay box. + + $_colorswatch-radius: 2px; + + &, &:drop(active) { border-style: none; } + + // border rounding + &.top { + border-top-left-radius: $_colorswatch-radius + 0.5px; + border-top-right-radius: $_colorswatch-radius + 0.5; + + overlay { + border-top-left-radius: $_colorswatch-radius; + border-top-right-radius: $_colorswatch-radius; + } + } + &.bottom { + border-bottom-left-radius: $_colorswatch-radius + 0.5px; + border-bottom-right-radius: $_colorswatch-radius + 0.5; + + overlay { + border-bottom-left-radius: $_colorswatch-radius; + border-bottom-right-radius: $_colorswatch-radius; + } + } + &.left, &:first-child:not(.top) { + border-top-left-radius: $_colorswatch_radius + 0.5px; + border-bottom-left-radius: $_colorswatch_radius + 0.5px; + overlay { + border-top-left-radius: $_colorswatch_radius; + border-bottom-left-radius: $_colorswatch_radius; + } + } + &.right, &:last-child:not(.bottom) { + border-top-right-radius: $_colorswatch_radius + 0.5px; + border-bottom-right-radius: $_colorswatch_radius + 0.5px; + overlay { + border-top-right-radius: $_colorswatch_radius; + border-bottom-right-radius: $_colorswatch_radius; + } + } + + &.dark overlay { + color: transparentize(white, 0.3); + &:hover { + border-color: if($variant == 'light', transparentize(black, 0.5), $borders_color); + } + } + &.light overlay { + color: transparentize(black, 0.3); + &:hover { + border-color: if($variant == 'light', transparentize(black, 0.7), $borders_color); + } + } + + overlay { + border: 1px solid if($variant == 'light', transparentize(black, 0.85), $borders_color); + &:hover { background-color: transparentize(white, 0.8) } + } + + &:disabled { + opacity: 0.5; + overlay { + border-color: transparentize(black, 0.4); + box-shadow: none; + } + } + + &#add-color-button { + border-style: solid; // the borders are drawn by the overlay for standard colorswatches to have them semi + border-width: 1px; // translucent on the colored background, here it's not necessary so they need to be set + @include button(normal); + &:hover { @include button(hover); } + overlay { @include button(undecorated); } // reset the overlay to not cover the button style underneath + } +} + +button.color { + padding: 0; + + colorswatch:first-child:last-child { + &, overlay { + margin: 4px; + border-radius: 0; + } + } +} + +// colorscale popup +colorchooser .popover.osd { border-radius: $bt_radius; } + +// +// Misc +// +//content view (grid/list) +.content-view { + background-color: $base_color; + + &:hover { -gtk-icon-filter: brightness(1.2); } + + .tile { + margin: 2px; + background-color: if($variant=='light', transparent, black); + border-radius: 0; + padding: 0; + + &:active, &:selected { background-color: if($variant=='light', transparent, $selected_bg_color); } + &:disabled { background-color: if($variant=='light', transparent, mix($bg_color, $base_color, 60%)); } + } + + > rubberband { @extend %rubberband; } +} + +.scale-popup { + // .osd & { @extend %osd; } + + .osd & button.flat { //FIXME: quick hack, redo properly + border-style: none; + border-radius: $bt_radius; + } + + button { // +/- buttons on GtkVolumeButton popup + border: none; + @extend %flat_button; + } +} + +// Decouple the font of context menus from their entry/textview +.context-menu { font: initial; } +.monospace { font-family: Monospace; } + +// +// Shortcuts Help +// +%circular_button, +button.circular { + border-radius: 100px; + padding: 0 0 0 0; + min-height: 28px; + min-width: 28px; + + &:active, &:checked { + @if $variant=='light' { + @include button(flat-active); + border-color: rgba(black, 0.2); + } + } + + // label { padding: 0; } +} + +.keycap { + min-width: 16px; + min-height: 20px; + + padding: 3px 6px 4px 6px; + + color: $fg_color; + background-color: $base_color; + border: 1px solid $borders_color; + border-radius: $bt_radius; + box-shadow: inset 0px -2px 0px if($variant=='light', transparentize(black, 0.95), transparentize(black, 0.85)); +} + +stackswitcher { + button.text-button { min-width: 80px; } + button.circular { + @extend %circular_button; + } +} + +// +// Dnd +// +*:drop(active):focus, +*:drop(active) { + box-shadow: inset 0 0 0 1px $drop_target_color; +} + +// +// Window Decorations +// + +window { + border-width: 0; + + &.csd { + transition: $shadow_transition; + border-radius: $wm_radius; + box-shadow: 0 3px 3px 0 $wm_shadow, + 0 8px 8px 0 $wm_shadow, + 0 16px 16px 0 $wm_shadow, + $wm_outline; + + // this is used for the resize cursor area + margin: 6px; + + &:backdrop { + // the transparent shadow here is to enforce that the shadow extents don't + // change when we go to backdrop, to prevent jumping windows + box-shadow: 0 3px 3px 0 $wm_shadow, + 0 8px 8px 0 transparent, + 0 16px 16px 0 transparent, + $wm_outline; + } + + &.popup { + border-radius: $mn_radius; + box-shadow: 0 5px 8px rgba(0, 0, 0, 0.15), 0 8px 15px rgba(0, 0, 0, 0.08), $wm_outline; + } + + &.dialog.message { + border-radius: $wm_radius; + } + + .solid-csd & { + border: 1px solid $header_border; + border-radius: 0; + margin: 0; + background-color: $header_bg; + box-shadow: none; + } + } + + &.maximized, + &.fullscreen, + &.tiled, + &.tiled-top, + &.tiled-left, + &.tiled-right, + &.tiled-bottom { + border-radius: 0; + } + + &.popup { box-shadow: none; } + + // server-side decorations as used by mutter + &.ssd { box-shadow: 0 0 0 1px $wm_shadow; } //just doing borders, wm draws actual shadows +} + +// +// Titlebuttons +// +windowcontrols { + border-spacing: 6px; + + &:not(.empty) { + &.start:dir(ltr), + &.end:dir(rtl) { + margin-right: 7px; + } + + &.start:dir(rtl), + &.end:dir(ltr) { + margin-left: 7px; + } + } + + button { + margin: 0; + padding: 0; + + &.close, &.maximize, &.minimize { + min-width: 16px; + min-height: 16px; + margin: 0; + padding: 0; + background-position: center; + background-repeat: no-repeat; + background-size: 16px 16px; + + &, &:hover, &:focus, &:active, &:backdrop { + @include button(undecorated); + color: transparent; + } + + &:backdrop { opacity: 1; } + } + + // Load png assets for each button, Fix the Chrome window restore button bug + @each $k in ('close', 'maximize', 'minimize') { + @each $l, $m in ('',''), (':backdrop','-backdrop'), (':backdrop:hover','-backdrop-hover'), (':hover','-hover'), (':active','-active') { + &.#{$k}#{$l} { + background-image: -gtk-scaled(url('windows-assets/titlebutton-#{$k}#{$m}#{$asset_suffix}.png'), + url('windows-assets/titlebutton-#{$k}#{$m}#{$asset_suffix}@2.png')); + } + } + } + } + + .fullscreen &, + .maximized & { + button { + @each $l, $m in ('',''), (':backdrop','-backdrop'), (':backdrop:hover','-backdrop-hover'), (':hover','-hover'), (':active','-active') { + &.maximize#{$l} { + background-image: -gtk-scaled(url('windows-assets/titlebutton-restore#{$m}#{$asset_suffix}.png'), + url('windows-assets/titlebutton-restore#{$m}#{$asset_suffix}@2.png')); + } + } + } + } +} + +// catch all extend +%selected_items { + background-color: $selected_bg_color; + color: $selected_fg_color; + + &:disabled { color: mix($selected_fg_color, $selected_bg_color, 50%); } +} + +%nobg_selected_items { + color: $selected_fg_color; + + &:disabled { color: mix($selected_fg_color, $selected_bg_color, 50%); } +} + +/********* + * Emoji * + *********/ +popover.emoji-picker { + padding: 0; + border-radius: $wm_radius; + + > contents { + padding: 0; + } +} + +.emoji-searchbar { + padding: 6px; + border-spacing: 6px; + border-bottom: 1px solid $borders_color; +} + +.emoji-toolbar { + padding: 6px; + border-spacing: 6px; + border-top: 1px solid $borders_color; +} + +// mimic tab style +button.emoji-section { + margin: 3px 1px; + padding: 1px 12px; + border-radius: $bt_radius; + border: none; + outline-offset: -2px; + box-shadow: none; + transition: none; + animation: none; + + &:first-child { margin-left: 6px; } + &:last-child { margin-right: 6px; } +} + +popover.emoji-picker emoji { + font-size: x-large; + padding: 6px; + border-radius: $bt_radius; + + &:focus, + &:hover { + @extend %selected_items; + } +} + +emoji-completion-row > box { + border-spacing: 10px; + padding: 2px 10px; +} + +emoji-completion-row:focus, +emoji-completion-row:hover { + background-color: $selected_bg_color; + color: $selected_fg_color; +} + +emoji-completion-row emoji:focus, +emoji-completion-row emoji:hover { + background-color: $borders_color; +} + +popover.entry-completion > contents { + padding: 0; +} + +statusbar { + padding: 6px 10px 6px 10px; +} diff --git a/src/sass/gtk/_drawing.scss b/src/sass/gtk/_drawing.scss index cb322189..42a19c55 100644 --- a/src/sass/gtk/_drawing.scss +++ b/src/sass/gtk/_drawing.scss @@ -329,10 +329,11 @@ // active osd button // color: $selected_fg_color; - border-color: if($variant == 'light', $selected_bg_color, $osd_button_border); + border-color: $osd_button_border; background-color: $selected_bg_color; background-image: none; box-shadow: none; + background-clip: padding-box; } @else if $t==osd-insensitive { @@ -372,42 +373,62 @@ // // Overshoot // -@mixin overshoot($p, $c:$selected_bg_color) { +@mixin overshoot($p, $t:normal, $c:$fg_color) { +// +// overshoot +// // $p: position +// $t: type // $c: base color // // possible $p values: // top, bottom, right, left +// +// possible $t values: +// normal, backdrop // - $_big_gradient_length: 60%; + $_small_gradient_length: 3%; + $_big_gradient_length: 50%; - $_position: center top; + $_small_gradient_size: 100% $_small_gradient_length; $_big_gradient_size: 100% $_big_gradient_length; - @if $p==bottom { - $_position: center bottom; - } - - @else if $p==right { - $_position: right center; + @if $p==right or $p==left { + $_small_gradient_size: $_small_gradient_length 100%; $_big_gradient_size: $_big_gradient_length 100%; } - @else if $p==left { - $_position: left center; - $_big_gradient_size: $_big_gradient_length 100%; + $_small_gradient_color: $c; + $_big_gradient_color: transparentize($c, 0.93); + + @if $c==$fg_color { + $_small_gradient_color: darken($borders_color, 10%); + $_big_gradient_color: transparentize($fg_color, 0.93); + + @if $t==backdrop { $_small_gradient_color: $backdrop_borders_color; } } - background-image: -gtk-gradient(radial, - $_position, 0, - $_position, 0.6, - from(transparentize($c, 0.8)), - to(transparentize($c, 1))); + $_small_gradient: radial-gradient(farthest-side at $p, + $_small_gradient_color 85%, + transparentize($_small_gradient_color, 1)); + + $_big_gradient: radial-gradient(farthest-side at $p, + $_big_gradient_color, + transparentize($_big_gradient_color, 1)); + + @if $t==normal { + background-image: $_small_gradient, $_big_gradient; + background-size: $_small_gradient_size, $_big_gradient_size; + } + + @else if $t==backdrop { + background-image: $_small_gradient; + background-size: $_small_gradient_size; + } - background-size: $_big_gradient_size; background-repeat: no-repeat; - background-position: $_position; + background-position: $p; background-color: transparent; // reset some properties to be sure to not inherit them somehow border: none; //