diff --git a/common/accent-colors.scss.in b/common/accent-colors.scss.in
index 3352a0065f..008346460d 100644
--- a/common/accent-colors.scss.in
+++ b/common/accent-colors.scss.in
@@ -4,28 +4,24 @@
$color: null;
@if $accent_color == 'default' {
$color: #E95420;
- } @else if $accent_color == 'bark' {
- $color: #787859;
- } @else if $accent_color == 'sage' {
- $color: #657B69;
- } @else if $accent_color == 'olive' {
- $color: #4B8501;
- } @else if $accent_color == 'viridian' {
- $color: #03875B;
- } @else if $accent_color == 'prussiangreen' {
- $color: #308280;
- } @else if $accent_color == 'blue' {
- $color: #0073E5;
- } @else if $accent_color == 'purple' {
- $color: #7764D8;
- } @else if $accent_color == 'magenta' {
- $color: #B34CB3;
- } @else if $accent_color == 'red' {
- $color: #DA3450;
+ }
+
+ @else if $accent_color == 'blue' {
+ $color: #3584e4; // ADW_ACCENT_COLOR_BLUE
+ } @else if $accent_color == 'teal' {
+ $color: #2190a4; // ADW_ACCENT_COLOR_TEAL
+ } @else if $accent_color == 'green' {
+ $color: #3a944a; // ADW_ACCENT_COLOR_GREEN
} @else if $accent_color == 'yellow' {
- $color: #C88800;
- } @else if $accent_color == 'wartybrown' {
- $color: #B39169;
+ $color: #c88800; // ADW_ACCENT_COLOR_YELLOW
+ } @else if $accent_color == 'red' {
+ $color: #e62d42; // ADW_ACCENT_COLOR_RED
+ } @else if $accent_color == 'pink' {
+ $color: #d56199; // ADW_ACCENT_COLOR_PINK
+ } @else if $accent_color == 'purple' {
+ $color: #9141ac; // ADW_ACCENT_COLOR_PURPLE
+ } @else if $accent_color == 'slate' {
+ $color: #6f8396; // ADW_ACCENT_COLOR_SLATE
} @else {
@error('No known accent color defined!');
}
@@ -38,9 +34,10 @@ $jet: #181818;
$yaru_bg_color: if($yaru_is_dark_variant, #FAFAFA, lighten($jet, 8%));
$yaru_accent_bg_color: get_accent_color('@yaru_accent_color@', $yaru_is_dark_variant);
-$contrast_target: if($yaru_is_dark_variant, 4.8, 4.51);
-$yaru_accent_color: optimize-contrast($yaru_bg_color,
- $yaru_accent_bg_color, $target: $contrast_target);
+// Use Libadwaita approach with HSL approximation (GTK3 doesn't support oklab)
+// accent_bg_color: Raw hex for backgrounds (with white foreground)
+// accent_color: Lightness-adjusted for standalone use (links, icons)
+$yaru_accent_color: standalone-accent($yaru_accent_bg_color, $yaru_is_dark_variant);
@debug("Accent color is " + $yaru_accent_bg_color);
@debug("Contrast optimized accent is " + $yaru_accent_color);
@@ -49,8 +46,4 @@ $accent_bg_color: $yaru_accent_bg_color;
$accent_fg_color: white;
$accent_color: $yaru_accent_color;
-$yaru_accent_bg_color: optimize-contrast($accent_fg_color,
- $yaru_accent_bg_color, $target: $contrast_target);
-$accent_bg_color: $yaru_accent_bg_color;
-
@import '@yaru_theme_entry_point@'
diff --git a/common/sass-utils.scss b/common/sass-utils.scss
index f01a70e31c..aa4c50e215 100644
--- a/common/sass-utils.scss
+++ b/common/sass-utils.scss
@@ -222,4 +222,21 @@
round(green($fg) * $alpha + green($bg) * (1 - $alpha)),
round(blue($fg) * $alpha + blue($bg) * (1 - $alpha))
);
- }
+}
+
+// Standalone accent color function (Libadwaita-style)
+// Adjusts color lightness for use on light or dark backgrounds
+// Approximates Oklab lightness thresholds using HSL
+@function standalone-accent($color, $dark: false) {
+ $L: lightness($color);
+
+ @if $dark {
+ // Dark mode: ensure minimum lightness of 85% (Oklab 0.85 ≈ HSL 85%)
+ $L: max($L, 85%);
+ } @else {
+ // Light mode: ensure maximum lightness of 50% (Oklab 0.5 ≈ HSL 50%)
+ $L: min($L, 50%);
+ }
+
+ @return hsl(hue($color), saturation($color), $L);
+}
diff --git a/debian/control b/debian/control
index 97e421fcc0..53c34eb29e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,8 @@ Build-Depends-Indep: libglib2.0-dev,
meson (>= 0.60),
libxml2-utils,
sassc,
+ inkscape,
+ optipng,
Standards-Version: 4.6.2
Rules-Requires-Root: no
Homepage: https://community.ubuntu.com/c/desktop/theme-refresh
diff --git a/gnome-shell/src/gnome-shell-sass/_color-overrides.scss b/gnome-shell/src/gnome-shell-sass/_color-overrides.scss
new file mode 100644
index 0000000000..7214e86486
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/_color-overrides.scss
@@ -0,0 +1,6 @@
+//
+// Color Overrides
+//
+// Override specific colors after all default colors are loaded
+
+$success_bg_color: #0e8420;
diff --git a/gnome-shell/src/gnome-shell-sass/_colors.scss b/gnome-shell/src/gnome-shell-sass/_colors.scss
deleted file mode 100644
index 2bb306cc49..0000000000
--- a/gnome-shell/src/gnome-shell-sass/_colors.scss
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// Main color definitions
-//
-// When color definition differs for dark and light variant, it gets @if-ed depending on $variant
-
-@import '_palette.scss';
-@import '_default-colors.scss';
-@import '_yaru-default-colors.scss';
-
-// global colors
-$base_color: if($variant == 'light', $light_1, $_base_color_dark);
-$bg_color: if($variant == 'light', $_base_color_light, #36363a);
-$fg_color: if($variant == 'light', $_base_color_dark, $light_1);
-
-// Yaru, customize global colors
-$bg_color_dark: lighten($jet, 2%);
-$bg_color: if($variant=='light', #FAFAFA, $bg_color_dark);
-$fg_color_dark: $porcelain;
-$fg_color: if($variant=='light', $inkstone, $fg_color_dark);
-
-// OSD elements
-$osd_fg_color: $light_1;
-$osd_bg_color: lighten($_base_color_dark, 5%);
-
-// system elements (e.g. the overview) that are always dark
-$system_base_color: $_base_color_dark;
-$system_fg_color: $_base_color_light;
-
-// Yaru override
-$system_fg_color: darken($porcelain, 2%);
-
-// panel colors
-$panel_bg_color: if($variant == 'light', $_base_color_light, $dark_5);
-$panel_fg_color: if($variant == 'light', $_base_color_dark, $light_1);
-$panel_border_color: if($variant == 'light', transparentize($_base_color_dark, .9), transparent);
-
-// card elements
-$card_bg_color: if($variant == 'light', $light_1, lighten($bg_color, 7%));
-$card_shadow_color: if($variant == 'light', transparentize($dark_5, .97), transparent);
-$card_shadow_border_color: if($variant == 'light', transparentize($dark_5, .91), transparent);
-
-//
-// Derived Colors
-//
-// colors based on the global defines above
-
-// borders
-$borders_color: transparentize($fg_color, $border_opacity);
-$outer_borders_color: if($variant == 'light', darken($bg_color, 7%), lighten($bg_color, 5%));
-
-// Yaru borders color
-$borders_color: if($variant=='light', darken($bg_color, 20%), $yaru_borders_color_dark);
-$outer_borders_color: transparentize($fg_color, 0.85);
-
-// osd colors
-$osd_borders_color: transparentize($osd_fg_color, 0.9);
-$osd_outer_borders_color: transparentize($osd_fg_color, 0.98);
-
-// system colors
-$system_bg_color: lighten($system_base_color, 5%);
-$system_bg_color: $_base_color_dark; // Yaru - use our definition our definition
-$system_borders_color: transparentize($system_fg_color, .9);
-$system_insensitive_fg_color: mix($system_bg_color, $system_fg_color, 37%);
-$system_overlay_bg_color: mix($system_base_color, $system_fg_color, 90%); // for non-transparent items, e.g. dash
-
-// insensitive state
-$insensitive_fg_color: if($variant == 'light', mix($fg_color, $bg_color, 60%), mix($fg_color, $bg_color, 50%));
-$insensitive_bg_color: mix($bg_color, $base_color, 60%);
-$insensitive_borders_color: mix($borders_color, $base_color, 60%);
-
-// checked state
-$checked_bg_color: if($variant=='light', darken($bg_color, 7%), lighten($bg_color, 9%));
-$checked_fg_color: if($variant=='light', darken($fg_color, 7%), lighten($fg_color, 9%));
-
-// hover state
-// Yaru: we want the hover bg to be a visible gray for dark and light shell themes
-$hover_bg_color: transparentize($fg_color, 0.9);
-$hover_fg_color: $fg_color;
-$hover_borders_color: lighten($borders_color, 5%);
-
-// active state
-$active_bg_color: if($variant=='light', darken($bg_color, 11%), lighten($bg_color, 12%));
-$active_fg_color: if($variant=='light', darken($fg_color, 11%), lighten($fg_color, 12%));
-
-// accent colors
-$accent_borders_color: if($variant== 'light', st-darken(-st-accent-color, 20%), st-lighten(-st-accent-color, 30%));
-@import '_yaru-colors.scss';
diff --git a/gnome-shell/src/gnome-shell-sass/_colors.scss b/gnome-shell/src/gnome-shell-sass/_colors.scss
new file mode 120000
index 0000000000..370b2d1025
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/_colors.scss
@@ -0,0 +1 @@
+../../upstream/theme/gnome-shell-sass/_colors.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/_common.scss b/gnome-shell/src/gnome-shell-sass/_common.scss
deleted file mode 100644
index ad4f0fd17f..0000000000
--- a/gnome-shell/src/gnome-shell-sass/_common.scss
+++ /dev/null
@@ -1,400 +0,0 @@
-//This is the RIGHT PLACE to edit the stylesheet
-
-//let's start by telling people not to edit the generated CSS:
-$cakeisalie: "This stylesheet is generated, DO NOT EDIT";
-/* #{$cakeisalie} */
-
-/* Copyright 2009, 2015 Red Hat, Inc.
- *
- * Portions adapted from Mx's data/style/default.css
- * Copyright 2009 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/* Global Values */
-
-// Base values of elements of the shell in their smallest "unit".
-// These are used in calculations elsewhere to have elements in proportion
-$base_font_size: 11pt; // font size
-$base_padding: 6px; // internal padding of elements
-$base_margin: 4px; // margin between elements
-$base_border_radius: 8px; // radii on all elements
-$base_border_radius: 6px; // Yaru change: sync radius with Gtk4
-
-// Radius used to make sure elements that have rounded corners stay as such.
-// This is a workaround for 50% not working.
-$forced_circular_radius: 999px;
-
-// radii of things that display over other things, e.g. popovers
-$modal_radius: $base_border_radius * 2;
-$modal_radius: $base_border_radius; // Yaru change: reduce modal border-radius
-
-// radii of dialogs
-$alert_radius: 18px;
-$alert_radius: 8px; // Yaru change: reduce modal border-radius
-
-// Chroma key to flag when a background-color is always occluded, not visible.
-// This allows any box-shadow behind it to be rendered more efficiently by
-// omitting the middle rectangle.
-$invisible_occluded_bg_color: rgba(3,2,1,0);
-
-// Fixed icon sizes
-$base_icon_size: 16px;
-$medium_icon_size: $base_icon_size * 1.5; // 24px
-$large_icon_size: $base_icon_size * 2; // 32px
-
-// Scaled values
-// Used in elements that follow text scaling factors
-$scaled_padding: to_em(6px); // same as $base_padding
-
-// Used for symbolic icons that scale
-$scalable_icon_size: to_em(16px);
-$medium_scalable_icon_size: $scalable_icon_size * 1.5;
-$large_scalable_icon_size: $scalable_icon_size * 2;
-
-// animation definition
-$ease_out_quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
-
-// Yaru menu radius
-$yaru_menu_border_radius: $modal_radius * 2.25;
-
-// Stage
-stage {
- @include fontsize($base_font_size);
- color: $fg_color;
-}
-
-/* Common Stylings */
-%reset {
- background: none;
- box-shadow: none;
- border: none;
- border-radius: 0;
- padding: 0;
- margin: 0;
-}
-
-// icon tiles
-%tile {
- border-radius: $base_border_radius * 2;
- padding: $base_padding;
- spacing: $base_padding;
- text-align: center;
- transition-duration: 100ms;
-}
-
-// common button styling
-%button_common {
- border-radius: $base_border_radius;
- padding: $base_padding * .5 $base_padding * 4;
- font-weight: bold;
- transition: border-width 300ms $ease_out_quad,
- box-shadow 300ms $ease_out_quad;
-}
-
-%button {
- @extend %button_common;
- @include button(normal);
- &:focus { @include button(focus);}
- &:hover { @include button(hover);}
- &:insensitive { @include button(insensitive);}
- &:selected,
- &:active { @include button(active);}
- &:checked { @include button(checked);}
-}
-
-%flat_button {
- @include button(normal, $style: flat);
- &:focus { @include button(focus, $style: flat);}
- &:hover { @include button(hover, $style: flat);}
- &:insensitive { @include button(insensitive, $style: flat);}
- &:selected,
- &:active { @include button(active, $style: flat);}
- &:checked { @include button(checked, $style: flat);}
-}
-
-%default_button {
- @include button(normal, $c:-st-accent-color, $tc:-st-accent-fg-color, $style: default);
- &:focus { @include button(focus, $c:-st-accent-color, $tc:-st-accent-fg-color, $style: default);}
- &:hover { @include button(hover, $c:-st-accent-color, $tc:-st-accent-fg-color, $style: default);}
- &:insensitive { @include button(insensitive, $c:-st-accent-color, $tc:-st-accent-fg-color, $style: default);}
- &:active { @include button(active, $c:-st-accent-color, $tc:-st-accent-fg-color, $style: default);}
-}
-
-// items in popover menus
-%menuitem {
- font-weight: normal;
- spacing: $base_padding;
- transition-duration: 100ms;
- padding: $base_padding * 1.5 $base_padding * 2;
-}
-
-// common style for card elements
-%card_common {
- border-radius: $base_border_radius * 1.5;
- padding: $scaled_padding * 2;
- margin: $base_margin;
- background-color: $card_bg_color;
- box-shadow: 0 1px 2px 0 $card_shadow_color;
- // bit of a hack here with border since we can't have double box-shadow
- border: 1px solid $card_shadow_border_color;
-
- @if $contrast == 'high' {
- border-color: transparent;
- box-shadow: none;
- }
-}
-
-%button_dark { // Yaru change: add dark variant (for light theme)
- @extend %button;
- @include button(normal, $tc: $fg_color_dark, $c: $bg_color_dark, $brightness: 'dark');
- &:focus { @include button(focus, $tc: $fg_color_dark, $c: $bg_color_dark, $brightness: 'dark');}
- &:hover { @include button(hover, $tc: $fg_color_dark, $c: $bg_color_dark, $brightness: 'dark');}
- &:insensitive { @include button(insensitive, $tc: $fg_color_dark, $c: $bg_color_dark, $brightness: 'dark');}
- &:selected,
- &:active { @include button(active, $tc: $fg_color_dark, $c: $bg_color_dark, $brightness: 'dark');}
- &:checked { @include button(checked, $tc: $fg_color_dark, $c: $bg_color_dark, $brightness: 'dark');}
-}
-
-%card {
- @extend %card_common;
- @include button(normal, $style: card);
- &:hover { @include button(hover, $style: card);}
- &:active { @include button(active, $style: card);}
- &:focus { @include button(focus, $style: card);}
- &:insensitive { @include button(insensitive, $style: card);}
-}
-
-%card_flat {
- @extend %card_common;
- border: 1px solid transparent !important; // override of the button style needed here
- @include button(undecorated, $style: flat);
- &:hover { @include button(hover, $style: flat);}
- &:active { @include button(active, $style: flat);}
- &:focus { @include button(focus, $style: card);}
- &:insensitive { @include button(insensitive, $style: card);}
-}
-
-
-// normal entry style
-%entry_common {
- min-height: 22px; // Yaru change: fix for height shift
- border-radius: $base_border_radius;
- padding: $base_padding * 1.5 $base_padding * 1.5;
- selection-background-color: st-transparentize(-st-accent-color, 0.7);
- selected-color: $fg_color;
-
- selection-background-color: -st-accent-color; // Yaru change: we want solid focus-ring.
- border-width: 1px; // Yaru change: we want bordered entries
-}
-
-%entry {
- @extend %entry_common;
- @include entry(normal);
- &:hover { @include entry(hover);}
- &:focus { @include entry(focus);}
- &:insensitive { @include entry(insensitive);}
-
- StLabel.hint-text {
- color: transparentize($fg_color, 0.3);
- }
-}
-
-// buttons in notifications
-// use a rounded style and have a lighter background
-%notification_button {
- // font-weight: bold; // Yaru change: use normal font weight
- padding: $base_padding $base_padding * 2;
- border-radius: $base_border_radius;
-
- @include button(normal, $style: notification);
- &:focus { @include button(focus, $style: notification);}
- &:hover { @include button(hover, $style: notification);}
- &:active { @include button(active, $style: notification);}
- &:checked { @include button(checked, $style: notification);}
- &:insensitive { @include button(insensitive, $style: notification);}
-}
-
-// buttons in dialogs
-%dialog_button {
- // font-weight: bold; // Yaru change: use normal font weight
- padding: $base_padding * 2;
- border-radius: $base_border_radius * 1.5;
-
- @include button(normal, $style: dialog);
- &:focus { @include button(focus, $style: dialog);}
- &:hover { @include button(hover, $style: dialog);}
- &:active { @include button(active, $style: dialog);}
- &:checked { @include button(checked, $style: dialog);}
- &:insensitive { @include button(insensitive, $style: dialog);}
-}
-
-// tooltip
-%tooltip {
- background-color: $system_bg_color; // Yaru: Use yaru palette
- border: 1px solid $system_borders_color; // Yaru: use our border
- color: $system_fg_color; // Yaru: Use yaru palette
-
- border-radius: $forced_circular_radius;
- padding: $base_padding $base_padding * 2;
- text-align: center;
-
- @if $contrast == 'high' {
- background-color: black;
- border-color: $hc_inset_color;
- }
-}
-
-/* General Typography */
-%large_title {
- font-weight: 300;
- @include fontsize(24pt);
-}
-
-%title_1 {
- font-weight: 800;
- @include fontsize(20pt);
-}
-
-%title_2 {
- font-weight: 800;
- @include fontsize(15pt);
-}
-
-%title_3 {
- font-weight: 700;
- @include fontsize(15pt);
-}
-
-%title_4 {
- font-weight: 700;
- @include fontsize(13pt);
-}
-
-%heading {
- font-weight: 700;
- @include fontsize(11pt);
-}
-
-%caption_heading {
- font-weight: 700;
- @include fontsize(9pt);
-}
-
-%caption {
- font-weight: 400;
- @include fontsize(9pt);
-}
-
-%smaller {
- font-weight: 400;
- @include fontsize(9pt);
-}
-
-%monospace {font-family: 'Ubuntu Mono 15', monospace;}
-%numeric { font-feature-settings: "tnum";}
-
-
-/* OSD Elements */
-%osd_panel {
- color: $osd_fg_color;
- background-color: $osd_bg_color;
- border: 1px solid $system_borders_color; // Yaru: use our border
- border-radius: $forced_circular_radius;
- padding: $base_padding * 2;
- @if $contrast == 'high' {
- @include draw_hc_inset($width: 2px,$border: true);
- }
-}
-
-// entries
-%osd_entry {
- @extend %entry_common;
- @include entry(normal, $c:$osd_fg_color, $bc:$osd_bg_color, $always_dark: true);
- &:hover { @include entry(hover, $c:$osd_fg_color, $bc:$osd_bg_color, $always_dark: true);}
- &:focus { @include entry(focus, $c:$osd_fg_color, $bc:$osd_bg_color, $always_dark: true);}
- &:insensitive { @include entry(insensitive, $c:$osd_fg_color, $bc:$osd_bg_color, $always_dark: true);}
-
- StLabel.hint-text {color: transparentize($osd_fg_color, 0.3); }
-}
-
-// buttons on OSD elements
-%osd_button {
- @extend %button_common;
- @include button(normal, $tc:$osd_fg_color, $c:$osd_bg_color, $always_dark: true);
- &:focus { @include button(focus, $tc:$osd_fg_color, $c:$osd_bg_color, $always_dark: true);}
- &:hover { @include button(hover, $tc:$osd_fg_color, $c:$osd_bg_color, $always_dark: true);}
- &:active { @include button(active, $tc:$osd_fg_color, $c:$osd_bg_color, $always_dark: true);}
- &:checked { @include button(checked, $tc:$osd_fg_color, $c:$osd_bg_color, $always_dark: true);}
- &:insensitive { @include button(insensitive, $tc:$osd_fg_color, $c:$osd_bg_color, $always_dark: true);}
-}
-
-%osd_button_flat {
- @extend %button_common;
- @include button(normal, $tc:$osd_fg_color, $c:$osd_bg_color, $style: flat, $always_dark: true);
- &:focus { @include button(focus, $tc:$osd_fg_color, $c:$osd_bg_color, $style: flat, $always_dark: true);}
- &:hover { @include button(hover, $tc:$osd_fg_color, $c:$osd_bg_color, $style: flat, $always_dark: true);}
- &:active { @include button(active, $tc:$osd_fg_color, $c:$osd_bg_color, $style: flat, $always_dark: true);}
- &:checked { @include button(checked, $tc:$osd_fg_color, $c:$osd_bg_color, $style: flat, $always_dark: true);}
- &:insensitive { @include button(insensitive, $tc:$osd_fg_color, $c:$osd_bg_color, $style: flat, $always_dark: true);}
-}
-
-/* System Elements */
-
-// entries
-%system_entry {
- @extend %entry_common;
- @include entry(normal, $c:$system_fg_color, $bc:$system_bg_color, $always_dark: true);
- &:hover { @include entry(hover, $c:$system_fg_color, $bc:$system_bg_color, $always_dark: true);}
- &:focus { @include entry(focus, $c:$system_fg_color, $bc:$system_bg_color, $always_dark: true);}
- &:insensitive { @include entry(insensitive, $c:$system_fg_color, $bc:$system_bg_color, $always_dark: true);}
-
- StLabel.hint-text { color: transparentize($fg_color, 0.3);} // Yaru: ↑↑↑
-}
-
-// buttons
-%system_button {
- @include button(normal, $tc:$system_fg_color, $c:$system_bg_color);
- &:insensitive { @include button(insensitive, $tc:$system_fg_color, $c:$system_bg_color);}
- &:focus { @include button(focus, $tc:$system_fg_color, $c:$system_bg_color);}
- &:hover { @include button(hover, $tc:$system_fg_color, $c:$system_bg_color);}
- &:active { @include button(active, $tc:$system_fg_color, $c:$system_bg_color);}
- &:checked { @include button(checked, $tc:$system_fg_color, $c:$system_bg_color);}
-}
-
-/* Lockscreen Elements */
-
-// buttons
-%lockscreen_button {
- @extend %button_common;
- @include button(normal, $tc:$system_fg_color, $style: lockscreen);
- &:focus { @include button(focus, $tc:$system_fg_color, $style: lockscreen);}
- &:hover { @include button(hover, $tc:$system_fg_color, $style: lockscreen);}
- &:active { @include button(active, $tc:$system_fg_color, $style: lockscreen);}
- &:checked { @include button(checked, $tc:$system_fg_color, $style: lockscreen);}
- &:insensitive { @include button(insensitive, $tc:$system_fg_color, $style: lockscreen);}
-}
-
-// entries
-%lockscreen_entry {
- @extend %entry_common;
- @include entry(normal, $c:$system_fg_color, $style: lockscreen, $always_dark: true);
- &:hover { @include entry(hover, $c:$system_fg_color, $style: lockscreen, $always_dark: true);}
- &:focus { @include entry(focus, $c:$system_fg_color, $style: lockscreen, $always_dark: true);}
- &:insensitive { @include entry(insensitive, $c:$system_fg_color, $style: lockscreen, $always_dark: true);}
-
- StLabel.hint-text { color: transparentize($system_fg_color, 0.3);}
-}
-
diff --git a/gnome-shell/src/gnome-shell-sass/_common.scss b/gnome-shell/src/gnome-shell-sass/_common.scss
new file mode 120000
index 0000000000..5e9780dc43
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/_common.scss
@@ -0,0 +1 @@
+../../upstream/theme/gnome-shell-sass/_common.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/_default-colors.scss b/gnome-shell/src/gnome-shell-sass/_default-colors.scss
deleted file mode 100644
index aaf9448549..0000000000
--- a/gnome-shell/src/gnome-shell-sass/_default-colors.scss
+++ /dev/null
@@ -1,51 +0,0 @@
-// Named Colors
-
-// base colors
-$_base_color_dark: #222226;
-$_base_color_light: #fafafb;
-
-// accent colors
-$accent_color: if($variant== 'light', -st-accent-color, st-mix(-st-accent-color, $light_1, 60%));
-
-// colors for destructive elements
-$destructive_bg_color: if($variant == 'light', $red_3, $red_4);
-$destructive_fg_color: $light_1;
-$destructive_color: $destructive_bg_color;
-
-// colors for levelbars, entries, labels and infobars
-$success_bg_color: if($variant == 'light', $green_4, $green_5);
-$success_fg_color: $light_1;
-$success_color: $success_bg_color;
-
-$warning_bg_color: if($variant == 'light', $yellow_5, #cd9309); // uses darker off-palette yellow
-$warning_fg_color: transparentize(black, .2);
-$warning_color: $warning_bg_color;
-
-$error_bg_color: if($variant == 'light', $red_3, $red_4);
-$error_fg_color: $light_1;
-$error_color: $error_bg_color;
-
-// link colors
-$link_color: if($variant =='light', st-darken(-st-accent-color, 10%), st-lighten(-st-accent-color, 20%));
-$link_visited_color: st-transparentize($link_color, .6);
-
-// special cased widget definitions
-$background_mix_factor: if($variant == 'light', 12%, 9%); // used to boost the color of backgrounds in different variants
-
-// shadows
-$shadow_color: if($variant == 'light', rgba(0,0,0,.05), rgba(0,0,0,0.2));
-$text_shadow_color: if($variant == 'light', rgba(255,255,255,0.3), rgba(0,0,0,0.2));
-
-// border opacities
-$border_opacity: if($variant == 'light', .85, .9); // change the border opacity in different variants
-$focus_border_opacity: .2;
-
-// High Contrast overrides
-@if $contrast == 'high' {
- // increase border opacity
- $border_opacity: .5;
- $focus_border_opacity: .1;
- // remove shadows
- $shadow_color: transparent;
- $text_shadow_color: transparent;
-}
diff --git a/gnome-shell/src/gnome-shell-sass/_default-colors.scss b/gnome-shell/src/gnome-shell-sass/_default-colors.scss
new file mode 120000
index 0000000000..1d55c40c2b
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/_default-colors.scss
@@ -0,0 +1 @@
+../../upstream/theme/gnome-shell-sass/_default-colors.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/_dock.scss b/gnome-shell/src/gnome-shell-sass/_dock.scss
index dda09091b0..cb60f12e05 100644
--- a/gnome-shell/src/gnome-shell-sass/_dock.scss
+++ b/gnome-shell/src/gnome-shell-sass/_dock.scss
@@ -487,7 +487,9 @@ $dock_style_modes: [null, shrink, extended, extended-shrink];
/* Yaru Dock styling */
-$dock_color: $panel_bg_color;
+// Use dark color for dock in both light and dark themes
+// This matches our panel styling approach
+$dock_color: $dark_5;
@each $side in bottom, top, left, right {
#dashtodockContainer.#{$side} {
@@ -533,7 +535,7 @@ $dock_color: $panel_bg_color;
border-radius: $dash_border_radius;
&:active, &:checked {
.overview-icon {
- background-color: $base_active_color; box-shadow: none;
+ background-color: $active_bg_color; box-shadow: none;
}
}
}
@@ -580,12 +582,13 @@ $dock_color: $panel_bg_color;
}
}
-// Use success color for the notification badges in the overview
+// Use Yaru's success color for the notification badges in the overview
+$yaru_success_color: #0e8420;
#dashtodockContainer .notification-badge,
.overview-tile .notification-badge,
.icon-grid .notification-badge {
- background-color: $success_color;
- border: 1px solid darken($success_color, 10%);
+ background-color: $yaru_success_color;
+ border: 1px solid darken($yaru_success_color, 10%);
box-shadow: -1px 1px 5px 0px transparentize(black, 0.5);
}
diff --git a/gnome-shell/src/gnome-shell-sass/_drawing.scss b/gnome-shell/src/gnome-shell-sass/_drawing.scss
deleted file mode 100644
index f2ef46d739..0000000000
--- a/gnome-shell/src/gnome-shell-sass/_drawing.scss
+++ /dev/null
@@ -1,476 +0,0 @@
-//
-// Drawing functions
-//
-
-// Function to convert px values to em
-@function to_em($input, $base: 16px) {
- // multiplied and divided by 1000 to make up for round() shortcoming
- $em_value: ($input / $base) * 1.091 * 1000;
- @return round($em_value) / 1000 * 1em;
-}
-
-// Boost the contrast of a color by mixing it with high contrast defined colors
-@function hc_color_mix($c, $mc:$hc_mix_color, $mf:$hc_mix_factor) {
- //
- // $c: input color
- // $mc: mix color, defined in High Contrast specific stylesheet
- // $mf: mix factor (%), defined in High Contrast specific stylesheet
- //
- @return st-mix($c, $mc, $mf);
-}
-
-// Function to mix the color and make the focus background
-@function focus_bg_color($bg, $fc:$accent_color) {
- @return st-mix($fc, $bg, 5%);
-}
-
-//
-// Drawing mixins
-//
-
-// Draw the inset for High Contrast elements
-@mixin draw_hc_inset($width: 1px, $ic: $hc_inset_color, $border: false, $no_inset: false) {
- //
- // $width width of the inset, in pixels
- // $ic color of the inset
- //
- // $border if true, use a border instead of a box-shadow to draw inset
- // $no_inset if true, override the mixin to not draw an iset
- //
-
- box-shadow: inset 0 0 0 $width $ic;
-
- // draw inset as border
- @if $border {
- border: $width solid $ic;
- box-shadow: none;
- }
-
- // don't draw an inset at all
- @if $no_inset {
- box-shadow: none;
- border: none;
- }
-}
-
-// Draw the focus ring
-@mixin focus_ring($width: 2px, $fc: $accent_color, $border: false) {
-
- $focus_color: st-transparentize($fc, $focus_border_opacity);
-
- box-shadow: inset 0 0 0 $width $focus_color !important;
- @if $border {
- border:$width solid $focus_color !important;
- box-shadow: none;
- }
-}
-
-// Mixin to convert provided font size in pt to em units
-@mixin fontsize($size, $base: 16px, $unit: pt) {
- // if pt, convert into unitless value with the assumption: 1pt = 1.091px
- $adjusted_size: if($unit == pt, $size * 1.091, $size) * 1000;
- $rounded_size: round($adjusted_size / $base) / 1000;
- font-size: $rounded_size * 1em;
- // font-size: round($size) + pt;
-}
-
-// Function to fill the background of a panel button
-@mixin panel_button_fill($bg) {
- // use a box-shadow to fill the background
- // this is done because panel buttons use a transparent border to fake padding
- box-shadow: inset 0 0 0 100px $bg;
-}
-
-// Text entries drawing function
-@mixin entry($type, $c:$fg_color, $bc:$bg_color, $style: null, $always_dark: false) {
- //
- // $type: entry type, possible values: normal, focus, hover, insensitive
- // $c: text color
- // $bc: background color
- // $always_dark: override the light theme check to use dark colors, true or false
- //
-
- // entry colors
- $entry_fg_color: $c;
- $entry_bg_color: mix($c, $bc, $background_mix_factor);
- $entry_focus_color: $accent_color;
-
- // entry color overrides for lockscreen style
- @if $style == 'lockscreen' {
- $entry_bg_color: transparentize($c, .9);
- $entry_focus_color: transparentize($entry_fg_color, 0.6);
- @if $contrast == 'high' {
- $entry_focus_color: transparentize($entry_fg_color, 0.3);
- }
- }
-
- // background color adjustment factors
- // the % a color is lightened or darkened for button states
- $hover_factor: 4%;
- $insensitive_factor: 3%;
-
- // entry state background colors
- $hover_entry_bg_color: if($variant == 'light', darken($entry_bg_color, $hover_factor), lighten($entry_bg_color, $hover_factor));
- $insensitive_entry_bg_color: if($variant == 'light', lighten($entry_bg_color, $insensitive_factor), darken($entry_bg_color, $insensitive_factor));
-
- // override entry background colours if element is always dark
- @if $always_dark {
- $hover_entry_bg_color: lighten($entry_bg_color, $hover_factor);
- $insensitive_entry_bg_color: darken($entry_bg_color, $insensitive_factor);
- }
-
- @if $contrast == 'high' {
- @include draw_hc_inset();
- }
-
- // normal
- @if $type == 'normal' {
- background-color: $entry_bg_color;
- color: transparentize($c, 0.3);
- }
-
- // focus styles
- @if $type == 'focus' {
- @include focus_ring($fc:$entry_focus_color);
- background-color: focus_bg_color($entry_bg_color);
- color: $entry_fg_color;
-
- // lockscreen style
- @if $style == 'lockscreen' {
- @include focus_ring($fc:$entry_focus_color);
- background-color: focus_bg_color($entry_bg_color, $fc:$entry_focus_color);
- }
- }
-
- // hover styles
- @if $type == 'hover' {
- background-color: $hover_entry_bg_color;
- color: $entry_fg_color;
- }
-
- // insensitive styles
- @if $type == 'insensitive' {
- background-color: $insensitive_entry_bg_color;
- color: transparentize($entry_fg_color, 0.5);
- }
-}
-
-
-// Button drawing function
-@mixin button($type, $tc:$fg_color, $c:$bg_color, $style: null, $always_dark: false, $bg: null, $brightness: null) {
- // Yaru change: allow forced bg-color, add brightness parameter)
- //
- // $type: button type, possible values:
- // - normal, focus, hover, active, checked, insensitive, default, undecorated
- // $c: button bg color, derived from bg_color
- // $tc: button text color, derived from fg_color
- // $style: button style, possible values: card, notification, dialog, flat, default
- // $always_dark: override the light theme check to use dark colors, true or false
- //
-
- // mix input colors to get button background color
- $button_bg_color: st-mix($tc, $c, $background_mix_factor);
- $button_bg_color: if($bg != null, $bg, st-mix($tc, $c, $background_mix_factor)); // Yaru change: allow forced
- $variant: if($brightness ==null, $variant, $brightness); // Yaru change: add forced brightness support
-
- // background color override for card elements
- @if $style == 'card' { $button_bg_color: $card_bg_color;}
- // background color mix override for flat style; the button bg color is the background color input
- @if $style == 'flat' { $button_bg_color: $c;}
- // background color mix override for default button style
- @if $style == 'default' { $button_bg_color: $c;}
-
- // background color adjustment factors
- // the % a color is lightened or darkened for button states
- $hover_factor: 4%;
- $active_factor: 9%;
- $checked_factor: 8%;
- $insensitive_factor: 3%;
-
- // flat style overrides
- @if $style == 'flat' {
- $hover_factor: 7%; // stronger factor in flat style
- }
-
- // button base state background colors
- $hover_button_bg_color: if($variant == 'light', st-darken($button_bg_color, $hover_factor), st-lighten($button_bg_color, $hover_factor));
- $active_button_bg_color: if($variant == 'light', st-darken($button_bg_color, $active_factor), st-lighten($button_bg_color, $active_factor));
- $checked_button_bg_color: if($variant == 'light', st-darken($button_bg_color, $checked_factor), st-lighten($button_bg_color, $checked_factor));
- $insensitive_button_bg_color: if($variant == 'light', st-lighten($button_bg_color, $insensitive_factor), st-darken($button_bg_color, $insensitive_factor));
-
- // button extended state background colors
- $active_hover_button_bg_color: if($variant == 'light', st-darken($active_button_bg_color, $hover_factor), st-lighten($active_button_bg_color, $hover_factor));
- $checked_hover_button_bg_color: if($variant == 'light', st-darken($checked_button_bg_color, $hover_factor), st-lighten($checked_button_bg_color, $hover_factor));
- $checked_active_button_bg_color: if($variant == 'light', st-darken($checked_button_bg_color, $active_factor), st-lighten($checked_button_bg_color, $active_factor));
-
- // override button background colours if element is always dark
- @if $always_dark {
- $hover_button_bg_color: st-lighten($button_bg_color, $hover_factor);
- $active_button_bg_color: st-lighten($button_bg_color, $active_factor);
- $checked_button_bg_color: st-lighten($button_bg_color, $checked_factor);
- $insensitive_button_bg_color: st-darken($button_bg_color, $insensitive_factor);
- // extended
- $active_hover_button_bg_color: st-lighten($active_button_bg_color, $hover_factor);
- $checked_hover_button_bg_color: st-lighten($checked_button_bg_color, $hover_factor);
- $checked_active_button_bg_color: st-lighten($checked_button_bg_color, $active_factor);
- }
-
- // background color override for buttons that use transparency
- // styles: dialogs bubbles, lockscreen
- @if $style == 'dialog' or $style == 'lockscreen' {
- $button_bg_color: transparentize($tc, .9);
- $hover_button_bg_color: transparentize($tc, .87);
- $active_button_bg_color: transparentize($tc, .84);
- $active_hover_button_bg_color: transparentize($tc, .81);
-
- // Yaru: fix insensitive background in light themes.
- $insensitive_button_bg_color: transparentize($tc, .83);
- }
-
- // background color overrides for notification style
- @if $style == 'notification' {
- $button_bg_color: transparentize($tc, .85);
- $hover_button_bg_color: transparentize($tc, .7);
- $insensitive_button_bg_color: transparentize($tc, .9);
- $active_button_bg_color: transparentize($tc, .8);
- $active_hover_button_bg_color: transparentize($tc, .8);
- }
-
- // flat style overrides
- @if $style == 'flat' {
- $insensitive_button_bg_color: $button_bg_color;
- }
-
- // high contrast overrides
- @if $contrast == 'high' {
- // override button background colors for high contrast
- $button_bg_color: hc_color_mix($button_bg_color);
- $hover_button_bg_color: hc_color_mix($hover_button_bg_color);
- $active_button_bg_color: hc_color_mix($active_button_bg_color);
- $checked_button_bg_color: hc_color_mix($checked_button_bg_color);
-
- // also draw the inset border
- @include draw_hc_inset();
-
- // duplicate flat bg color for High Contrast
- @if $style == 'flat' {
- $button_bg_color: $c;
- }
-
- @if $style == 'default' {
- @include draw_hc_inset($no_inset: true);
- }
- }
-
- // normal style
- @if $type == 'normal' {
- color: $tc;
- background-color: $button_bg_color;
-
- // no inset in High Contrast when the style is flat
- @if $style == 'flat' and $contrast == 'high' {
- @include draw_hc_inset($no_inset: true);
- }
- }
-
- // hover button
- @else if $type == 'hover' {
- color: $tc;
- background-color: $hover_button_bg_color;
- }
-
- // active button
- @else if $type == 'active' {
- color: $tc;
- background-color: $active_button_bg_color;
- &:hover { background-color: $active_hover_button_bg_color;}
- &:focus {
- // otherwise use focus bg color mixin
- $bg: focus_bg_color($active_button_bg_color);
- background-color: $bg;
- }
- }
-
- // checked button
- @else if $type == 'checked' {
- color: $tc;
- background-color: $checked_button_bg_color;
- &:hover { background-color: $checked_hover_button_bg_color;}
- &:active { background-color: $checked_active_button_bg_color;}
- }
-
- // insensitive button
- @else if $type == 'insensitive' {
- $insensitive_button_fg_color: if($variant == 'light', st-transparentize($tc, .6), st-transparentize($tc, .5));
- color: $insensitive_button_fg_color;
- background-color: $insensitive_button_bg_color;
-
- // no outline in High Contrast for insensitive buttons
- @if $contrast == 'high' {
- @include draw_hc_inset($no_inset: true);
- }
- }
-
- // focused button
- @else if $type == 'focus' {
- color: $tc;
- @include focus_ring();
-
- // use a different focus ring color for default style
- @if $style == 'default' {
- @include focus_ring($fc:$accent_borders_color);
- }
- // change background color if style is flat
- @if $style == 'flat' {
- $button_bg_color: transparentize($button_bg_color, 0.75);
- }
-
- background-color: focus_bg_color($button_bg_color);
-
- &:hover {
- background-color: focus_bg_color($hover_button_bg_color);
- }
- }
-
- // reset (unstyled button)
- @else if $type == 'undecorated' {
- background-color: transparent;
- border-color: transparent;
- box-shadow: none;
-
- &:insensitive {
- background-color: transparent !important;
- }
- }
-}
-
-// Helper mixin for button-like elements with an icon
-@mixin tile_button($fg:$system_fg_color, $bg:$system_bg_color, $raised: false, $system: true) {
- //
- // $fg: foreground color
- // $bg: background color
- //
- // $raised: uses raised style, true or false
- // $system: uses system styles, true or false
- //
-
- @extend %tile;
-
- @if $raised {
- @include button(normal, $tc:$fg, $c:$bg, $always_dark: $system);
- &:focus { @include button(focus, $tc:$fg, $c:$bg, $always_dark: $system);}
- &:hover { @include button(hover, $tc:$fg, $c:$bg, $always_dark: $system);}
- &:active { @include button(active, $tc:$fg, $c:$bg, $always_dark: $system);}
- &:highlighted,&:selected,
- &:checked { @include button(checked, $tc:$fg, $c:$bg, $always_dark: $system);}
- &:insensitive { @include button(insensitive, $tc:$fg, $c:$bg, $always_dark: $system);}
- } @else {
- @include button(normal, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);
- // override the mixin to have the flat button always be transparent
- // fixes issue with overlapping tiles
- background-color: transparent;
- &:focus { @include button(focus, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);}
- &:hover { @include button(hover, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);}
- &:active { @include button(active, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);}
- &:highlighted,&:selected,
- &:checked { @include button(checked, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);}
- &:insensitive { @include button(insensitive, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);}
- }
-
- &:drop {
- background-color: st-transparentize(-st-accent-color, .8);
- box-shadow: inset 0 0 0 2px st-transparentize(-st-accent-color, .2);
- }
-}
-
-// styling for all menuitems in popovers
-@mixin menuitem($bg) {
-
- // extend common styles
- @extend %menuitem;
-
- @include button(undecorated, $c:$bg, $style: flat);
- &:active { @include button(active, $c:$bg, $style: flat);}
- &:hover, &:selected, &:checked { @include button(hover, $c:$bg, $style: flat);}
- &:insensitive { @include button(insensitive, $c:$bg, $style: flat);}
-}
-
-// Panel menu/button drawing function
-@mixin panel_button($bg:$panel_fg_color, $fg:$panel_fg_color, $style: null, $highlighted_child: false, $child_class:"") {
- //
- // $bg: background color, derived from $panel_fg_color
- // $fg: foreground color, also derived from $panel_fg_color
- // $style: can be set to 'filled' if button uses a colored background
- //
- // $highlighted_child: if true, applies some special overrides for to a
- // child element, see _panel.scss for details
- // $child_class: class name of the child element
- //
-
- transition-duration: 150ms;
- border: 3px solid transparent;
- background-color: transparent;
- border-radius: $forced_circular_radius;
-
- font-weight: bold;
- color: $fg;
-
- // background fill defines
- $fill: transparent;
- $hover_fill: transparentize($fg, .83);
- $active_fill: transparentize($fg, .72);
- $active_hover_fill: transparentize($fg, .68);
-
- @if $style == 'filled' {
- $fill: $bg;
- $hover_fill: if($variant == 'light', darken($bg, 5%), lighten($bg, 5%));
- $active_fill: if($variant == 'light', darken($bg, 9%), lighten($bg, 9%));
- $active_hover_fill: if($variant == 'light', darken($bg, 11%), lighten($bg, 11%));
- }
-
- @include panel_button_fill($fill);
-
- &:focus, &:hover {
- @include panel_button_fill($hover_fill);
- }
-
- &:active, &:checked {
- @include panel_button_fill($active_fill);
-
- &:hover{
- @include panel_button_fill($active_hover_fill);
- }
- }
-
- // some overrides to style a child element
- @if $highlighted_child {
-
- // remove the common styles from the parent
- background: none !important;
- box-shadow: none !important;
- border: none !important;
-
- // add them to the child
- #{$child_class} {
- transition-duration: 150ms;
- border: 3px solid transparent;
- border-radius: $forced_circular_radius;
- }
-
- &:focus, &:hover {
- #{$child_class} {
- @include panel_button_fill($hover_fill);
- }
- }
-
- &:active, &:checked {
- #{$child_class} {
- @include panel_button_fill($active_fill);
-
- &:hover {
- @include panel_button_fill($active_hover_fill);
- }
- }
- }
- }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/_drawing.scss b/gnome-shell/src/gnome-shell-sass/_drawing.scss
new file mode 120000
index 0000000000..903dab7795
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/_drawing.scss
@@ -0,0 +1 @@
+../../upstream/theme/gnome-shell-sass/_drawing.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/_high-contrast-colors.scss b/gnome-shell/src/gnome-shell-sass/_high-contrast-colors.scss
deleted file mode 100644
index c7463b3ea4..0000000000
--- a/gnome-shell/src/gnome-shell-sass/_high-contrast-colors.scss
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// High Contrast theme definitions
-//
-// this is an always dark theme, so no 'light' theme conditions
-
-@import '_palette.scss';
-
-// Yaru change: hard include gnome palette because include and symlink doesn't work with Github CI
-//GNOME Color Palette
-$blue_1: #99c1f1;
-$blue_2: #62a0ea;
-$blue_3: #3584e4;
-$blue_4: #1c71d8;
-$blue_5: #1a5fb4;
-$green_1: #8ff0a4;
-$green_2: #57e389;
-$green_3: #33d17a;
-$green_4: #2ec27e;
-$green_5: #26a269;
-$yellow_1: #f9f06b;
-$yellow_2: #f8e45c;
-$yellow_3: #f6d32d;
-$yellow_4: #f5c211;
-$yellow_5: #e5a50a;
-$orange_1: #ffbe6f;
-$orange_2: #ffa348;
-$orange_3: #ff7800;
-$orange_4: #e66100;
-$orange_5: #c64600;
-$red_1: #f66151;
-$red_2: #ed333b;
-$red_3: #e01b24;
-$red_4: #c01c28;
-$red_5: #a51d2d;
-$purple_1: #dc8add;
-$purple_2: #c061cb;
-$purple_3: #9141ac;
-$purple_4: #813d9c;
-$purple_5: #613583;
-$brown_1: #cdab8f;
-$brown_2: #b5835a;
-$brown_3: #986a44;
-$brown_4: #865e3c;
-$brown_5: #63452c;
-$light_1: #ffffff;
-$light_2: #f6f5f4;
-$light_3: #deddda;
-$light_4: #c0bfbc;
-$light_5: #9a9996;
-$dark_1: #77767b;
-$dark_2: #5e5c64;
-$dark_3: #3d3846;
-$dark_4: #241f31;
-$dark_5: #000000;
-
-@import '_default-colors.scss';
-
-// global colors
-$base_color: $dark_5;
-$bg_color: lighten($base_color, 10%);
-$fg_color: $light_1;
-
-// OSD elements
-$osd_fg_color: $light_1;
-$osd_bg_color: $base_color;
-
-// system elements
-$system_base_color: $dark_5;
-$system_fg_color: $light_1;
-
-// panel colors
-$panel_bg_color: $dark_5;
-$panel_fg_color: $light_1;
-
-// card elements
-$card_bg_color: $bg_color;
-$card_shadow_color: transparent;
-$card_shadow_border_color: $card_bg_color;
-
-//
-// Derived Colors
-//
-// colors based on the global defines above
-
-// borders
-$borders_color: transparentize($fg_color, $border_opacity);
-$outer_borders_color: $borders_color;
-
-// osd colors
-$osd_borders_color: transparentize($osd_fg_color, 0.8);
-$osd_outer_borders_color: $osd_borders_color;
-
-// system colors
-$system_bg_color: lighten($system_base_color, 5%);
-$system_borders_color: transparentize($system_fg_color, .9);
-$system_insensitive_fg_color: mix($system_bg_color, $system_fg_color, 30%);
-$system_overlay_bg_color: mix($system_bg_color, $system_fg_color, 90%);
-
-// insensitive state
-$insensitive_fg_color: $fg_color;
-$insensitive_bg_color: mix($bg_color, $base_color, 60%);
-$insensitive_borders_color: $borders_color;
-
-// checked state
-$checked_bg_color: lighten($bg_color, 18%);
-$checked_fg_color: lighten($fg_color, 18%);
-
-// hover state
-$hover_bg_color: lighten($bg_color, 20%);
-$hover_fg_color: lighten($fg_color, 20%);
-
-// active state
-$active_bg_color: lighten($bg_color, 22%);
-$active_fg_color: lighten($fg_color, 22%);
-
-// accent colors
-$accent_borders_color: st-lighten(-st-accent-color, 30%);
-
-//
-// High Contrast specific definitions
-//
-
-// color for outline drawn onto all elements (may be a border or a box-shadow)
-$hc_inset_color: transparentize($fg_color, 0.6);
-
-// color used in a mixin in _drawing to boost a color's contrast
-$hc_mix_color: $light_1;
-
-// the mix factor used to boost contrast of a color in the above mixin
-$hc_mix_factor: 87%;
-
-$fg_color_dark: $porcelain;
-$bg_color_dark: lighten($jet, 2%);
-
-// Yaru custom definitions
-@import '_yaru-default-colors';
-@import '_yaru-colors.scss';
diff --git a/gnome-shell/src/gnome-shell-sass/_high-contrast-colors.scss b/gnome-shell/src/gnome-shell-sass/_high-contrast-colors.scss
new file mode 120000
index 0000000000..d938a4deda
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/_high-contrast-colors.scss
@@ -0,0 +1 @@
+../../upstream/theme/gnome-shell-sass/_high-contrast-colors.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/_palette.scss b/gnome-shell/src/gnome-shell-sass/_palette.scss
deleted file mode 100644
index c14bca6a3b..0000000000
--- a/gnome-shell/src/gnome-shell-sass/_palette.scss
+++ /dev/null
@@ -1,52 +0,0 @@
-// Blacks
-$jet: #181818;
-$inkstone: #3D3D3D;
-$slate: #5D5D5D;
-$graphite: #666666;
-
-// Whites
-$white: #FFFFFF;
-$porcelain: #F7F7F7;
-$silk: #CCC;
-$warm_gray: #AEA79F;
-$ash: #878787;
-
-// Purples
-$aubergine: #924D8B;
-$purple: #762572;
-$light_aubergine: #77216F;
-$mid_aubergine: #5E2750;
-$dark_aubergine: #2C001E;
-
-// Reds
-$red: #c7162b;
-
-// Oranges
-$orange: #E95420;
-
-// Yellows
-$yellow: #f99b11;
-
-// Greens
-$green: #0e8420;
-
-// Blues
-$blue: #19B6EE;
-$linkblue: #007aa6;
-$darkblue: #335280;
-
-// Redefine some GNOME colors we are ok with
-$light_1: white;
-$light_2: $porcelain;
-
-$dark_4: lighten($jet, 4%);
-$dark_5: black;
-
-$red_3: $red;
-$red_4: darken($red, 10%);
-
-$green_4: lighten($green, 5%);
-$green_5: darken($green, 5%);
-
-$yellow_4: darken($yellow, 1%);
-$yellow_5: $yellow;
diff --git a/gnome-shell/src/gnome-shell-sass/_palette.scss b/gnome-shell/src/gnome-shell-sass/_palette.scss
new file mode 120000
index 0000000000..622449f683
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/_palette.scss
@@ -0,0 +1 @@
+../../upstream/theme/gnome-shell-sass/_palette.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/_tweaks.scss b/gnome-shell/src/gnome-shell-sass/_tweaks.scss
new file mode 100644
index 0000000000..52b3849d0f
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/_tweaks.scss
@@ -0,0 +1,160 @@
+/* Yaru Tweaks for GNOME Shell
+ *
+ * This file contains minimal style overrides to the upstream GNOME Shell theme.
+ */
+
+// ============================================================================
+// Typography Overrides
+// ============================================================================
+// Custom font weight definitions for titles and headings
+// Adjust these values as needed for Yaru's referencing the weights from Vanilla Framework
+
+%large_title {
+ font-weight: 300;
+ @include fontsize(24pt);
+}
+
+%title_1 {
+ font-weight: 650;
+ @include fontsize(20pt);
+}
+
+%title_2 {
+ font-weight: 650;
+ @include fontsize(15pt);
+}
+
+%title_3 {
+ font-weight: 550;
+ @include fontsize(15pt);
+}
+
+%title_4 {
+ font-weight: 550;
+ @include fontsize(13pt);
+}
+
+%heading {
+ font-weight: 550;
+ @include fontsize(11pt);
+}
+
+%caption_heading {
+ font-weight: 550;
+ @include fontsize(9pt);
+}
+
+%caption {
+ font-weight: 400;
+ @include fontsize(9pt);
+}
+
+%smaller {
+ font-weight: 400;
+ @include fontsize(9pt);
+}
+// ============================================================================
+// Looking Glass Tweaks
+// ============================================================================
+// Looking Glass dialog - ensure it's always dark with good contrast
+#LookingGlassDialog {
+ background-color: rgba(34, 34, 38, 0.98) !important;
+ color: $light_1 !important;
+ border-radius: 12px;
+
+ StLabel {
+ color: $light_1 !important;
+ }
+
+ StEntry {
+ color: $light_1 !important;
+ background-color: rgba(255, 255, 255, 0.1) !important;
+ }
+}
+
+// ============================================================================
+// Panel Tweaks
+// ============================================================================
+// Always use dark panel appearance with white text (even in light theme)
+// This provides better visual hierarchy and modern look
+
+// Panel - dark background in all modes (desktop and overview)
+#panel {
+ background-color: $dark_5 !important;
+
+ // Keep panel dark in overview too
+ &:overview {
+ background-color: $dark_5 !important;
+ }
+
+ // Override all panel button styling to use white text and normal font weight
+ // This needs to be specific enough to override the panel_button mixin
+ .panel-button {
+ font-weight: normal !important;
+ color: $light_1 !important;
+
+ // All text and icons should be white
+ StIcon,
+ StLabel {
+ color: $light_1 !important;
+ }
+
+ // Activities button workspace dots should be white
+ &#panelActivities .workspace-dot {
+ background-color: $light_1 !important;
+ }
+ }
+
+ // Override overview-specific panel button colors
+ &:overview .panel-button {
+ color: $light_1 !important;
+
+ StIcon,
+ StLabel {
+ color: $light_1 !important;
+ }
+
+ // Activities button workspace dots in overview should also be white
+ &#panelActivities .workspace-dot {
+ background-color: $light_1 !important;
+ }
+ }
+
+ // Ensure system status indicators are white
+ .system-status-icon {
+ color: $light_1 !important;
+ }
+}
+
+// Lockscreen/login screen - transparent panel (override the above)
+// This must come AFTER the main panel rule to override it
+#panel.unlock-screen,
+#panel.login-screen {
+ background-color: transparent !important;
+}
+
+// ============================================================================
+// Lockscreen Tweaks
+// ============================================================================
+
+// Lockscreen clock - use normal font weight for all text
+// Apply to parent to override all children
+.unlock-dialog-clock {
+ font-weight: normal !important;
+
+ .unlock-dialog-clock-time,
+ .unlock-dialog-clock-date,
+ .unlock-dialog-clock-hint {
+ font-weight: normal !important;
+ }
+}
+
+// Also override the placeholder that includes these elements
+.unlock-dialog-clock .unlock-dialog-clock-date {
+ font-weight: normal !important;
+}
+
+// Lockscreen notification counter - use normal font weight
+.unlock-dialog-notification-count-text {
+ font-weight: normal !important;
+}
diff --git a/gnome-shell/src/gnome-shell-sass/_widgets.scss b/gnome-shell/src/gnome-shell-sass/_widgets.scss
deleted file mode 100644
index 20de2ed083..0000000000
--- a/gnome-shell/src/gnome-shell-sass/_widgets.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Shell widgets stylesheets are placed in separate .scss files
-// in 'widgets' and imported into the main stylesheet in this file.
-// To create or update a widget for the shell modify the list below.
-//
-
-/* WIDGETS */
-
-// Primary widgets
-@import 'widgets/base';
-@import 'widgets/entries';
-@import 'widgets/buttons';
-@import 'widgets/check-box';
-@import 'widgets/switches';
-@import 'widgets/slider';
-@import 'widgets/scrollbars';
-// Popovers
-@import 'widgets/popovers';
-@import 'widgets/calendar';
-@import 'widgets/message-list';
-@import 'widgets/ibus-popup';
-// Notifications
-@import 'widgets/notifications';
-// Dialogs
-@import 'widgets/dialogs';
-// OSDs
-@import 'widgets/osd';
-@import 'widgets/switcher-popup';
-@import 'widgets/workspace-switcher';
-@import 'widgets/screenshot';
-// Panel
-@import 'widgets/panel';
-@import 'widgets/corner-ripple';
-@import 'widgets/quick-settings';
-// Overview
-@import 'widgets/overview';
-@import 'widgets/window-picker';
-@import 'widgets/search-entry';
-@import 'widgets/search-results';
-@import 'widgets/dash';
-@import 'widgets/app-grid';
-@import 'widgets/workspace-thumbnails';
-// A11y / misc
-@import 'widgets/a11y';
-@import 'widgets/misc';
-@import 'widgets/keyboard';
-@import 'widgets/looking-glass';
-// Lock / login screen
-@import 'widgets/login-lock';
-
-// Yaru change: make font normal here to have less diff in the widgets
-* {
- font-weight: normal !important;
- text-shadow: none !important;
-}
-
-// gnome-shell-extension-desktop-icons styling
-.file-item {
- border-radius: $base_border_radius;
-}
diff --git a/gnome-shell/src/gnome-shell-sass/_widgets.scss b/gnome-shell/src/gnome-shell-sass/_widgets.scss
new file mode 120000
index 0000000000..29265980de
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/_widgets.scss
@@ -0,0 +1 @@
+../../upstream/theme/gnome-shell-sass/_widgets.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/_yaru-colors.scss b/gnome-shell/src/gnome-shell-sass/_yaru-colors.scss
deleted file mode 100644
index 3a6b3100f9..0000000000
--- a/gnome-shell/src/gnome-shell-sass/_yaru-colors.scss
+++ /dev/null
@@ -1,61 +0,0 @@
-@import 'sass-utils';
-
-// Yaru custom definitions
-$base_hover_color: transparentize(white, 0.8);
-$base_active_color: transparentize(white, 0.75);
-
-$active_bg_color: transparentize($fg_color, 0.8);
-$active_fg_color: darken($fg_color, if($variant=='light', 5%, 3%));
-
-$panel_bg_color: darken($jet, 2%);
-$panel_fg_color: darken($porcelain, 2%);
-
-$panel-alpha-value: 0.6;
-$panel_opaque_value: 0.0;
-
-$dash_background_color: lighten($jet, 2%);
-$dash-alpha-value: 0.6;
-$dash-opaque-alpha-value: 0.0;
-
-$suggested_bg_color: if($variant=='light', lighten($green, 5%), darken($green, 5%));
-$suggested_border_color: if($variant=='light', darken($suggested_bg_color, 5%), darken($suggested_bg_color, 10%));
-
-$alt_borders_color: if($variant=='light', darken($bg_color, 24%), darken($bg_color, 10%));
-
-$system_borders_color: $yaru_borders_color_dark; // Yaru: use our definition
-$system_overlay_bg_color: $dash_background_color; // Yaru - Use system bg color for overlay items
-
-// card elements
-$card_bg_color: if($variant =='light', $light_1, lighten($bg_color, 7%));
-$card_shadow_color: if($variant =='light', transparentize($inkstone, .97), transparent);
-$card_shadow_border_color: if($variant =='light', transparentize($inkstone, .91), transparent);
-
-// Yaru overrides for osd colors
-$osd_fg_color: #eeeeec;
-$osd_bg_color: transparentize(lighten($jet, 2%), 0.025);
-$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
-$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
-$osd_borders_color: transparentize(black, 0.3);
-$osd_outer_borders_color: transparentize(white, 0.84);
-
-// Overrides defaults for contrast optimized ones.
-
-// colors for destructive elements
-$destructive_bg_color: optimize-contrast($destructive_fg_color, $red, $target: 5.5);
-$destructive_color: optimize-contrast($bg_color, $red, $target: 6.0);
-
-// colors for levelbars, entries, labels and infobars
-$success_bg_color: optimize-contrast($success_fg_color, $green, $target: 5.5);
-$success_color: optimize-contrast($bg_color, $green, $target: 6.0);
-
-$warning_bg_color: optimize-contrast($warning_fg_color, $yellow, $target: 5.5);
-$warning_color: optimize-contrast($bg_color, $yellow, $target: 6.0);
-$warning_fg_color: optimize-contrast($warning_bg_color,
- composite($warning_bg_color, $warning_fg_color), $target: 5.5);
-
-$warning_caption_bg_color: composite($bg_color, transparentize($warning_color, 0.9));
-$warning_caption_color: optimize-contrast($warning_caption_bg_color,
- $warning_color, $target: 6.0);
-
-$error_bg_color: optimize-contrast($error_fg_color, $red, $target: 5.5);
-$error_color: optimize-contrast($bg_color, $red, $target: 6.0);
diff --git a/gnome-shell/src/gnome-shell-sass/_yaru-default-colors.scss b/gnome-shell/src/gnome-shell-sass/_yaru-default-colors.scss
deleted file mode 100644
index bd8e16f72e..0000000000
--- a/gnome-shell/src/gnome-shell-sass/_yaru-default-colors.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-// override base colors
-$_base_color_dark: lighten($jet, 4%); // Yaru: use our colors
-$_base_color_light: $light_1; // Yaru: use our colors
-
-// Used for dash and other dark elements on light theme
-$yaru_borders_color_dark: lighten(desaturate(lighten($jet, 4%), 100%), 14%);
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_a11y.scss b/gnome-shell/src/gnome-shell-sass/widgets/_a11y.scss
deleted file mode 100644
index 0bbf185b6a..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_a11y.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-// Pointer location
-.ripple-pointer-location {
- width: $ripple_size;
- height: $ripple_size;
- border-radius: $ripple_size * 0.5; // radius equals the size of the box to give us the curve
- background-color: st-lighten(st-transparentize(-st-accent-color, 0.7), 30%);
- box-shadow: 0 0 2px 2px st-lighten(-st-accent-color, 20%);
-}
-
-// Pointer accessibility notifications
-.pie-timer {
- width: 60px;
- height: 60px;
- -pie-border-width: 3px;
- -pie-border-color: -st-accent-color;
- -pie-background-color: st-lighten(st-transparentize(-st-accent-color, 0.7), 40%);
-}
-
-// Screen zoom/Magnifier
-.magnifier-zoom-region {
- border: 2px solid -st-accent-color;
-
- &.full-screen { border-width: 0; }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_a11y.scss b/gnome-shell/src/gnome-shell-sass/widgets/_a11y.scss
new file mode 120000
index 0000000000..0b9d6b25cf
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_a11y.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_a11y.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_app-grid.scss b/gnome-shell/src/gnome-shell-sass/widgets/_app-grid.scss
deleted file mode 100644
index 07ee24afe7..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_app-grid.scss
+++ /dev/null
@@ -1,188 +0,0 @@
-/* App Grid */
-
-$app_icon_size: 96px;
-$app_folder_size: 720px;
-
-// app icons
-.icon-grid {
- row-spacing: $base_padding * 2;
- column-spacing: $base_padding * 2;
- max-row-spacing: $base_padding * 6;
- max-column-spacing: $base_padding * 6;
- page-padding-top: $base_padding * 4;
- page-padding-bottom: $base_padding * 4;
- page-padding-left: $base_padding * 3;
- page-padding-right: $base_padding * 3;
-}
-
-/* App Icons */
-
-// items in the app grid and dash
-.overview-tile {
- @include tile_button($bg:$system_base_color);
-
- // override the %tile style
- border-radius: $base_border_radius*3;
- padding: $base_padding * 2;
-
- // the icon itself
- .overview-icon {
- // item with a label
- &.overview-icon-with-label {
- > StBoxLayout {
- spacing: $base_padding;
- }
- }
- }
-}
-
-// app folders
-.app-folder {
- @include tile_button($bg:$system_base_color, $raised: true);
-}
-
-// Running app indicator (also shown in dash)
-.app-grid-running-dot {
- height: 5px;
- width: 5px;
- border-radius:5px;
- background-color: $system_fg_color;
- offset-y: 6px;
-}
-
-.app-folder-dialog-container {
- // pad the top with panel height so the folder doesn't overlap the panel on smaller resolutions
- padding-top: $panel_height;
-}
-
-// Expanded app folder dialog
-.app-folder-dialog {
- width: $app_folder_size;
- height: $app_folder_size;
-
- border-radius: $modal_radius * 4;
- background-color: $system_overlay_bg_color;
- color: $system_fg_color;
-
- @if $contrast == 'high' {
- // Yaru: use border instead
- // padding: 0 2px;
- // box-shadow: inset 0 0 0 2px $hc_inset_color;
- border: 2px solid $system_borders_color; // Yaru: add border instead
- } @else {
- // Yaru: use border instead
- // padding: 0 1px;
- // box-shadow: inset 0 0 0 1px $system_borders_color;
- border: 1px solid $system_borders_color; // Yaru: add border instead
- }
-
- & .folder-name-container {
- padding: $base_padding * 4 $base_padding * 6;
- padding-bottom: 0;
-
- & .folder-name-label,
- & .folder-name-entry {
- @extend %title_1;
- }
- & .folder-name-entry {
- @extend %system_entry;
- width: 12em;
- }
- }
-
- & .icon-button {
- @include button(normal, $tc:$system_fg_color, $c:$system_overlay_bg_color, $always_dark: true);
- &:hover { @include button(hover, $tc:$system_fg_color, $c:$system_overlay_bg_color, $always_dark: true);}
- &:active { @include button(active, $tc:$system_fg_color, $c:$system_overlay_bg_color, $always_dark: true);}
- }
-
- & .page-indicators {
- margin-bottom: $base_padding * 4;
- }
-
- & .page-navigation-arrow {
- @include button(normal, $tc:$system_fg_color, $c:$system_overlay_bg_color, $style: flat, $always_dark: true);
- &:hover { @include button(hover, $tc:$system_fg_color, $c:$system_overlay_bg_color, $style: flat, $always_dark: true);}
- &:active { @include button(active, $tc:$system_fg_color, $c:$system_overlay_bg_color, $style: flat, $always_dark: true);}
- }
-
- & .overview-tile {
- @include tile_button($bg:$system_overlay_bg_color);
- }
-}
-
-// Rename popup for app folders
-.rename-folder-popup {
- .rename-folder-popup-item {
- spacing: $base_padding;
- &:ltr, &:rtl { padding: 0 $base_padding * 2; }
- }
-}
-
-// App Grid pagination indicators
-$page_indicator_size: 10px;
-.page-indicator {
- padding: $base_padding $base_padding * 2 0;
- transition-duration:400ms;
-
- .page-indicator-icon {
- width: $page_indicator_size;
- height: $page_indicator_size;
- border-radius: $forced_circular_radius;
- background-color: $system_fg_color;
- transition-duration: 400ms;
- }
-}
-
-.apps-scroll-view {
- padding: 0;
-}
-
-// shutdown and other actions in the grid
-.system-action-icon {
- background-color: transparentize($system_fg_color,.9);
- color: $system_fg_color;
- border-radius: $forced_circular_radius;
- icon-size: $app_icon_size * 0.5;
- @if $contrast == 'high' {
- box-shadow: inset 0 0 0 2px $hc_inset_color;
- }
-}
-
-// page navigation
-.page-navigation-hint {
- &.dnd {
- background: rgba(255, 255, 255, 0.1);
- }
-
- &.next:ltr,
- &.previous:rtl {
- background-gradient-start: rgba(255, 255, 255, 0.05);
- background-gradient-end: transparent;
- background-gradient-direction: horizontal;
- border-radius: $modal_radius * 1.5 0px 0px $modal_radius * 1.5;
- }
-
- &.previous:ltr,
- &.next:rtl {
- background-gradient-start: transparent;
- background-gradient-end: rgba(255, 255, 255, 0.05);
- background-gradient-direction: horizontal;
- border-radius: 0px $modal_radius * 1.5 $modal_radius * 1.5 0px;
- }
-}
-
-.page-navigation-arrow {
- margin: $base_padding;
- padding: $base_padding * 3;
- width: $medium_icon_size;
- height: $medium_icon_size;
- border-radius: $forced_circular_radius;
- transition-duration: 100ms;
-
- > StIcon { color: $system_fg_color;}
-
- @include button(normal, $tc:$system_fg_color, $c:$system_base_color, $style: flat, $always_dark: true);
- &:hover { @include button(hover, $tc:$system_fg_color, $c:$system_base_color, $style: flat, $always_dark: true);}
- &:active { @include button(active, $tc:$system_fg_color, $c:$system_base_color, $style: flat, $always_dark: true);}
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_app-grid.scss b/gnome-shell/src/gnome-shell-sass/widgets/_app-grid.scss
new file mode 120000
index 0000000000..100e3bddc3
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_app-grid.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_app-grid.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_base.scss b/gnome-shell/src/gnome-shell-sass/widgets/_base.scss
deleted file mode 100644
index 0a9618d300..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_base.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-// Links
-.shell-link {
- color: $link_color;
-
- &:hover {
- color: st-lighten($link_color, 10%);
- }
-}
-
-// Outline for low res icons
-.lowres-icon {
- icon-shadow: 0 1px 2px rgba(black, 0.2);
-}
-
-// Dropshadow for large icons
-.icon-dropshadow {
- icon-shadow: 0 2px 4px rgba(black, 0.4);
-
- @if $contrast == 'high' {
- icon-shadow: none;
- }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_base.scss b/gnome-shell/src/gnome-shell-sass/widgets/_base.scss
new file mode 120000
index 0000000000..ab1888c429
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_base.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_base.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_buttons.scss b/gnome-shell/src/gnome-shell-sass/widgets/_buttons.scss
deleted file mode 100644
index 60fa4d8db4..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_buttons.scss
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Buttons */
-
-.button {
- @extend %button;
- // uses scalable value since it's a text element
- min-height: to_em(22px);
-
- // default style
- &.default {
- @extend %default_button;
- }
- // flat style
- &.flat {
- @extend %flat_button;
- }
-}
-
-.icon-button {
- @extend %button;
-
- border-radius: $forced_circular_radius; // is circular
- padding: $scaled_padding * 2;
- min-height: $scalable_icon_size;
-
- StIcon {
- icon-size: $scalable_icon_size;
- -st-icon-style: symbolic;
- }
-
- // default style
- &.default {
- @extend %default_button;
- }
-
- // flat style
- &.flat {
- @extend %flat_button;
- }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_buttons.scss b/gnome-shell/src/gnome-shell-sass/widgets/_buttons.scss
new file mode 120000
index 0000000000..c57e2982d2
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_buttons.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_buttons.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_calendar.scss b/gnome-shell/src/gnome-shell-sass/widgets/_calendar.scss
deleted file mode 100644
index 87ae8bde40..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_calendar.scss
+++ /dev/null
@@ -1,293 +0,0 @@
-/* Date/Time Menu */
-
-// overall menu
-#calendarArea {
- padding: $base_margin;
-}
-
-.datemenu-popover {
- border-radius: $base_border_radius * 1.5 + $base_padding * 3;
- border-radius: $yaru_menu_border_radius;
-}
-
-// calendar menu side column
-.datemenu-calendar-column {
- spacing: $base_padding;
- &:ltr { margin-left: $base_padding;}
- &:rtl { margin-right: $base_padding;}
- .datemenu-displays-box {
- spacing: $base_padding;
- }
-}
-
-// today button (the date)
-.datemenu-today-button {
- @extend %card_flat;
- padding: $base_padding * 1.5;
-
- // weekday label
- .day-label {
- font-weight: bold;
- }
-
- // date label
- .date-label {
- @extend %title_2;
- }
-
- &:insensitive { // Yaru change: fix insensitive state in light theme
- .day-label, .date-label {
- color: $insensitive_fg_color;
- }
- }
-}
-
-// the mini calendar
-.calendar {
- @extend %card_flat;
- margin-top: 0;
- padding: 0;
-
- // month header
- .calendar-month-header {
-
- // prev/next month icons
- .calendar-change-month-back StIcon,
- .calendar-change-month-forward StIcon {
- icon-size: $scalable_icon_size;
- }
-
- // month label
- .calendar-month-label {
- @extend %heading;
- @extend %flat_button;
- color: $fg_color !important;
- padding: 8px 0;
- width: 10em;
- border-radius: $forced_circular_radius;
- text-align: center;
- }
-
- .pager-button {
- @extend .icon-button, .flat;
- height: 2.6em;
- width: 2.6em;
- padding: 0;
- }
- }
-
- // day style
- .calendar-day {
- @extend %numeric;
- @extend %smaller;
- @extend %flat_button;
- border-radius: $forced_circular_radius;
- height: 3em;
- width: 3em;
- margin: 2px;
- padding: 0;
- font-weight: bold;
- text-align: center;
-
- &.calendar-weekday {}
-
- &.calendar-weekend {
- color: $insensitive_fg_color;
- @if $contrast == 'high' {
- font-style: italic;
- }
- }
-
- &.calendar-other-month {
- color: transparentize($fg_color, 0.5);
- font-weight: normal;
-
- &.calendar-weekend {
- color: transparentize($fg_color, 0.5);
- @if $contrast == 'high' {
- color: $fg_color;
- }
- }
-
- @if $contrast == 'high' {
- color: $fg_color;
- font-style: italic; // differentiate with a font-style instead of text color
- }
- }
-
- &.calendar-today {
- @extend %default_button;
- // override colors above for when today is a weekend
- color: -st-accent-fg-color !important;
- &.calendar-day-with-events {
- background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg") !important; // always use light asset with .default style
- }
- }
-
- &.calendar-day-with-events {
- background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/calendar-today-light.svg"),url("resource:///org/gnome/shell/theme/calendar-today.svg"));
- background-size: contain;
- }
- }
-
- // day of week heading
- .calendar-day-heading {
- @extend %numeric;
- @extend %smaller;
- @extend %flat_button;
- font-weight: bold;
- text-align: center;
- margin: $base_margin;
- padding: $base_padding * 0.5 $base_padding;
- border-radius: $base_border_radius;
- }
-
- // week number style
- .calendar-week-number {
- @extend %smaller;
- font-weight: bold;
- font-feature-settings: "tnum";
- text-align: center;
- margin: $base_padding;
- padding: 0 $base_padding;
- border-radius: $base_border_radius * 0.5;
- background-color: transparentize($insensitive_fg_color, .8);
- color: $insensitive_fg_color;
- }
-}
-
-// common style for the date menu widgets
-.events-button,
-.world-clocks-button,
-.weather-button {
- @extend %card;
-}
-
-// events
-.events-button {
-
- .events-box {
-
- // event title
- .events-title {
- @extend %heading;
- color: $insensitive_fg_color;
- padding-bottom: $base_padding;
- }
-
- // list of events
- .events-list {
- spacing: $base_padding;
-
- // container for an event
- .event-box {
- spacing: $base_padding;
- border-radius: $base_border_radius;
-
- .event-summary {
- @extend %heading;
- }
-
- .event-time {
- @extend %numeric;
- @extend %caption;
- color: $insensitive_fg_color;
- }
- }
-
- .event-placeholder {
- color: $insensitive_fg_color;
- font-style: italic;
- }
- }
- }
-}
-
-// world clocks
-.world-clocks-button {
-
- // title
- .world-clocks-header {
- @extend %heading;
- color: $insensitive_fg_color;
-
- // change style when no world clocks are configured
- &.no-world-clocks {
- color: $fg_color;
- }
- }
-
- // clocks
- .world-clocks-grid {
- spacing-rows: $base_padding;
- spacing-columns: $base_padding * 2;
-
- // city label
- .world-clocks-city {
- }
-
- // timezone time
- .world-clocks-time {
- @extend %numeric;
- font-weight: bold;
-
- &:ltr {text-align: right;}
- &:rtl {text-align: left;}
- }
-
- // timezone offset label
- .world-clocks-timezone {
- @extend %numeric;
- @extend %caption;
- color: $insensitive_fg_color;
- }
- }
-}
-
-// weather
-.weather-button {
-
- .weather-box {
- spacing: $base_padding;
-
- // header
- .weather-header-box {
- spacing: $base_padding;
-
- .weather-header {
- @extend %heading;
- color: $insensitive_fg_color;
-
- // change style when no location is configured
- &.no-location {
- color: $fg_color;
- }
-
- &.location {
- font-weight: normal;
- }
- }
- }
-
- // weather items
- .weather-grid {
- spacing-rows: $base_padding;
- spacing-columns: $base_padding * 2;
-
- .weather-forecast-time {
- @extend %smaller;
- padding-top: $base_padding;
- padding-bottom: $base_padding;
- }
- .weather-forecast-icon {
- icon-size: $large_scalable_icon_size;
- margin-bottom: $base_margin;
- }
-
- .weather-forecast-temp {
- @extend %numeric;
- font-weight: bold;
- }
- }
- }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_calendar.scss b/gnome-shell/src/gnome-shell-sass/widgets/_calendar.scss
new file mode 120000
index 0000000000..e424ca796d
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_calendar.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_calendar.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_check-box.scss b/gnome-shell/src/gnome-shell-sass/widgets/_check-box.scss
deleted file mode 100644
index 956a59ee52..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_check-box.scss
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Check Boxes */
-
-.check-box {
- StBoxLayout { spacing: .8em; }
-
- StBin {
- border-radius: 7px;
- padding: 2px;
- }
-
- &:focus StBin {
- // Trick due to St limitations. It needs a background to draw a box-shadow
- background-color: rgba(0, 0, 0, 0.01);
- box-shadow: inset 0 0 0 2px st-transparentize(-st-accent-color, .65);
- }
-
- StIcon {
- icon-size: 14px;
- padding: 1px;
-
- color: transparent;
- border-radius: 6px;
- border: 2px solid transparentize(if($variant == 'light', black, white), .85);
- }
-
- &:hover StIcon {
- border-color: transparentize(if($variant == 'light', black, white), .8);
- }
-
- &:active StIcon {
- border-color: transparentize(if($variant == 'light', black, white), .7);
- }
-
- &:checked StIcon {
- background-color: -st-accent-color;
- color: -st-accent-fg-color;
- border-color: transparent;
- }
-
- &:checked:hover StIcon {
- background-color: st-lighten(-st-accent-color, 5%);
- color: st-lighten(-st-accent-fg-color, 5%);
- }
-
- &:checked:active StIcon {
- background-color: st-darken(-st-accent-color, 7%);
- color: st-darken(-st-accent-fg-color, 7%);
- }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_check-box.scss b/gnome-shell/src/gnome-shell-sass/widgets/_check-box.scss
new file mode 120000
index 0000000000..edc80a0931
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_check-box.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_check-box.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_corner-ripple.scss b/gnome-shell/src/gnome-shell-sass/widgets/_corner-ripple.scss
deleted file mode 100644
index 9aff43174f..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_corner-ripple.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Activities Ripple */
-
-$ripple_size: 50px;
-
-.ripple-box {
- background-color: rgba(255,255,255,0.2);
- box-shadow: 0 0 2px 2px rgba(255,255,255,0.2);
- // plus + 2px for the border (box-shadow)
- width: $ripple_size + 2px;
- height: $ripple_size + 2px;
- border-radius: 0 0 $ripple_size + 2px 0; // radius equals the size of the box to give us the curve
-
- // just a simple change to the border radius position
- &:rtl { border-radius: 0 0 0 $ripple_size + 2px; }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_corner-ripple.scss b/gnome-shell/src/gnome-shell-sass/widgets/_corner-ripple.scss
new file mode 120000
index 0000000000..7980065887
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_corner-ripple.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_corner-ripple.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_dash.scss b/gnome-shell/src/gnome-shell-sass/widgets/_dash.scss
deleted file mode 100644
index e66a900f1c..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_dash.scss
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Dash */
-
-// uses system colors
-$dash_background_color: $system_overlay_bg_color;
-
-$dash_placeholder_size: 32px;
-$dash_padding: $base_padding * 2;
-$dash_edge_offset: $base_margin * 3;
-$dash_border_radius: $modal_radius + $dash_padding;
-$dash_spacing: $base_margin * 0.5;
-
-// container for the dash
-#dash {
- // a bit of spacing so that dash doesn't touch the screen edges
- padding-left: $base_padding;
- padding-right: $base_padding;
-
- // background behind item container
- .dash-background {
- background-color: $dash_background_color;
- border-radius: $dash_border_radius;
- padding-top: $dash_padding;
- padding-bottom: $dash_padding;
- padding-left: $dash_padding - $dash_spacing; // subtract the margins added to .overview-tile below
- padding-right: $dash_padding - $dash_spacing;
- border: 1px solid $system_borders_color; // Yaru: add border
-
- @if $contrast == 'high' {
- @include draw_hc_inset($width: 2px);
- }
- }
-
- // items on the dash
- .dash-item-container {
-
- .placeholder {
- // background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
- background-image: none;
- background-size: contain;
- height: $dash_placeholder_size;
- }
-
- .empty-dash-drop-target {
- width: $dash_placeholder_size;
- height: $dash_placeholder_size;
- }
-
- // IMPORTANT: items on the dash need to extend to the edge to be adequate click targets
- // as such the %tile style is overriden and button styles are applied to the child class .overview-icon
- .show-apps,
- .overview-tile {
- // remove styles
- @extend %reset;
-
- margin: 0 $dash_spacing;
- padding-bottom: $dash_edge_offset; // align with other items
-
- $fg:$system_fg_color;
- $bg:$dash_background_color;
-
- .overview-icon {
- @extend %tile;
- @include button(normal, $tc:$fg, $c:$bg, $style: flat, $always_dark: true);
- }
-
- &:focus .overview-icon { @include button(focus, $tc:$fg, $c:$bg, $style: flat, $always_dark: true);}
- &:hover .overview-icon { @include button(hover, $tc:$fg, $c:$bg, $style: flat, $always_dark: true);}
- &:active .overview-icon { @include button(active, $tc:$fg, $c:$bg, $style: flat, $always_dark: true);}
- &:checked .overview-icon { @include button(checked, $tc:$fg, $c:$bg, $style: flat, $always_dark: true);}
- }
-
- // running app dot
- .app-grid-running-dot {
- // manually position the dot within the dash item
- @if $contrast == 'high' {
- offset-y: -$dash_padding - 1px; // don't draw dot directly on inset
- } @else {
- // offset-y: -$dash_padding; // Yaru: we manage this through margin
- }
- margin-bottom: $dash_padding + $dash_edge_offset - 3px; // 3px = size of dot (5px) subtracted from its translationY from appDisplay.js
-
- // margin-bottom: 13px; // hardcoded - Yaru change: move dot a bit down
- background-color: -st-accent-color; // Yaru: we want an accented dot
- }
- }
-
- // separator between pinned and running apps
- .dash-separator {
- width: 1px;
- margin-left:$base_margin;
- margin-right:$base_margin;
- background-color: $system_borders_color;
-
- @if $contrast == 'high' {
- width: 2px;
- background-color: $hc_inset_color;
- }
- }
-
- // make sure all dash components have same margin from screen edge
- .dash-separator,
- .dash-background {
- margin-bottom: $dash_edge_offset;
- }
-}
-
-// OSD Tooltip
-.dash-label {
- @extend %tooltip;
- -y-offset: $base_margin * 2; // distance from the dash edge
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_dash.scss b/gnome-shell/src/gnome-shell-sass/widgets/_dash.scss
new file mode 120000
index 0000000000..cab52eee45
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_dash.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_dash.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_dialogs.scss b/gnome-shell/src/gnome-shell-sass/widgets/_dialogs.scss
deleted file mode 100644
index 7bfcd97cb9..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_dialogs.scss
+++ /dev/null
@@ -1,223 +0,0 @@
-/* Modal Dialogs */
-
-// Yaru Custom Definition
-$dialog_padding: $base_padding * 4 $base_padding * 3 $base_padding * 3 $base_padding * 3;
-
-// Yaru Custom headline
-.headline {
- @extend %title_4;
-}
-
-// style for all dialogs
-.modal-dialog {
- background-color: $bg_color;
- border-radius: $alert_radius;
- padding: $base_padding * 4;
- spacing: $base_padding * 3;
- box-shadow: 0 12px 8px 12px rgba(0,0,0,0.03);
-
- .modal-dialog-content-box {
- padding-top: $base_padding * 2;
- spacing: $base_padding * 3;
- max-width: 28em;
- }
-
- .modal-dialog-button-box {
- padding-top: $base_padding;
- .modal-dialog-button {
- @extend %dialog_button;
- }
- }
-}
-
-// lists in dialogs
-.dialog-list {
- spacing: $base_padding * 3;
-
- .dialog-list-title {
- @extend %heading;
- text-align: center;
- }
-
- .dialog-list-scrollview { max-height: 200px; }
- .dialog-list-box {
- spacing: 1em;
-
- .dialog-list-item {
- spacing: 1em;
-
- .dialog-list-item-title { font-weight: bold; }
- .dialog-list-item-description {
- @extend %caption;
- color: darken($fg_color,5%);
- }
- }
- }
-}
-
-/* End Session Dialog */
-.end-session-dialog {
- width: 24em;
- border-radius: $yaru_menu_border_radius; // Yaru Change: Override default radius
- padding: $base_padding * 3; // Yaru Change: Override default padding
-
- // special style for session warnings
- .end-session-dialog-battery-warning,
- .dialog-list-title {
- // Yaru: use contrast-optimized color.
- color: $warning_caption_color;
- background-color: $warning_caption_bg_color;
- padding: $base_padding * 1.5;
- border-radius: $base_border_radius;
- margin: $base_margin 0;
- }
-}
-
-/* Message Dialog */
-.message-dialog-content {
- spacing: $base_padding * 3;
-
- .message-dialog-title {
- text-align: center;
- @extend %title_2;
-
- &.lightweight {
- @extend %title_4;
- }
- }
- .message-dialog-description {
- text-align: center;
- }
-}
-
-/* Run Dialog */
-.run-dialog {
- padding: $base_padding * 3; // Yaru change: padding match to quick settings
- border-radius: $yaru_menu_border_radius; // Yaru change: match border-radius to quick settings
- width: 24em;
-
- // run dialog needs to override bottom padding
- // to account for inexplicable extra padding
- padding-bottom: $base_padding;
-
- .run-dialog-entry {
- padding: $base_padding * 2 $base_padding * 1.5;
- }
- .run-dialog-description {
- @extend %caption;
- color: darken($fg_color, 20%);
- }
-}
-
-/* Password or Authentication Dialog */
-.prompt-dialog {
- width: 26em; // Yaru Change: Decrease from 28 to 26 em
- padding: $dialog_padding; // Yaru change: padding match to quick settings
- border-radius: $yaru_menu_border_radius; // Yaru change: match border-radius to quick settings
-
- .prompt-dialog-password-grid {
- spacing-rows: $base_margin * 2;
- spacing-columns: $base_margin;
-
- .prompt-dialog-password-entry {
- width: auto;
- // 4px (spacing) + 16px (spinner-width)
- &:ltr { margin-left: $base_margin+$base_icon_size; }
- &:rtl { margin-right: $base_margin+$base_icon_size; }
- }
- }
-
- .prompt-dialog-password-layout {
- spacing: $base_margin * 2;
- }
-
- .prompt-dialog-password-entry {
- width: 20em;
- padding: $base_padding * 2 $base_padding * 1.5;
- }
-
- .prompt-dialog-error-label,
- .prompt-dialog-info-label,
- .prompt-dialog-null-label {
- @extend %caption;
- text-align: center;
- // Yaru: Use uniform aspect on dialog messages.
- // See: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3897
- padding: $base_padding * 1.5;
- border-radius: $base_border_radius;
- margin: $base_margin 0;
- }
-
- .prompt-dialog-error-label {
- // Yaru: use contrast-optimized color.
- color: $warning_caption_color;
- // Yaru: Use uniform aspect on dialog messages.
- // See: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3897
- background-color: $warning_caption_bg_color;
- }
-
- .prompt-dialog-info-label {
- // Yaru: Use uniform aspect on dialog messages.
- // See: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3897
- color: $fg_color;
- background-color: transparentize($fg_color, 0.9);
- }
-}
-
-/* Polkit Dialog */
-.polkit-dialog-user-layout {
- text-align: center;
- spacing: $base_margin * 2;
- margin-bottom: $base_padding;
-
- .polkit-dialog-user-label,
- .polkit-dialog-user-root-label {
- @extend %title_4;
- }
-
- .polkit-dialog-user-root-label {
- color: $warning_color;
- }
-}
-
-/* Audio selection dialog */
-.audio-device-selection-dialog {
- min-width: 24em;
-
- .audio-selection-box {
- spacing: $base_padding * 2;
-
- // styled similar to switcher-popup
- .audio-selection-device {
- @include tile_button($fg:$fg_color, $bg:$bg_color, $system:false);
-
- .audio-selection-device-box {
- padding: $base_padding * 2;
- spacing: $base_padding * 2;
- }
-
- .audio-selection-device-icon {
- icon-size: $base_icon_size * 4;
- }
- }
- }
-}
-
-/* Welcome dialog */
-.welcome-dialog-image {
- background-image: url("resource:///org/gnome/shell/theme/gnome-shell-start.svg");
- background-size: contain;
- /* Reasonable maximum dimensions */
- height: 300px;
- width: 300px;
-}
-
-/* Access portal dialog */
-.access-dialog {
- text-align: center;
-}
-
-// specific label style for restart message
-.restart-message {
- @extend %title_4;
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_dialogs.scss b/gnome-shell/src/gnome-shell-sass/widgets/_dialogs.scss
new file mode 120000
index 0000000000..3297908841
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_dialogs.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_dialogs.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_entries.scss b/gnome-shell/src/gnome-shell-sass/widgets/_entries.scss
deleted file mode 100644
index 41e10f7663..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_entries.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Entries */
-
-StEntry {
- @extend %entry;
-
- StIcon.capslock-warning {
- icon-size: $scalable_icon_size;
- warning-color: $warning_color;
- padding: 0 $base_margin;
- }
-
- StIcon.peek-password {
- icon-size: $scalable_icon_size;
- padding: 0 $base_margin;
- }
-
- StLabel.hint-text {
- margin-left: $base_margin * 0.5;
- }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_entries.scss b/gnome-shell/src/gnome-shell-sass/widgets/_entries.scss
new file mode 120000
index 0000000000..a1356d504c
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_entries.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_entries.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_ibus-popup.scss b/gnome-shell/src/gnome-shell-sass/widgets/_ibus-popup.scss
deleted file mode 100644
index bedc311865..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_ibus-popup.scss
+++ /dev/null
@@ -1,40 +0,0 @@
-// IBus Candidate Popup
-
-.candidate-popup-boxpointer {
- @extend .popup-menu-boxpointer;
-}
-
-.candidate-popup-content {
- padding: $base_padding;
- spacing: $base_padding;
- border-radius: $base_padding * 2;
- @extend .popup-menu-content;
-}
-
-.candidate-index {
- padding: 0;
- padding-right: $base_padding;
- color: $insensitive_fg_color;
-}
-
-.candidate-box {
- padding: $base_padding $base_padding * 2 $base_padding $base_padding * 2;
- border-radius: $base_border_radius;
- &:selected { background-color: -st-accent-color; color: -st-accent-fg-color; }
- &:hover { background-color: $hover_bg_color; color: $hover_fg_color; }
-}
-
-.candidate-page-button-box {
- height: 2em;
- .vertical & { padding-top: $base_padding * 2; }
- .horizontal & { padding-left: $base_padding * 2; }
-}
-
-.candidate-page-button {
- padding: $base_padding;
-
- & StIcon { icon-size: $base_icon_size; }
-}
-
-.candidate-page-button-previous { border-radius: $base_border_radius 0px 0px $base_border_radius; border-right-width: 0;box-shadow: none;}
-.candidate-page-button-next { border-radius: 0px $base_border_radius $base_border_radius 0px;box-shadow: none;}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_ibus-popup.scss b/gnome-shell/src/gnome-shell-sass/widgets/_ibus-popup.scss
new file mode 120000
index 0000000000..1c6c29edfa
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_ibus-popup.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_ibus-popup.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_keyboard.scss b/gnome-shell/src/gnome-shell-sass/widgets/_keyboard.scss
deleted file mode 100644
index 21fa2230ca..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_keyboard.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-/* On-screen Keyboard */
-
-$key_border_radius: to_em($base_border_radius);
-$key_bg_color: darken($osd_fg_color, 70%);
-$default_key_bg_color: if($variant=='light', darken($key_bg_color, 11%), darken($key_bg_color, 10%));
-
-// Yaru: Make keyboard buttons work on both variants
-$key_bg_color: if($variant=='light', darken($bg_color, 9%), $key_bg_color);
-$default_key_bg_color: if($variant=='light', darken($key_bg_color, 13%), $default_key_bg_color);
-
-// draw keys using button function
-#keyboard {
- // background-color: transparentize(if($variant=='light', darken($bg_color, 5%), darken($bg_color, 8%)), 0.1);
- background-color: $osd_bg_color;
- box-shadow: inset 0 1px 0 0 $osd_outer_borders_color;
-
- @if ($variant =='light') {
- // Yaru: light support
- background-color: transparentize(darken($bg_color, 3%), 0.05);
- box-shadow: none;
- }
-
- .page-indicator {
- padding: $base_padding;
-
- .page-indicator-icon {
- width: 8px;
- height: 8px;
-
- @if ($variant =='light') {
- // Yaru: light support
- background-color: $fg_color;
- }
- }
- }
-}
-
-// the container for individual keys
-.key-container {
- padding: $base_margin;
- spacing: $base_margin;
-}
-
-// the keys
-.keyboard-key {
- @include fontsize($base_font_size + 5pt);
- font-weight: bold;
- border-radius: $key_border_radius;
- box-shadow: 0 1px 0 0 $shadow_color;
-
- // Yaru: light support
- $osd_fg_color: if($variant=='light', $fg_color, $osd_fg_color);
-
- @include button(normal, $c:$key_bg_color, $tc:$osd_fg_color);
-
- &:focus { @include button(focus);}
- &:hover { @include button(hover, $c:$key_bg_color, $tc:$osd_fg_color);}
- &:active { @include button(active, $c:$key_bg_color, $tc:$osd_fg_color); }
- &:checked { @include button(checked, $c:$key_bg_color, $tc:$osd_fg_color); }
-
- // non-character keys
- &.default-key {
- @include button(normal, $c:$default_key_bg_color, $tc:$osd_fg_color);
- &:hover { @include button(hover, $c:$default_key_bg_color, $tc:$osd_fg_color);}
- &:active { @include button(active, $c:$default_key_bg_color, $tc:$osd_fg_color);}
- &:checked { @include button(checked, $c:$default_key_bg_color, $tc:$osd_fg_color);}
- border:none;
-
- // keys that may be latched: ctrl/alt/shift
- &:latched {
- background-color: -st-accent-color;
- }
- }
-
- // size of icons on keys
- StIcon { icon-size: $medium_scalable_icon_size; }
-}
-
-// long press on a key popup
-.keyboard-subkeys-boxpointer {
- -arrow-border-radius: $base_border_radius * 2 + $base_padding;
- -arrow-background-color: $osd_bg_color;
- -arrow-border-width: 1px;
- -arrow-border-color: lighten($osd_bg_color, 9%);
- -arrow-base: 20px;
- -arrow-rise: 10px;
- -boxpointer-gap: $base_margin;
-
- @if ($variant =='light') {
- // Yaru: Make keyboard popups work on both variants
- -arrow-background-color: transparentize(darken($bg_color, 5%), 0.05);
- -arrow-border-color: $borders_color;
- }
-
- border-radius: $base_border_radius * 2 + $base_padding;
- box-shadow: 0 0 12px 0 rgba(0,0,0,0.1);
-
- .key-container {
- padding: $base_padding * 2;
- spacing: $base_margin * 2;
- }
-}
-
-// emoji
-.emoji-page {
- .keyboard-key {
- background-color: transparent;
- border: none;
- color: initial;
- }
-}
-
-.emoji-panel {
- .keyboard-key:latched {
- border-color: st-lighten(-st-accent-color, 5%);
- background-color: -st-accent-color;
- }
-}
-
-// suggestions
-.word-suggestions {
- @extend %title_4;
- spacing: 12px;
- min-height: 17pt;
- padding: $base_padding * 2;
-
- // Yaru: light support
- $osd_fg_color: if($variant=='light', $fg_color, $osd_fg_color);
-
- color: $osd_fg_color;
-
- // each suggestion
- StButton {
- margin: 0 3px;
- min-width: 32px;
- border-radius: 4px;
- padding: $base_padding $base_padding * 3;
-
- @include button(undecorated, $c:$key_bg_color, $tc:$osd_fg_color);
-
- &:focus { @include button(focus);}
- &:hover { @include button(hover, $c:$key_bg_color, $tc:$osd_fg_color);}
- &:active { @include button(active, $c:$key_bg_color, $tc:$osd_fg_color); }
- &:checked { @include button(checked, $c:$key_bg_color, $tc:$osd_fg_color); }
- }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_keyboard.scss b/gnome-shell/src/gnome-shell-sass/widgets/_keyboard.scss
new file mode 120000
index 0000000000..6f460e006f
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_keyboard.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_keyboard.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_login-lock.scss b/gnome-shell/src/gnome-shell-sass/widgets/_login-lock.scss
deleted file mode 100644
index 9d8f016e1c..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_login-lock.scss
+++ /dev/null
@@ -1,591 +0,0 @@
-$_gdm_bg: $system_base_color;
-$_gdm_fg: $system_fg_color;
-$_gdm_dialog_width: 25em;
-
-// common style for login and lockscreen
-.login-dialog,
-.unlock-dialog {
- color: $_gdm_fg;
-
- .caps-lock-warning-label,
- .login-dialog-message-warning {
- color: $_gdm_fg;
- }
-
- .login-dialog-prompt-layout {
- width: $_gdm_dialog_width;
- spacing: $base_padding * 1.5;
- }
-}
-
-// GDM Login Dialog
-// uses dark grey system styles
-.login-dialog {
- .login-dialog-prompt-entry {
- @extend %system_entry;
- }
-}
-
-.login-dialog-bottom-button-group {
- padding: 32px;
- spacing: 16px;
-}
-
-// buttons on login screen
-.login-dialog-button {
-
- &.a11y-button,
- &.cancel-button,
- &.switch-user-button,
- &.login-dialog-auth-menu-button,
- &.login-dialog-session-list-button,
- &.web-login-intro-button {
- @extend .icon-button;
- @extend %system_button;
-
- padding: to_em(16px);
- }
-
- &.cancel-button {
- padding: $base_padding * 1.5;
- }
-}
-
-.login-dialog-auth-menu-button-title {
- @include fontsize($base_font_size - 1);
- color: darken($_gdm_fg,40%);
- font-weight: bold;
- padding-top: $base_padding;
- padding-bottom: $base_padding * 2;
- padding-left: $base_padding * 2;
- padding-right: $base_padding * 2;
-}
-
-.login-dialog-auth-menu-button-popup-menu-box {
- padding: $base_padding * 3;
-}
-
-.login-dialog-auth-menu-button-item {
- padding-left: $base_padding * 2;
- padding-right: $base_padding * 2;
-}
-
-.login-dialog-button-box {
- spacing: $base_padding * 2;
-}
-
-.conflicting-session-dialog-content {
- spacing: 20px;
-
- .conflicting-session-dialog-title {
- text-align: center;
- @extend %title_2;
- margin-bottom: 5px;
- }
-
- .conflicting-session-dialog-desc {
- text-align: center;
- }
-
- .conflicting-session-dialog-desc-warning {
- text-align: center;
- // Yaru: use contrast-optimized color.
- color: $warning_caption_color;
- // Yaru: Use uniform aspect on dialog messages.
- // See: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3897
- background-color: $warning_caption_bg_color;
- padding: $base_padding * 1.5;
- border-radius: $base_border_radius;
- margin: $base_margin 0;
- }
-}
-
-.login-dialog-menu-button-box {
- spacing: $base_padding * 2;
- padding-left: $base_padding * 2;
- padding-right: $base_padding * 2;
- padding-bottom: $base_padding * 2;
-}
-
-.login-dialog-logo-bin {
- margin: 3em 0;
-}
-
-.login-dialog-banner-view {
- max-width: $_gdm_dialog_width;
-
- .login-dialog-banner {
- color: darken($_gdm_fg,10%);
- }
-}
-
-.login-dialog-message {
- text-align: center;
-}
-
-.login-dialog-message-hint, .login-dialog-message {
- color: darken($_gdm_fg, 10%);
- min-height: 2.75em;
-}
-
-.login-dialog-user-selection-box {
- // padding to ensure the box doesn't overlap the panel
- padding-top: 4em;
- padding-bottom: 8em;
-}
-
-.login-dialog-not-listed-label {
- @extend %heading;
- padding: $base_padding;
-}
-
-.login-dialog-not-listed-button {
- // use button styling
- @extend %button_common;
- @include button(normal, $tc:$_gdm_fg, $c:$_gdm_bg, $style: flat, $always_dark: true);
- &:focus { @include button(focus, $tc:$_gdm_fg, $c:$_gdm_bg, $style: flat, $always_dark: true);}
- &:hover { @include button(hover, $tc:$_gdm_fg, $c:$_gdm_bg, $style: flat, $always_dark: true);}
- &:active { @include button(active, $tc:$_gdm_fg, $c:$_gdm_bg, $style: flat, $always_dark: true);}
-
- padding: 0 $base_padding;
- margin: $base_padding;
-}
-
-// Authentication methods list
-.login-dialog-auth-list-view {
- -st-vfade-offset: 3em;
-}
-
-.login-dialog-auth-list {
- spacing: $base_padding;
- margin-left: 2em;
-}
-
-.login-dialog-auth-list-title {
- margin-left: 2em;
- padding-bottom: $base_padding;
-}
-
-.login-dialog {
- .login-dialog-auth-list-item {
- @extend %button_common;
- @include button(normal, $tc:$_gdm_fg, $c:$system_base_color, $always_dark: true);
- &:selected,
- &:focus { @include button(focus, $tc:$_gdm_fg, $c:$system_base_color, $always_dark: true);}
- &:hover { @include button(hover, $tc:$_gdm_fg, $c:$system_base_color, $always_dark: true);}
- &:active { @include button(active, $tc:$_gdm_fg, $c:$system_base_color, $always_dark: true);}
-
- border-radius: $modal_radius * 0.6;
- padding: $base_padding * 1.2;
- }
-}
-
-.unlock-dialog {
- .login-dialog-auth-list-item {
- @extend %lockscreen_button;
-
- border-radius: $modal_radius * 0.6;
- padding: $base_padding * 1.2;
- }
-}
-
-.login-dialog-auth-list-item {
- min-width: 300px;
-}
-
-.login-dialog {
- .login-dialog-auth-list-item {
- // Yaru: use button styling
- @extend %button_common;
- @include button(normal, $tc:$_gdm_fg, $c:$system_base_color, $always_dark: true);
- &:selected,
- &:focus { @include button(focus, $tc:$_gdm_fg, $c:$system_base_color, $always_dark: true);}
- &:hover { @include button(hover, $tc:$_gdm_fg, $c:$system_base_color, $always_dark: true);}
- &:active { @include button(active, $tc:$_gdm_fg, $c:$system_base_color, $always_dark: true)};
-
- border-radius: $modal_radius;
- padding: $base_padding * 1.2;
- }
-}
-
-.unlock-dialog {
- // Yaru: use button styling
- .login-dialog-auth-list-item {
- @extend %lockscreen_button;
-
- border-radius: $modal_radius;
- padding: $base_padding * 1.2;
- }
-}
-
-.login-dialog-auth-list-label {
- @extend %title_4;
- &:ltr { padding-left: $base_padding * 2.5; text-align: left; }
- &:rtl { padding-right: $base_padding * 2.5; text-align: right; }
-}
-
-
-// User list
-.login-dialog-user-list-view {
- width: $_gdm_dialog_width;
- -st-vfade-offset: 3em;
-
- .login-dialog-user-list {
- margin: 0 $base_margin * 2; // margin to account for scrollbar
- spacing: $base_padding * 2;
-
- .login-dialog-user-list-item {
- // use button styling
- @extend %button_common;
- @include button(normal, $tc:$_gdm_fg, $c:$system_base_color, $always_dark: true);
- &:selected,
- &:focus { @include button(focus, $tc:$_gdm_fg, $c:$system_base_color, $always_dark: true);}
- &:hover { @include button(hover, $tc:$_gdm_fg, $c:$system_base_color, $always_dark: true);}
- &:active { @include button(active, $tc:$_gdm_fg, $c:$system_base_color, $always_dark: true);}
-
- border-radius: $modal_radius;
- padding: $base_padding * 1.5;
-
- // create border for indicating logged in user
- .user-icon {
- border: 2px solid transparent;
- }
-
- .login-dialog-timed-login-indicator {
- height: 2px;
- margin-top: $base_padding;
- background-color: transparentize($_gdm_fg, .3);
- }
-
- &:logged-in {
- // color border for logged-in user
- .user-icon {
- border-color: -st-accent-color;
- StIcon {
- background-color: st-transparentize(-st-accent-color, .7);
- }
- }
- }
- }
- }
-}
-
-.login-dialog-prompt-layout {
- spacing: $base_padding * 2;
- min-width: 30em;
-}
-
-.login-dialog-prompt-entry {
- @extend %system_entry;
- border-radius: $base_border_radius + 3; // Yaru Change: Match Upstream button radius
-}
-
-.web-login-dialog-content-overlay {
- background-color: transparentize($bg_color, 0.3);
- border-radius: $modal_radius;
- margin-bottom: 3em;
-}
-
-.web-login-spinner {
- color: $osd_fg_color;
- background-color: transparentize($osd_bg_color, 0.5);
- border: 5px transparent;
- border-radius: 50px;
-}
-
-.web-login-title-label {
- @include fontsize($base_font_size);
- color: if($variant =='dark', darken($fg_color, 30%), lighten($fg_color, 20%));
-}
-
-.web-login-url-label {
- @include fontsize($base_font_size);
- @extend %monospace;
- color: $fg_color;
- text-align: center;
-}
-
-.web-login-code-title-label {
- @include fontsize($base_font_size);
- color: $fg_color;
-}
-
-.web-login-code-label {
- @include fontsize($base_font_size);
- color: $fg_color;
- font-weight: bold;
-}
-
-.web-login-prompt {
- padding-top: $base_padding;
- padding-bottom: $base_padding;
- padding-left: $base_padding * 4.5;
- padding-right: $base_padding * 4.5;
- spacing: 1.75em;
- border-radius: $base_border_radius * 2;
-}
-
-.web-login-intro-button-label {
- @include fontsize($base_font_size + 5);
- color: $fg_color;
- height: 3em;
- text-align: center;
- font-weight: bold;
-}
-
-.web-login-intro-button {
- @include fontsize($base_font_size);
- color: $fg_color;
- height: 3em;
- text-align: center;
- border-radius: $base_border_radius * 4;
-}
-
-// Screen Shield
-// a.k.a. the lockscreen, uses transparent styles
-.unlock-dialog {
- background-color: transparent;
-
- .login-dialog-prompt-entry {
- @extend %lockscreen_entry;
- &:focus {
- // Yaru change: remove focus border
- box-shadow: none !important;
- }
- }
-
- .button,
- .icon-button {
- @extend %lockscreen_button;
- }
-}
-
-.screen-shield-background { // just the shadow, really
- background: black;
- box-shadow: 0 2px 4px rgba(0,0,0,0.6);
-}
-
-#lockDialogGroup {
- background-color: $_gdm_bg;
-}
-
-// Clock
-.unlock-dialog-clock {
- color: $_gdm_fg;
- spacing: 2em;
-
- .unlock-dialog-clock-time {
- @extend %numeric;
- @include fontsize(72pt);
- font-weight: 800;
- }
-
- .unlock-dialog-clock-date {
- @extend %title_1;
- font-weight: 400;
- }
-
- .unlock-dialog-clock-hint {
- margin-top: 2em;
- padding: $base_padding $base_padding * 3;
- border-radius: $base_border_radius * 2;
- font-weight: bold;
- }
-}
-
-// Notifications
-#unlockDialogNotifications {
- > .vhandle, > .hhandle {
- background-color: transparentize($bg_color,0.7);
- &:hover, &:focus { background-color: transparentize($bg_color,0.5); }
- &:active { background-color: st-transparentize(-st-accent-color,0.5); }
- }
-}
-
-.unlock-dialog-notifications-container {
- margin: $base_margin * 3;
- spacing: $base_padding;
- width: $_gdm_dialog_width;
- background-color: transparent;
-
- .summary-notification-stack-scrollview {
- padding-top: 0;
- padding-bottom: 0;
- }
-
- .message,
- .unlock-dialog-notification-source {
- padding: $base_margin * 3 $base_margin * 4;
- border: none;
- background-color: transparentize($_gdm_fg,0.9);
- color: $_gdm_fg;
- border-radius: $modal_radius;
-
- &.critical { background-color: transparentize($_gdm_fg,0.8) }
- &:active { background-color: transparentize($_gdm_fg,0.9); }
-
- & StButton {
- @extend %lockscreen_button;
- background-color: transparent;
- &:insensitive { background-color: transparent; opacity: 0.5; }
- }
- .message-header {
- color: $_gdm_fg;
- }
- }
-}
-
-.unlock-dialog-notification-icon {
- icon-size: $large_icon_size;
-}
-
-.unlock-dialog-notification-label {
- padding-left: $base_padding * 2;
- padding-right: 0;
- &:rtl { padding-right: $base_padding * 2; padding-left: 0; }
-}
-
-.unlock-dialog-notification-count-text {
- font-weight: bold;
- padding: 0 $base_padding * 2;
- color: $_gdm_fg;
- background-color: transparentize($_gdm_fg, .9);
- border-radius: $forced_circular_radius;
-}
-
-.login-dialog,
-.unlock-dialog {
-
- // User Widget
- .user-widget {
-
- // common
- .user-widget-label {
- color: $_gdm_fg;
- }
-
- .user-icon {
- background-color: transparentize($_gdm_fg, .87);
- color: $_gdm_fg;
-
- @if $contrast == 'high' {
- background-color: transparentize($_gdm_fg, .7);
- box-shadow:inset 0 0 0 1px $hc_inset_color;
- }
- }
-
- // layout of the user list
- &.horizontal {
- spacing: $base_padding * 3;
- .user-widget-label {
- @extend %title_3;
- }
- }
-
- // layout of the login prompt
- &.vertical {
- spacing: $base_padding * 4;
-
- .user-widget-label {
- font-weight: 400;
- @include fontsize(20pt);
- text-align: center;
- margin-bottom: .75em;
- }
-
- .user-icon {
- icon-size: $base_icon_size * 10;
-
- & StIcon {
- padding: $base_padding * 5;
- color: $_gdm_fg; // Yaru change: dark/light theme support
- }
- }
- }
- }
-}
-
-// Login Failed banner
-.auth-notification-banner {
- .message-header {
- width: 0px;
- height: 0px;
-
- .message-close-button {
- border: none;
- background-color: rgba(0, 0, 0, 0.0);
- }
- }
-}
-
-// QR Code
-.qr-code {
- @if ($variant == 'light') {
- $qrcode_bg_color: mix($fg_color, $bg_color, 8%);
- background-color: $qrcode_bg_color;
- border-color: $qrcode_bg_color;
- color: $fg_color;
- } @else {
- background-color: $_gdm_fg;
- border-color: $_gdm_fg;
- color: $_gdm_bg;
- }
- border-radius: $base_border_radius * .5;
- border-width: 1em;
-}
-
-// Yaru change: style login dialog entry in dark theme
-@if $variant=='dark' {
- login-dialog {
- StEntry {
- background-color: darken($system_bg_color, 3%);
- color: $fg_color;
- border-color: $system_borders_color;
- }
- }
-}
-
-// Yaru change: style unlock dialog with half-transparent items
-.unlock-dialog {
- StEntry {
- border:none !important;
- &, &:focus {
- color: $fg_color_dark;
- background-color: transparentize($fg_color_dark, 0.9);
- box-shadow: none;
- }
-
- &:insensitive {
- color: transparentize($fg_color_dark, 0.5);
- background-color: transparentize($fg_color_dark, 0.95);
- }
-
- StLabel.hint-text {
- color: transparentize($fg_color_dark, 0.3);
- }
- }
-
- .cancel-button,
- .switch-user-button,
- .login-dialog-session-list-button {
- border-color: transparent;
- background-color: transparentize($fg_color_dark, 0.9);
- box-shadow: none;
-
- &,
- &:hover,
- &:focus,
- &:active {
- color: $fg_color_dark;
- }
-
- &:hover,
- &:focus {
- background-color: transparentize($fg_color_dark, 0.85);
- }
-
- &:active {
- background-color: transparentize($fg_color_dark, 0.80);
- }
- }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_login-lock.scss b/gnome-shell/src/gnome-shell-sass/widgets/_login-lock.scss
new file mode 120000
index 0000000000..21bb324daa
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_login-lock.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_login-lock.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_looking-glass.scss b/gnome-shell/src/gnome-shell-sass/widgets/_looking-glass.scss
deleted file mode 100644
index 51bb51b8d3..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_looking-glass.scss
+++ /dev/null
@@ -1,234 +0,0 @@
-/* Looking Glass */
-
-// common
-.lg-dialog {
-
- StEntry {
- @extend %osd_entry;
- min-height: to_em(22px);
- }
-
- // override link color since OSD style
- $lg_link_color: st-lighten(-st-accent-color, 20%);
- .shell-link {
- color: $lg_link_color;
- &:hover { color: st-lighten($lg_link_color, 10%); }
- &:active { color: st-darken($lg_link_color, 10%); }
- }
-
- .actor-link {
- @extend %monospace;
- color: st-darken($osd_fg_color, 20%);
- &:hover { color:$osd_fg_color; }
- &:active { color: st-lighten($osd_fg_color, 20%); }
- & StIcon { icon-size: 12px; }
- }
-}
-
-.lg-completions-text {
- @extend %caption;
- font-style: italic;
-}
-
-// Dialog
-#LookingGlassDialog {
-
- @extend %osd_panel;
- background-color: transparentize($osd_bg_color,0.02);
- color: $osd_fg_color;
-
- border-radius: $modal_radius;
- margin-top: $base_margin;
- border: 2px solid transparent;
- padding: $base_padding;
- spacing: $base_padding;
- box-shadow: 0 2px 4px 0 $shadow_color;
-
- @if $contrast == 'high' {
- border-color: $hc_inset_color;
- background-color: $osd_bg_color;
- box-shadow:none;
- }
-
- & > #Toolbar {
- border: none;
- padding: $base_padding;
- border-radius: 0;
- background-color: transparent;
- spacing: $base_padding;
-
- .lg-toolbar-button {
- @extend %osd_button;
- padding: $base_padding $base_padding * 2;
-
- & > StIcon { icon-size: $base_icon_size; }
- }
- }
-
- .labels {
- spacing: $base_padding;
- }
-
- .notebook-tab {
- @extend %osd_button_flat;
- background-color: transparent;
- -natural-hpadding: $base_padding * 2;
- -minimum-hpadding: $base_padding * 2;
- padding: $base_padding $base_padding * 2;
- &:selected {
- @include button(active, $tc:$osd_fg_color, $c:$osd_bg_color, $always_dark: true);
- }
- }
-}
-
-// Inspector
-#LookingGlassPropertyInspector {
-
- background-color: $osd_bg_color;
- color: $osd_fg_color;
- border-radius: $modal_radius;
- border: 1px solid $osd_borders_color;
- padding: $base_padding * 2;
-
- @if $contrast == 'high' {
- border-color: $hc_inset_color;
- }
-
- .lg-obj-inspector-title {
- @extend %heading;
- spacing: $base_margin;
- }
-
- .lg-obj-inspector-close-button,
- .lg-obj-inspector-button {
- @extend %osd_button;
- padding: $base_padding $base_padding * 2;
- }
-
- .lg-obj-inspector-close-button {
- margin: $base_margin;
- padding: $base_padding;
- border-radius: $forced_circular_radius;
- > StIcon {
- icon-size: $base_icon_size;
- }
- }
-}
-
-
-// Evaluator
-#LookingGlassEvaluator {
- padding: $base_padding;
-
- .evaluator-results {
- @extend %monospace;
- spacing: $base_padding;
- }
-}
-
-// Window List
-#LookingGlassWindows {
-
- padding: $base_padding;
- spacing: $base_padding;
-
- .lg-window {
- @extend %card_common;
- @include button(normal, $tc:$osd_fg_color, $c:$osd_bg_color, $always_dark: true);
- margin: 0;
- padding: $base_padding * 2;
-
- .lg-window-name {
- @extend %heading;
- }
-
- .lg-window-props-box {
- .lg-window-props {
- }
- }
- }
-}
-
-// Extensions
-#LookingGlassExtensions {
-
- .lg-extensions-list {
- padding: $base_padding;
- spacing: $base_padding;
- }
-
- .lg-extension {
- @extend %card_common;
- @include button(normal, $tc:$osd_fg_color, $c:$osd_bg_color, $always_dark: true);
- margin: 0;
- spacing: $base_margin;
- padding: $base_padding * 2;
-
- .lg-extension-name {
- @extend %heading;
- color: $osd_fg_color !important;
- }
-
- .lg-extension-description {
- }
-
- .lg-extension-meta {
- spacing: $base_padding * 2;
- }
- }
-
- .lg-extensions-none {
- @extend %title_4;
- color: transparentize($osd_fg_color, 0.5);
- }
-}
-
-// Actors
-#LookingGlassActors {
- padding: $base_padding;
- spacing: $base_margin;
-}
-
-// Debug
-#LookingGlassDebugFlags {
-
- .lg-debug-flags-header {
- padding: $base_padding;
- padding-top: 2 * $base_padding;
- @extend %title_4;
- }
-
- .lg-debug-flag-button {
- @extend %osd_button;
- padding: $base_padding * 1.5 $base_padding * 2;
- margin-bottom: $base_padding;
-
- StLabel {
- @extend %monospace;
- font-weight: normal !important;
- }
-
- // switch style overrides since lg is OSD style
- .toggle-switch {
- @if $contrast == 'high' {
- background: transparentize(white, .7);
- &:hover {
- background: transparentize(white, .6);
- }
- } @else {
- background: transparentize(white, .85);
- &:hover {
- background: transparentize(white, .8);
- }
- }
- &:checked {
- background: -st-accent-color;
- color: -st-accent-fg-color;
- &:hover {
- background-color: st-lighten(-st-accent-color, 5%);
- color: st-lighten(-st-accent-fg-color, 5%);
- }
- }
- }
- }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_looking-glass.scss b/gnome-shell/src/gnome-shell-sass/widgets/_looking-glass.scss
new file mode 120000
index 0000000000..01a7f122ae
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_looking-glass.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_looking-glass.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_message-list.scss b/gnome-shell/src/gnome-shell-sass/widgets/_message-list.scss
deleted file mode 100644
index 0b0786082c..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_message-list.scss
+++ /dev/null
@@ -1,271 +0,0 @@
-/* Message List */
-// a.k.a. notifications in the menu
-
-// main list
-.message-list {
- width: 29em;
- border: solid $borders_color;
-
- // padding and margins to account for scrollbar
- &:ltr {margin-left: 0; margin-right: $base_margin; padding-right: $base_padding; border-right-width: 1px; }
- &:rtl {margin-right: 0; margin-left: $base_margin; padding-left: $base_padding; border-left-width: 1px; }
-
- .message-list-placeholder {
- @extend %title_3;
- color: transparentize($fg_color, .55);
- // Yaru change: better contrast
- color: $insensitive_fg_color;
- @if $contrast == 'high' {
- color: $fg_color;
- }
- // icon size and color
- > StIcon {
- icon-size: 96px; // non-em asset size
- margin-bottom: $base_margin * 3;
- -st-icon-style: symbolic;
- }
- }
-}
-
-.message-view {
- // to account for scrollbar
- &:ltr {margin-right: $base_margin * 3; }
- &:rtl {margin-left: $base_margin * 3;}
-
- -st-vfade-offset: 68px;
-
- .message {
- margin-bottom: $base_padding * 2 !important;
- // manually adjust radius to account for popover corners
- border-radius: $modal_radius + 2px;
- }
-}
-
-// do-not-disturb + clear button
-.message-list-controls {
- // NOTE: remove the padding if notification_bubble could remove margin for drop shadow
- padding: $base_padding * 2;
- padding-bottom: $base_padding * 1.5;
- spacing: $base_padding;
- @extend %heading;
-
- .message-list-clear-button {
- border-radius: $forced_circular_radius;
- }
-}
-
-// message notification group
-.message-notification-group {
- spacing: $base_padding * 2;
-
- .message-group-header {
- padding: $base_padding;
- .message-group-title {
- @extend %title_2;
- margin: 0 $base_margin;
- }
- }
-
- // close button
- .message-collapse-button {
- @extend .icon-button;
- color: $fg_color;
- background-color: transparentize($fg_color, 0.8);
- padding: 4px !important;
- border: 4px transparent solid;
- &:hover {background-color: transparentize($fg_color, 0.7);}
- &:active {background-color: transparentize($fg_color, 0.8);}
- }
-}
-
-// message bubbles
-.message {
- @extend %card;
- padding: $base_padding;
- margin: 0;
- border-radius: $modal_radius;
-
- background-color: if($variant == 'light', $card_bg_color, lighten($card_bg_color, 5%));
-
- &:second-in-stack {
- background-color: if($variant == 'light', darken($card_bg_color, 4%), darken($card_bg_color, 1%));
- box-shadow: 0 1px 1px 0 $card_shadow_color;
- }
-
- &:lower-in-stack {
- background-color: if($variant == 'light', darken($card_bg_color, 7%), darken($card_bg_color, 4%));
- box-shadow: none;
- border-color: if($variant == 'light', darken($card_bg_color, 10%), transparent); // a not ideal workaround for light theme
- }
-
- // message header
- .message-header {
- spacing: $base_padding;
- color: $insensitive_fg_color;
- padding:0 $base_padding;
-
- // remove side padding to accommodate the close button
- &:ltr { padding-right: 0; }
- &:rtl { padding-left: 0; }
-
- // header source icon
- .message-source-icon {
- icon-size: $scalable_icon_size; // 16px
- -st-icon-style: symbolic;
- }
-
- // box that contains the source icon, source name and timestamp of the message
- .message-header-content {
- spacing: $base_padding;
- min-height: to_em(24px);
- padding-bottom: $base_padding;
-
- // header source title
- .message-source-title {
- font-weight: bold;
- }
-
- // Time label
- .event-time {
- @extend %caption;
- color: $insensitive_fg_color;
- // Add bottom padding to align the app name with the time horizontally
- padding-bottom: to_em(1px);
-
- &:ltr { text-align: right; }
- &:rtl { text-align: left; }
- }
- }
-
- // buttons in the message header
- .message-expand-button,
- .message-close-button {
- @extend .icon-button;
- @extend %notification_button;
- border-radius: $forced_circular_radius; // make circular
- color: $fg_color;
- }
-
- // increase padding to expand button to make it larger
- .message-expand-button {
- padding: $base_padding;
- }
-
- // add margin to close button to balance it with the expand button
- .message-close-button {
- margin: $base_padding * 0.5;
- padding: 4px;
- }
- }
-
- // container for message contents
- .message-box {
- padding: $base_padding;
- margin-top: 0;
- spacing: $base_padding;
-
- // icon of the message
- .message-icon {
- &:ltr { margin-right:$base_padding;}
- &:rtl { margin-left:$base_padding;}
-
- // icon size and color
- icon-size: $base_icon_size * 3; // 48px
-
- // a small symbolic icon on a circle background
- &.message-themed-icon {
- border-radius: $forced_circular_radius;
- background-color: transparentize($fg_color, .93);
- icon-size: $scalable_icon_size;
- min-width: $base_icon_size * 3;
- min-height: $base_icon_size * 3;
- }
- }
-
- // If the header isn't displayed we need more top margin
- &:first-child {
- margin-top: $base_padding * 2;
- }
-
- // text of the message
- .message-content {
- spacing: $base_margin;
-
- // message title
- .message-title {
- font-weight: bold;
- }
- }
- }
-
- // container for message buttons
- .message-action-bin {
- padding: $base_margin;
- spacing: $base_padding;
-
- // set margin on children
- * {
- margin: 0 $base_margin;
- // remove margins
- &:first-child {
- &:ltr { margin-left:0;}
- &:rtl { margin-right:0;}
- }
- &:last-child {
- &:ltr { margin-right:0;}
- &:rtl { margin-left:0;}
- }
- }
- }
-}
-
-// URLs in messages
-.url-highlighter {
- link-color: $link_color;
-}
-
-/* Media Controls */
-.message-media-control {
- padding: 0 $base_padding * 3;
- border-radius: $base_border_radius;
- color: $fg_color;
- border: 1px solid transparent;
-
- @if $contrast == 'high' {
- border-color: $hc_inset_color;
- margin: $base_padding * 2 2px;
- }
-
- // colors are lightened since the media controls are in a card
- &:hover {
- background-color: lighten($hover_bg_color, 5%);
- color: $fg_color;
- }
-
- &:active {
- // background-color: $active_bg_color; // Yaru: make play/pause/next buttons active visible
- background-color: lighten($active_bg_color, 5%);
- color: $fg_color;
- }
-
- &:insensitive {
- color: lighten($insensitive_fg_color, 5%);
-
- @if $contrast == 'high' {
- border-color: transparent;
- }
- }
-
- & StIcon { icon-size: $base_icon_size; }
-}
-
-.media-message {
- // album-art
- .message-icon {
- border-radius: $base_border_radius !important;
-
- &.message-themed-icon {
- icon-size: $large_icon_size !important; // 32px
- }
- }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_message-list.scss b/gnome-shell/src/gnome-shell-sass/widgets/_message-list.scss
new file mode 120000
index 0000000000..e849a30538
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_message-list.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_message-list.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_misc.scss b/gnome-shell/src/gnome-shell-sass/widgets/_misc.scss
deleted file mode 100644
index 0bc95adafa..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_misc.scss
+++ /dev/null
@@ -1,57 +0,0 @@
-// Rubberband for select-area screenshots
-.select-area-rubberband {
- background-color: st-transparentize(-st-accent-color,0.7);
- border: 1px solid -st-accent-color;
-
- // Yaru: accents are too colorful here, thus use grays
- background-color: transparentize($ash, 0.8);
- border: 1px solid transparentize($silk, 0.2);
-}
-
-// User icon
-.user-icon {
- background-size: contain;
- border-radius: $forced_circular_radius;
- icon-size: $base_icon_size * 4;
-
- background-color: transparentize($fg_color,0.95);
- color: $fg_color;
-
- & StIcon {
- padding: $base_padding * 2;
- }
-
- &.user-avatar {
- box-shadow:inset 0 0 0 1px transparentize($fg_color, 0.9);
-
- @if $contrast == 'high' {
- @include draw_hc_inset();
- }
- }
-}
-
-.lightbox { background-color: black; }
-.flashspot { background-color: white; }
-
-// Hidden
-.hidden { color: transparent;}
-
-// Caps-lock warning
-.caps-lock-warning-label {
- text-align: center;
- padding-bottom: 8px;
- @extend %caption;
- color: $warning_color;
-}
-
-/* Workspace animation */
-
-.workspace-animation {
- background-color: $system_bg_color;
-}
-
-/* Tiled window previews */
-.tile-preview {
- background-color: st-transparentize(-st-accent-color,0.5);
- border: 1px solid -st-accent-color;
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_misc.scss b/gnome-shell/src/gnome-shell-sass/widgets/_misc.scss
new file mode 120000
index 0000000000..527c991c8c
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_misc.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_misc.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_notifications.scss b/gnome-shell/src/gnome-shell-sass/widgets/_notifications.scss
deleted file mode 100644
index 4ab062d37e..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_notifications.scss
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Notifications & Message Tray */
-
-$notification_banner_height: 64px;
-$notification_banner_width: 34em;
-$notification_banner_border_radius: 12px; // similar to the implemented to yaru-gtk $window_radius: $button_radius + 6;
-
-// Banner notifications
-.notification-banner {
- min-height: $notification_banner_height;
- width: $notification_banner_width;
- box-shadow: 0 2px 4px 2px $shadow_color;
- border-radius: $notification_banner_border_radius; // Yaru: $modal_radius is too small (see issue #4082).
- margin: $base_margin;
- background-color: $bg_color; // Yaru change: use bg_color for better contrast with buttons
-
- @if $contrast == 'high' {
- @include draw_hc_inset();
- }
-
- &:hover {
- // Yaru change: ↑↑↑
- background-color: if($variant =='light', darken($bg_color, 2%), lighten($bg_color, 2%));
- }
-
- &:active {
- // Yaru change: ↑↑↑
- // Yaru notice: the original 4% for darken and lighten value was actually not working and is overwritten by upstream colors.
- // increased value from 4% to 8%
- // Fixed on click color problem by adding (!important) flag.
- background-color: if($variant =='light', darken($bg_color, 8%), lighten($bg_color, 8%)) !important;
- }
-
- // Yaru: make notifications more visible on different headerbars:
- &,
- &:hover,
- &:focus,
- &:active {
- box-shadow: 0 0 4px 2px rgba(0, 0, 0, 0.1);
- border: 1px solid $borders_color;
- }
-}
-
-.notification-buttons-bin {
- spacing: 0;
-}
-
-.notification-button {
- @extend %notification_button;
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_notifications.scss b/gnome-shell/src/gnome-shell-sass/widgets/_notifications.scss
new file mode 120000
index 0000000000..f3b3215f80
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_notifications.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_notifications.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_osd.scss b/gnome-shell/src/gnome-shell-sass/widgets/_osd.scss
deleted file mode 100644
index 1f689d958e..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_osd.scss
+++ /dev/null
@@ -1,75 +0,0 @@
-/* OSD */
-
-@import 'sass-utils';
-
-$osd_levelbar_height:6px;
-
-.osd-window {
- @extend %osd_panel;
- @extend %heading;
- text-align: center;
- font-weight: bold;
- spacing: $base_padding * 2;
- padding: $base_padding * 2 $base_padding * 3;
- & > * { spacing: $base_margin * 2; }
- margin-bottom: 4em;
-
- StIcon { icon-size: $large_icon_size;}
-
- StLabel {
- &:ltr { margin-right: $base_padding; }
- &:rtl { margin-left: $base_padding; }
- }
-
- .level {
- margin-bottom: $base_margin;
- &:first-child { margin-bottom: 0; }
-
- min-width: 160px;
- -barlevel-height: $osd_levelbar_height;
- -barlevel-background-color: transparentize($osd_fg_color, if($variant=='light', 0.7, 0.9));
- -barlevel-active-background-color: $osd_fg_color;
- // Yaru: Optimize overdrive color for contrast
- -barlevel-overdrive-color: optimize-contrast($osd_bg_color, $destructive_color, $target: 5.5);
- -barlevel-overdrive-separator-width: $base_padding * 0.5;
- &:ltr { margin-right: $base_padding; }
- &:rtl { margin-left: $base_padding; }
- }
-}
-
-// Monitor number label
-.osd-monitor-label, .osd-break-countdown-label {
- background-color: -st-accent-color;
- color: -st-accent-fg-color;
- border-radius: $modal_radius;
- font-size: 3em;
- font-weight: bold;
- font-feature-settings: "tnum";
- margin: $base_margin * 3;
- padding: $base_padding * 2;
- text-align: center;
- min-width: 1.5em;
-}
-
-/* Pad OSD */
-.pad-osd-window { // Yaru: Make pad OSD visible again in the light theme by using osd colors, should be ported to upstream
- padding: 32px;
- background-color: $osd_bg_color;
- color: $osd_fg_color;
-
- .button {
- @extend %button;
- &:insensitive { color: $fg_color; }
- }
-
- .pad-osd-title-box { spacing: 12px; }
- .pad-osd-title-menu-box { spacing: 6px; }
-}
-
-.combo-box-label {
- width: 15em;
-}
-
-.resize-popup {
- @extend %osd_panel;
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_osd.scss b/gnome-shell/src/gnome-shell-sass/widgets/_osd.scss
new file mode 120000
index 0000000000..2b57069206
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_osd.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_osd.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_overview.scss b/gnome-shell/src/gnome-shell-sass/widgets/_overview.scss
deleted file mode 100644
index 1172c070e0..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_overview.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-/* OVERVIEW */
-
-.secondary-monitor-workspaces {
- spacing: $base_padding * 2;
-}
-
-#overviewGroup {
- background-color: $system_base_color;
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_overview.scss b/gnome-shell/src/gnome-shell-sass/widgets/_overview.scss
new file mode 120000
index 0000000000..7077d395e2
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_overview.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_overview.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_panel.scss b/gnome-shell/src/gnome-shell-sass/widgets/_panel.scss
deleted file mode 100644
index 3ba8ceba81..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_panel.scss
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Top Bar */
-// a.k.a. the panel
-
-// $privacy_indicator_color: if($variant == 'light', $orange_4, $orange_3);
-// $recording_indicator_color: $red_4;
-
-// Yaru: Use our palette
-$privacy_indicator_color: if($variant =='light', $orange, $yellow);
-$recording_indicator_color: $red;
-
-$transparent_panel_fg_color: $light_1; // always white for transparent lock screens
-$system_panel_fg_color: $system_fg_color; // always light for lockscreen, overview
-
-$panel_height: 2.2em;
-$panel_transition_duration: 250ms; // same as the overview transition duration
-
-#panel {
- background-color: $panel_bg_color;
- font-weight: bold;
- height: $panel_height;
- @extend %numeric;
- transition-duration: $panel_transition_duration;
-
- @if $variant == 'light' {
- // uses half a pixel to compensate for box-shadow weirdness
- box-shadow: inset 0 -0.5px 0 0 $panel_border_color;
- }
-
- // panel menus
- .panel-button {
- @include panel_button();
- -natural-hpadding: $base_padding * 2;
- -minimum-hpadding: $base_padding;
-
- // status area icons
- .system-status-icon {
- icon-size: $scalable_icon_size;
- padding: 0 $base_padding;
- margin: 0 $base_margin;
- }
-
- // reduce margin between icons in combined menu
- .panel-status-indicators-box {
- spacing: $base_margin;
-
- > .system-status-icon {
- padding: 0;
- }
- }
-
- &#panelActivities {
- & StBoxLayout {
- padding: 0 $scaled_padding * 0.5; // use em padding to keep proportion
- spacing: 5px;
- }
-
- & .workspace-dot {
- border-radius: $forced_circular_radius;
- min-width: $scalable_icon_size * 0.5;
- min-height: $scalable_icon_size * 0.5;
- background-color: $panel_fg_color;
- }
- }
-
- // screen activity indicators
- &.screen-recording-indicator,
- &.screen-sharing-indicator {
- StBoxLayout {
- spacing: $scaled_padding;
- }
-
- StIcon {
- icon-size: $scalable_icon_size;
- }
- }
-
- &.screen-recording-indicator {
- @include panel_button($bg:$recording_indicator_color, $fg:$_base_color_light, $style: filled);
- }
-
- &.screen-sharing-indicator {
- @include panel_button($bg:$privacy_indicator_color, $fg:$_base_color_light, $style: filled);
- }
-
- // clock
- &.clock-display {
- // The clock display needs to have the background on .clock because
- // we want to exclude the do-not-disturb indicator from the background
- // see _drawing.scss for override details
- @include panel_button($highlighted_child: true, $child_class: '.clock');
-
- .clock {
- // the highlighted child
- }
-
- .messages-indicator {
- icon-size: $scalable_icon_size;
- }
- }
- }
-
- // transparent panel on overview, lock & login screens
- &:overview,
- &.unlock-screen,
- &.login-screen {
- // Yaru change: static background into overview
- // background-color: transparent;
-
- // unfortunate duplication to keep indicator style in these states
- .panel-button {
- &.screen-recording-indicator {
- @include panel_button($bg:$recording_indicator_color, $fg:$_base_color_light, $style: filled);
- }
-
- &.screen-sharing-indicator {
- @include panel_button($bg:$privacy_indicator_color, $fg:$_base_color_light, $style: filled);
- }
- }
- }
-
- // use transparent text styles for lock & login screen panels
- &.unlock-screen,
- &.login-screen {
- // Yaru change: static background into overview
- background-color: transparent;
- .panel-button {
- @include panel_button($fg:$transparent_panel_fg_color);
-
- // clock
- &.clock-display {
- @include panel_button($fg:$transparent_panel_fg_color, $highlighted_child: true, $child_class: '.clock');
- }
- }
- }
-
- // use system text styles for overview panel
- $button-system-panel-fg-color: $system_panel_fg_color;
- &:overview {
- .panel-button {
- @include panel_button($fg:$button-system-panel-fg-color);
-
- &#panelActivities .workspace-dot {
- background-color: $button-system-panel-fg-color;
- }
-
- // clock
- &.clock-display {
- @include panel_button($fg:$button-system-panel-fg-color, $highlighted_child: true, $child_class: '.clock');
- }
- }
- }
-
- .panel-status-indicators-box {
- spacing: 2px;
- }
-
- // spacing between power icon and (optional) percentage label
- .power-status.panel-status-indicators-box {
- spacing: 0;
- }
-
- // important privacy related indicators
- .privacy-indicator { color: $privacy_indicator_color; }
-}
-
-// Clock
-.clock-display-box {
- spacing: 2px;
- .clock {
- padding-left: $scaled_padding * 2;
- padding-right: $scaled_padding * 2;
- }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_panel.scss b/gnome-shell/src/gnome-shell-sass/widgets/_panel.scss
new file mode 120000
index 0000000000..d078cae9c8
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_panel.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_panel.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_popovers.scss b/gnome-shell/src/gnome-shell-sass/widgets/_popovers.scss
deleted file mode 100644
index 6c64f0f157..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_popovers.scss
+++ /dev/null
@@ -1,155 +0,0 @@
-/* Popovers/Menus */
-
-$menu_bg_color: $bg_color;
-
-$menuitem_bg_color: if($variant == 'light', darken($menu_bg_color, 5%), lighten($menu_bg_color, 5%));
-$menuitem_border_radius: $base_border_radius * 1.5;
-
-$submenu_bg_color: if($variant == 'light', darken($menu_bg_color, 17%), lighten($menu_bg_color, 13%));
-
-// the popover itself
-.popup-menu-boxpointer {
- -arrow-rise: $base_padding; // distance from the panel & screen edge
-}
-
-// container of the popover menu
-.popup-menu {
- min-width: 15em;
- color: $fg_color;
-
- //.popup-status-menu-item {font-weight: normal; color: pink;} //dunno what that is
- &.panel-menu {
- margin-bottom: 1.75em; // so it doesn't touch the bottom of the screen
- }
-}
-
-// popover content
-.popup-menu-content {
- padding: $base_padding;
- background-color: $bg_color;
- border-radius: $modal_radius * 1.25;
- border-radius: $yaru_menu_border_radius;
- border: 1px solid $outer_borders_color;
- box-shadow: 0 2px 4px 0 $shadow_color;
-}
-
-// menu items
-.popup-menu-item {
- @include menuitem($bg:$menuitem_bg_color);
-
- border-radius: $menuitem_border_radius;
-
- &:checked {
- border-radius: $menuitem_border_radius $menuitem_border_radius 0 0 !important;
-
- @if $contrast == 'high' {
- border: 1px solid $hc_inset_color;
- border-bottom-width:0;
- }
- }
-
- // add margin to switches in menu items
- .toggle-switch {
- &:ltr { margin-left: $base_margin;}
- &:rtl { margin-right: $base_margin;}
- }
-}
-
-.popup-ornamented-menu-item {
- &:ltr {padding-left: $base_padding;}
- &:rtl {padding-right: $base_padding;}
-}
-
-// all other graphical elements (sliders)
-.popup-inactive-menu-item {
- color: $fg_color;
- &:insensitive { color: $insensitive_fg_color; }
-}
-
-// symbolic icons in popover
-.popup-menu-arrow,
-.popup-menu-icon {
- icon-size: $scalable_icon_size;
-}
-
-// popover submenus
-.popup-sub-menu {
- border-radius: 0 0 $menuitem_border_radius+1px $menuitem_border_radius+1px;
- margin-bottom: $base_padding;
- border: 1px solid transparent;
- background-color: $submenu_bg_color;
-
- @if $contrast == 'high' {
- border-color: $hc_inset_color;
- }
-
- // submenu specific styles
- .popup-menu-item {
- border-radius: 0;
- border-top-width:0;
- @include menuitem($bg:$submenu_bg_color);
-
- &:last-child {
- border-radius: 0 0 $menuitem_border_radius $menuitem_border_radius;
- border-bottom-width:0;
- }
- }
-
- .popup-menu-section {
- .popup-menu-item:last-child {
- &:hover,&:focus { border-radius: 0;}
- }
- &:last-child .popup-menu-item:last-child {
- border-radius: 0 0 $menuitem_border_radius $menuitem_border_radius;
- }
- }
-}
-
-// container for radio and check boxes
-.popup-menu-ornament {
- icon-size: $scalable_icon_size !important;
- width: $scalable_icon_size;
-}
-
-// separator
-.popup-separator-menu-item {
- border:none !important;
-
- .popup-separator-menu-item-separator {
- height: 1px; //not really the whole box
- background-color: $borders_color;
- }
-
- // separators in submenus
- .popup-sub-menu & {
- background-color: transparent;
-
- // account for ornament
- &:ltr { margin-right: 2.5em;}
- &:rtl { margin-left: 2.5em;}
-
- .popup-separator-menu-item-separator {
- background-color: $borders_color;
- }
- }
-}
-
-// desktop background menu
-.background-menu {
- -boxpointer-gap: 0px;
- -arrow-rise: 0px; // hide the beak on the menu
-}
-
-// right-click (and panel) app menu
-.app-menu {
- max-width: 27.25em;
-
- .popup-inactive-menu-item:first-child {
- // "Open Windows" label
- > StLabel {
- @extend %caption_heading;
- &:ltr {margin-right: $base_margin * 2;}
- &:rtl {margin-left: $base_margin * 2;}
- }
- }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_popovers.scss b/gnome-shell/src/gnome-shell-sass/widgets/_popovers.scss
new file mode 120000
index 0000000000..d6aec24122
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_popovers.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_popovers.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_quick-settings.scss b/gnome-shell/src/gnome-shell-sass/widgets/_quick-settings.scss
deleted file mode 100644
index d024d183c2..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_quick-settings.scss
+++ /dev/null
@@ -1,273 +0,0 @@
-.quick-settings {
- padding: $base_padding * 3;
- border-radius: $modal_radius * 2.25;
- border-radius: $yaru_menu_border_radius;
-
- .icon-button, .button {
- padding: $base_padding * 1.75;
- }
-}
-
-.quick-settings-grid {
- spacing-rows: $base_padding * 2;
- spacing-columns: $base_padding * 2;
-}
-
-.quick-toggle, .quick-toggle-has-menu {
- border-radius: $forced_circular_radius;
- min-width: 12em;
- max-width: 12em;
- min-height: $scalable_icon_size * 3; // use icon size so the button scales
-}
-
-// standalone toggle button
-.quick-toggle {
- &:checked { @extend %default_button;}
-
- & > StBoxLayout { spacing: $base_padding * 1.5; }
-
- /* Move padding into the box; this is to allow menu arrows
- to extend to the border */
- &.button { padding: 0; }
- & > StBoxLayout {
- padding: 0 $base_padding * 2;
- }
-
- &:ltr > StBoxLayout { padding-left: $base_padding * 2.5; }
- &:rtl > StBoxLayout { padding-right: $base_padding * 2.5; }
-
- .quick-toggle-title {
- @extend %heading;
- }
-
- .quick-toggle-subtitle {
- @extend %caption;
- font-weight: normal;
- }
-
- .quick-toggle-icon { icon-size: $scalable_icon_size; }
-}
-
-// toggle with a menu button
-.quick-toggle-has-menu {
- & .quick-toggle {
- min-width: auto;
- max-width: auto;
-
- &:ltr {
- border-radius: $forced_circular_radius 0 0 $forced_circular_radius;
- > StBoxLayout { padding-right: $scaled_padding * 1.5; }
- }
-
- &:rtl {
- border-radius: 0 $forced_circular_radius $forced_circular_radius 0;
- > StBoxLayout { padding-left: $scaled_padding * 1.5; }
- }
-
- &:ltr:last-child { border-radius: $forced_circular_radius; }
- &:rtl:last-child { border-radius: $forced_circular_radius; }
- }
-
- & .quick-toggle-menu-button {
- padding: $scaled_padding $scaled_padding * 1.75;
-
- &:ltr {
- border-radius: 0 $forced_circular_radius $forced_circular_radius 0;
- }
- &:rtl {
- border-radius: $forced_circular_radius 0 0 $forced_circular_radius;
- }
- }
-
- & .quick-toggle-separator {
- width: 1px;
- }
-}
-
-
-// Set the color of separators and menu buttons within the toggle.
-// This is bit of a mess but needed to have working colors in
-// both light, dark and high contrast styles.
-
-// menu button colors
-$quick_toggle_menubutton_bg_color: if(
- $contrast == 'high', lighten($bg_color, 22%),
- if($variant == 'light', darken($bg_color, 5%), lighten($bg_color, 8%))
-);
-$quick_toggle_menubutton_checked_bg_color: if(
- $contrast == 'high', st-mix(-st-accent-color, $fg_color, 75%),
- if($variant == 'light', st-mix(-st-accent-color, $fg_color, 92%), st-mix(-st-accent-color, $fg_color, 85%))
-);
-
-// separator colors
-$quick_toggle_separator_color: if(
- $contrast == 'high', transparent,
- transparentize($fg_color, .75)
-);
-
-$quick_toggle_checked_separator_color: if(
- $contrast == 'high', transparent,
- if($variant == 'light', st-mix(-st-accent-fg-color, -st-accent-color, 20%), st-mix(-st-accent-fg-color, -st-accent-color, 30%),)
-);
-
-.quick-toggle-has-menu {
- & .quick-toggle-menu-button {
- @include button(normal, $c: $quick_toggle_menubutton_bg_color);
- &:focus { @include button(focus, $c: $quick_toggle_menubutton_bg_color);}
- &:hover { @include button(hover, $c: $quick_toggle_menubutton_bg_color);}
- &:active { @include button(active, $c: $quick_toggle_menubutton_bg_color);}
-
- &:checked {
- @include button(normal, $c: $quick_toggle_menubutton_checked_bg_color, $tc:-st-accent-fg-color, $style: default);
- &:focus { @include button(focus, $c: $quick_toggle_menubutton_checked_bg_color, $tc:-st-accent-fg-color, $style: default);}
- &:hover { @include button(hover, $c: $quick_toggle_menubutton_checked_bg_color, $tc:-st-accent-fg-color, $style: default);}
- &:active { @include button(active, $c: $quick_toggle_menubutton_checked_bg_color, $tc:-st-accent-fg-color, $style: default);}
- }
- }
-
- &:checked {
- & .quick-toggle-separator {
- background-color: $quick_toggle_checked_separator_color;
- }
- }
-
- & .quick-toggle-separator {
- background-color: $quick_toggle_separator_color;
- }
-}
-
-.quick-slider {
- & > StBoxLayout { spacing: $base_padding; }
-
- .icon-button { padding: $base_padding; }
-
- .slider-bin {
- &:focus {@include button(focus);}
- padding: $base_padding;
- border-radius: $forced_circular_radius;
- }
-}
-
-.quick-toggle-menu {
- @extend %card;
-
- &:insensitive {
- // override insensitive style on submenu
- @include button(normal);
- }
-
- border-radius: $base_border_radius * 3;
-
- margin: $base_padding * 2 $base_padding * 3 0;
-
- .popup-menu-item > StIcon {
- -st-icon-style: symbolic;
- icon-size: $scalable_icon_size;
- }
-
- & .header {
- spacing-rows: $base_padding * 0.5;
- spacing-columns: $base_padding * 2;
- padding-bottom: $base_padding * 2;
-
- & .icon {
- icon-size: $medium_scalable_icon_size;
- border-radius: $forced_circular_radius;
- padding: 1.5 * $base_padding;
- background-color: transparentize($fg_color, 0.8);
-
- &.active {
- background-color: -st-accent-color;
- color: -st-accent-fg-color;
- }
-
- // draw hc outline
- @if $contrast == 'high' {
- @include draw_hc_inset();
- &.active {
- @include draw_hc_inset($no_inset: true);
- }
- }
- }
-
- & .title {
- @extend %title_3;
- }
-
- & .subtitle {
- @extend %caption_heading;
- }
- }
-}
-
-.quick-toggle-menu-container {
-}
-
-.quick-settings-system-item {
- & > StBoxLayout { spacing: $base_padding * 2; }
-
- & .power-item {
- min-height: 0;
- min-width: 0;
-
- &:insensitive {
- @include button(normal);
- background-color: transparent;
- }
- }
-}
-
-.nm-network-item {
- .wireless-secure-icon { icon-size: $scalable_icon_size * 0.5; } // half-size symbolic
-}
-
-.bt-device-item {
- .popup-menu-icon { -st-icon-style: symbolic; }
-}
-
-.bt-menu-placeholder.popup-menu-item {
- @extend %title_4;
- text-align: center;
-
- padding: 2em 4em;
-}
-
-.device-subtitle { color: transparentize($fg_color, 0.5); }
-
-.keyboard-brightness-level {
- spacing: $base_padding;
-
- .button:checked { @extend %default_button; }
-}
-
-// background apps
-
-.background-apps-quick-toggle {
- min-height: to_em(40px);
- background-color: transparent;
-
- & StIcon { icon-size: $scalable_icon_size !important; }
-}
-
-.background-app-item {
- & .title { @extend %heading; }
- & .subtitle { @extend %caption; }
- & .popup-menu-icon {
- icon-size: $large_icon_size !important;
- -st-icon-style: regular !important;
- }
- & .icon-button {
- padding: $base_padding;
-
- // override some background colors since it's a button on an already styled background
- // FIXME: may need a generic drawing method for button in menu item in future
- background-color: transparentize($fg_color, 0.87);
- &:hover { background-color: transparentize($fg_color, 0.78);}
- &:active { background-color: transparentize($fg_color, 0.69);}
- }
- & .spinner {
- padding: $base_padding;
- }
-
- &.popup-inactive-menu-item { color: $fg_color; }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_quick-settings.scss b/gnome-shell/src/gnome-shell-sass/widgets/_quick-settings.scss
new file mode 120000
index 0000000000..b1f64af5db
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_quick-settings.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_quick-settings.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_screenshot.scss b/gnome-shell/src/gnome-shell-sass/widgets/_screenshot.scss
deleted file mode 100644
index 1d58559316..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_screenshot.scss
+++ /dev/null
@@ -1,206 +0,0 @@
-// Screenshot UI
-
-$screenshot_ui_panel_padding: $base_padding * 3;
-$screenshot_ui_panel_border_radius: $modal_radius * 2;
-// $screenshot_ui_button_red: $red_4;
-
-$screenshot_ui_button_red: $red; // Yaru: Use our palette's color
-
-.screenshot-ui-panel {
- @extend %osd_panel;
- border-radius: $screenshot_ui_panel_border_radius;
- padding: $screenshot_ui_panel_padding;
- // Reduce the bottom padding a little to accommodate the large capture button.
- padding-bottom: $screenshot_ui_panel_padding - $base_padding;
- margin-bottom: 4em;
- spacing: $base_padding * 2;
-}
-
-.screenshot-ui-close-button {
- @extend .window-close; // copy window close button
- padding: $base_padding !important; // but with more padding
- margin-top: $base_margin * 3;
- box-shadow: 0 2px 4px 0 $shadow_color;
- &.left { margin-left: $base_margin * 3;}
- &.right { margin-right: $base_margin * 3;}
-}
-
-.screenshot-ui-type-button {
- @extend %osd_button_flat;
- min-width: 48px;
- padding: $base_padding * 2 $base_padding * 3;
- border-radius: $screenshot_ui_panel_border_radius - $screenshot_ui_panel_padding;
-
- .icon-label-button-container {
- @extend %caption;
- spacing: $scaled_padding;
-
- > StIcon { icon-size: $large_icon_size;}
- }
-}
-
-.screenshot-ui-capture-button {
- width: $large_icon_size;
- height: $large_icon_size;
- border-radius: $forced_circular_radius;
- border: 4px $osd_fg_color;
- padding: $base_margin;
-
- .screenshot-ui-capture-button-circle {
- background-color: $osd_fg_color;
- transition-duration: 200ms;
- &:hover, &:focus { background-color: $hover_bg_color;}
- border-radius: $forced_circular_radius;
- }
-
- &:hover, &:focus {
- .screenshot-ui-capture-button-circle {
- background-color: darken($osd_fg_color, 20%);
- }
- }
-
- &:active {
- .screenshot-ui-capture-button-circle {
- background-color: darken($osd_fg_color, 50%);
- }
- }
-
- &:cast {
- .screenshot-ui-capture-button-circle {
- background-color: $screenshot_ui_button_red;
- }
- &:hover, &:focus {
- .screenshot-ui-capture-button-circle {
- background-color: lighten($screenshot_ui_button_red, 5%);
- }
- }
- &:active {
- .screenshot-ui-capture-button-circle {
- background-color: darken($screenshot_ui_button_red, 7%);
- }
- }
- }
-}
-
-.screenshot-ui-shot-cast-container {
- background-color: transparentize($osd_fg_color,0.9);
- border-radius: $forced_circular_radius;
- padding: $base_padding * 0.5;
- spacing: $base_padding * 0.5;
-
- @if $contrast == 'high' {
- @include draw_hc_inset();
- }
-}
-
-// non-standard button style
-.screenshot-ui-shot-cast-button {
- padding: $base_padding $base_padding * 2;
- background-color: transparent;
- border-radius: $forced_circular_radius;
-
- @if $contrast == 'high' {
- @include draw_hc_inset();
- }
-
- > StIcon { icon-size: $base_icon_size;}
-
- &:hover, &:focus { background-color: transparentize($osd_fg_color, 0.8);}
- &:active { background-color: transparentize($osd_fg_color, .5);}
- &:checked { background-color: $osd_fg_color; color: $osd_bg_color;}
- &:insensitive { color: transparentize($osd_fg_color, 0.5);}
-}
-
-.screenshot-ui-show-pointer-button {
- @extend %osd_button_flat;
- @extend .icon-button;
-}
-
-.screenshot-ui-area-indicator-shade {
- background-color: rgba(0,0,0,.3);
-}
-
-.screenshot-ui-area-selector {
- .screenshot-ui-area-indicator-shade {
- background-color: rgba(0,0,0,.5);
- }
-
- .screenshot-ui-area-indicator-selection {
- border: 2px white;
- }
-}
-
-.screenshot-ui-area-selector-handle {
- border-radius: $forced_circular_radius;
- background-color: white;
- box-shadow: 0 1px 3px 2px $shadow_color;
- width: $medium_icon_size;
- height: $medium_icon_size;
-}
-
-.screenshot-ui-window-selector {
- background-color: $system_base_color;
-
- .screenshot-ui-window-selector-window-container {
- margin: 100px;
- }
-
- &:primary-monitor {
- .screenshot-ui-window-selector-window-container {
- // Make some room for the panel.
- margin-bottom: 200px;
- }
- }
-}
-
-.screenshot-ui-window-selector-window-border {
- transition-duration: 200ms;
- border-radius: $modal_radius;
- border: 6px transparent;
-}
-
-.screenshot-ui-window-selector-check {
- transition-duration: 200ms;
- color: transparent;
- border-radius: $forced_circular_radius;
- border-width: 12px;
- icon-size: $medium_icon_size;
-}
-
-.screenshot-ui-window-selector-window {
- &:hover {
- .screenshot-ui-window-selector-window-border {
- border-color: st-darken(-st-accent-color, 15%);
- }
- }
- &:checked {
- .screenshot-ui-window-selector-window-border {
- border-color: -st-accent-color;
- background-color: st-transparentize(-st-accent-color, 0.8);
- }
-
- .screenshot-ui-window-selector-check {
- color: -st-accent-fg-color;
- background-color: -st-accent-color;
- }
- }
-}
-
-.screenshot-ui-screen-selector {
- transition-duration: 200ms;
- background-color: rgba(0,0,0,.5);
-
- &:hover { background-color: rgba(0,0,0,.3);}
- &:active { background-color: rgba(0,0,0,.7);}
- &:checked {
- background-color: transparent;
- border: 2px white;
- }
-}
-
-.screenshot-ui-tooltip {
- @extend %tooltip;
- text-align: center;
- -y-offset: $base_margin * 6;
- border: 1px solid $system_borders_color; // Yaru change: add border
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_screenshot.scss b/gnome-shell/src/gnome-shell-sass/widgets/_screenshot.scss
new file mode 120000
index 0000000000..1b250457ae
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_screenshot.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_screenshot.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_scrollbars.scss b/gnome-shell/src/gnome-shell-sass/widgets/_scrollbars.scss
deleted file mode 100644
index 1a7d17fc7d..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_scrollbars.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Scrollbars */
-
-StScrollView {
- &.vfade { -st-vfade-offset: 68px; }
- &.hfade { -st-hfade-offset: 68px; }
-}
-
-StScrollBar {
- padding: 0;
-
- StScrollView & {
- min-width: 8px;
- min-height: 8px;
- }
-
- StBin#trough {
- border-radius: 0;
- background-color: transparent;
- }
-
- > .vhandle, > .hhandle {
- border-radius: 8px;
- background-color: mix($fg_color, $bg_color, 30%);
- border: 3px solid transparent; //would be nice to margin or at least to transparent
- transition: 500ms all ease;
- &:hover {background-color: mix($fg_color, $bg_color, 50%);}
- &:active {background-color: mix($fg_color, $bg_color, 40%);}
- }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_scrollbars.scss b/gnome-shell/src/gnome-shell-sass/widgets/_scrollbars.scss
new file mode 120000
index 0000000000..7ffdee5dae
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_scrollbars.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_scrollbars.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_search-entry.scss b/gnome-shell/src/gnome-shell-sass/widgets/_search-entry.scss
deleted file mode 100644
index 0d8e2db2d9..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_search-entry.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-// Search entry
-
-.search-entry {
- border-radius: $forced_circular_radius;
- margin-top: $base_padding * 4; // Yaru change: realign search entry due to fixed panel opacity
- margin-bottom: $base_padding * 2; // Yaru change: realign search entry due to fixed panel opacity
- width: 24em;
-
-
- @extend %system_entry;
-
- // Yaru: Use light text for the search hint
- @if ($variant =='light') {
- StLabel.hint-text {
- color: transparentize($system_fg_color, 0.2);
- }
- }
-
- .search-entry-icon {
- icon-size: $scalable_icon_size;
- margin-top: 2px; // center vertically
- padding: 0 $base_margin;
- }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_search-entry.scss b/gnome-shell/src/gnome-shell-sass/widgets/_search-entry.scss
new file mode 120000
index 0000000000..c80a2da991
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_search-entry.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_search-entry.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_search-results.scss b/gnome-shell/src/gnome-shell-sass/widgets/_search-results.scss
deleted file mode 100644
index e41d80fcc0..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_search-results.scss
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Search */
-
-// search overview container
-#searchResults {
- margin: 0 $base_margin;
-}
-
-#searchResultsContent {
- max-width: 1044px;
-}
-
-// search results sections "the boxes"
-.search-section {
- // This should be equal to #searchResultsContent spacing
- spacing: $base_padding * 3;
-
- // separator (unstyled)
- .search-section-separator {
- height: $base_margin * 2; // use it as a spacer
- background-color: transparent;
- }
-}
-
-// content
-.search-section-content {
- background-color: $system_overlay_bg_color;
- color: $system_fg_color;
- border-radius: $modal_radius * 1.5;
- padding: $base_padding * 2;
- margin:0 $base_margin * 3;
- border: 2px solid transparent;
- border: 1px solid $system_borders_color; // Yaru: use same border-color as dash
-
- @if $contrast == 'high' {
- border-color: $hc_inset_color;
- }
-}
-
-%search_section_content_item {
- @include tile_button($bg:$system_overlay_bg_color);
- border-radius: $base_border_radius * 1.65;
-}
-
-.search-statusbox {
- spacing: $base_padding * 4;
-}
-
-// "no results" text
-.search-statustext {
- @extend %title_1;
- color: transparentize($system_fg_color, .2);
-}
-
-.grid-search-results {
- spacing: $base_padding * 5;
-}
-
-// Search results with icons
-.grid-search-result {
- @extend .overview-tile;
-}
-
-// search result provider
-.search-provider-icon {
- @extend %search_section_content_item;
- &:ltr {margin-right: $base_margin;}
- &:rtl {margin-left: $base_margin;}
-
- // content
- .list-search-provider-content {
- spacing: $base_padding * 2;
-
- // provider labels
- .list-search-provider-details {
- width: 120px;
- color: $system_fg_color;
- }
- }
-}
-
-// search results list
-.list-search-results {
- spacing: $base_padding;
-}
-
-// search result listitem
-.list-search-result {
- @extend %search_section_content_item;
-
- // content
- .list-search-result-content {
- spacing: $base_padding;
- }
-
- // list item title (with leading icon)
- .list-search-result-title {
- spacing: $base_padding * 2;
-
- @if $contrast == 'high' {
- font-weight: bold;
- }
- }
-
- // list item description
- .list-search-result-description {
- color: $system_insensitive_fg_color;
-
- @if $contrast == 'high' {
- color: $system_fg_color;
- }
- }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_search-results.scss b/gnome-shell/src/gnome-shell-sass/widgets/_search-results.scss
new file mode 120000
index 0000000000..d9c31b05c8
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_search-results.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_search-results.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_slider.scss b/gnome-shell/src/gnome-shell-sass/widgets/_slider.scss
deleted file mode 100644
index 4cb7a5338d..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_slider.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Slider */
-
-$slider_size: $scalable_icon_size;
-$slider_size: to_em(18px);; // Yaru change: larger slider cause to border in light theme
-
-.slider {
- // Yaru: Use less invasive handle color on light theme
- color: if($variant == 'light', lighten($fg_color, 15%), darken($fg_color, 9%));
-
- // slider trough
- -barlevel-height: 4px;
- -barlevel-background-color: transparentize($fg_color, 0.9);
- // fill style
- -barlevel-active-background-color: -st-accent-color;
- // overfill style (red in this case)
- -barlevel-overdrive-color: $destructive_color;
- -barlevel-overdrive-separator-width:1px;
- // slider handler
- // -slider-handle-border-width: 0;
- // -slider-handle-border-color: transparent; // because 0 width
- -slider-handle-border-width: 1px; // Yaru change: add border
- -slider-handle-border-color: if($variant=='light', darken($alt_borders_color, 3%), transparent); // because 0 width - Yaru change: the handle border needs to be darker for the light theme
- -slider-handle-radius: $slider_size * 0.5; // half the size of the size
-
- height: $slider_size + to_em(2px); // Yaru change: increase height due to border
-
- // hc style
- @if $contrast == 'high' {
- -barlevel-background-color: transparentize($fg_color, 0.6);
- }
-
- &:hover {
- color: if($variant == 'light', lighten($fg_color, 7%), $fg_color);
- }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_slider.scss b/gnome-shell/src/gnome-shell-sass/widgets/_slider.scss
new file mode 120000
index 0000000000..b4c3ba9c1d
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_slider.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_slider.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_switcher-popup.scss b/gnome-shell/src/gnome-shell-sass/widgets/_switcher-popup.scss
deleted file mode 100644
index 476e67d6a0..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_switcher-popup.scss
+++ /dev/null
@@ -1,81 +0,0 @@
-/* App Switcher */
-
-// same as dash
-$switcher_padding: $base_padding * 2;
-$switcher_radius: $modal_radius + $switcher_padding;
-
-// the full screen container of the switcher
-.switcher-popup {
- padding: 0;
- spacing: $base_padding * 4;
-}
-
-// switcher onscreen panel
-.switcher-list {
- @extend %osd_panel;
- padding: $switcher_padding;
- border-radius: $switcher_radius;
- box-shadow: 0 8px 8px 0 $shadow_color;
-
- // container for items in list
- .switcher-list-item-container {
- spacing: $base_padding * 2;
- }
-
- // each item in the list
- .item-box {
- @include tile_button($fg:$osd_fg_color, $bg:$osd_bg_color);
- // override %tile style so mouse doesn't steal focus
- &:hover {background: none;}
-
- // brighter than normal selected style
- &:selected {
- background-color: transparentize($osd_fg_color, 0.8);
- }
-
- @if $contrast == 'high' {
- &:selected {
- background-color: transparentize($osd_fg_color, 0.7);
- }
- }
- }
-
- .separator {
- width: 1px;
- background: $borders_color;
- }
-
- // container of thumbnails
- .thumbnail-box {
- padding: 2px;
- spacing: $base_padding;
- }
-
- // window thumbnail itself
- .thumbnail {
- width: 256px; // equal to THUMBNAIL_DEFAULT_SIZE in altTab.js
- border-radius:$base_border_radius;
- }
-}
-
-.switcher-arrow { // Yaru: make arrow visible in the light theme, should be ported to upstream
- border-color: rgba(0,0,0,0);
- color: transparentize($osd_fg_color,0.2);
-
- &:highlighted {
- border-color: $osd_fg_color;
- color: $osd_fg_color;
- }
-}
-
-// Input Source Switcher
-.input-source-switcher-symbol {
- font-size: 34pt;
- width: 96px;
- height: 96px;
-}
-
-// Window cycler highlight
-.cycler-highlight {
- border: 5px solid -st-accent-color;
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_switcher-popup.scss b/gnome-shell/src/gnome-shell-sass/widgets/_switcher-popup.scss
new file mode 120000
index 0000000000..999c53bfed
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_switcher-popup.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_switcher-popup.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_switches.scss b/gnome-shell/src/gnome-shell-sass/widgets/_switches.scss
deleted file mode 100644
index 055b0561b6..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_switches.scss
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Switches */
-
-$switch_width: 46px;
-$switch_handle_size: 20px;
-
-.toggle-switch {
- width: $switch_width;
- border-radius: $forced_circular_radius;
- transition-duration: 100ms;
- color: $fg_color;
-
- @if $contrast == 'high' {
- background: transparentize(if($variant == 'light', black, white), .7);
-
- &:hover {
- background: transparentize(if($variant == 'light', black, white), .6);
- }
- } @else {
- background: transparentize(if($variant == 'light', black, white), .85);
-
- &:hover {
- background: transparentize(if($variant == 'light', black, white), .8);
- }
- }
-
- StIcon {
- icon-size: $base_icon_size;
- }
-
- .handle {
- margin: 3px;
- width: $switch_handle_size;
- height: $switch_handle_size;
- border-radius: $forced_circular_radius;
- background: if($variant == 'light', white, mix(white, $bg_color, 80%));
- box-shadow: 0 2px 4px transparentize(black, .8);
- transition-duration: 100ms;
- }
-
- &:checked {
- background: -st-accent-color;
- color: -st-accent-fg-color;
- &:hover {
- background-color: st-lighten(-st-accent-color, 5%);
- color: st-lighten(-st-accent-fg-color, 5%);
- }
-
- .handle {
- background: white;
- }
- }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_switches.scss b/gnome-shell/src/gnome-shell-sass/widgets/_switches.scss
new file mode 120000
index 0000000000..2f8cab2590
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_switches.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_switches.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_window-picker.scss b/gnome-shell/src/gnome-shell-sass/widgets/_window-picker.scss
deleted file mode 100644
index 5527308baf..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_window-picker.scss
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Window Picker */
-$window_close_button_color: transparentize(lighten($system_bg_color, 7%), .02);
-
-// Window picker
-.window-picker {
- // Space between window thumbnails
- spacing: $base_padding;
-}
-
-// Window icons
-.window-icon {
- // styled only with .icon-dropshadow
- // but has a different style in high-contrast
- @if $contrast == 'high' {
- background-color: $osd_bg_color;
- padding: $base_padding * 2;
- border-radius: $modal_radius;
- border: 2px solid $hc_inset_color;
- margin: $base_padding * 3;
- }
-}
-
-// Window titles
-.window-caption {
- @extend %tooltip;
-}
-
-// Close button
-.window-close {
- background-color: $window_close_button_color;
- color: $system_fg_color;
- border-radius: $forced_circular_radius;
- box-shadow: 0 2px 4px 0 $shadow_color;
- padding: $base_padding * 0.5;
- height: $large_icon_size;
- width: $large_icon_size;
- transition-duration: 100ms;
- border: 2px solid transparent;
- border: 1px solid $system_borders_color; // Yaru: add border
-
- @if $contrast == 'high' {
- border-color: $hc_inset_color;
- }
-
- & StIcon { icon-size: $medium_icon_size; }
-
- &:hover {
- background-color: lighten($window_close_button_color, 7%);
- }
-
- &:active {
- background-color: lighten($window_close_button_color, 13%);
- }
-
-}
-
-.workspace-background {
- // keep in sync with BACKGROUND_CORNER_RADIUS_PIXELS in workspace.js
- border-radius: 30px;
- background-color: $invisible_occluded_bg_color;
- box-shadow: 0 4px 16px 4px $shadow_color;
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_window-picker.scss b/gnome-shell/src/gnome-shell-sass/widgets/_window-picker.scss
new file mode 120000
index 0000000000..91984afaed
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_window-picker.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_window-picker.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_workspace-switcher.scss b/gnome-shell/src/gnome-shell-sass/widgets/_workspace-switcher.scss
deleted file mode 100644
index da8d77fdeb..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_workspace-switcher.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Workspace Switcher */
-
-$ws_indicator_height: 32px;
-$ws_dot_active: $ws_indicator_height / 3;
-$ws_dot_inactive: $ws_indicator_height / 6;
-
-.workspace-switcher {
- @extend %osd_panel;
- margin-bottom: 4em;
- spacing: $base_padding * 2;
- padding: $base_padding * 2 $base_padding * 3;
-}
-
-.ws-switcher-indicator {
- background-color: transparentize($osd_fg_color,0.5);
- padding: $ws_dot_inactive / 2;
- margin: ($ws_indicator_height - $ws_dot_inactive) / 2;
- border-radius: $ws_indicator_height;
-
- &:active {
- background-color: $osd_fg_color;
- padding: $ws_dot_active / 2;
- margin: ($ws_indicator_height - $ws_dot_active) / 2;
- }
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_workspace-switcher.scss b/gnome-shell/src/gnome-shell-sass/widgets/_workspace-switcher.scss
new file mode 120000
index 0000000000..327e6f5b05
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_workspace-switcher.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_workspace-switcher.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_workspace-thumbnails.scss b/gnome-shell/src/gnome-shell-sass/widgets/_workspace-thumbnails.scss
deleted file mode 100644
index 5b2c7f9cf7..0000000000
--- a/gnome-shell/src/gnome-shell-sass/widgets/_workspace-thumbnails.scss
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Workspace pager */
-
-// thumbnails in overview
-.workspace-thumbnails {
- visible-width: 32px; //amount visible before hover
- spacing: $base_padding;
- padding: $base_padding;
- border-color: transparent; // Yaru: adapt the workspace osd border to the dock border
-
- .workspace-thumbnail {
- color: $system_fg_color;
- background-color: lighten($system_bg_color, 10%);
- border-radius: $base_border_radius * 0.5;
- border: 1px solid transparent;
-
- background-color: $system_overlay_bg_color; // Yaru: use same background as dash
- border: 1px solid $system_borders_color; // Yaru: use same border as dash
-
- @if $contrast == 'high' {
- border-color: $hc_inset_color;
- }
- }
-
- // drag and drop indicator
- .placeholder {
- background-image: url("resource:///org/gnome/shell/theme/workspace-placeholder.svg");
- background-size: contain;
- width: 18px;
- }
-}
-
-// selected indicator
-.workspace-thumbnail-indicator {
- border: 3px solid -st-accent-color;
- border: 2px solid -st-accent-color; // Yaru: we detached focus from selected
- border-radius: $base_border_radius;
-}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_workspace-thumbnails.scss b/gnome-shell/src/gnome-shell-sass/widgets/_workspace-thumbnails.scss
new file mode 120000
index 0000000000..db00d34b09
--- /dev/null
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_workspace-thumbnails.scss
@@ -0,0 +1 @@
+../../../upstream/theme/gnome-shell-sass/widgets/_workspace-thumbnails.scss
\ No newline at end of file
diff --git a/gnome-shell/src/gnome-shell.scss.in b/gnome-shell/src/gnome-shell.scss.in
index 5bad1401c5..b0ce00dc3b 100644
--- a/gnome-shell/src/gnome-shell.scss.in
+++ b/gnome-shell/src/gnome-shell.scss.in
@@ -24,8 +24,10 @@ $contrast: @Contrast@;
@debug 'Generating GNOME Shell ' + $variant + ' theme (contrast: '+ $contrast + ')';
@import "gnome-shell-sass/_@Colors@";
+@import "gnome-shell-sass/_color-overrides";
@import "gnome-shell-sass/_drawing";
@import "gnome-shell-sass/_common";
@import "gnome-shell-sass/_widgets";
@import "gnome-shell-sass/_dock";
+@import "gnome-shell-sass/_tweaks"; // Yaru custom tweaks (loaded last to override upstream)
diff --git a/gnome-shell/src/meson.build b/gnome-shell/src/meson.build
index 87b930ea04..1010a70735 100644
--- a/gnome-shell/src/meson.build
+++ b/gnome-shell/src/meson.build
@@ -122,6 +122,8 @@ foreach variant: variants
sassc, '-a', '@INPUT@', '@OUTPUT@',
'-I', css_sources_path,
'-I', meson.project_source_root() / 'common',
+ '-I', meson.project_source_root() / 'gnome-shell' / 'upstream' / 'theme',
+ '-I', meson.current_source_dir(),
],
install: install_theme_sources,
install_dir: install_dir,
diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_dialogs.scss b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_dialogs.scss
index 1cf85f57ce..0b61782bef 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_dialogs.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_dialogs.scss
@@ -126,10 +126,19 @@
.prompt-dialog-null-label {
@extend %caption;
text-align: center;
+ padding: $base_padding * 1.5;
+ border-radius: $base_border_radius;
+ margin: $base_margin 0;
}
.prompt-dialog-error-label {
color: $warning_color;
+ background-color: transparentize($warning_color, 0.9);
+ }
+
+ .prompt-dialog-info-label {
+ color: $fg_color;
+ background-color: transparentize($fg_color, 0.9);
}
}
diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_login-lock.scss b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_login-lock.scss
index d8e22980d0..b661e93c8d 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_login-lock.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_login-lock.scss
@@ -37,9 +37,7 @@ $_gdm_dialog_width: 25em;
&.a11y-button,
&.cancel-button,
&.switch-user-button,
- &.login-dialog-auth-menu-button,
- &.login-dialog-session-list-button,
- &.web-login-intro-button {
+ &.login-dialog-session-list-button {
@extend .icon-button;
@extend %system_button;
@@ -51,25 +49,6 @@ $_gdm_dialog_width: 25em;
}
}
-.login-dialog-auth-menu-button-title {
- @include fontsize($base_font_size - 1);
- color: darken($_gdm_fg,40%);
- font-weight: bold;
- padding-top: $base_padding;
- padding-bottom: $base_padding * 2;
- padding-left: $base_padding * 2;
- padding-right: $base_padding * 2;
-}
-
-.login-dialog-auth-menu-button-popup-menu-box {
- padding: $base_padding * 3;
-}
-
-.login-dialog-auth-menu-button-item {
- padding-left: $base_padding * 2;
- padding-right: $base_padding * 2;
-}
-
.login-dialog-button-box {
spacing: $base_padding * 2;
}
@@ -90,16 +69,13 @@ $_gdm_dialog_width: 25em;
.conflicting-session-dialog-desc-warning {
text-align: center;
color: $warning_color;
+ background-color: transparentize($warning_color, 0.9);
+ padding: $base_padding * 1.5;
+ border-radius: $base_border_radius;
+ margin: $base_margin 0;
}
}
-.login-dialog-menu-button-box {
- spacing: $base_padding * 2;
- padding-left: $base_padding * 2;
- padding-right: $base_padding * 2;
- padding-bottom: $base_padding * 2;
-}
-
.login-dialog-logo-bin {
margin: 3em 0;
}
@@ -234,80 +210,8 @@ $_gdm_dialog_width: 25em;
}
}
-.login-dialog-prompt-layout {
- spacing: $base_padding * 2;
- min-width: 30em;
-}
-
-.login-dialog-prompt-entry {
- @extend %system_entry;
-}
-
-.web-login-dialog-content-overlay {
- background-color: transparentize($bg_color, 0.3);
- border-radius: $modal_radius;
- margin-bottom: 3em;
-}
-
-.web-login-spinner {
- color: $osd_fg_color;
- background-color: transparentize($osd_bg_color, 0.5);
- border: 5px transparent;
- border-radius: 50px;
-}
-
-.web-login-title-label {
- @include fontsize($base_font_size);
- color: if($variant == 'dark', darken($fg_color,30%), lighten($fg_color,20%));
-}
-
-.web-login-url-label {
- @include fontsize($base_font_size);
- @extend %monospace;
- color: $fg_color;
- text-align: center;
-}
-
-.web-login-code-title-label {
- @include fontsize($base_font_size);
- @include fontsize($base_font_size);
- color: $fg_color;
-}
-
-.web-login-code-label {
- @include fontsize($base_font_size);
- color: $fg_color;
- font-weight: bold;
-}
-
-.web-login-prompt {
- padding-top: $base_padding;
- padding-bottom: $base_padding;
- padding-left: $base_padding * 4.5;
- padding-right: $base_padding * 4.5;
- spacing: 1.75em;
- border-radius: $base_border_radius * 2;
-}
-
-.web-login-intro-button-label {
- @include fontsize($base_font_size + 5);
- color: $fg_color;
- height: 3em;
- text-align: center;
- font-weight: bold;
-}
-
-.web-login-intro-button {
- @include fontsize($base_font_size);
- color: $fg_color;
- height: 3em;
- text-align: center;
- border-radius: $base_border_radius * 4;
-}
-
// Screen Shield
// a.k.a. the lockscreen, uses transparent styles
-
.unlock-dialog {
background-color: transparent;
@@ -465,32 +369,3 @@ $_gdm_dialog_width: 25em;
}
}
}
-
-// Login Failed banner
-.auth-notification-banner {
- .message-header {
- width: 0px;
- height: 0px;
-
- .message-close-button {
- border: none;
- background-color: rgba(0, 0, 0, 0.0);
- }
- }
-}
-
-// QR Code
-.qr-code {
- @if ($variant == 'light') {
- $qrcode_bg_color: mix($fg_color, $bg_color, 8%);
- background-color: $qrcode_bg_color;
- border-color: $qrcode_bg_color;
- color: $fg_color;
- } @else {
- background-color: $_gdm_fg;
- border-color: $_gdm_fg;
- color: $_gdm_bg;
- }
- border-radius: $base_border_radius * .5;
- border-width: 1em;
-}
diff --git a/gtk/src/bark-dark/gtk-2.0/assets-external.svg b/gtk/src/bark-dark/gtk-2.0/assets-external.svg
deleted file mode 100644
index ba29299842..0000000000
--- a/gtk/src/bark-dark/gtk-2.0/assets-external.svg
+++ /dev/null
@@ -1,6842 +0,0 @@
-
-
-
-
diff --git a/gtk/src/bark-dark/gtk-2.0/assets.svg b/gtk/src/bark-dark/gtk-2.0/assets.svg
deleted file mode 100644
index 6f5aad3cba..0000000000
--- a/gtk/src/bark-dark/gtk-2.0/assets.svg
+++ /dev/null
@@ -1,5838 +0,0 @@
-
-
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/checkbox-checked-active.png b/gtk/src/bark-dark/gtk-2.0/assets/checkbox-checked-active.png
deleted file mode 100644
index b486d7880c..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/checkbox-checked-active.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/checkbox-checked-insensitive.png b/gtk/src/bark-dark/gtk-2.0/assets/checkbox-checked-insensitive.png
deleted file mode 100644
index 346cae2c1d..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/checkbox-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/checkbox-checked.png b/gtk/src/bark-dark/gtk-2.0/assets/checkbox-checked.png
deleted file mode 100644
index 42e8e2140c..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/checkbox-checked.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/checkbox-mixed-active.png b/gtk/src/bark-dark/gtk-2.0/assets/checkbox-mixed-active.png
deleted file mode 100644
index 692984a56d..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/checkbox-mixed-active.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/checkbox-mixed-insensitive.png b/gtk/src/bark-dark/gtk-2.0/assets/checkbox-mixed-insensitive.png
deleted file mode 100644
index c0d074bd77..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/checkbox-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/checkbox-mixed.png b/gtk/src/bark-dark/gtk-2.0/assets/checkbox-mixed.png
deleted file mode 100644
index 0f525c6602..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/checkbox-mixed.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/combo-entry-ltr-entry-active.png b/gtk/src/bark-dark/gtk-2.0/assets/combo-entry-ltr-entry-active.png
deleted file mode 100644
index 883494dbb9..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/combo-entry-ltr-entry-active.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/combo-entry-rtl-entry-active.png b/gtk/src/bark-dark/gtk-2.0/assets/combo-entry-rtl-entry-active.png
deleted file mode 100644
index 8ea75bf681..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/combo-entry-rtl-entry-active.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/entry-active.png b/gtk/src/bark-dark/gtk-2.0/assets/entry-active.png
deleted file mode 100644
index f7d3105799..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/entry-active.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/focus.png b/gtk/src/bark-dark/gtk-2.0/assets/focus.png
deleted file mode 100644
index 617c820763..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/focus.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menubar-item-active.png b/gtk/src/bark-dark/gtk-2.0/assets/menubar-item-active.png
deleted file mode 100644
index 00ef780461..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/menubar-item-active.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png b/gtk/src/bark-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png
deleted file mode 100644
index ed99849e67..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png b/gtk/src/bark-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png
deleted file mode 100644
index d13443e782..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/notebook-entry-active.png b/gtk/src/bark-dark/gtk-2.0/assets/notebook-entry-active.png
deleted file mode 100644
index b27d4de36d..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/notebook-entry-active.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/progressbar-horz.png b/gtk/src/bark-dark/gtk-2.0/assets/progressbar-horz.png
deleted file mode 100644
index 080b6d3d2e..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/progressbar-horz.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/progressbar-vert.png b/gtk/src/bark-dark/gtk-2.0/assets/progressbar-vert.png
deleted file mode 100644
index 446f94caef..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/progressbar-vert.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/radio-checked-active.png b/gtk/src/bark-dark/gtk-2.0/assets/radio-checked-active.png
deleted file mode 100644
index 4b9304a570..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/radio-checked-active.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/radio-checked-insensitive.png b/gtk/src/bark-dark/gtk-2.0/assets/radio-checked-insensitive.png
deleted file mode 100644
index 218884e491..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/radio-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/radio-checked.png b/gtk/src/bark-dark/gtk-2.0/assets/radio-checked.png
deleted file mode 100644
index 9101d8677b..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/radio-checked.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/radio-mixed-active.png b/gtk/src/bark-dark/gtk-2.0/assets/radio-mixed-active.png
deleted file mode 100644
index 12a7ad1ed7..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/radio-mixed-active.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/radio-mixed-insensitive.png b/gtk/src/bark-dark/gtk-2.0/assets/radio-mixed-insensitive.png
deleted file mode 100644
index 0fe1e47497..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/radio-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/radio-mixed.png b/gtk/src/bark-dark/gtk-2.0/assets/radio-mixed.png
deleted file mode 100644
index 34eb24c8e4..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/radio-mixed.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scale-horz-trough-active.png b/gtk/src/bark-dark/gtk-2.0/assets/scale-horz-trough-active.png
deleted file mode 100644
index d8720232bf..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/scale-horz-trough-active.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scale-slider-active.png b/gtk/src/bark-dark/gtk-2.0/assets/scale-slider-active.png
deleted file mode 100644
index 5ffbbca475..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/scale-slider-active.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scale-vert-trough-active.png b/gtk/src/bark-dark/gtk-2.0/assets/scale-vert-trough-active.png
deleted file mode 100644
index 9bbc50a104..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/scale-vert-trough-active.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scrollbar-horz-slider-active.png b/gtk/src/bark-dark/gtk-2.0/assets/scrollbar-horz-slider-active.png
deleted file mode 100644
index b108fb29ee..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/scrollbar-horz-slider-active.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png b/gtk/src/bark-dark/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png
deleted file mode 100644
index 8618b6fe4c..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scrollbar-vert-slider-active.png b/gtk/src/bark-dark/gtk-2.0/assets/scrollbar-vert-slider-active.png
deleted file mode 100644
index a043156d23..0000000000
Binary files a/gtk/src/bark-dark/gtk-2.0/assets/scrollbar-vert-slider-active.png and /dev/null differ
diff --git a/gtk/src/bark-dark/gtk-2.0/gtkrc b/gtk/src/bark-dark/gtk-2.0/gtkrc
deleted file mode 100644
index 5fefbb2472..0000000000
--- a/gtk/src/bark-dark/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,49 +0,0 @@
-# Based on Bridge by ScionicSpectre
-# vim:set ts=2 sw=2 sts=2 ai et:
-#
-# This is the GTK+ 2 version of Adwaita. It's whole purpose is to look as the
-# GTK+ 3 version as much as possible until GTK+ 2 dies completely.
-#
-# Note: comments for explaining styles are on the bottom of each file beside the
-# widget matches.
-
-# Declare the colours used throughout the theme.
-# There shouldn't be any fiddling with them in the theme files themselves in
-# order to not mess up the dark theme.
-
-# Text/base
-gtk-color-scheme = "text_color:#F7F7F7\nbase_color:#3d3d3d"
-# Foreground/background
-gtk-color-scheme = "fg_color:#F7F7F7\nbg_color:#353535"
-# Selected foreground/background
-gtk-color-scheme = "selected_fg_color:#FFFFFF\nselected_bg_color:#787859"
-# Insensitive foreground/background
-gtk-color-scheme = "insensitive_fg_color:#969696\ninsensitive_bg_color:#383838"
-# Menus
-gtk-color-scheme = "menu_color:#424242\nmenubar_bg:#3A3A3A"
-gtk-color-scheme = "menubar_fg:#F7F7F7\nmenubar_insensitive_fg:#CCCCCC"
-# Links
-gtk-color-scheme = "link_color:#787859\nvisited_link_color:#737859"
-# Treeview headers
-gtk-color-scheme = "column_header_color:#353535\nhover_column_header_color:#636769"
-# Window decoration
-gtk-color-scheme = "menu_hover_color:#616161\nwindow_color:#f4f4f4"
-# Tooltips
-gtk-color-scheme = "tooltip_fg_color:#f7f7f7\ntooltip_bg_color:#353535"
-
-# Set GTK settings
-gtk-auto-mnemonics = 1
-gtk-primary-button-warps-slider = 1
-gtk-icon-sizes="gtk-menu=16,16:\
- gtk-button=16,16:\
- gtk-small-toolbar=16,16:\
- gtk-dnd=16,16:\
- gtk-dialog=16,16"
-gtk-toolbar-style = GTK_TOOLBAR_ICONS
-gtk-menu-images = 0
-gtk-menu-popup-delay = 0
-
-# And hand over the control to the theme files
-include "main.rc"
-include "apps.rc"
-include "hacks.rc"
diff --git a/gtk/src/bark-dark/gtk-2.0/render-all-assets.sh b/gtk/src/bark-dark/gtk-2.0/render-all-assets.sh
deleted file mode 100755
index 82b9a4280e..0000000000
--- a/gtk/src/bark-dark/gtk-2.0/render-all-assets.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="inkscape"
-OPTIPNG="optipng"
-
-SRC_FILE="assets.svg"
-ASSETS_DIR="assets"
-INDEX="assets.txt"
-
-rm assets/*.png
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
- echo $ASSETS_DIR/$i.png exists.
-else
- echo
- echo Rendering $ASSETS_DIR/$i.png
- $INKSCAPE --export-id=$i \
- --export-id-only \
- -o $ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
- && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png
-fi
-done
-exit 0
diff --git a/gtk/src/bark/gtk-2.0/assets-external.svg b/gtk/src/bark/gtk-2.0/assets-external.svg
deleted file mode 100644
index 71e012d04d..0000000000
--- a/gtk/src/bark/gtk-2.0/assets-external.svg
+++ /dev/null
@@ -1,6842 +0,0 @@
-
-
-
-
diff --git a/gtk/src/bark/gtk-2.0/assets.svg b/gtk/src/bark/gtk-2.0/assets.svg
deleted file mode 100644
index 5976c69b9d..0000000000
--- a/gtk/src/bark/gtk-2.0/assets.svg
+++ /dev/null
@@ -1,5753 +0,0 @@
-
-
diff --git a/gtk/src/bark/gtk-2.0/assets/checkbox-checked-active.png b/gtk/src/bark/gtk-2.0/assets/checkbox-checked-active.png
deleted file mode 100644
index b486d7880c..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/checkbox-checked-active.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/checkbox-checked-insensitive.png b/gtk/src/bark/gtk-2.0/assets/checkbox-checked-insensitive.png
deleted file mode 100644
index 734a8424da..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/checkbox-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/checkbox-checked.png b/gtk/src/bark/gtk-2.0/assets/checkbox-checked.png
deleted file mode 100644
index 42e8e2140c..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/checkbox-checked.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/checkbox-mixed-active.png b/gtk/src/bark/gtk-2.0/assets/checkbox-mixed-active.png
deleted file mode 100644
index 692984a56d..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/checkbox-mixed-active.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/checkbox-mixed-insensitive.png b/gtk/src/bark/gtk-2.0/assets/checkbox-mixed-insensitive.png
deleted file mode 100644
index 7dfbfdb54f..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/checkbox-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/checkbox-mixed.png b/gtk/src/bark/gtk-2.0/assets/checkbox-mixed.png
deleted file mode 100644
index 0f525c6602..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/checkbox-mixed.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/combo-entry-ltr-entry-active.png b/gtk/src/bark/gtk-2.0/assets/combo-entry-ltr-entry-active.png
deleted file mode 100644
index 2b597b1408..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/combo-entry-ltr-entry-active.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/combo-entry-rtl-entry-active.png b/gtk/src/bark/gtk-2.0/assets/combo-entry-rtl-entry-active.png
deleted file mode 100644
index 0e79188ce2..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/combo-entry-rtl-entry-active.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/entry-active.png b/gtk/src/bark/gtk-2.0/assets/entry-active.png
deleted file mode 100644
index 7cddd0314c..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/entry-active.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/focus.png b/gtk/src/bark/gtk-2.0/assets/focus.png
deleted file mode 100644
index 617c820763..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/focus.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/menubar-item-active.png b/gtk/src/bark/gtk-2.0/assets/menubar-item-active.png
deleted file mode 100644
index 00ef780461..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/menubar-item-active.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png b/gtk/src/bark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png
deleted file mode 100644
index 17ccd48c5e..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png b/gtk/src/bark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png
deleted file mode 100644
index 85b0966924..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/notebook-entry-active.png b/gtk/src/bark/gtk-2.0/assets/notebook-entry-active.png
deleted file mode 100644
index 1ce7579a3f..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/notebook-entry-active.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/progressbar-horz.png b/gtk/src/bark/gtk-2.0/assets/progressbar-horz.png
deleted file mode 100644
index c4ca2b5756..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/progressbar-horz.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/progressbar-vert.png b/gtk/src/bark/gtk-2.0/assets/progressbar-vert.png
deleted file mode 100644
index 66869515bb..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/progressbar-vert.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/radio-checked-active.png b/gtk/src/bark/gtk-2.0/assets/radio-checked-active.png
deleted file mode 100644
index 4b9304a570..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/radio-checked-active.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/radio-checked-insensitive.png b/gtk/src/bark/gtk-2.0/assets/radio-checked-insensitive.png
deleted file mode 100644
index 44a9c389c4..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/radio-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/radio-checked.png b/gtk/src/bark/gtk-2.0/assets/radio-checked.png
deleted file mode 100644
index 9101d8677b..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/radio-checked.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/radio-mixed-active.png b/gtk/src/bark/gtk-2.0/assets/radio-mixed-active.png
deleted file mode 100644
index 12a7ad1ed7..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/radio-mixed-active.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/radio-mixed-insensitive.png b/gtk/src/bark/gtk-2.0/assets/radio-mixed-insensitive.png
deleted file mode 100644
index 8c31493d87..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/radio-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/radio-mixed.png b/gtk/src/bark/gtk-2.0/assets/radio-mixed.png
deleted file mode 100644
index 34eb24c8e4..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/radio-mixed.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/scale-horz-trough-active.png b/gtk/src/bark/gtk-2.0/assets/scale-horz-trough-active.png
deleted file mode 100644
index 0789822246..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/scale-horz-trough-active.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/scale-slider-active.png b/gtk/src/bark/gtk-2.0/assets/scale-slider-active.png
deleted file mode 100644
index 5ffbbca475..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/scale-slider-active.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/scale-slider-hover.png b/gtk/src/bark/gtk-2.0/assets/scale-slider-hover.png
deleted file mode 100644
index 9a41c44ece..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/scale-slider-hover.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/scale-vert-trough-active.png b/gtk/src/bark/gtk-2.0/assets/scale-vert-trough-active.png
deleted file mode 100644
index 99cd5405f8..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/scale-vert-trough-active.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/scrollbar-horz-slider-active.png b/gtk/src/bark/gtk-2.0/assets/scrollbar-horz-slider-active.png
deleted file mode 100644
index b108fb29ee..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/scrollbar-horz-slider-active.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png b/gtk/src/bark/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png
deleted file mode 100644
index 8618b6fe4c..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/assets/scrollbar-vert-slider-active.png b/gtk/src/bark/gtk-2.0/assets/scrollbar-vert-slider-active.png
deleted file mode 100644
index a043156d23..0000000000
Binary files a/gtk/src/bark/gtk-2.0/assets/scrollbar-vert-slider-active.png and /dev/null differ
diff --git a/gtk/src/bark/gtk-2.0/gtkrc b/gtk/src/bark/gtk-2.0/gtkrc
deleted file mode 100644
index de8784e18c..0000000000
--- a/gtk/src/bark/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,50 +0,0 @@
-# Based on Bridge by ScionicSpectre
-# vim:set ts=2 sw=2 sts=2 ai et:
-#
-# This is the GTK+ 2 version of Adwaita. It's whole purpose is to look as the
-# GTK+ 3 version as much as possible until GTK+ 2 dies completely.
-#
-# Note: comments for explaining styles are on the bottom of each file beside the
-# widget matches.
-
-# Declare the colours used throughout the theme.
-# There shouldn't be any fiddling with them in the theme files themselves in
-# order to not mess up the dark theme.
-
-# Text/base
-gtk-color-scheme = "text_color:#5D5D5D\nbase_color:#FFFFFF"
-# Foreground/background
-gtk-color-scheme = "fg_color:#3D3D3D\nbg_color:#F5F6F7"
-# Selected foreground/background
-gtk-color-scheme = "selected_fg_color:#ffffff\nselected_bg_color:#787859"
-# Insensitive foreground/background
-gtk-color-scheme = "insensitive_fg_color:#8b8e8f\ninsensitive_bg_color:#f1f1f1"
-# Menus
-gtk-color-scheme = "menu_color:#fafafa\nmenubar_bg:#f5f6f7"
-gtk-color-scheme = "menubar_fg:#3d3d3d\nmenubar_insensitive_fg:#3d3d3d"
-# Links
-gtk-color-scheme = "link_color:#787859\nvisited_link_color:#737859"
-# Treeview headers
-gtk-color-scheme = "column_header_color:#979a9b\nhover_column_header_color:#636769"
-# Window decoration
-gtk-color-scheme = "menu_hover_color:#e2e2e2\nwindow_color:#f4f4f4"
-# Tooltips
-gtk-color-scheme = "tooltip_fg_color:#ffffff\ntooltip_bg_color:#343434"
-
-# Set GTK settings
-gtk-auto-mnemonics = 1
-gtk-primary-button-warps-slider = 1
-gtk-icon-sizes="gtk-menu=16,16:
-gtk-button=16,16:
-gtk-small-toolbar=16,16:
-
-gtk-dnd=16,16:
-gtk-dialog=16,16"
-gtk-toolbar-style = GTK_TOOLBAR_ICONS
-gtk-menu-images = 0
-gtk-menu-popup-delay = 0
-
-# And hand over the control to the theme files
-include "main.rc"
-include "apps.rc"
-include "hacks.rc"
diff --git a/gtk/src/bark/gtk-2.0/render-all-assets.sh b/gtk/src/bark/gtk-2.0/render-all-assets.sh
deleted file mode 100755
index 82b9a4280e..0000000000
--- a/gtk/src/bark/gtk-2.0/render-all-assets.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="inkscape"
-OPTIPNG="optipng"
-
-SRC_FILE="assets.svg"
-ASSETS_DIR="assets"
-INDEX="assets.txt"
-
-rm assets/*.png
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
- echo $ASSETS_DIR/$i.png exists.
-else
- echo
- echo Rendering $ASSETS_DIR/$i.png
- $INKSCAPE --export-id=$i \
- --export-id-only \
- -o $ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
- && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png
-fi
-done
-exit 0
diff --git a/gtk/src/bark/gtk-2.0/render-assets-external.sh b/gtk/src/bark/gtk-2.0/render-assets-external.sh
deleted file mode 100755
index 5f5c2c2e7b..0000000000
--- a/gtk/src/bark/gtk-2.0/render-assets-external.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="inkscape"
-OPTIPNG="optipng"
-
-SRC_FILE="assets-external.svg"
-ASSETS_DIR="assets"
-INDEX="assets-external.txt"
-
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
- echo $ASSETS_DIR/$i.png exists.
-else
- echo
- echo Rendering $ASSETS_DIR/$i.png
- $INKSCAPE --export-id=$i \
- --export-id-only \
- --export-background-opacity=0 \
- --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
- && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png
-fi
-done
-exit 0
diff --git a/gtk/src/blue-dark/gtk-2.0/assets-external.svg b/gtk/src/blue-dark/gtk-2.0/assets-external.svg
deleted file mode 100644
index bc70880a3c..0000000000
--- a/gtk/src/blue-dark/gtk-2.0/assets-external.svg
+++ /dev/null
@@ -1,6840 +0,0 @@
-
-
-
-
diff --git a/gtk/src/blue-dark/gtk-2.0/assets.svg b/gtk/src/blue-dark/gtk-2.0/assets.svg
deleted file mode 100644
index e7105bf812..0000000000
--- a/gtk/src/blue-dark/gtk-2.0/assets.svg
+++ /dev/null
@@ -1,5836 +0,0 @@
-
-
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/button-active.png b/gtk/src/blue-dark/gtk-2.0/assets/button-active.png
deleted file mode 100644
index a81736fc26..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/button-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/button-hover.png b/gtk/src/blue-dark/gtk-2.0/assets/button-hover.png
deleted file mode 100644
index 5e6a3e4f4f..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/button-hover.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/button-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/button-insensitive.png
deleted file mode 100644
index 6f21fd83ce..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/button-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/button.png b/gtk/src/blue-dark/gtk-2.0/assets/button.png
deleted file mode 100644
index c841d1f7bb..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/button.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-checked-active.png b/gtk/src/blue-dark/gtk-2.0/assets/checkbox-checked-active.png
deleted file mode 100644
index 3f2274ac01..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-checked-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-checked-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/checkbox-checked-insensitive.png
deleted file mode 100644
index 420913e403..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-checked.png b/gtk/src/blue-dark/gtk-2.0/assets/checkbox-checked.png
deleted file mode 100644
index fea086d9d1..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-checked.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-mixed-active.png b/gtk/src/blue-dark/gtk-2.0/assets/checkbox-mixed-active.png
deleted file mode 100644
index 0cc4926122..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-mixed-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-mixed-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/checkbox-mixed-insensitive.png
deleted file mode 100644
index 2fdb86bf44..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-mixed.png b/gtk/src/blue-dark/gtk-2.0/assets/checkbox-mixed.png
deleted file mode 100644
index 1c3fc23a68..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-mixed.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-unchecked-active.png b/gtk/src/blue-dark/gtk-2.0/assets/checkbox-unchecked-active.png
deleted file mode 100644
index 6dd362192d..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-unchecked-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-unchecked-hover.png b/gtk/src/blue-dark/gtk-2.0/assets/checkbox-unchecked-hover.png
deleted file mode 100644
index 1d53f96eb0..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-unchecked-hover.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-unchecked-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/checkbox-unchecked-insensitive.png
deleted file mode 100644
index 2282847f50..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-unchecked-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-unchecked.png b/gtk/src/blue-dark/gtk-2.0/assets/checkbox-unchecked.png
deleted file mode 100644
index e2964791ca..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/checkbox-unchecked.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-button-active.png b/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-button-active.png
deleted file mode 100644
index a45d33ea66..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-button-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-button-hover.png b/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-button-hover.png
deleted file mode 100644
index 10703ad816..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-button-hover.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png
deleted file mode 100644
index bdbae85a01..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-button.png b/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-button.png
deleted file mode 100644
index 78e2354af1..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-button.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-entry-active.png b/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-entry-active.png
deleted file mode 100644
index 7c98ce5a66..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-entry-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png
deleted file mode 100644
index ab286b3694..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-entry.png b/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-entry.png
deleted file mode 100644
index d6703ca3b9..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-ltr-entry.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-button-active.png b/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-button-active.png
deleted file mode 100644
index 41176ab320..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-button-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-button-hover.png b/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-button-hover.png
deleted file mode 100644
index 182dcea8c6..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-button-hover.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png
deleted file mode 100644
index 56ea02790a..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-button.png b/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-button.png
deleted file mode 100644
index f5c3259bab..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-button.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-entry-active.png b/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-entry-active.png
deleted file mode 100644
index 200eab452e..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-entry-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png
deleted file mode 100644
index b45560d05e..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-entry.png b/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-entry.png
deleted file mode 100644
index 5fca5f2a7b..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/combo-entry-rtl-entry.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/entry-active.png b/gtk/src/blue-dark/gtk-2.0/assets/entry-active.png
deleted file mode 100644
index ee2d3552e0..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/entry-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/entry-background-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/entry-background-insensitive.png
deleted file mode 100644
index e702aee22a..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/entry-background-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/entry-background.png b/gtk/src/blue-dark/gtk-2.0/assets/entry-background.png
deleted file mode 100644
index 95e7c8173c..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/entry-background.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/entry-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/entry-insensitive.png
deleted file mode 100644
index 1225573ebc..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/entry.png b/gtk/src/blue-dark/gtk-2.0/assets/entry.png
deleted file mode 100644
index 7b4f4390f0..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/entry.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/focus.png b/gtk/src/blue-dark/gtk-2.0/assets/focus.png
deleted file mode 100644
index 9ad64d8264..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/focus.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/frame-inline.png b/gtk/src/blue-dark/gtk-2.0/assets/frame-inline.png
deleted file mode 100644
index 6bac7b96c6..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/frame-inline.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/frame-notebook.png b/gtk/src/blue-dark/gtk-2.0/assets/frame-notebook.png
deleted file mode 100644
index 8b3f329538..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/frame-notebook.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/frame.png b/gtk/src/blue-dark/gtk-2.0/assets/frame.png
deleted file mode 100644
index 56a2d8dad6..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/frame.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/handle-horz.png b/gtk/src/blue-dark/gtk-2.0/assets/handle-horz.png
deleted file mode 100644
index 7e53b2e31d..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/handle-horz.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/handle-vert.png b/gtk/src/blue-dark/gtk-2.0/assets/handle-vert.png
deleted file mode 100644
index fd6890c81d..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/handle-vert.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/line.png b/gtk/src/blue-dark/gtk-2.0/assets/line.png
deleted file mode 100644
index 1fad628ee0..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/line.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox-checked-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox-checked-insensitive.png
deleted file mode 100644
index 49038d3625..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox-checked.png b/gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox-checked.png
deleted file mode 100644
index 25c34e7275..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox-checked.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox-hover.png b/gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox-hover.png
deleted file mode 100644
index 83ef341ff3..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox-hover.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png
deleted file mode 100644
index 861685a014..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox-mixed.png b/gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox-mixed.png
deleted file mode 100644
index fc85684cd2..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox-mixed.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-pan-down.png b/gtk/src/blue-dark/gtk-2.0/assets/menu-pan-down.png
deleted file mode 100644
index 31ef6a353b..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/menu-pan-down.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-pan-left.png b/gtk/src/blue-dark/gtk-2.0/assets/menu-pan-left.png
deleted file mode 100644
index 6dce59eacc..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/menu-pan-left.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-pan-right.png b/gtk/src/blue-dark/gtk-2.0/assets/menu-pan-right.png
deleted file mode 100644
index fcf6cd8579..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/menu-pan-right.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-pan-up.png b/gtk/src/blue-dark/gtk-2.0/assets/menu-pan-up.png
deleted file mode 100644
index e42cce9df9..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/menu-pan-up.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-radio-checked-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/menu-radio-checked-insensitive.png
deleted file mode 100644
index 66d5a9183a..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/menu-radio-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-radio-checked.png b/gtk/src/blue-dark/gtk-2.0/assets/menu-radio-checked.png
deleted file mode 100644
index 2fb650ed9c..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/menu-radio-checked.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-radio-hover.png b/gtk/src/blue-dark/gtk-2.0/assets/menu-radio-hover.png
deleted file mode 100644
index 0a49b1bc06..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/menu-radio-hover.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-radio-mixed-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/menu-radio-mixed-insensitive.png
deleted file mode 100644
index 861685a014..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/menu-radio-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-radio-mixed.png b/gtk/src/blue-dark/gtk-2.0/assets/menu-radio-mixed.png
deleted file mode 100644
index fc85684cd2..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/menu-radio-mixed.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menubar-item-active.png b/gtk/src/blue-dark/gtk-2.0/assets/menubar-item-active.png
deleted file mode 100644
index e2ce476b4e..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/menubar-item-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png b/gtk/src/blue-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png
deleted file mode 100644
index d6a5ba160f..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png
deleted file mode 100644
index 35419c49c0..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png b/gtk/src/blue-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png
deleted file mode 100644
index 9ec4987140..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png b/gtk/src/blue-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png
deleted file mode 100644
index 35a2d9293e..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png
deleted file mode 100644
index ea235aa9c4..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png b/gtk/src/blue-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png
deleted file mode 100644
index 9564a57b31..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/notebook-entry-active.png b/gtk/src/blue-dark/gtk-2.0/assets/notebook-entry-active.png
deleted file mode 100644
index 568eede9bd..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/notebook-entry-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/notebook-entry-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/notebook-entry-insensitive.png
deleted file mode 100644
index 81631c711d..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/notebook-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/notebook-entry.png b/gtk/src/blue-dark/gtk-2.0/assets/notebook-entry.png
deleted file mode 100644
index e29fd1e78c..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/notebook-entry.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/pan-down-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/pan-down-insensitive.png
deleted file mode 100644
index e898198d34..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/pan-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/pan-down.png b/gtk/src/blue-dark/gtk-2.0/assets/pan-down.png
deleted file mode 100644
index 31ef6a353b..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/pan-down.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/pan-left-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/pan-left-insensitive.png
deleted file mode 100644
index e765c2d3aa..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/pan-left-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/pan-left-semi.png b/gtk/src/blue-dark/gtk-2.0/assets/pan-left-semi.png
deleted file mode 100644
index 936672edb6..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/pan-left-semi.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/pan-left.png b/gtk/src/blue-dark/gtk-2.0/assets/pan-left.png
deleted file mode 100644
index 5280692827..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/pan-left.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/pan-right-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/pan-right-insensitive.png
deleted file mode 100644
index 70f578f138..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/pan-right-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/pan-right-semi.png b/gtk/src/blue-dark/gtk-2.0/assets/pan-right-semi.png
deleted file mode 100644
index 6f0796eeea..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/pan-right-semi.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/pan-right.png b/gtk/src/blue-dark/gtk-2.0/assets/pan-right.png
deleted file mode 100644
index 936c2be433..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/pan-right.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/pan-up-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/pan-up-insensitive.png
deleted file mode 100644
index 4dda1cd33a..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/pan-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/pan-up.png b/gtk/src/blue-dark/gtk-2.0/assets/pan-up.png
deleted file mode 100644
index e42cce9df9..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/pan-up.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/progressbar-horz.png b/gtk/src/blue-dark/gtk-2.0/assets/progressbar-horz.png
deleted file mode 100644
index 0c81e90ba5..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/progressbar-horz.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/progressbar-vert.png b/gtk/src/blue-dark/gtk-2.0/assets/progressbar-vert.png
deleted file mode 100644
index 05ea26236b..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/progressbar-vert.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/radio-checked-active.png b/gtk/src/blue-dark/gtk-2.0/assets/radio-checked-active.png
deleted file mode 100644
index 4cfa2b3d3b..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/radio-checked-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/radio-checked-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/radio-checked-insensitive.png
deleted file mode 100644
index 87ca04b8cd..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/radio-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/radio-checked.png b/gtk/src/blue-dark/gtk-2.0/assets/radio-checked.png
deleted file mode 100644
index 74ab25acb8..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/radio-checked.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/radio-mixed-active.png b/gtk/src/blue-dark/gtk-2.0/assets/radio-mixed-active.png
deleted file mode 100644
index 3ecb51ad26..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/radio-mixed-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/radio-mixed-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/radio-mixed-insensitive.png
deleted file mode 100644
index 98c473ccfd..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/radio-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/radio-mixed.png b/gtk/src/blue-dark/gtk-2.0/assets/radio-mixed.png
deleted file mode 100644
index 31a652e223..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/radio-mixed.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/radio-unchecked-active.png b/gtk/src/blue-dark/gtk-2.0/assets/radio-unchecked-active.png
deleted file mode 100644
index 3b551f2b5a..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/radio-unchecked-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/radio-unchecked-hover.png b/gtk/src/blue-dark/gtk-2.0/assets/radio-unchecked-hover.png
deleted file mode 100644
index cecf227dae..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/radio-unchecked-hover.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/radio-unchecked-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/radio-unchecked-insensitive.png
deleted file mode 100644
index e8a5fdbaca..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/radio-unchecked-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/radio-unchecked.png b/gtk/src/blue-dark/gtk-2.0/assets/radio-unchecked.png
deleted file mode 100644
index 78f114f35e..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/radio-unchecked.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scale-horz-trough-active.png b/gtk/src/blue-dark/gtk-2.0/assets/scale-horz-trough-active.png
deleted file mode 100644
index 18555f8d32..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/scale-horz-trough-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scale-slider-active.png b/gtk/src/blue-dark/gtk-2.0/assets/scale-slider-active.png
deleted file mode 100644
index 742c83efa0..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/scale-slider-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scale-slider-hover.png b/gtk/src/blue-dark/gtk-2.0/assets/scale-slider-hover.png
deleted file mode 100644
index 93f1a71deb..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/scale-slider-hover.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scale-slider-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/scale-slider-insensitive.png
deleted file mode 100644
index a417de4354..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/scale-slider-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scale-slider.png b/gtk/src/blue-dark/gtk-2.0/assets/scale-slider.png
deleted file mode 100644
index 2432f87ab5..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/scale-slider.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scale-vert-trough-active.png b/gtk/src/blue-dark/gtk-2.0/assets/scale-vert-trough-active.png
deleted file mode 100644
index b5e5db2ed3..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/scale-vert-trough-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-horz-slider-active.png b/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-horz-slider-active.png
deleted file mode 100644
index 2cf0d1eb52..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-horz-slider-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-horz-slider-hover.png b/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-horz-slider-hover.png
deleted file mode 100644
index 9d936cb932..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-horz-slider-hover.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-horz-trough.png b/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-horz-trough.png
deleted file mode 100644
index 2d5d36b271..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-horz-trough.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png b/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png
deleted file mode 100644
index 2285f379fc..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-slider-active.png b/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-slider-active.png
deleted file mode 100644
index 9b6defbf59..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-slider-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png b/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png
deleted file mode 100644
index 525a929bca..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-slider-hover.png b/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-slider-hover.png
deleted file mode 100644
index dc1c0bd7f4..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-slider-hover.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-trough-rtl.png b/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-trough-rtl.png
deleted file mode 100644
index 694e334145..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-trough-rtl.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-trough.png b/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-trough.png
deleted file mode 100644
index 694e334145..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-trough.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-down-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-down-insensitive.png
deleted file mode 100644
index 2a77729339..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-down.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-down.png
deleted file mode 100644
index 9ba7e8c646..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-down.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-down-active.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-down-active.png
deleted file mode 100644
index 215721f9b2..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-down-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-down-hover.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-down-hover.png
deleted file mode 100644
index d1ff4fca9b..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-down-hover.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-down-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-down-insensitive.png
deleted file mode 100644
index bd9508a3ca..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-down.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-down.png
deleted file mode 100644
index 4f366b45f5..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-down.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-up-active.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-up-active.png
deleted file mode 100644
index 57a84eba51..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-up-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-up-hover.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-up-hover.png
deleted file mode 100644
index 286c4cad59..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-up-hover.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-up-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-up-insensitive.png
deleted file mode 100644
index 01d6287666..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-up.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-up.png
deleted file mode 100644
index a3aaab0be1..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-ltr-up.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-down-active.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-down-active.png
deleted file mode 100644
index 18d48adc63..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-down-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-down-hover.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-down-hover.png
deleted file mode 100644
index 96e40b47f8..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-down-hover.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-down-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-down-insensitive.png
deleted file mode 100644
index 03b99934f2..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-down.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-down.png
deleted file mode 100644
index 7d0ec869e9..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-down.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-up-active.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-up-active.png
deleted file mode 100644
index ebaa3ff4eb..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-up-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-up-hover.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-up-hover.png
deleted file mode 100644
index 4b6b7b67ea..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-up-hover.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-up-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-up-insensitive.png
deleted file mode 100644
index 05cd2a3698..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-up.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-up.png
deleted file mode 100644
index f334c25a7a..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-rtl-up.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-up-insensitive.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-up-insensitive.png
deleted file mode 100644
index c9dcc0aefe..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/spin-up.png b/gtk/src/blue-dark/gtk-2.0/assets/spin-up.png
deleted file mode 100644
index 69d276646a..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/spin-up.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/tab-down-active.png b/gtk/src/blue-dark/gtk-2.0/assets/tab-down-active.png
deleted file mode 100644
index e6c3b8c2f0..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/tab-down-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/tab-horz-gap.png b/gtk/src/blue-dark/gtk-2.0/assets/tab-horz-gap.png
deleted file mode 100644
index 5a24cc142e..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/tab-horz-gap.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/tab-left-active.png b/gtk/src/blue-dark/gtk-2.0/assets/tab-left-active.png
deleted file mode 100644
index 63a7e3b739..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/tab-left-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/tab-right-active.png b/gtk/src/blue-dark/gtk-2.0/assets/tab-right-active.png
deleted file mode 100644
index a85784c9f4..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/tab-right-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/tab-up-active.png b/gtk/src/blue-dark/gtk-2.0/assets/tab-up-active.png
deleted file mode 100644
index 3007d886db..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/tab-up-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/tab-vert-gap.png b/gtk/src/blue-dark/gtk-2.0/assets/tab-vert-gap.png
deleted file mode 100644
index 6670b113e6..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/tab-vert-gap.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/treeview-header-button.png b/gtk/src/blue-dark/gtk-2.0/assets/treeview-header-button.png
deleted file mode 100644
index 86da7ad21e..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/treeview-header-button.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/treeview-pan-down-active.png b/gtk/src/blue-dark/gtk-2.0/assets/treeview-pan-down-active.png
deleted file mode 100644
index 31ef6a353b..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/treeview-pan-down-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/treeview-pan-down-hover.png b/gtk/src/blue-dark/gtk-2.0/assets/treeview-pan-down-hover.png
deleted file mode 100644
index 2f28e41e15..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/treeview-pan-down-hover.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/treeview-pan-down.png b/gtk/src/blue-dark/gtk-2.0/assets/treeview-pan-down.png
deleted file mode 100644
index e898198d34..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/treeview-pan-down.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/treeview-pan-up-active.png b/gtk/src/blue-dark/gtk-2.0/assets/treeview-pan-up-active.png
deleted file mode 100644
index e42cce9df9..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/treeview-pan-up-active.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/treeview-pan-up-hover.png b/gtk/src/blue-dark/gtk-2.0/assets/treeview-pan-up-hover.png
deleted file mode 100644
index a99f7cf08a..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/treeview-pan-up-hover.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/treeview-pan-up.png b/gtk/src/blue-dark/gtk-2.0/assets/treeview-pan-up.png
deleted file mode 100644
index 4dda1cd33a..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/treeview-pan-up.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/treeview-separator-ltr.png b/gtk/src/blue-dark/gtk-2.0/assets/treeview-separator-ltr.png
deleted file mode 100644
index 109c32b9ca..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/treeview-separator-ltr.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/treeview-separator-rtl.png b/gtk/src/blue-dark/gtk-2.0/assets/treeview-separator-rtl.png
deleted file mode 100644
index dec2110da9..0000000000
Binary files a/gtk/src/blue-dark/gtk-2.0/assets/treeview-separator-rtl.png and /dev/null differ
diff --git a/gtk/src/blue-dark/gtk-2.0/gtkrc b/gtk/src/blue-dark/gtk-2.0/gtkrc
deleted file mode 100644
index 24823a84bc..0000000000
--- a/gtk/src/blue-dark/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,49 +0,0 @@
-# Based on Bridge by ScionicSpectre
-# vim:set ts=2 sw=2 sts=2 ai et:
-#
-# This is the GTK+ 2 version of Adwaita. It's whole purpose is to look as the
-# GTK+ 3 version as much as possible until GTK+ 2 dies completely.
-#
-# Note: comments for explaining styles are on the bottom of each file beside the
-# widget matches.
-
-# Declare the colours used throughout the theme.
-# There shouldn't be any fiddling with them in the theme files themselves in
-# order to not mess up the dark theme.
-
-# Text/base
-gtk-color-scheme = "text_color:#F7F7F7\nbase_color:#3d3d3d"
-# Foreground/background
-gtk-color-scheme = "fg_color:#F7F7F7\nbg_color:#353535"
-# Selected foreground/background
-gtk-color-scheme = "selected_fg_color:#FFFFFF\nselected_bg_color:#0073E5"
-# Insensitive foreground/background
-gtk-color-scheme = "insensitive_fg_color:#969696\ninsensitive_bg_color:#383838"
-# Menus
-gtk-color-scheme = "menu_color:#424242\nmenubar_bg:#3A3A3A"
-gtk-color-scheme = "menubar_fg:#F7F7F7\nmenubar_insensitive_fg:#CCCCCC"
-# Links
-gtk-color-scheme = "link_color:#0073E5\nvisited_link_color:#004CE5"
-# Treeview headers
-gtk-color-scheme = "column_header_color:#353535\nhover_column_header_color:#636769"
-# Window decoration
-gtk-color-scheme = "menu_hover_color:#616161\nwindow_color:#f4f4f4"
-# Tooltips
-gtk-color-scheme = "tooltip_fg_color:#f7f7f7\ntooltip_bg_color:#353535"
-
-# Set GTK settings
-gtk-auto-mnemonics = 1
-gtk-primary-button-warps-slider = 1
-gtk-icon-sizes="gtk-menu=16,16:\
- gtk-button=16,16:\
- gtk-small-toolbar=16,16:\
- gtk-dnd=16,16:\
- gtk-dialog=16,16"
-gtk-toolbar-style = GTK_TOOLBAR_ICONS
-gtk-menu-images = 0
-gtk-menu-popup-delay = 0
-
-# And hand over the control to the theme files
-include "main.rc"
-include "apps.rc"
-include "hacks.rc"
diff --git a/gtk/src/blue-dark/gtk-2.0/render-all-assets.sh b/gtk/src/blue-dark/gtk-2.0/render-all-assets.sh
deleted file mode 100755
index 82b9a4280e..0000000000
--- a/gtk/src/blue-dark/gtk-2.0/render-all-assets.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="inkscape"
-OPTIPNG="optipng"
-
-SRC_FILE="assets.svg"
-ASSETS_DIR="assets"
-INDEX="assets.txt"
-
-rm assets/*.png
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
- echo $ASSETS_DIR/$i.png exists.
-else
- echo
- echo Rendering $ASSETS_DIR/$i.png
- $INKSCAPE --export-id=$i \
- --export-id-only \
- -o $ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
- && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png
-fi
-done
-exit 0
diff --git a/gtk/src/blue-dark/gtk-2.0/render-assets-external.sh b/gtk/src/blue-dark/gtk-2.0/render-assets-external.sh
deleted file mode 100755
index 5f5c2c2e7b..0000000000
--- a/gtk/src/blue-dark/gtk-2.0/render-assets-external.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="inkscape"
-OPTIPNG="optipng"
-
-SRC_FILE="assets-external.svg"
-ASSETS_DIR="assets"
-INDEX="assets-external.txt"
-
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
- echo $ASSETS_DIR/$i.png exists.
-else
- echo
- echo Rendering $ASSETS_DIR/$i.png
- $INKSCAPE --export-id=$i \
- --export-id-only \
- --export-background-opacity=0 \
- --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
- && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png
-fi
-done
-exit 0
diff --git a/gtk/src/blue/gtk-2.0/assets-external.svg b/gtk/src/blue/gtk-2.0/assets-external.svg
deleted file mode 100644
index 61db4816ba..0000000000
--- a/gtk/src/blue/gtk-2.0/assets-external.svg
+++ /dev/null
@@ -1,6840 +0,0 @@
-
-
-
-
diff --git a/gtk/src/blue/gtk-2.0/assets.svg b/gtk/src/blue/gtk-2.0/assets.svg
deleted file mode 100644
index ddbbdfcb4a..0000000000
--- a/gtk/src/blue/gtk-2.0/assets.svg
+++ /dev/null
@@ -1,5751 +0,0 @@
-
-
diff --git a/gtk/src/blue/gtk-2.0/assets/checkbox-checked-active.png b/gtk/src/blue/gtk-2.0/assets/checkbox-checked-active.png
deleted file mode 100644
index 3f2274ac01..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/checkbox-checked-active.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/checkbox-checked-insensitive.png b/gtk/src/blue/gtk-2.0/assets/checkbox-checked-insensitive.png
deleted file mode 100644
index d58afe73fd..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/checkbox-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/checkbox-checked.png b/gtk/src/blue/gtk-2.0/assets/checkbox-checked.png
deleted file mode 100644
index fea086d9d1..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/checkbox-checked.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/checkbox-mixed-active.png b/gtk/src/blue/gtk-2.0/assets/checkbox-mixed-active.png
deleted file mode 100644
index 0cc4926122..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/checkbox-mixed-active.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/checkbox-mixed-insensitive.png b/gtk/src/blue/gtk-2.0/assets/checkbox-mixed-insensitive.png
deleted file mode 100644
index 6e9bfcb52d..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/checkbox-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/checkbox-mixed.png b/gtk/src/blue/gtk-2.0/assets/checkbox-mixed.png
deleted file mode 100644
index 1c3fc23a68..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/checkbox-mixed.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/combo-entry-ltr-entry-active.png b/gtk/src/blue/gtk-2.0/assets/combo-entry-ltr-entry-active.png
deleted file mode 100644
index 06bfdfb518..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/combo-entry-ltr-entry-active.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/combo-entry-rtl-entry-active.png b/gtk/src/blue/gtk-2.0/assets/combo-entry-rtl-entry-active.png
deleted file mode 100644
index 108a6e513a..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/combo-entry-rtl-entry-active.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/entry-active.png b/gtk/src/blue/gtk-2.0/assets/entry-active.png
deleted file mode 100644
index e86e685e57..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/entry-active.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/focus.png b/gtk/src/blue/gtk-2.0/assets/focus.png
deleted file mode 100644
index 9ad64d8264..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/focus.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/menubar-item-active.png b/gtk/src/blue/gtk-2.0/assets/menubar-item-active.png
deleted file mode 100644
index e2ce476b4e..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/menubar-item-active.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png b/gtk/src/blue/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png
deleted file mode 100644
index 9ed4caf9cd..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png b/gtk/src/blue/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png
deleted file mode 100644
index 3a5089d585..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/notebook-entry-active.png b/gtk/src/blue/gtk-2.0/assets/notebook-entry-active.png
deleted file mode 100644
index ebcda7c192..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/notebook-entry-active.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/progressbar-horz.png b/gtk/src/blue/gtk-2.0/assets/progressbar-horz.png
deleted file mode 100644
index 7f6a90e5ce..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/progressbar-horz.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/progressbar-vert.png b/gtk/src/blue/gtk-2.0/assets/progressbar-vert.png
deleted file mode 100644
index 27c78eca15..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/progressbar-vert.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/radio-checked-active.png b/gtk/src/blue/gtk-2.0/assets/radio-checked-active.png
deleted file mode 100644
index 4cfa2b3d3b..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/radio-checked-active.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/radio-checked-insensitive.png b/gtk/src/blue/gtk-2.0/assets/radio-checked-insensitive.png
deleted file mode 100644
index eaf80c992b..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/radio-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/radio-checked.png b/gtk/src/blue/gtk-2.0/assets/radio-checked.png
deleted file mode 100644
index 74ab25acb8..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/radio-checked.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/radio-mixed-active.png b/gtk/src/blue/gtk-2.0/assets/radio-mixed-active.png
deleted file mode 100644
index 3ecb51ad26..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/radio-mixed-active.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/radio-mixed-insensitive.png b/gtk/src/blue/gtk-2.0/assets/radio-mixed-insensitive.png
deleted file mode 100644
index 4400fb34b4..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/radio-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/radio-mixed.png b/gtk/src/blue/gtk-2.0/assets/radio-mixed.png
deleted file mode 100644
index 31a652e223..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/radio-mixed.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/scale-horz-trough-active.png b/gtk/src/blue/gtk-2.0/assets/scale-horz-trough-active.png
deleted file mode 100644
index bd567c4591..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/scale-horz-trough-active.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/scale-slider-active.png b/gtk/src/blue/gtk-2.0/assets/scale-slider-active.png
deleted file mode 100644
index 742c83efa0..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/scale-slider-active.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/scale-slider-hover.png b/gtk/src/blue/gtk-2.0/assets/scale-slider-hover.png
deleted file mode 100644
index 8c1989216e..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/scale-slider-hover.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/scale-vert-trough-active.png b/gtk/src/blue/gtk-2.0/assets/scale-vert-trough-active.png
deleted file mode 100644
index b0e67b157f..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/scale-vert-trough-active.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/scrollbar-horz-slider-active.png b/gtk/src/blue/gtk-2.0/assets/scrollbar-horz-slider-active.png
deleted file mode 100644
index 2cf0d1eb52..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/scrollbar-horz-slider-active.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png b/gtk/src/blue/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png
deleted file mode 100644
index 2285f379fc..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/assets/scrollbar-vert-slider-active.png b/gtk/src/blue/gtk-2.0/assets/scrollbar-vert-slider-active.png
deleted file mode 100644
index 9b6defbf59..0000000000
Binary files a/gtk/src/blue/gtk-2.0/assets/scrollbar-vert-slider-active.png and /dev/null differ
diff --git a/gtk/src/blue/gtk-2.0/gtkrc b/gtk/src/blue/gtk-2.0/gtkrc
deleted file mode 100644
index db52f917b6..0000000000
--- a/gtk/src/blue/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,50 +0,0 @@
-# Based on Bridge by ScionicSpectre
-# vim:set ts=2 sw=2 sts=2 ai et:
-#
-# This is the GTK+ 2 version of Adwaita. It's whole purpose is to look as the
-# GTK+ 3 version as much as possible until GTK+ 2 dies completely.
-#
-# Note: comments for explaining styles are on the bottom of each file beside the
-# widget matches.
-
-# Declare the colours used throughout the theme.
-# There shouldn't be any fiddling with them in the theme files themselves in
-# order to not mess up the dark theme.
-
-# Text/base
-gtk-color-scheme = "text_color:#5D5D5D\nbase_color:#FFFFFF"
-# Foreground/background
-gtk-color-scheme = "fg_color:#3D3D3D\nbg_color:#F5F6F7"
-# Selected foreground/background
-gtk-color-scheme = "selected_fg_color:#ffffff\nselected_bg_color:#0073E5"
-# Insensitive foreground/background
-gtk-color-scheme = "insensitive_fg_color:#8b8e8f\ninsensitive_bg_color:#f1f1f1"
-# Menus
-gtk-color-scheme = "menu_color:#fafafa\nmenubar_bg:#f5f6f7"
-gtk-color-scheme = "menubar_fg:#3d3d3d\nmenubar_insensitive_fg:#3d3d3d"
-# Links
-gtk-color-scheme = "link_color:#0073E5\nvisited_link_color:#004CE5"
-# Treeview headers
-gtk-color-scheme = "column_header_color:#979a9b\nhover_column_header_color:#636769"
-# Window decoration
-gtk-color-scheme = "menu_hover_color:#e2e2e2\nwindow_color:#f4f4f4"
-# Tooltips
-gtk-color-scheme = "tooltip_fg_color:#ffffff\ntooltip_bg_color:#343434"
-
-# Set GTK settings
-gtk-auto-mnemonics = 1
-gtk-primary-button-warps-slider = 1
-gtk-icon-sizes="gtk-menu=16,16:
-gtk-button=16,16:
-gtk-small-toolbar=16,16:
-
-gtk-dnd=16,16:
-gtk-dialog=16,16"
-gtk-toolbar-style = GTK_TOOLBAR_ICONS
-gtk-menu-images = 0
-gtk-menu-popup-delay = 0
-
-# And hand over the control to the theme files
-include "main.rc"
-include "apps.rc"
-include "hacks.rc"
diff --git a/gtk/src/blue/gtk-2.0/render-all-assets.sh b/gtk/src/blue/gtk-2.0/render-all-assets.sh
deleted file mode 100755
index 82b9a4280e..0000000000
--- a/gtk/src/blue/gtk-2.0/render-all-assets.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="inkscape"
-OPTIPNG="optipng"
-
-SRC_FILE="assets.svg"
-ASSETS_DIR="assets"
-INDEX="assets.txt"
-
-rm assets/*.png
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
- echo $ASSETS_DIR/$i.png exists.
-else
- echo
- echo Rendering $ASSETS_DIR/$i.png
- $INKSCAPE --export-id=$i \
- --export-id-only \
- -o $ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
- && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png
-fi
-done
-exit 0
diff --git a/gtk/src/blue/gtk-2.0/render-assets-external.sh b/gtk/src/blue/gtk-2.0/render-assets-external.sh
deleted file mode 100755
index 5f5c2c2e7b..0000000000
--- a/gtk/src/blue/gtk-2.0/render-assets-external.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="inkscape"
-OPTIPNG="optipng"
-
-SRC_FILE="assets-external.svg"
-ASSETS_DIR="assets"
-INDEX="assets-external.txt"
-
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
- echo $ASSETS_DIR/$i.png exists.
-else
- echo
- echo Rendering $ASSETS_DIR/$i.png
- $INKSCAPE --export-id=$i \
- --export-id-only \
- --export-background-opacity=0 \
- --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
- && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png
-fi
-done
-exit 0
diff --git a/gtk/src/dark/gtk-2.0/apps.rc b/gtk/src/dark/gtk-2.0/apps.rc
deleted file mode 100644
index 916acfdaec..0000000000
--- a/gtk/src/dark/gtk-2.0/apps.rc
+++ /dev/null
@@ -1,99 +0,0 @@
-# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
-#
-# This file, unlike hacks.rc, contains legitimate cases we need to handle, e.g.
-# custom widgets, programs giving us a chance to alter their UI to fit more with
-# the theme or stuff that is supposed to look different, like panels.
-
-# TODO: This could really look nicer
-style "gimp_spin_scale" {
-
- # Spin background
- bg[NORMAL] = @base_color
-
- engine "pixmap" {
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_up"
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_up"
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_up"
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_up"
- overlay_file = "assets/spin-up-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_down"
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_down"
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_down"
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_down"
- overlay_file = "assets/spin-down-insensitive.png"
- overlay_stretch = FALSE
- }
-
- }
-
-}
-
-style "chrome_gtk_frame" {
-
- ChromeGtkFrame::frame-color = @window_color
- ChromeGtkFrame::frame-gradient-color = @window_color
- ChromeGtkFrame::inactive-frame-color = @bg_color
-
- ChromeGtkFrame::incognito-frame-color = "#cbd2d9"
- ChromeGtkFrame::incognito-frame-gradient-color = "#cbd2d9"
- ChromeGtkFrame::incognito-inactive-frame-color = mix (0.5, @bg_color, "#cbd2d9")
-
-}
-
-# Disable spin button assets for GimpSpinScale
-class "GimpSpinScale" style "gimp_spin_scale"
-
-# Chromium lets us define some colours and settings for better integration
-class "ChromeGtkFrame" style "chrome_gtk_frame"
diff --git a/gtk/src/dark/gtk-2.0/assets-external.txt b/gtk/src/dark/gtk-2.0/assets-external.txt
deleted file mode 100644
index 9abba2aaf4..0000000000
--- a/gtk/src/dark/gtk-2.0/assets-external.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-checkbox-checked
-checkbox-checked-active
-checkbox-checked-insensitive
-checkbox-unchecked
-checkbox-unchecked-hover
-checkbox-unchecked-active
-checkbox-unchecked-insensitive
-checkbox-mixed
-checkbox-mixed-active
-checkbox-mixed-insensitive
-radio-checked
-radio-checked-active
-radio-checked-insensitive
-radio-unchecked
-radio-unchecked-hover
-radio-unchecked-active
-radio-unchecked-insensitive
-radio-mixed
-radio-mixed-active
-radio-mixed-insensitive
diff --git a/gtk/src/dark/gtk-2.0/assets.txt b/gtk/src/dark/gtk-2.0/assets.txt
deleted file mode 100644
index 425651383b..0000000000
--- a/gtk/src/dark/gtk-2.0/assets.txt
+++ /dev/null
@@ -1,141 +0,0 @@
-menu-checkbox
-menu-checkbox-hover
-menu-checkbox-insensitive
-menu-checkbox-checked
-menu-checkbox-checked-insensitive
-menu-checkbox-mixed
-menu-checkbox-mixed-insensitive
-menu-radio
-menu-radio-hover
-menu-radio-insensitive
-menu-radio-checked
-menu-radio-checked-insensitive
-menu-radio-mixed
-menu-radio-mixed-insensitive
-menu-pan-left
-menu-pan-left-hover
-menu-pan-left-insensitive
-menu-pan-right
-menu-pan-right-hover
-menu-pan-right-insensitive
-menu-pan-up
-menu-pan-up-insensitive
-menu-pan-down
-menu-pan-down-insensitive
-button
-button-hover
-button-active
-button-insensitive
-combo-entry-ltr-entry
-combo-entry-ltr-entry-active
-combo-entry-ltr-entry-insensitive
-combo-entry-ltr-button
-combo-entry-ltr-button-hover
-combo-entry-ltr-button-active
-combo-entry-ltr-button-insensitive
-combo-entry-rtl-entry
-combo-entry-rtl-entry-active
-combo-entry-rtl-entry-insensitive
-combo-entry-rtl-button
-combo-entry-rtl-button-hover
-combo-entry-rtl-button-active
-combo-entry-rtl-button-insensitive
-entry
-entry-active
-entry-insensitive
-entry-background
-entry-background-insensitive
-border
-frame
-frame-inline
-frame-notebook
-line
-focus
-handle
-handle-horz
-handle-vert
-menu-border
-menubar-item-active
-notebook-entry
-notebook-entry-active
-notebook-entry-insensitive
-notebook-combo-entry-ltr-entry
-notebook-combo-entry-ltr-entry-active
-notebook-combo-entry-ltr-entry-insensitive
-notebook-combo-entry-rtl-entry
-notebook-combo-entry-rtl-entry-active
-notebook-combo-entry-rtl-entry-insensitive
-pan-left
-pan-left-semi
-pan-left-insensitive
-pan-right
-pan-right-semi
-pan-right-insensitive
-pan-up
-pan-up-insensitive
-pan-down
-pan-down-insensitive
-progressbar-horz
-progressbar-horz-trough
-progressbar-vert
-progressbar-vert-trough
-scrollbar-horz-slider
-scrollbar-horz-slider-hover
-scrollbar-horz-slider-active
-scrollbar-horz-trough
-scrollbar-vert-slider
-scrollbar-vert-slider-hover
-scrollbar-vert-slider-active
-scrollbar-vert-trough
-scrollbar-vert-slider-rtl
-scrollbar-vert-slider-hover-rtl
-scrollbar-vert-slider-active-rtl
-scrollbar-vert-trough-rtl
-spin-ltr-down
-spin-ltr-down-hover
-spin-ltr-down-active
-spin-ltr-down-insensitive
-spin-ltr-up
-spin-ltr-up-hover
-spin-ltr-up-active
-spin-ltr-up-insensitive
-spin-rtl-down
-spin-rtl-down-hover
-spin-rtl-down-active
-spin-rtl-down-insensitive
-spin-rtl-up
-spin-rtl-up-hover
-spin-rtl-up-active
-spin-rtl-up-insensitive
-spin-up
-spin-down
-spin-up-insensitive
-spin-down-insensitive
-scale-slider
-scale-slider-hover
-scale-slider-active
-scale-slider-insensitive
-scale-horz-focus
-scale-horz-trough
-scale-horz-trough-active
-scale-vert-trough
-scale-vert-trough-active
-tab-left
-tab-left-active
-tab-right
-tab-right-active
-tab-up
-tab-up-active
-tab-down
-tab-down-active
-tab-horz-gap
-tab-vert-gap
-treeview-header-button
-treeview-pan-up
-treeview-pan-up-hover
-treeview-pan-up-active
-treeview-pan-down
-treeview-pan-down-hover
-treeview-pan-down-active
-treeview-separator-ltr
-treeview-separator-rtl
diff --git a/gtk/src/dark/gtk-2.0/assets/border.png b/gtk/src/dark/gtk-2.0/assets/border.png
deleted file mode 100644
index 9f6d1a06bb..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/border.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/button-active.png b/gtk/src/dark/gtk-2.0/assets/button-active.png
deleted file mode 100644
index a81736fc26..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/button-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/button-hover.png b/gtk/src/dark/gtk-2.0/assets/button-hover.png
deleted file mode 100644
index 5e6a3e4f4f..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/button-hover.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/button-insensitive.png b/gtk/src/dark/gtk-2.0/assets/button-insensitive.png
deleted file mode 100644
index 6f21fd83ce..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/button-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/button.png b/gtk/src/dark/gtk-2.0/assets/button.png
deleted file mode 100644
index c841d1f7bb..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/button.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/checkbox-checked-insensitive.png b/gtk/src/dark/gtk-2.0/assets/checkbox-checked-insensitive.png
deleted file mode 100644
index ed32bb97c9..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/checkbox-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/checkbox-mixed-insensitive.png b/gtk/src/dark/gtk-2.0/assets/checkbox-mixed-insensitive.png
deleted file mode 100644
index 0459082787..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/checkbox-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/checkbox-unchecked-active.png b/gtk/src/dark/gtk-2.0/assets/checkbox-unchecked-active.png
deleted file mode 100644
index 6dd362192d..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/checkbox-unchecked-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/checkbox-unchecked-hover.png b/gtk/src/dark/gtk-2.0/assets/checkbox-unchecked-hover.png
deleted file mode 100644
index 1d53f96eb0..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/checkbox-unchecked-hover.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/checkbox-unchecked-insensitive.png b/gtk/src/dark/gtk-2.0/assets/checkbox-unchecked-insensitive.png
deleted file mode 100644
index 2282847f50..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/checkbox-unchecked-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/checkbox-unchecked.png b/gtk/src/dark/gtk-2.0/assets/checkbox-unchecked.png
deleted file mode 100644
index e2964791ca..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/checkbox-unchecked.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-button-active.png b/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-button-active.png
deleted file mode 100644
index a45d33ea66..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-button-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-button-hover.png b/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-button-hover.png
deleted file mode 100644
index 10703ad816..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-button-hover.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png b/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png
deleted file mode 100644
index bdbae85a01..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-button.png b/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-button.png
deleted file mode 100644
index 78e2354af1..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-button.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-entry-active.png b/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-entry-active.png
deleted file mode 100644
index 65d875a026..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-entry-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png b/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png
deleted file mode 100644
index ab286b3694..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-entry.png b/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-entry.png
deleted file mode 100644
index d6703ca3b9..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/combo-entry-ltr-entry.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-button-active.png b/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-button-active.png
deleted file mode 100644
index 41176ab320..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-button-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-button-hover.png b/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-button-hover.png
deleted file mode 100644
index 182dcea8c6..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-button-hover.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png b/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png
deleted file mode 100644
index 56ea02790a..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-button.png b/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-button.png
deleted file mode 100644
index f5c3259bab..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-button.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-entry-active.png b/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-entry-active.png
deleted file mode 100644
index 0859b83954..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-entry-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png b/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png
deleted file mode 100644
index b45560d05e..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-entry.png b/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-entry.png
deleted file mode 100644
index 5fca5f2a7b..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/combo-entry-rtl-entry.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/entry-active.png b/gtk/src/dark/gtk-2.0/assets/entry-active.png
deleted file mode 100644
index fab3d1cba2..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/entry-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/entry-background-insensitive.png b/gtk/src/dark/gtk-2.0/assets/entry-background-insensitive.png
deleted file mode 100644
index e702aee22a..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/entry-background-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/entry-background.png b/gtk/src/dark/gtk-2.0/assets/entry-background.png
deleted file mode 100644
index 95e7c8173c..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/entry-background.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/entry-insensitive.png b/gtk/src/dark/gtk-2.0/assets/entry-insensitive.png
deleted file mode 100644
index 1225573ebc..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/entry.png b/gtk/src/dark/gtk-2.0/assets/entry.png
deleted file mode 100644
index 7b4f4390f0..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/entry.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/focus.png b/gtk/src/dark/gtk-2.0/assets/focus.png
deleted file mode 100644
index 9e9673051f..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/focus.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/frame-inline.png b/gtk/src/dark/gtk-2.0/assets/frame-inline.png
deleted file mode 100644
index 6bac7b96c6..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/frame-inline.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/frame-notebook.png b/gtk/src/dark/gtk-2.0/assets/frame-notebook.png
deleted file mode 100644
index 8b3f329538..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/frame-notebook.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/frame.png b/gtk/src/dark/gtk-2.0/assets/frame.png
deleted file mode 100644
index 56a2d8dad6..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/frame.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/handle-horz.png b/gtk/src/dark/gtk-2.0/assets/handle-horz.png
deleted file mode 100644
index 7e53b2e31d..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/handle-horz.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/handle-vert.png b/gtk/src/dark/gtk-2.0/assets/handle-vert.png
deleted file mode 100644
index fd6890c81d..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/handle-vert.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/handle.png b/gtk/src/dark/gtk-2.0/assets/handle.png
deleted file mode 100644
index c7b9825591..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/handle.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/line.png b/gtk/src/dark/gtk-2.0/assets/line.png
deleted file mode 100644
index 1fad628ee0..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/line.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-border.png b/gtk/src/dark/gtk-2.0/assets/menu-border.png
deleted file mode 100644
index 728f243d1d..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-border.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-checkbox-checked-insensitive.png b/gtk/src/dark/gtk-2.0/assets/menu-checkbox-checked-insensitive.png
deleted file mode 100644
index 49038d3625..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-checkbox-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-checkbox-checked.png b/gtk/src/dark/gtk-2.0/assets/menu-checkbox-checked.png
deleted file mode 100644
index 25c34e7275..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-checkbox-checked.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-checkbox-hover.png b/gtk/src/dark/gtk-2.0/assets/menu-checkbox-hover.png
deleted file mode 100644
index 83ef341ff3..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-checkbox-hover.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-checkbox-insensitive.png b/gtk/src/dark/gtk-2.0/assets/menu-checkbox-insensitive.png
deleted file mode 100644
index b82efc4afc..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-checkbox-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png b/gtk/src/dark/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png
deleted file mode 100644
index 861685a014..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-checkbox-mixed.png b/gtk/src/dark/gtk-2.0/assets/menu-checkbox-mixed.png
deleted file mode 100644
index fc85684cd2..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-checkbox-mixed.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-checkbox.png b/gtk/src/dark/gtk-2.0/assets/menu-checkbox.png
deleted file mode 100644
index b82efc4afc..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-checkbox.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-pan-down-insensitive.png b/gtk/src/dark/gtk-2.0/assets/menu-pan-down-insensitive.png
deleted file mode 100644
index 535de1c059..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-pan-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-pan-down.png b/gtk/src/dark/gtk-2.0/assets/menu-pan-down.png
deleted file mode 100644
index 31ef6a353b..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-pan-down.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-pan-left-hover.png b/gtk/src/dark/gtk-2.0/assets/menu-pan-left-hover.png
deleted file mode 100644
index a2cac3ef38..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-pan-left-hover.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-pan-left-insensitive.png b/gtk/src/dark/gtk-2.0/assets/menu-pan-left-insensitive.png
deleted file mode 100644
index 29323a7b8d..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-pan-left-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-pan-left.png b/gtk/src/dark/gtk-2.0/assets/menu-pan-left.png
deleted file mode 100644
index 6dce59eacc..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-pan-left.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-pan-right-hover.png b/gtk/src/dark/gtk-2.0/assets/menu-pan-right-hover.png
deleted file mode 100644
index 80da318c6e..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-pan-right-hover.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-pan-right-insensitive.png b/gtk/src/dark/gtk-2.0/assets/menu-pan-right-insensitive.png
deleted file mode 100644
index 9de489b728..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-pan-right-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-pan-right.png b/gtk/src/dark/gtk-2.0/assets/menu-pan-right.png
deleted file mode 100644
index fcf6cd8579..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-pan-right.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-pan-up-insensitive.png b/gtk/src/dark/gtk-2.0/assets/menu-pan-up-insensitive.png
deleted file mode 100644
index 76af286613..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-pan-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-pan-up.png b/gtk/src/dark/gtk-2.0/assets/menu-pan-up.png
deleted file mode 100644
index e42cce9df9..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-pan-up.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-radio-checked-insensitive.png b/gtk/src/dark/gtk-2.0/assets/menu-radio-checked-insensitive.png
deleted file mode 100644
index 66d5a9183a..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-radio-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-radio-checked.png b/gtk/src/dark/gtk-2.0/assets/menu-radio-checked.png
deleted file mode 100644
index 2fb650ed9c..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-radio-checked.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-radio-hover.png b/gtk/src/dark/gtk-2.0/assets/menu-radio-hover.png
deleted file mode 100644
index 0a49b1bc06..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-radio-hover.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-radio-insensitive.png b/gtk/src/dark/gtk-2.0/assets/menu-radio-insensitive.png
deleted file mode 100644
index b82efc4afc..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-radio-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-radio-mixed-insensitive.png b/gtk/src/dark/gtk-2.0/assets/menu-radio-mixed-insensitive.png
deleted file mode 100644
index 861685a014..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-radio-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-radio-mixed.png b/gtk/src/dark/gtk-2.0/assets/menu-radio-mixed.png
deleted file mode 100644
index fc85684cd2..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-radio-mixed.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/menu-radio.png b/gtk/src/dark/gtk-2.0/assets/menu-radio.png
deleted file mode 100644
index b82efc4afc..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/menu-radio.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png b/gtk/src/dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png
deleted file mode 100644
index 16ecdef27b..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png b/gtk/src/dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png
deleted file mode 100644
index 35419c49c0..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png b/gtk/src/dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png
deleted file mode 100644
index 9ec4987140..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png b/gtk/src/dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png
deleted file mode 100644
index 1b51270efb..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png b/gtk/src/dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png
deleted file mode 100644
index ea235aa9c4..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png b/gtk/src/dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png
deleted file mode 100644
index 9564a57b31..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/notebook-entry-active.png b/gtk/src/dark/gtk-2.0/assets/notebook-entry-active.png
deleted file mode 100644
index 6ada411808..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/notebook-entry-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/notebook-entry-insensitive.png b/gtk/src/dark/gtk-2.0/assets/notebook-entry-insensitive.png
deleted file mode 100644
index 81631c711d..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/notebook-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/notebook-entry.png b/gtk/src/dark/gtk-2.0/assets/notebook-entry.png
deleted file mode 100644
index e29fd1e78c..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/notebook-entry.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/pan-down-insensitive.png b/gtk/src/dark/gtk-2.0/assets/pan-down-insensitive.png
deleted file mode 100644
index e898198d34..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/pan-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/pan-down.png b/gtk/src/dark/gtk-2.0/assets/pan-down.png
deleted file mode 100644
index 31ef6a353b..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/pan-down.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/pan-left-insensitive.png b/gtk/src/dark/gtk-2.0/assets/pan-left-insensitive.png
deleted file mode 100644
index e765c2d3aa..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/pan-left-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/pan-left-semi.png b/gtk/src/dark/gtk-2.0/assets/pan-left-semi.png
deleted file mode 100644
index 936672edb6..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/pan-left-semi.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/pan-left.png b/gtk/src/dark/gtk-2.0/assets/pan-left.png
deleted file mode 100644
index 5280692827..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/pan-left.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/pan-right-insensitive.png b/gtk/src/dark/gtk-2.0/assets/pan-right-insensitive.png
deleted file mode 100644
index 70f578f138..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/pan-right-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/pan-right-semi.png b/gtk/src/dark/gtk-2.0/assets/pan-right-semi.png
deleted file mode 100644
index 6f0796eeea..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/pan-right-semi.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/pan-right.png b/gtk/src/dark/gtk-2.0/assets/pan-right.png
deleted file mode 100644
index 936c2be433..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/pan-right.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/pan-up-insensitive.png b/gtk/src/dark/gtk-2.0/assets/pan-up-insensitive.png
deleted file mode 100644
index 4dda1cd33a..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/pan-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/pan-up.png b/gtk/src/dark/gtk-2.0/assets/pan-up.png
deleted file mode 100644
index e42cce9df9..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/pan-up.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/progressbar-horz-trough.png b/gtk/src/dark/gtk-2.0/assets/progressbar-horz-trough.png
deleted file mode 100644
index 5589ac52d5..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/progressbar-horz-trough.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/progressbar-horz.png b/gtk/src/dark/gtk-2.0/assets/progressbar-horz.png
deleted file mode 100644
index 28fe3472fc..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/progressbar-horz.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/progressbar-vert-trough.png b/gtk/src/dark/gtk-2.0/assets/progressbar-vert-trough.png
deleted file mode 100644
index d4152dab2b..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/progressbar-vert-trough.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/progressbar-vert.png b/gtk/src/dark/gtk-2.0/assets/progressbar-vert.png
deleted file mode 100644
index 3e66d94c78..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/progressbar-vert.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/radio-checked-insensitive.png b/gtk/src/dark/gtk-2.0/assets/radio-checked-insensitive.png
deleted file mode 100644
index b966aab6ea..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/radio-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/radio-mixed-insensitive.png b/gtk/src/dark/gtk-2.0/assets/radio-mixed-insensitive.png
deleted file mode 100644
index e0d637c2d0..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/radio-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/radio-unchecked-active.png b/gtk/src/dark/gtk-2.0/assets/radio-unchecked-active.png
deleted file mode 100644
index 3b551f2b5a..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/radio-unchecked-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/radio-unchecked-hover.png b/gtk/src/dark/gtk-2.0/assets/radio-unchecked-hover.png
deleted file mode 100644
index cecf227dae..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/radio-unchecked-hover.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/radio-unchecked-insensitive.png b/gtk/src/dark/gtk-2.0/assets/radio-unchecked-insensitive.png
deleted file mode 100644
index e8a5fdbaca..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/radio-unchecked-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/radio-unchecked.png b/gtk/src/dark/gtk-2.0/assets/radio-unchecked.png
deleted file mode 100644
index 78f114f35e..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/radio-unchecked.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/scale-horz-focus.png b/gtk/src/dark/gtk-2.0/assets/scale-horz-focus.png
deleted file mode 100644
index e6688bde53..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/scale-horz-focus.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/scale-horz-trough-active.png b/gtk/src/dark/gtk-2.0/assets/scale-horz-trough-active.png
deleted file mode 100644
index 50caaf36a2..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/scale-horz-trough-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/scale-horz-trough.png b/gtk/src/dark/gtk-2.0/assets/scale-horz-trough.png
deleted file mode 100644
index 8e2f291272..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/scale-horz-trough.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/scale-slider-hover.png b/gtk/src/dark/gtk-2.0/assets/scale-slider-hover.png
deleted file mode 100644
index 93f1a71deb..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/scale-slider-hover.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/scale-slider-insensitive.png b/gtk/src/dark/gtk-2.0/assets/scale-slider-insensitive.png
deleted file mode 100644
index a417de4354..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/scale-slider-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/scale-slider.png b/gtk/src/dark/gtk-2.0/assets/scale-slider.png
deleted file mode 100644
index 2432f87ab5..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/scale-slider.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/scale-vert-trough-active.png b/gtk/src/dark/gtk-2.0/assets/scale-vert-trough-active.png
deleted file mode 100644
index e91c6f758d..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/scale-vert-trough-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/scale-vert-trough.png b/gtk/src/dark/gtk-2.0/assets/scale-vert-trough.png
deleted file mode 100644
index b2f04217c7..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/scale-vert-trough.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/scrollbar-horz-slider-hover.png b/gtk/src/dark/gtk-2.0/assets/scrollbar-horz-slider-hover.png
deleted file mode 100644
index 9d936cb932..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/scrollbar-horz-slider-hover.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/scrollbar-horz-slider.png b/gtk/src/dark/gtk-2.0/assets/scrollbar-horz-slider.png
deleted file mode 100644
index e56537d30b..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/scrollbar-horz-slider.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/scrollbar-horz-trough.png b/gtk/src/dark/gtk-2.0/assets/scrollbar-horz-trough.png
deleted file mode 100644
index 2d5d36b271..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/scrollbar-horz-trough.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png b/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png
deleted file mode 100644
index 525a929bca..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-slider-hover.png b/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-slider-hover.png
deleted file mode 100644
index dc1c0bd7f4..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-slider-hover.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-slider-rtl.png b/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-slider-rtl.png
deleted file mode 100644
index 8b535f98f1..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-slider-rtl.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-slider.png b/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-slider.png
deleted file mode 100644
index 68a3b5cf5b..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-slider.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-trough-rtl.png b/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-trough-rtl.png
deleted file mode 100644
index 694e334145..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-trough-rtl.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-trough.png b/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-trough.png
deleted file mode 100644
index 694e334145..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-trough.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-down-insensitive.png b/gtk/src/dark/gtk-2.0/assets/spin-down-insensitive.png
deleted file mode 100644
index 2a77729339..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-down.png b/gtk/src/dark/gtk-2.0/assets/spin-down.png
deleted file mode 100644
index 9ba7e8c646..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-down.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-ltr-down-active.png b/gtk/src/dark/gtk-2.0/assets/spin-ltr-down-active.png
deleted file mode 100644
index 215721f9b2..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-ltr-down-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-ltr-down-hover.png b/gtk/src/dark/gtk-2.0/assets/spin-ltr-down-hover.png
deleted file mode 100644
index d1ff4fca9b..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-ltr-down-hover.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-ltr-down-insensitive.png b/gtk/src/dark/gtk-2.0/assets/spin-ltr-down-insensitive.png
deleted file mode 100644
index bd9508a3ca..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-ltr-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-ltr-down.png b/gtk/src/dark/gtk-2.0/assets/spin-ltr-down.png
deleted file mode 100644
index 4f366b45f5..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-ltr-down.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-ltr-up-active.png b/gtk/src/dark/gtk-2.0/assets/spin-ltr-up-active.png
deleted file mode 100644
index 57a84eba51..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-ltr-up-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-ltr-up-hover.png b/gtk/src/dark/gtk-2.0/assets/spin-ltr-up-hover.png
deleted file mode 100644
index 286c4cad59..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-ltr-up-hover.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-ltr-up-insensitive.png b/gtk/src/dark/gtk-2.0/assets/spin-ltr-up-insensitive.png
deleted file mode 100644
index 01d6287666..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-ltr-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-ltr-up.png b/gtk/src/dark/gtk-2.0/assets/spin-ltr-up.png
deleted file mode 100644
index a3aaab0be1..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-ltr-up.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-rtl-down-active.png b/gtk/src/dark/gtk-2.0/assets/spin-rtl-down-active.png
deleted file mode 100644
index 18d48adc63..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-rtl-down-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-rtl-down-hover.png b/gtk/src/dark/gtk-2.0/assets/spin-rtl-down-hover.png
deleted file mode 100644
index 96e40b47f8..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-rtl-down-hover.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-rtl-down-insensitive.png b/gtk/src/dark/gtk-2.0/assets/spin-rtl-down-insensitive.png
deleted file mode 100644
index 03b99934f2..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-rtl-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-rtl-down.png b/gtk/src/dark/gtk-2.0/assets/spin-rtl-down.png
deleted file mode 100644
index 7d0ec869e9..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-rtl-down.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-rtl-up-active.png b/gtk/src/dark/gtk-2.0/assets/spin-rtl-up-active.png
deleted file mode 100644
index ebaa3ff4eb..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-rtl-up-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-rtl-up-hover.png b/gtk/src/dark/gtk-2.0/assets/spin-rtl-up-hover.png
deleted file mode 100644
index 4b6b7b67ea..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-rtl-up-hover.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-rtl-up-insensitive.png b/gtk/src/dark/gtk-2.0/assets/spin-rtl-up-insensitive.png
deleted file mode 100644
index 05cd2a3698..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-rtl-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-rtl-up.png b/gtk/src/dark/gtk-2.0/assets/spin-rtl-up.png
deleted file mode 100644
index f334c25a7a..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-rtl-up.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-up-insensitive.png b/gtk/src/dark/gtk-2.0/assets/spin-up-insensitive.png
deleted file mode 100644
index c9dcc0aefe..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/spin-up.png b/gtk/src/dark/gtk-2.0/assets/spin-up.png
deleted file mode 100644
index 69d276646a..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/spin-up.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/tab-down-active.png b/gtk/src/dark/gtk-2.0/assets/tab-down-active.png
deleted file mode 100644
index e6c3b8c2f0..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/tab-down-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/tab-down.png b/gtk/src/dark/gtk-2.0/assets/tab-down.png
deleted file mode 100644
index eecbdf3a92..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/tab-down.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/tab-horz-gap.png b/gtk/src/dark/gtk-2.0/assets/tab-horz-gap.png
deleted file mode 100644
index 5a24cc142e..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/tab-horz-gap.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/tab-left-active.png b/gtk/src/dark/gtk-2.0/assets/tab-left-active.png
deleted file mode 100644
index 63a7e3b739..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/tab-left-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/tab-left.png b/gtk/src/dark/gtk-2.0/assets/tab-left.png
deleted file mode 100644
index 4973e1fcbe..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/tab-left.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/tab-right-active.png b/gtk/src/dark/gtk-2.0/assets/tab-right-active.png
deleted file mode 100644
index a85784c9f4..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/tab-right-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/tab-right.png b/gtk/src/dark/gtk-2.0/assets/tab-right.png
deleted file mode 100644
index 4973e1fcbe..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/tab-right.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/tab-up-active.png b/gtk/src/dark/gtk-2.0/assets/tab-up-active.png
deleted file mode 100644
index 3007d886db..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/tab-up-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/tab-up.png b/gtk/src/dark/gtk-2.0/assets/tab-up.png
deleted file mode 100644
index eecbdf3a92..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/tab-up.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/tab-vert-gap.png b/gtk/src/dark/gtk-2.0/assets/tab-vert-gap.png
deleted file mode 100644
index 6670b113e6..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/tab-vert-gap.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/treeview-header-button.png b/gtk/src/dark/gtk-2.0/assets/treeview-header-button.png
deleted file mode 100644
index 86da7ad21e..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/treeview-header-button.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/treeview-pan-down-active.png b/gtk/src/dark/gtk-2.0/assets/treeview-pan-down-active.png
deleted file mode 100644
index 31ef6a353b..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/treeview-pan-down-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/treeview-pan-down-hover.png b/gtk/src/dark/gtk-2.0/assets/treeview-pan-down-hover.png
deleted file mode 100644
index 2f28e41e15..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/treeview-pan-down-hover.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/treeview-pan-down.png b/gtk/src/dark/gtk-2.0/assets/treeview-pan-down.png
deleted file mode 100644
index e898198d34..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/treeview-pan-down.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/treeview-pan-up-active.png b/gtk/src/dark/gtk-2.0/assets/treeview-pan-up-active.png
deleted file mode 100644
index e42cce9df9..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/treeview-pan-up-active.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/treeview-pan-up-hover.png b/gtk/src/dark/gtk-2.0/assets/treeview-pan-up-hover.png
deleted file mode 100644
index a99f7cf08a..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/treeview-pan-up-hover.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/treeview-pan-up.png b/gtk/src/dark/gtk-2.0/assets/treeview-pan-up.png
deleted file mode 100644
index 4dda1cd33a..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/treeview-pan-up.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/treeview-separator-ltr.png b/gtk/src/dark/gtk-2.0/assets/treeview-separator-ltr.png
deleted file mode 100644
index 109c32b9ca..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/treeview-separator-ltr.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/assets/treeview-separator-rtl.png b/gtk/src/dark/gtk-2.0/assets/treeview-separator-rtl.png
deleted file mode 100644
index dec2110da9..0000000000
Binary files a/gtk/src/dark/gtk-2.0/assets/treeview-separator-rtl.png and /dev/null differ
diff --git a/gtk/src/dark/gtk-2.0/gtkrc b/gtk/src/dark/gtk-2.0/gtkrc
deleted file mode 100644
index 224dbd5a82..0000000000
--- a/gtk/src/dark/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,49 +0,0 @@
-# Based on Bridge by ScionicSpectre
-# vim:set ts=2 sw=2 sts=2 ai et:
-#
-# This is the GTK+ 2 version of Adwaita. It's whole purpose is to look as the
-# GTK+ 3 version as much as possible until GTK+ 2 dies completely.
-#
-# Note: comments for explaining styles are on the bottom of each file beside the
-# widget matches.
-
-# Declare the colours used throughout the theme.
-# There shouldn't be any fiddling with them in the theme files themselves in
-# order to not mess up the dark theme.
-
-# Text/base
-gtk-color-scheme = "text_color:#F7F7F7\nbase_color:#3d3d3d"
-# Foreground/background
-gtk-color-scheme = "fg_color:#F7F7F7\nbg_color:#353535"
-# Selected foreground/background
-gtk-color-scheme = "selected_fg_color:#FFFFFF\nselected_bg_color:#E95420"
-# Insensitive foreground/background
-gtk-color-scheme = "insensitive_fg_color:#969696\ninsensitive_bg_color:#383838"
-# Menus
-gtk-color-scheme = "menu_color:#424242\nmenubar_bg:#3A3A3A"
-gtk-color-scheme = "menubar_fg:#F7F7F7\nmenubar_insensitive_fg:#CCCCCC"
-# Links
-gtk-color-scheme = "link_color:#2194bd\nvisited_link_color:#c97c5b"
-# Treeview headers
-gtk-color-scheme = "column_header_color:#353535\nhover_column_header_color:#636769"
-# Window decoration
-gtk-color-scheme = "menu_hover_color:#616161\nwindow_color:#f4f4f4"
-# Tooltips
-gtk-color-scheme = "tooltip_fg_color:#f7f7f7\ntooltip_bg_color:#353535"
-
-# Set GTK settings
-gtk-auto-mnemonics = 1
-gtk-primary-button-warps-slider = 1
-gtk-icon-sizes="gtk-menu=16,16:\
- gtk-button=16,16:\
- gtk-small-toolbar=16,16:\
- gtk-dnd=16,16:\
- gtk-dialog=16,16"
-gtk-toolbar-style = GTK_TOOLBAR_ICONS
-gtk-menu-images = 0
-gtk-menu-popup-delay = 0
-
-# And hand over the control to the theme files
-include "main.rc"
-include "apps.rc"
-include "hacks.rc"
diff --git a/gtk/src/dark/gtk-2.0/hacks.rc b/gtk/src/dark/gtk-2.0/hacks.rc
deleted file mode 100644
index 1bdbee9a41..0000000000
--- a/gtk/src/dark/gtk-2.0/hacks.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
-#
-# This file contains horrible hacks to make this theme work with some programs
-# This is mostly due to the limitations of gtk2 but sometimes its the fault of
-# the programs themselves. Not going to point fingers.
-#
-# Either way, it's a WONTFIX for both, hence this horrible file.
-
-style "toplevel_hack" {
- engine "adwaita" {}
-}
-
-style "chrome_entry" {
- base[NORMAL] = @base_color
- base[INSENSITIVE] = @base_color
-}
-
-style "vim_notebook" {
- bg[NORMAL] = @base_color
- bg[ACTIVE] = @insensitive_bg_color
-}
-
-# Vim puts an eventbox between the tab and the label and colours it,
-# we need to handle that
-widget "vim-main-window*GtkNotebook.GtkEventBox" style "vim_notebook"
-
-# (he)xchat input box
-class "SexySpellEntry" style:highest "normal_entry"
-
-# Chromium uses base as the fill colour of its own entries
-# This would be fine but Gtk+ uses it to fill the surrounding space, so its set to bg
-# That results in Chromium using it for the fill, so we need to handle that
-widget_class "*Chrom*" style "chrome_entry"
-
-# Hack to be able to match widgets in LibreOffice
-class "GtkWindow" style "toplevel_hack"
diff --git a/gtk/src/dark/gtk-2.0/main.rc b/gtk/src/dark/gtk-2.0/main.rc
deleted file mode 100644
index 8b2997fb09..0000000000
--- a/gtk/src/dark/gtk-2.0/main.rc
+++ /dev/null
@@ -1,2630 +0,0 @@
-# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
-#
-# This is the main theme file, handling all the default widgets and theme
-# properties. Since GTK+ 2 is old, we need to overcome some of its limitations,
-# which is also mostly done in this file. Sadly not all of them can be overcome
-# so there will always be a visible difference between the GTK+ 2 and 3 theme.
-
-style "default" {
-
- xthickness = 1
- ythickness = 1
-
- ####################
- # Style Properties #
- ####################
-
- GtkWidget::focus-line-width = 1
- GtkWidget::focus-line-pattern = "\2\1"
-
- GtkToolbar::internal-padding = 4
- GtkToolButton::icon-spacing = 4
-
- GtkWidget::tooltip-radius = 3
- GtkWidget::tooltip-alpha = 235
- GtkWidget::new-tooltip-style = 1 #for compatibility
-
- GtkWidget::link-color = @link_color
- GtkWidget::visited-link-color = @visited_link_color
- GnomeHRef::link_color = @link_color
- GtkHTML::link-color = @link_color
- GtkHTML::vlink-color = @visited_link_color
- GtkIMHtml::hyperlink-color = @link_color
- GtkIMHtml::hyperlink-visited-color = @visited_link_color
-
- GtkSeparatorMenuItem::horizontal-padding = 0
- GtkSeparatorMenuItem::wide-separators = 1
- GtkSeparatorMenuItem::separator-height = 1
-
- GtkButton::child-displacement-y = 0
-
- GtkButton::default-border = {0, 0, 0, 0}
- GtkButton::default-outside-border = {0, 0, 0, 0}
- GtkButton::inner-border = {4, 4, 4, 4}
-
- GtkEntry::state-hint = 1
- GtkEntry::inner-border = {7, 7, 4, 5}
-
- GtkPaned::handle-size = 8
- GtkHPaned::handle-size = 8
- GtkVPaned::handle-size = 8
-
- GtkScrollbar::trough-border = 0
- GtkRange::trough-border = 0
- GtkRange::slider-width = 13
- GtkRange::stepper-size = 0
- GtkRange::activate-slider = 1
-
- GtkScrollbar::activate-slider = 1
- GtkScrollbar::stepper-size = 0
- GtkScrollbar::has-backward-stepper = 0
- GtkScrollbar::has-forward-stepper = 0
- GtkScrollbar::min-slider-length = 48 # 42 + 2*3 (margins)
- GtkScrolledWindow::scrollbar-spacing = 0
- GtkScrolledWindow::scrollbars-within-bevel = 1
-
- GtkScale::slider_length = 26
- GtkScale::slider_width = 26
- GtkScale::trough-side-details = 1
-
- GtkProgressBar::min-horizontal-bar-height = 6
- GtkProgressBar::min-vertical-bar-width = 6
- # Making this bigger than the min[height,width]-2*[y,x]spacing makes the
- # whole progressbar thicker, so by setting it to the exact above value
- # we get the maximum spacing between the text and the edges without
- # doing so.
- GtkProgressBar::xspacing = 4
- GtkProgressBar::yspacing = 4
-
- GtkStatusbar::shadow_type = GTK_SHADOW_NONE
- GtkSpinButton::shadow_type = GTK_SHADOW_NONE
- GtkMenuBar::shadow-type = GTK_SHADOW_NONE
- GtkToolbar::shadow-type = GTK_SHADOW_NONE
- # TODO: find out what this comment means:
- # ( every window is misaligned for the sake of menus ):
- GtkMenuBar::internal-padding = 0
- GtkMenu::horizontal-padding = 0
- GtkMenu::vertical-padding = 2
- GtkMenu::double-arrows = 0
- GtkMenuItem::arrow-scaling = 1
- GtkMenuItem::toggle-spacing = 10
-
- GtkCheckButton::indicator_spacing = 3
- GtkOptionMenu::indicator_spacing = {13, 13, 5, 8}
-
- GtkTreeView::expander-size = 16
- GtkTreeView::vertical-separator = 0
- GtkTreeView::horizontal-separator = 4
- GtkTreeView::allow-rules = 0
- # Set this because some apps read it
- GtkTreeView::odd-row-color = @base_color
- GtkTreeView::even-row-color = @base_color
-
- GtkExpander::expander-size = 16
-
- GtkNotebook::tab-overlap = 4
-
- ##########
- # Colors #
- ##########
-
- bg[NORMAL] = @bg_color
- bg[PRELIGHT] = @bg_color
- bg[SELECTED] = @selected_bg_color
- bg[INSENSITIVE] = @insensitive_bg_color
- bg[ACTIVE] = @bg_color
-
- fg[NORMAL] = @fg_color
- fg[PRELIGHT] = @fg_color
- fg[SELECTED] = @selected_fg_color
- fg[INSENSITIVE] = @insensitive_fg_color
- fg[ACTIVE] = @fg_color
-
- text[NORMAL] = @text_color
- text[PRELIGHT] = @text_color
- text[SELECTED] = @selected_fg_color
- text[INSENSITIVE] = @insensitive_fg_color
- text[ACTIVE] = @selected_fg_color
-
- base[NORMAL] = @base_color
- base[PRELIGHT] = shade (0.95, @bg_color)
- base[SELECTED] = @selected_bg_color
- base[INSENSITIVE] = @insensitive_bg_color
- base[ACTIVE] = @selected_bg_color
-
- # For succinctness, all reasonable pixmap options remain here
-
- # Draw frame around menu in a non-compositied environment
- # This needs to go before pixmap because we need to override some stuff
- engine "adwaita" {}
-
- engine "pixmap" {
-
- #################
- # Check Buttons #
- #################
-
- image {
- function = CHECK
- state = NORMAL
- shadow = OUT
- overlay_file = "assets/checkbox-unchecked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = OUT
- overlay_file = "assets/checkbox-unchecked-hover.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = OUT
- overlay_file = "assets/checkbox-unchecked-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = SELECTED
- shadow = OUT
- overlay_file = "assets/checkbox-unchecked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = OUT
- overlay_file = "assets/checkbox-unchecked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = NORMAL
- shadow = IN
- overlay_file = "assets/checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = IN
- overlay_file = "assets/checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = IN
- overlay_file = "assets/checkbox-checked-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = SELECTED
- shadow = IN
- overlay_file = "assets/checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = IN
- overlay_file = "assets/checkbox-checked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = NORMAL
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = SELECTED
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed-insensitive.png"
- overlay_stretch = FALSE
- }
-
- #################
- # Radio Buttons #
- #################
-
- image {
- function = OPTION
- state = NORMAL
- shadow = OUT
- overlay_file = "assets/radio-unchecked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = OUT
- overlay_file = "assets/radio-unchecked-hover.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = OUT
- overlay_file = "assets/radio-unchecked-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = SELECTED
- shadow = OUT
- overlay_file = "assets/radio-unchecked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = OUT
- overlay_file = "assets/radio-unchecked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = NORMAL
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = SELECTED
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = IN
- overlay_file = "assets/menu-radio-checked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = NORMAL
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = SELECTED
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed-insensitive.png"
- overlay_stretch = FALSE
- }
-
- ##########
- # Arrows #
- ##########
-
- # Overrides
-
- # Disable arrows in spinbuttons
- image {
- function = ARROW
- detail = "spinbutton"
- }
-
- # QGtkStyle (used for Qt apps) *always* assumes scrollbars have
- # arrows, so configure these here. Gtk2 apps will atually ignore
- # this.
-
- image {
- function = ARROW
- overlay_file = "assets/scrollbar-arrow-up.png"
- detail = "vscrollbar"
- overlay_border = { 0, 0, 0, 0 }
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- overlay_file = "assets/scrollbar-arrow-down.png"
- detail = "vscrollbar"
- overlay_border = { 0, 0, 0, 0 }
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- overlay_file = "assets/scrollbar-arrow-left.png"
- detail = "hscrollbar"
- overlay_border = { 0, 0, 0, 0 }
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- overlay_file = "assets/scrollbar-arrow-right.png"
- detail = "hscrollbar"
- overlay_border = { 0, 0, 0, 0 }
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = BOX
- detail = "hscrollbar"
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "vscrollbar"
- orientation = VERTICAL
- }
-
- # Menu arrows
-
- image {
- function = ARROW
- state = NORMAL
- detail = "menuitem"
- overlay_file = "assets/menu-pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- detail = "menuitem"
- overlay_file = "assets/menu-pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- detail = "menuitem"
- overlay_file = "assets/menu-pan-left-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = NORMAL
- detail = "menuitem"
- overlay_file = "assets/menu-pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- detail = "menuitem"
- overlay_file = "assets/menu-pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- detail = "menuitem"
- overlay_file = "assets/menu-pan-right-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- detail = "menu_scroll_arrow_up"
- overlay_file = "assets/menu-pan-up-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = ARROW
- detail = "menu_scroll_arrow_up"
- overlay_file = "assets/menu-pan-up.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- detail = "menu_scroll_arrow_down"
- overlay_file = "assets/menu-pan-down-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = ARROW
- detail = "menu_scroll_arrow_down"
- overlay_file = "assets/menu-pan-down.png"
- overlay_stretch = FALSE
- }
-
- # Regular arrows
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/pan-up.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/pan-up.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/pan-up.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- overlay_file = "assets/pan-up-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- overlay_file = "assets/pan-down-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- overlay_file = "assets/pan-left-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- overlay_file = "assets/pan-right-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- ######################
- # Option Menu Arrows #
- ######################
-
- image {
- function = TAB
- state = NORMAL
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = TAB
- state = PRELIGHT
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = TAB
- state = ACTIVE
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = TAB
- state = INSENSITIVE
- overlay_file = "assets/pan-down-insensitive.png"
- overlay_stretch = FALSE
- }
-
- #########
- # Lines #
- #########
-
- image {
- function = VLINE
- file = "assets/line.png"
- border = {1, 0, 0, 0}
- }
-
- image {
- function = HLINE
- file = "assets/line.png"
- border = {0, 0, 1, 0}
- }
-
- #########
- # Focus #
- #########
-
- image {
- function = FOCUS
- file = "assets/focus.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- }
-
- ###########
- # Handles #
- ###########
-
- image {
- function = HANDLE
- detail = "handlebox"
- overlay_file = "assets/handle.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = HANDLE
- file = "assets/handle-horz.png"
- border = {0, 0, 4, 4}
- orientation = HORIZONTAL
- }
-
- image {
- function = HANDLE
- file = "assets/handle-vert.png"
- border = {4, 4, 0, 0}
- orientation = VERTICAL
- }
-
- image {
- function = RESIZE_GRIP
- }
-
- #############
- # Expanders #
- #############
-
- image {
- function = EXPANDER
- expander_style = EXPANDED
- file = "assets/pan-down.png"
- }
-
- # LTR
-
- image {
- function = EXPANDER
- expander_style = COLLAPSED
- file = "assets/pan-right.png"
- direction = LTR
- }
-
- image {
- function = EXPANDER
- expander_style = SEMI_COLLAPSED
- file = "assets/pan-right-semi.png"
- direction = LTR
- }
-
- image {
- function = EXPANDER
- expander_style = SEMI_EXPANDED
- file = "assets/pan-right-semi.png"
- direction = LTR
- }
-
- # RTL
-
- image {
- function = EXPANDER
- expander_style = COLLAPSED
- file = "assets/pan-left.png"
- direction = RTL
- }
-
- image {
- function = EXPANDER
- expander_style = SEMI_COLLAPSED
- file = "assets/pan-left-semi.png"
- direction = RTL
- }
-
- image {
- function = EXPANDER
- expander_style = SEMI_EXPANDED
- file = "assets/pan-left-semi.png"
- direction = RTL
- }
-
- #############
- # Notebooks #
- #############
-
- # Left
-
- image {
- function = EXTENSION
- state = NORMAL
- file = "assets/tab-left-active.png"
- border = {3, 0, 3, 3}
- stretch = TRUE
- gap_side = RIGHT
- }
-
- image {
- function = EXTENSION
- file = "assets/tab-left.png"
- border = {3, 0, 3, 3}
- stretch = TRUE
- gap_side = RIGHT
- }
-
- # Right
-
- image {
- function = EXTENSION
- state = NORMAL
- file = "assets/tab-right-active.png"
- border = {0, 3, 3, 3}
- stretch = TRUE
- gap_side = LEFT
- }
-
- image {
- function = EXTENSION
- file = "assets/tab-right.png"
- border = {0, 3, 3, 3}
- stretch = TRUE
- gap_side = LEFT
- }
-
- # Up
-
- image {
- function = EXTENSION
- state = NORMAL
- file = "assets/tab-up-active.png"
- border = {3, 3, 3, 0}
- stretch = TRUE
- gap_side = BOTTOM
- }
-
- image {
- function = EXTENSION
- file = "assets/tab-up.png"
- border = {3, 3, 3, 0}
- stretch = TRUE
- gap_side = BOTTOM
- }
-
- # Down
-
- image {
- function = EXTENSION
- state = NORMAL
- file = "assets/tab-down-active.png"
- border = {3, 3, 0, 3}
- stretch = TRUE
- gap_side = TOP
- }
-
- image {
- function = EXTENSION
- file = "assets/tab-down.png"
- border = {3, 3, 0, 3}
- stretch = TRUE
- gap_side = TOP
- }
-
- # Inner frame
-
- image {
- function = BOX_GAP
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_file = "assets/tab-vert-gap.png"
- gap_border = {1, 0, 1, 1}
- gap_side = LEFT
- }
-
- image {
- function = BOX_GAP
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_file = "assets/tab-vert-gap.png"
- gap_border = {0, 1, 1, 1}
- gap_side = RIGHT
- }
-
- image {
- function = BOX_GAP
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_file = "assets/tab-horz-gap.png"
- gap_border = {1, 1, 1, 0}
- gap_side = TOP
- }
-
- image {
- function = BOX_GAP
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_file = "assets/tab-horz-gap.png"
- gap_border = {1, 1, 0, 1}
- gap_side = BOTTOM
- }
-
- # Standalone frame
- image {
- function = BOX
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- }
-
- ##############
- # Scrollbars #
- ##############
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/scrollbar-horz-trough.png"
- border = {0, 0, 1, 0}
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/scrollbar-vert-trough.png"
- border = {1, 0, 0, 0}
- orientation = VERTICAL
- direction = LTR
- }
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/scrollbar-vert-trough-rtl.png"
- border = {0, 1, 0, 0}
- orientation = VERTICAL
- direction = RTL
- }
-
-
- # Disable insensitive sliders
-
- image {
- function = SLIDER
- state = INSENSITIVE
- detail = "slider"
- }
-
- # Horizontal sliders
-
- image {
- function = SLIDER
- state = NORMAL
- detail = "slider"
- file = "assets/scrollbar-horz-slider.png"
- border = {6, 6, 7, 6 }
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "slider"
- file = "assets/scrollbar-horz-slider-hover.png"
- border = {6, 6, 7, 6 }
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "slider"
- file = "assets/scrollbar-horz-slider-active.png"
- border = {6, 6, 7, 6 }
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- # Vertical sliders
-
- image {
- function = SLIDER
- state = NORMAL
- detail = "slider"
- file = "assets/scrollbar-vert-slider.png"
- border = {7, 6, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = LTR
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "slider"
- file = "assets/scrollbar-vert-slider-hover.png"
- border = {7, 6, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = LTR
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "slider"
- file = "assets/scrollbar-vert-slider-active.png"
- border = {7, 6, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = LTR
- }
-
- # RTL
-
- image {
- function = SLIDER
- state = NORMAL
- detail = "slider"
- file = "assets/scrollbar-vert-slider-rtl.png"
- border = {6, 7, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = RTL
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "slider"
- file = "assets/scrollbar-vert-slider-hover-rtl.png"
- border = {6, 7, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = RTL
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "slider"
- file = "assets/scrollbar-vert-slider-active-rtl.png"
- border = {6, 7, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = RTL
- }
-
- ##########
- # Scales #
- ##########
-
- # Troughs, overrided later on. We set them here too because some widgets
- # don't specify their orientation.
-
- image {
- function = BOX
- detail = "trough-upper"
- file = "assets/scale-horz-trough.png"
- border = {10, 10, 0, 0}
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "trough-lower"
- file = "assets/scale-horz-trough-active.png"
- border = {10, 10, 0, 0}
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "trough-upper"
- file = "assets/scale-vert-trough.png"
- border = {0, 0, 10, 10}
- stretch = TRUE
- orientation = VERTICAL
- }
-
- image {
- function = BOX
- detail = "trough-lower"
- file = "assets/scale-vert-trough-active.png"
- border = {0, 0, 10, 10}
- stretch = TRUE
- orientation = VERTICAL
- }
-
- # Sliders
-
- image {
- function = SLIDER
- state = NORMAL
- detail = "hscale"
- file = "assets/scale-slider.png"
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "hscale"
- file = "assets/scale-slider-hover.png"
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "hscale"
- file = "assets/scale-slider-active.png"
- }
-
- image {
- function = SLIDER
- state = INSENSITIVE
- detail = "hscale"
- file = "assets/scale-slider-insensitive.png"
- }
- image {
- function = SLIDER
- state = NORMAL
- detail = "vscale"
- file = "assets/scale-slider.png"
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "vscale"
- file = "assets/scale-slider-hover.png"
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "vscale"
- file = "assets/scale-slider-active.png"
- }
-
- image {
- function = SLIDER
- state = INSENSITIVE
- detail = "vscale"
- file = "assets/scale-slider-insensitive.png"
- }
-
- ###########
- # Menubar #
- ###########
-
- image {
- function = BOX
- detail = "menubar"
- file = "assets/line.png"
- border = {0, 0, 0, 1}
- }
-
- #########
- # Menus #
- #########
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "menu_scroll_arrow_up"
- file = "assets/line.png"
- }
-
- image {
- function = BOX
- detail = "menu_scroll_arrow_up"
- file = "assets/line.png"
- border = {0, 0, 0, 1}
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "menu_scroll_arrow_down"
- file = "assets/line.png"
- }
-
- image {
- function = BOX
- detail = "menu_scroll_arrow_down"
- file = "assets/line.png"
- border = {0, 0, 1, 0}
- }
-
- ###########
- # Entries #
- ###########
-
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- detail = "entry"
- file = "assets/entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = FLAT_BOX
- state = ACTIVE
- detail = "entry_bg"
- file = "assets/entry-background.png"
- }
-
- image {
- function = FLAT_BOX
- state = INSENSITIVE
- detail = "entry_bg"
- file = "assets/entry-background-insensitive.png"
- }
-
- image {
- function = FLAT_BOX
- detail = "entry_bg"
- file = "assets/entry-background.png"
- }
- #########
- # Spins #
- #########
-
- # Spin-Up LTR
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_up"
- file = "assets/spin-ltr-up.png"
- border = {1, 4, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_up"
- file = "assets/spin-ltr-up-hover.png"
- border = {1, 4, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_up"
- file = "assets/spin-ltr-up-active.png"
- border = {1, 4, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_up"
- file = "assets/spin-ltr-up-insensitive.png"
- border = {1, 4, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up-insensitive.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- # Spin-Up RTL
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_up"
- file = "assets/spin-rtl-up.png"
- border = {4, 1, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_up"
- file = "assets/spin-rtl-up-hover.png"
- border = {4, 1, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_up"
- file = "assets/spin-rtl-up-hover.png"
- border = {4, 1, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_up"
- file = "assets/spin-rtl-up-insensitive.png"
- border = {4, 1, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up-insensitive.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- # Spin-Down LTR
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_down"
- file = "assets/spin-ltr-down.png"
- border = {1, 4, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_down"
- file = "assets/spin-ltr-down-hover.png"
- border = {1, 4, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_down"
- file = "assets/spin-ltr-down-active.png"
- border = {1, 4, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_down"
- file = "assets/spin-ltr-down-insensitive.png"
- border = {1, 4, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down-insensitive.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- # Spin-Down RTL
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_down"
- file = "assets/spin-rtl-down.png"
- border = {4, 1, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_down"
- file = "assets/spin-rtl-down-hover.png"
- border = {4, 1, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_down"
- file = "assets/spin-rtl-down-active.png"
- border = {4, 1, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_down"
- file = "assets/spin-rtl-down-insensitive.png"
- border = {4, 1, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down-insensitive.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- ##############
- # Scrollbars #
- ##############
-
- image {
- function = BOX
- detail = "bar"
- file = "assets/progressbar-horz.png"
- stretch = TRUE
- border = {2, 2, 1, 1}
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "bar"
- file = "assets/progressbar-vert.png"
- stretch = TRUE
- border = {1, 1, 2, 2}
- orientation = VERTICAL
- }
-
- #############
- # Treeviews #
- #############
-
- # Disable active the column highlight
- # We need to match specific cells or we break stuff
- # Looking at you deadbeef
-
- image {
- function = FLAT_BOX
- detail = "cell_even_sorted"
- state = NORMAL
- }
-
- image {
- function = FLAT_BOX
- detail = "cell_odd_sorted"
- state = NORMAL
- }
-
- # Disable all the other shadows
- # This prevents the Raleigh effect
- image {
- function = SHADOW
- }
-
- }
-
-}
-
-style "menubar" {
-
- # Needed to fix Firefox's menubar text
- bg[NORMAL] = @menubar_bg
- bg[SELECTED] = @selected_fg_color
- fg[SELECTED] = @link_color
-}
-
-style "menubar_item" {
-
- xthickness = 3
- ythickness = 4
-
- fg[NORMAL] = @menubar_insensitive_fg
- fg[PRELIGHT] = @menubar_fg
-
- engine "pixmap" {
- image {
- function = BOX
- state = PRELIGHT
- file = "assets/menubar-item-active.png"
- border = {0, 0, 0, 3}
- }
- }
-
-}
-
-style "menu" {
-
- xthickness = 0
- ythickness = 0
-
- bg[NORMAL] = @menu_color
- bg[INSENSITIVE] = @menu_color
- bg[PRELIGHT] = @menu_color
- bg[SELECTED] = @selected_bg_color
-
-}
-
-style "menu_item" {
-
- xthickness = 3
- ythickness = 4
-
- bg[PRELIGHT] = @menu_hover_color
- # Chromium uses this setting
- bg[SELECTED] = @menu_hover_color
-
- fg[PRELIGHT] = @fg_color
- fg[SELECTED] = @fg_color
- text[NORMAL] = @fg_color
- text[PRELIGHT] = @fg_color
- text[ACTIVE] = @fg_color
- text[SELECTED] = @fg_color
-
- # Some widgets use text, we need to handle that
- # Don't know what this comment is about but maybe we've nulled it
-
- # Unfortunately we can't tell regular and menu checks/radios apart
- # Without the heirarchy
- engine "pixmap" {
-
- #################
- # Check Buttons #
- #################
-
- image {
- function = CHECK
- state = NORMAL
- shadow = OUT
- overlay_file = "assets/menu-checkbox.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = OUT
- overlay_file = "assets/menu-checkbox.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = OUT
- overlay_file = "assets/menu-checkbox.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = OUT
- overlay_file = "assets/menu-checkbox-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = NORMAL
- shadow = IN
- overlay_file = "assets/menu-checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = IN
- overlay_file = "assets/menu-checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = IN
- overlay_file = "assets/menu-checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = IN
- overlay_file = "assets/menu-checkbox-checked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = NORMAL
- shadow = ETCHED_IN
- overlay_file = "assets/menu-checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = ETCHED_IN
- overlay_file = "assets/menu-checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = ETCHED_IN
- overlay_file = "assets/menu-checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = ETCHED_IN
- overlay_file = "assets/menu-checkbox-mixed-insensitive.png"
- overlay_stretch = FALSE
- }
-
- #################
- # Radio Buttons #
- #################
-
- image {
- function = OPTION
- state = NORMAL
- shadow = OUT
- overlay_file = "assets/menu-radio.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = OUT
- overlay_file = "assets/menu-radio.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = OUT
- overlay_file = "assets/menu-radio.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = OUT
- overlay_file = "assets/menu-radio-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = NORMAL
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = IN
- overlay_file = "assets/menu-radio-checked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = NORMAL
- shadow = ETCHED_IN
- overlay_file = "assets/menu-radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = ETCHED_IN
- overlay_file = "assets/menu-radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = ETCHED_IN
- overlay_file = "assets/menu-radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = ETCHED_IN
- overlay_file = "assets/menu-radio-mixed-insensitive.png"
- overlay_stretch = FALSE
- }
-
-
-
- }
-
-}
-
-style "separator_menu_item" {
-
- xthickness = 0
- ythickness = 0
-
- engine "pixmap" {
- image {
- function = BOX
- file = "assets/line.png"
- }
- }
-
-}
-
-style "button" {
-
- xthickness = 2
- ythickness = 2
-
- # For the sake of sanity style buttons this way
- engine "pixmap" {
-
- ###########
- # Buttons #
- ###########
-
- image {
- function = BOX
- state = NORMAL
- file = "assets/button.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = BOX
- state = PRELIGHT
- shadow = OUT
- file = "assets/button-hover.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- # Don't add hover effect on pressed buttons
- image {
- function = BOX
- state = PRELIGHT
- shadow = IN
- file = "assets/button-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = BOX
- state = ACTIVE
- file = "assets/button-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- file = "assets/button-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
- }
-}
-
-style "link_button" {
-
- # Disable the button effect, leave just the link
- engine "pixmap" {
- image {
- function = BOX
- }
- }
-
-}
-
-style "entry" {
-
- # We set this same as the border of the border of the entry
- # This way there's no overlap
- xthickness = 4
- ythickness = 4
-
-}
-
-style "combobox" {
-
- xthickness = 6
- ythickness = 4
-
- # This affects only the button beside an entry
- GtkButton::inner-border = {0, 0, 0, 0}
-
-}
-
-style "combobox_cellview" {
- text[NORMAL] = @fg_color
- text[PRELIGHT] = @fg_color
-}
-
-style "combobox_entry" {
-
- # Since one side of the button is missing, we need to shift the arrow a little to the right
- GtkButton::inner-border = {0, 1, 0, 0}
-
- engine "pixmap" {
-
- #############
- # LTR entry #
- #############
-
- image {
- function = SHADOW
- state = NORMAL
- detail = "entry"
- file = "assets/combo-entry-ltr-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/combo-entry-ltr-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/combo-entry-ltr-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- #############
- # RTL entry #
- #############
-
- image {
- function = SHADOW
- state = NORMAL
- detail = "entry"
- file = "assets/combo-entry-rtl-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/combo-entry-rtl-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/combo-entry-rtl-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- ##############
- # LTR button #
- ##############
-
- image {
- function = BOX
- state = NORMAL
- detail = "button"
- file = "assets/combo-entry-ltr-button.png"
- border = {0, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "button"
- file = "assets/combo-entry-ltr-button-hover.png"
- border = {0, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "button"
- file = "assets/combo-entry-ltr-button-active.png"
- border = {0, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "button"
- file = "assets/combo-entry-ltr-button-insensitive.png"
- border = {0, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- ##############
- # RTL button #
- ##############
-
- image {
- function = BOX
- state = NORMAL
- detail = "button"
- file = "assets/combo-entry-rtl-button.png"
- border = {4, 0, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "button"
- file = "assets/combo-entry-rtl-button-hover.png"
- border = {4, 0, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "button"
- file = "assets/combo-entry-rtl-button-active.png"
- border = {4, 0, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "button"
- file = "assets/combo-entry-rtl-button-insensitive.png"
- border = {4, 0, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- }
-
-}
-
-style "combo_button_padding" {
-
- # Since one side of the button is missing, we need to shift the arrow a
- # little to the right.
- # This is the same thing we've done above but the combo, unlike the combobox,
- # uses padding the same way as a button.
- GtkButton::inner-border = {6, 8, 4, 4}
-
-}
-
-style "notebook" {
-
- xthickness = 5
- ythickness = 2
-
-}
-
-style "notebook_viewport" {
- bg[NORMAL] = @base_color
-}
-
-style "notebook_bg" {
- bg[NORMAL] = @base_color
- bg[PRELIGHT] = @base_color
- bg[INSENSITIVE] = @base_color
-}
-
-style "notebook_entry" {
-
- engine "pixmap" {
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/notebook-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/notebook-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- detail = "entry"
- file = "assets/notebook-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
- }
-}
-
-style "normal_bg" {
- bg[NORMAL] = @bg_color
- bg[PRELIGHT] = @bg_color
- bg[INSENSITIVE] = @insensitive_bg_color
-}
-
-style "normal_entry" {
-
- engine "pixmap" {
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- detail = "entry"
- file = "assets/entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
- }
-}
-
-style "notebook_combo" {
-
- engine "pixmap" {
-
- #############
- # LTR entry #
- #############
-
- image {
- function = SHADOW
- state = NORMAL
- detail = "entry"
- file = "assets/notebook-combo-entry-ltr-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/notebook-combo-entry-ltr-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/notebook-combo-entry-ltr-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- #############
- # RTL entry #
- #############
-
- image {
- function = SHADOW
- state = NORMAL
- detail = "entry"
- file = "assets/notebook-combo-entry-rtl-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/notebook-combo-entry-rtl-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/notebook-combo-entry-rtl-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- }
-
-}
-
-style "textview" {
- bg[NORMAL] = @base_color
-}
-
-style "scale_horz" {
-
- engine "pixmap" {
-
- image {
- function = BOX
- detail = "trough-upper"
- file = "assets/scale-horz-trough.png"
- border = {10, 10, 0, 0}
- stretch = TRUE
- }
-
- image {
- function = BOX
- detail = "trough-lower"
- file = "assets/scale-horz-trough-active.png"
- border = {10, 10, 0, 0}
- stretch = TRUE
- }
-
- }
-
-}
-
-style "scale_vert" {
-
- engine "pixmap" {
-
- image {
- function = BOX
- detail = "trough-upper"
- file = "assets/scale-vert-trough.png"
- border = {0, 0, 10, 10}
- stretch = TRUE
- }
-
- image {
- function = BOX
- detail = "trough-lower"
- file = "assets/scale-vert-trough-active.png"
- border = {0, 0, 10, 10}
- stretch = TRUE
- }
-
- }
-
-}
-
-style "progressbar" {
-
- xthickness = 1
- ythickness = 1
-
- fg[PRELIGHT] = @selected_fg_color
-
- engine "pixmap" {
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/progressbar-horz-trough.png"
- border = {3, 3, 2, 2}
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/progressbar-vert-trough.png"
- border = {2, 2, 3, 3}
- stretch = TRUE
- orientation = VERTICAL
- }
-
- }
-
-}
-
-style "treeview_header_button" {
-
- engine "pixmap" {
- image {
- function = SHADOW
- state = NORMAL
- file = "assets/treeview-header-button.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
- }
-
-}
-
-style "treeview_header_label" {
-
- xthickness = 1
- ythickness = 0
-
- font_name = "Bold"
-
- GtkButton::inner-border = {5, 5, 0, 1}
-
- engine "pixmap" {
-
- image {
- function = BOX
- file = "assets/treeview-separator-ltr.png"
- border = {0, 1, 0, 1}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = BOX
- file = "assets/treeview-separator-rtl.png"
- border = {1, 0, 0, 1}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/treeview-pan-up.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/treeview-pan-up-hover.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/treeview-pan-up-active.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/treeview-pan-down.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/treeview-pan-down-hover.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/treeview-pan-down-active.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- }
-
-}
-
-style "scrolled_window" {
-
- engine "pixmap" {
- image {
- function = SHADOW
- file = "assets/frame.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- }
- }
-
-}
-
-style "frame" {
-
- engine "pixmap" {
-
- image {
- function = SHADOW
- shadow = NONE
- }
-
- image {
- function = SHADOW
- file = "assets/frame.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- }
-
- image {
- function = SHADOW_GAP
- file = "assets/frame.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_start_file = "assets/border.png"
- gap_end_file = "assets/border.png"
- }
-
- }
-
-}
-
-style "toolbar_button" {
-
- xthickness = 2
- ythickness = 2
-
- GtkButton::inner-border = {2, 2, 2, 2}
-
-}
-
-style "toolbar_separator" {
-
- GtkWidget::wide-separators = 1
- GtkWidget::separator-width = 1
- GtkWidget::separator-height = 1
-
- engine "pixmap" {
- image {
- function = BOX
- file = "assets/line.png"
- }
- }
-
-}
-
-style "inline_toolbar" {
-
- GtkToolbar::button-relief = GTK_RELIEF_NORMAL
-
- engine "pixmap" {
- image {
- function = SHADOW
- file = "assets/frame-inline.png"
- border = {1, 1, 0, 1}
- stretch = TRUE
- }
- }
-
-}
-
-style "tooltip" {
-
- xthickness = 13
- ythickness = 13
-
- bg[NORMAL] = @tooltip_bg_color
- fg[NORMAL] = @tooltip_fg_color
- bg[SELECTED] = @tooltip_bg_color
-
-}
-
-style "text" = "default" {
- engine "murrine" { textstyle = 0 }
-}
-
-style "menu_text" = "menu_item" {
- engine "murrine" { textstyle = 0 }
-}
-
-style "disable_separator" {
-
- xthickness = 0
- ythickness = 0
-
- GtkWidget::wide-separators = 1
-
-}
-
-# Default style, containing theme properties and trying to match every widget as
-# much as possible, which is not only faster than trying to match every widget
-# by its own but also less bug-prune and more consistent. However there is some
-# widget specific stuff that needs to be taken care of, which is the point of
-# every other style below.
-class "GtkWidget" style "default"
-
- ######################################
- # Override padding, style and colour #
- ######################################
-
-class "GtkButton" style "button"
-class "GtkLinkButton" style "link_button"
-class "GtkEntry" style "entry"
-class "GtkOldEditable" style "entry"
-class "GtkNotebook" style "notebook"
-class "GtkHScale" style "scale_horz"
-class "GtkVScale" style "scale_vert"
-class "GtkProgressBar" style "progressbar"
-class "GtkScrolledWindow" style "scrolled_window"
-class "GtkFrame" style "frame"
-class "GtkSeparatorToolItem" style "toolbar_separator"
-class "GtkMenuBar" style "menubar"
-class "GtkMenu" style "menu"
-class "GtkTextView" style "textview"
-
-# Menu and menubar items
-widget_class "**" style "menu_item"
-widget_class "*.*" style "menubar_item"
-widget_class "**" style "menubar_item"
-widget_class "**" style "separator_menu_item"
-
-# Treeview buttons
-widget_class "***" style "treeview_header_label"
-widget_class "**" style "treeview_header_button"
-
-# Give the file chooser toolbar a border
-widget_class "**" style "inline_toolbar"
-
-# Fix padding on regular comboboxes
-widget_class "*." style "combobox"
-# And disable separators on them
-widget_class "*.*" style "disable_separator"
-
-# Join together the ComboBoxEntry entry and button
-widget_class "**" style "combobox_entry"
-
-# Join the Combo entry and button
-widget_class "**" style "combobox_entry"
-# Tweak the padding on the button a little bit because it
-# uses it a bit differently
-widget_class "*." style "combo_button_padding"
-
-# Alas we cannot do the same for ComboBoxText because there
-# isn't a way to apply the style to only the comboboxes that
-# have an entry inside
-
-# Toolbar buttons have different paddings
-widget_class "**" style "toolbar_button"
-
-# Notebooks are white, act accordingly
-widget_class "**" style "notebook_entry"
-widget_class "**" style "notebook_bg"
-widget_class "**" style "notebook_bg"
-widget_class "***" style "notebook_bg"
-widget_class "**" style "notebook_bg"
-widget_class "*.*" style "notebook_bg"
-widget_class "***" style "notebook_combo"
-widget_class "***" style "notebook_combo"
-
-# However, stuff inside eventboxes inside notebooks is grey
-# again, react
-widget_class "***" style "normal_entry"
-widget_class "***" style "normal_bg"
-widget_class "***" style "normal_bg"
-widget_class "****" style "combobox_entry"
-widget_class "****" style "combobox_entry"
-widget_class "***." style "combo_button_padding"
-
-# ComboBoxes tend to draw the button label with text[]
-# instead of fg[], we need to fix that
-widget_class "**" style "combobox_cellview"
-
-# GTK tooltips
-widget "gtk-tooltip*" style "tooltip"
-
-# Fixes ugly text shadows for insensitive text
-widget_class "*" style "text"
-widget_class "**" style "menu_text"
-widget_class "**" style "text"
-widget_class "**" style "text"
-widget_class "**" style "text"
\ No newline at end of file
diff --git a/gtk/src/dark/gtk-2.0/render-all-assets.sh b/gtk/src/dark/gtk-2.0/render-all-assets.sh
deleted file mode 100755
index 82b9a4280e..0000000000
--- a/gtk/src/dark/gtk-2.0/render-all-assets.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="inkscape"
-OPTIPNG="optipng"
-
-SRC_FILE="assets.svg"
-ASSETS_DIR="assets"
-INDEX="assets.txt"
-
-rm assets/*.png
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
- echo $ASSETS_DIR/$i.png exists.
-else
- echo
- echo Rendering $ASSETS_DIR/$i.png
- $INKSCAPE --export-id=$i \
- --export-id-only \
- -o $ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
- && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png
-fi
-done
-exit 0
diff --git a/gtk/src/dark/gtk-2.0/render-assets-external.sh b/gtk/src/dark/gtk-2.0/render-assets-external.sh
deleted file mode 100755
index 5f5c2c2e7b..0000000000
--- a/gtk/src/dark/gtk-2.0/render-assets-external.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="inkscape"
-OPTIPNG="optipng"
-
-SRC_FILE="assets-external.svg"
-ASSETS_DIR="assets"
-INDEX="assets-external.txt"
-
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
- echo $ASSETS_DIR/$i.png exists.
-else
- echo
- echo Rendering $ASSETS_DIR/$i.png
- $INKSCAPE --export-id=$i \
- --export-id-only \
- --export-background-opacity=0 \
- --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
- && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png
-fi
-done
-exit 0
diff --git a/gtk/src/dark/gtk-3.0/thumbnail.png b/gtk/src/dark/gtk-3.0/thumbnail.png
deleted file mode 100644
index 0bf2b42646..0000000000
Binary files a/gtk/src/dark/gtk-3.0/thumbnail.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/apps.rc b/gtk/src/default/gtk-2.0/apps.rc
deleted file mode 100644
index 916acfdaec..0000000000
--- a/gtk/src/default/gtk-2.0/apps.rc
+++ /dev/null
@@ -1,99 +0,0 @@
-# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
-#
-# This file, unlike hacks.rc, contains legitimate cases we need to handle, e.g.
-# custom widgets, programs giving us a chance to alter their UI to fit more with
-# the theme or stuff that is supposed to look different, like panels.
-
-# TODO: This could really look nicer
-style "gimp_spin_scale" {
-
- # Spin background
- bg[NORMAL] = @base_color
-
- engine "pixmap" {
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_up"
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_up"
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_up"
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_up"
- overlay_file = "assets/spin-up-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_down"
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_down"
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_down"
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_down"
- overlay_file = "assets/spin-down-insensitive.png"
- overlay_stretch = FALSE
- }
-
- }
-
-}
-
-style "chrome_gtk_frame" {
-
- ChromeGtkFrame::frame-color = @window_color
- ChromeGtkFrame::frame-gradient-color = @window_color
- ChromeGtkFrame::inactive-frame-color = @bg_color
-
- ChromeGtkFrame::incognito-frame-color = "#cbd2d9"
- ChromeGtkFrame::incognito-frame-gradient-color = "#cbd2d9"
- ChromeGtkFrame::incognito-inactive-frame-color = mix (0.5, @bg_color, "#cbd2d9")
-
-}
-
-# Disable spin button assets for GimpSpinScale
-class "GimpSpinScale" style "gimp_spin_scale"
-
-# Chromium lets us define some colours and settings for better integration
-class "ChromeGtkFrame" style "chrome_gtk_frame"
diff --git a/gtk/src/default/gtk-2.0/assets-external.txt b/gtk/src/default/gtk-2.0/assets-external.txt
deleted file mode 100644
index 9abba2aaf4..0000000000
--- a/gtk/src/default/gtk-2.0/assets-external.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-checkbox-checked
-checkbox-checked-active
-checkbox-checked-insensitive
-checkbox-unchecked
-checkbox-unchecked-hover
-checkbox-unchecked-active
-checkbox-unchecked-insensitive
-checkbox-mixed
-checkbox-mixed-active
-checkbox-mixed-insensitive
-radio-checked
-radio-checked-active
-radio-checked-insensitive
-radio-unchecked
-radio-unchecked-hover
-radio-unchecked-active
-radio-unchecked-insensitive
-radio-mixed
-radio-mixed-active
-radio-mixed-insensitive
diff --git a/gtk/src/default/gtk-2.0/assets.txt b/gtk/src/default/gtk-2.0/assets.txt
deleted file mode 100644
index 425651383b..0000000000
--- a/gtk/src/default/gtk-2.0/assets.txt
+++ /dev/null
@@ -1,141 +0,0 @@
-menu-checkbox
-menu-checkbox-hover
-menu-checkbox-insensitive
-menu-checkbox-checked
-menu-checkbox-checked-insensitive
-menu-checkbox-mixed
-menu-checkbox-mixed-insensitive
-menu-radio
-menu-radio-hover
-menu-radio-insensitive
-menu-radio-checked
-menu-radio-checked-insensitive
-menu-radio-mixed
-menu-radio-mixed-insensitive
-menu-pan-left
-menu-pan-left-hover
-menu-pan-left-insensitive
-menu-pan-right
-menu-pan-right-hover
-menu-pan-right-insensitive
-menu-pan-up
-menu-pan-up-insensitive
-menu-pan-down
-menu-pan-down-insensitive
-button
-button-hover
-button-active
-button-insensitive
-combo-entry-ltr-entry
-combo-entry-ltr-entry-active
-combo-entry-ltr-entry-insensitive
-combo-entry-ltr-button
-combo-entry-ltr-button-hover
-combo-entry-ltr-button-active
-combo-entry-ltr-button-insensitive
-combo-entry-rtl-entry
-combo-entry-rtl-entry-active
-combo-entry-rtl-entry-insensitive
-combo-entry-rtl-button
-combo-entry-rtl-button-hover
-combo-entry-rtl-button-active
-combo-entry-rtl-button-insensitive
-entry
-entry-active
-entry-insensitive
-entry-background
-entry-background-insensitive
-border
-frame
-frame-inline
-frame-notebook
-line
-focus
-handle
-handle-horz
-handle-vert
-menu-border
-menubar-item-active
-notebook-entry
-notebook-entry-active
-notebook-entry-insensitive
-notebook-combo-entry-ltr-entry
-notebook-combo-entry-ltr-entry-active
-notebook-combo-entry-ltr-entry-insensitive
-notebook-combo-entry-rtl-entry
-notebook-combo-entry-rtl-entry-active
-notebook-combo-entry-rtl-entry-insensitive
-pan-left
-pan-left-semi
-pan-left-insensitive
-pan-right
-pan-right-semi
-pan-right-insensitive
-pan-up
-pan-up-insensitive
-pan-down
-pan-down-insensitive
-progressbar-horz
-progressbar-horz-trough
-progressbar-vert
-progressbar-vert-trough
-scrollbar-horz-slider
-scrollbar-horz-slider-hover
-scrollbar-horz-slider-active
-scrollbar-horz-trough
-scrollbar-vert-slider
-scrollbar-vert-slider-hover
-scrollbar-vert-slider-active
-scrollbar-vert-trough
-scrollbar-vert-slider-rtl
-scrollbar-vert-slider-hover-rtl
-scrollbar-vert-slider-active-rtl
-scrollbar-vert-trough-rtl
-spin-ltr-down
-spin-ltr-down-hover
-spin-ltr-down-active
-spin-ltr-down-insensitive
-spin-ltr-up
-spin-ltr-up-hover
-spin-ltr-up-active
-spin-ltr-up-insensitive
-spin-rtl-down
-spin-rtl-down-hover
-spin-rtl-down-active
-spin-rtl-down-insensitive
-spin-rtl-up
-spin-rtl-up-hover
-spin-rtl-up-active
-spin-rtl-up-insensitive
-spin-up
-spin-down
-spin-up-insensitive
-spin-down-insensitive
-scale-slider
-scale-slider-hover
-scale-slider-active
-scale-slider-insensitive
-scale-horz-focus
-scale-horz-trough
-scale-horz-trough-active
-scale-vert-trough
-scale-vert-trough-active
-tab-left
-tab-left-active
-tab-right
-tab-right-active
-tab-up
-tab-up-active
-tab-down
-tab-down-active
-tab-horz-gap
-tab-vert-gap
-treeview-header-button
-treeview-pan-up
-treeview-pan-up-hover
-treeview-pan-up-active
-treeview-pan-down
-treeview-pan-down-hover
-treeview-pan-down-active
-treeview-separator-ltr
-treeview-separator-rtl
diff --git a/gtk/src/default/gtk-2.0/assets/border.png b/gtk/src/default/gtk-2.0/assets/border.png
deleted file mode 100644
index 9f6d1a06bb..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/border.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/handle.png b/gtk/src/default/gtk-2.0/assets/handle.png
deleted file mode 100644
index c7b9825591..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/handle.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/menu-border.png b/gtk/src/default/gtk-2.0/assets/menu-border.png
deleted file mode 100644
index 728f243d1d..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/menu-border.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/menu-checkbox-insensitive.png b/gtk/src/default/gtk-2.0/assets/menu-checkbox-insensitive.png
deleted file mode 100644
index b82efc4afc..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/menu-checkbox-insensitive.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/menu-checkbox.png b/gtk/src/default/gtk-2.0/assets/menu-checkbox.png
deleted file mode 100644
index b82efc4afc..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/menu-checkbox.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/menu-pan-down-insensitive.png b/gtk/src/default/gtk-2.0/assets/menu-pan-down-insensitive.png
deleted file mode 100644
index 535de1c059..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/menu-pan-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/menu-pan-left-hover.png b/gtk/src/default/gtk-2.0/assets/menu-pan-left-hover.png
deleted file mode 100644
index a2cac3ef38..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/menu-pan-left-hover.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/menu-pan-left-insensitive.png b/gtk/src/default/gtk-2.0/assets/menu-pan-left-insensitive.png
deleted file mode 100644
index 29323a7b8d..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/menu-pan-left-insensitive.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/menu-pan-right-hover.png b/gtk/src/default/gtk-2.0/assets/menu-pan-right-hover.png
deleted file mode 100644
index 80da318c6e..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/menu-pan-right-hover.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/menu-pan-right-insensitive.png b/gtk/src/default/gtk-2.0/assets/menu-pan-right-insensitive.png
deleted file mode 100644
index 9de489b728..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/menu-pan-right-insensitive.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/menu-pan-up-insensitive.png b/gtk/src/default/gtk-2.0/assets/menu-pan-up-insensitive.png
deleted file mode 100644
index 76af286613..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/menu-pan-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/menu-radio-insensitive.png b/gtk/src/default/gtk-2.0/assets/menu-radio-insensitive.png
deleted file mode 100644
index b82efc4afc..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/menu-radio-insensitive.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/menu-radio.png b/gtk/src/default/gtk-2.0/assets/menu-radio.png
deleted file mode 100644
index b82efc4afc..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/menu-radio.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/progressbar-horz-trough.png b/gtk/src/default/gtk-2.0/assets/progressbar-horz-trough.png
deleted file mode 100644
index 5589ac52d5..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/progressbar-horz-trough.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/progressbar-vert-trough.png b/gtk/src/default/gtk-2.0/assets/progressbar-vert-trough.png
deleted file mode 100644
index d4152dab2b..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/progressbar-vert-trough.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/scale-horz-focus.png b/gtk/src/default/gtk-2.0/assets/scale-horz-focus.png
deleted file mode 100644
index e6688bde53..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/scale-horz-focus.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/scale-horz-trough.png b/gtk/src/default/gtk-2.0/assets/scale-horz-trough.png
deleted file mode 100644
index 8e2f291272..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/scale-horz-trough.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/scale-vert-trough.png b/gtk/src/default/gtk-2.0/assets/scale-vert-trough.png
deleted file mode 100644
index b2f04217c7..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/scale-vert-trough.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/scrollbar-horz-slider.png b/gtk/src/default/gtk-2.0/assets/scrollbar-horz-slider.png
deleted file mode 100644
index e56537d30b..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/scrollbar-horz-slider.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/scrollbar-vert-slider-rtl.png b/gtk/src/default/gtk-2.0/assets/scrollbar-vert-slider-rtl.png
deleted file mode 100644
index 8b535f98f1..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/scrollbar-vert-slider-rtl.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/scrollbar-vert-slider.png b/gtk/src/default/gtk-2.0/assets/scrollbar-vert-slider.png
deleted file mode 100644
index 68a3b5cf5b..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/scrollbar-vert-slider.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/tab-down.png b/gtk/src/default/gtk-2.0/assets/tab-down.png
deleted file mode 100644
index eecbdf3a92..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/tab-down.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/tab-left.png b/gtk/src/default/gtk-2.0/assets/tab-left.png
deleted file mode 100644
index 4973e1fcbe..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/tab-left.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/tab-right.png b/gtk/src/default/gtk-2.0/assets/tab-right.png
deleted file mode 100644
index 4973e1fcbe..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/tab-right.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/assets/tab-up.png b/gtk/src/default/gtk-2.0/assets/tab-up.png
deleted file mode 100644
index eecbdf3a92..0000000000
Binary files a/gtk/src/default/gtk-2.0/assets/tab-up.png and /dev/null differ
diff --git a/gtk/src/default/gtk-2.0/gtkrc b/gtk/src/default/gtk-2.0/gtkrc
deleted file mode 100644
index abec1cbc1d..0000000000
--- a/gtk/src/default/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,50 +0,0 @@
-# Based on Bridge by ScionicSpectre
-# vim:set ts=2 sw=2 sts=2 ai et:
-#
-# This is the GTK+ 2 version of Adwaita. It's whole purpose is to look as the
-# GTK+ 3 version as much as possible until GTK+ 2 dies completely.
-#
-# Note: comments for explaining styles are on the bottom of each file beside the
-# widget matches.
-
-# Declare the colours used throughout the theme.
-# There shouldn't be any fiddling with them in the theme files themselves in
-# order to not mess up the dark theme.
-
-# Text/base
-gtk-color-scheme = "text_color:#5D5D5D\nbase_color:#FFFFFF"
-# Foreground/background
-gtk-color-scheme = "fg_color:#3D3D3D\nbg_color:#F5F6F7"
-# Selected foreground/background
-gtk-color-scheme = "selected_fg_color:#ffffff\nselected_bg_color:#E95420"
-# Insensitive foreground/background
-gtk-color-scheme = "insensitive_fg_color:#8b8e8f\ninsensitive_bg_color:#f1f1f1"
-# Menus
-gtk-color-scheme = "menu_color:#fafafa\nmenubar_bg:#f5f6f7"
-gtk-color-scheme = "menubar_fg:#3d3d3d\nmenubar_insensitive_fg:#3d3d3d"
-# Links
-gtk-color-scheme = "link_color:#19B6EE\nvisited_link_color:#0b7196"
-# Treeview headers
-gtk-color-scheme = "column_header_color:#979a9b\nhover_column_header_color:#636769"
-# Window decoration
-gtk-color-scheme = "menu_hover_color:#e2e2e2\nwindow_color:#f4f4f4"
-# Tooltips
-gtk-color-scheme = "tooltip_fg_color:#ffffff\ntooltip_bg_color:#343434"
-
-# Set GTK settings
-gtk-auto-mnemonics = 1
-gtk-primary-button-warps-slider = 1
-gtk-icon-sizes="gtk-menu=16,16:
-gtk-button=16,16:
-gtk-small-toolbar=16,16:
-
-gtk-dnd=16,16:
-gtk-dialog=16,16"
-gtk-toolbar-style = GTK_TOOLBAR_ICONS
-gtk-menu-images = 0
-gtk-menu-popup-delay = 0
-
-# And hand over the control to the theme files
-include "main.rc"
-include "apps.rc"
-include "hacks.rc"
diff --git a/gtk/src/default/gtk-2.0/hacks.rc b/gtk/src/default/gtk-2.0/hacks.rc
deleted file mode 100644
index 1bdbee9a41..0000000000
--- a/gtk/src/default/gtk-2.0/hacks.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
-#
-# This file contains horrible hacks to make this theme work with some programs
-# This is mostly due to the limitations of gtk2 but sometimes its the fault of
-# the programs themselves. Not going to point fingers.
-#
-# Either way, it's a WONTFIX for both, hence this horrible file.
-
-style "toplevel_hack" {
- engine "adwaita" {}
-}
-
-style "chrome_entry" {
- base[NORMAL] = @base_color
- base[INSENSITIVE] = @base_color
-}
-
-style "vim_notebook" {
- bg[NORMAL] = @base_color
- bg[ACTIVE] = @insensitive_bg_color
-}
-
-# Vim puts an eventbox between the tab and the label and colours it,
-# we need to handle that
-widget "vim-main-window*GtkNotebook.GtkEventBox" style "vim_notebook"
-
-# (he)xchat input box
-class "SexySpellEntry" style:highest "normal_entry"
-
-# Chromium uses base as the fill colour of its own entries
-# This would be fine but Gtk+ uses it to fill the surrounding space, so its set to bg
-# That results in Chromium using it for the fill, so we need to handle that
-widget_class "*Chrom*" style "chrome_entry"
-
-# Hack to be able to match widgets in LibreOffice
-class "GtkWindow" style "toplevel_hack"
diff --git a/gtk/src/default/gtk-2.0/main.rc b/gtk/src/default/gtk-2.0/main.rc
deleted file mode 100644
index f1ad8dc74c..0000000000
--- a/gtk/src/default/gtk-2.0/main.rc
+++ /dev/null
@@ -1,2615 +0,0 @@
-# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
-#
-# This is the main theme file, handling all the default widgets and theme
-# properties. Since GTK+ 2 is old, we need to overcome some of its limitations,
-# which is also mostly done in this file. Sadly not all of them can be overcome
-# so there will always be a visible difference between the GTK+ 2 and 3 theme.
-
-style "default" {
-
- xthickness = 1
- ythickness = 1
-
- ####################
- # Style Properties #
- ####################
-
- GtkWidget::focus-line-width = 1
- GtkWidget::focus-line-pattern = "\2\1"
-
- GtkToolbar::internal-padding = 4
- GtkToolButton::icon-spacing = 4
-
- GtkWidget::tooltip-radius = 3
- GtkWidget::tooltip-alpha = 235
- GtkWidget::new-tooltip-style = 1 #for compatibility
-
- GtkWidget::link-color = @link_color
- GtkWidget::visited-link-color = @visited_link_color
- GnomeHRef::link_color = @link_color
- GtkHTML::link-color = @link_color
- GtkHTML::vlink-color = @visited_link_color
- GtkIMHtml::hyperlink-color = @link_color
- GtkIMHtml::hyperlink-visited-color = @visited_link_color
-
- GtkSeparatorMenuItem::horizontal-padding = 0
- GtkSeparatorMenuItem::wide-separators = 1
- GtkSeparatorMenuItem::separator-height = 1
-
- GtkButton::child-displacement-y = 0
-
- GtkButton::default-border = {0, 0, 0, 0}
- GtkButton::default-outside-border = {0, 0, 0, 0}
- GtkButton::inner-border = {4, 4, 4, 4}
-
- GtkEntry::state-hint = 1
- GtkEntry::inner-border = {7, 7, 4, 5}
-
- GtkPaned::handle-size = 8
- GtkHPaned::handle-size = 8
- GtkVPaned::handle-size = 8
-
- GtkScrollbar::trough-border = 0
- GtkRange::trough-border = 0
- GtkRange::slider-width = 13
- GtkRange::stepper-size = 0
- GtkRange::activate-slider = 1
-
- GtkScrollbar::activate-slider = 1
- GtkScrollbar::stepper-size = 0
- GtkScrollbar::has-backward-stepper = 0
- GtkScrollbar::has-forward-stepper = 0
- GtkScrollbar::min-slider-length = 48 # 42 + 2*3 (margins)
- GtkScrolledWindow::scrollbar-spacing = 0
- GtkScrolledWindow::scrollbars-within-bevel = 1
-
- GtkScale::slider_length = 26
- GtkScale::slider_width = 26
- GtkScale::trough-side-details = 1
-
- GtkProgressBar::min-horizontal-bar-height = 6
- GtkProgressBar::min-vertical-bar-width = 6
- # Making this bigger than the min[height,width]-2*[y,x]spacing makes the
- # whole progressbar thicker, so by setting it to the exact above value
- # we get the maximum spacing between the text and the edges without
- # doing so.
- GtkProgressBar::xspacing = 4
- GtkProgressBar::yspacing = 4
-
- GtkStatusbar::shadow_type = GTK_SHADOW_NONE
- GtkSpinButton::shadow_type = GTK_SHADOW_NONE
- GtkMenuBar::shadow-type = GTK_SHADOW_NONE
- GtkToolbar::shadow-type = GTK_SHADOW_NONE
- # TODO: find out what this comment means:
- # ( every window is misaligned for the sake of menus ):
- GtkMenuBar::internal-padding = 0
- GtkMenu::horizontal-padding = 0
- GtkMenu::vertical-padding = 2
- GtkMenu::double-arrows = 0
- GtkMenuItem::arrow-scaling = 1
- GtkMenuItem::toggle-spacing = 10
-
- GtkCheckButton::indicator_spacing = 3
- GtkOptionMenu::indicator_spacing = {13, 13, 5, 8}
-
- GtkTreeView::expander-size = 16
- GtkTreeView::vertical-separator = 0
- GtkTreeView::horizontal-separator = 4
- GtkTreeView::allow-rules = 0
- # Set this because some apps read it
- GtkTreeView::odd-row-color = @base_color
- GtkTreeView::even-row-color = @base_color
-
- GtkExpander::expander-size = 16
-
- GtkNotebook::tab-overlap = 4
-
- ##########
- # Colors #
- ##########
-
- bg[NORMAL] = @bg_color
- bg[PRELIGHT] = @bg_color
- bg[SELECTED] = @selected_bg_color
- bg[INSENSITIVE] = @insensitive_bg_color
- bg[ACTIVE] = @bg_color
-
- fg[NORMAL] = @fg_color
- fg[PRELIGHT] = @fg_color
- fg[SELECTED] = @selected_fg_color
- fg[INSENSITIVE] = @insensitive_fg_color
- fg[ACTIVE] = @fg_color
-
- text[NORMAL] = @text_color
- text[PRELIGHT] = @text_color
- text[SELECTED] = @selected_fg_color
- text[INSENSITIVE] = @insensitive_fg_color
- text[ACTIVE] = @selected_fg_color
-
- base[NORMAL] = @base_color
- base[PRELIGHT] = shade (0.95, @bg_color)
- base[SELECTED] = @selected_bg_color
- base[INSENSITIVE] = @insensitive_bg_color
- base[ACTIVE] = @selected_bg_color
-
- # For succinctness, all reasonable pixmap options remain here
-
- # Draw frame around menu in a non-compositied environment
- # This needs to go before pixmap because we need to override some stuff
- engine "adwaita" {}
-
- engine "pixmap" {
-
- #################
- # Check Buttons #
- #################
-
- image {
- function = CHECK
- state = NORMAL
- shadow = OUT
- overlay_file = "assets/checkbox-unchecked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = OUT
- overlay_file = "assets/checkbox-unchecked-hover.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = OUT
- overlay_file = "assets/checkbox-unchecked-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = SELECTED
- shadow = OUT
- overlay_file = "assets/checkbox-unchecked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = OUT
- overlay_file = "assets/menu-checkbox-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = NORMAL
- shadow = IN
- overlay_file = "assets/checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = IN
- overlay_file = "assets/checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = IN
- overlay_file = "assets/checkbox-checked-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = SELECTED
- shadow = IN
- overlay_file = "assets/checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = IN
- overlay_file = "assets/menu-checkbox-checked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = NORMAL
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = SELECTED
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed-insensitive.png"
- overlay_stretch = FALSE
- }
-
- #################
- # Radio Buttons #
- #################
-
- image {
- function = OPTION
- state = NORMAL
- shadow = OUT
- overlay_file = "assets/radio-unchecked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = OUT
- overlay_file = "assets/radio-unchecked-hover.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = OUT
- overlay_file = "assets/radio-unchecked-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = SELECTED
- shadow = OUT
- overlay_file = "assets/radio-unchecked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = OUT
- overlay_file = "assets/menu-radio-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = NORMAL
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = SELECTED
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = IN
- overlay_file = "assets/menu-radio-checked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = NORMAL
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = SELECTED
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed-insensitive.png"
- overlay_stretch = FALSE
- }
-
- ##########
- # Arrows #
- ##########
-
- # Overrides
-
- # Disable arrows in spinbuttons
- image {
- function = ARROW
- detail = "spinbutton"
- }
-
- # QGtkStyle (used for Qt apps) *always* assumes scrollbars have
- # arrows, so configure these here. Gtk2 apps will atually ignore
- # this.
-
- image {
- function = ARROW
- overlay_file = "assets/scrollbar-arrow-up.png"
- detail = "vscrollbar"
- overlay_border = { 0, 0, 0, 0 }
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- overlay_file = "assets/scrollbar-arrow-down.png"
- detail = "vscrollbar"
- overlay_border = { 0, 0, 0, 0 }
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- overlay_file = "assets/scrollbar-arrow-left.png"
- detail = "hscrollbar"
- overlay_border = { 0, 0, 0, 0 }
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- overlay_file = "assets/scrollbar-arrow-right.png"
- detail = "hscrollbar"
- overlay_border = { 0, 0, 0, 0 }
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = BOX
- detail = "hscrollbar"
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "vscrollbar"
- orientation = VERTICAL
- }
-
- # Menu arrows
-
- image {
- function = ARROW
- state = NORMAL
- detail = "menuitem"
- overlay_file = "assets/menu-pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- detail = "menuitem"
- overlay_file = "assets/menu-pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- detail = "menuitem"
- overlay_file = "assets/menu-pan-left-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = NORMAL
- detail = "menuitem"
- overlay_file = "assets/menu-pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- detail = "menuitem"
- overlay_file = "assets/menu-pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- detail = "menuitem"
- overlay_file = "assets/menu-pan-right-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- detail = "menu_scroll_arrow_up"
- overlay_file = "assets/menu-pan-up-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = ARROW
- detail = "menu_scroll_arrow_up"
- overlay_file = "assets/menu-pan-up.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- detail = "menu_scroll_arrow_down"
- overlay_file = "assets/menu-pan-down-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = ARROW
- detail = "menu_scroll_arrow_down"
- overlay_file = "assets/menu-pan-down.png"
- overlay_stretch = FALSE
- }
-
- # Regular arrows
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/pan-up.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/pan-up.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/pan-up.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- overlay_file = "assets/pan-up-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- overlay_file = "assets/pan-down-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- overlay_file = "assets/pan-left-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- overlay_file = "assets/pan-right-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- ######################
- # Option Menu Arrows #
- ######################
-
- image {
- function = TAB
- state = NORMAL
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = TAB
- state = PRELIGHT
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = TAB
- state = ACTIVE
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = TAB
- state = INSENSITIVE
- overlay_file = "assets/pan-down-insensitive.png"
- overlay_stretch = FALSE
- }
-
- #########
- # Lines #
- #########
-
- image {
- function = VLINE
- file = "assets/line.png"
- border = {1, 0, 0, 0}
- }
-
- image {
- function = HLINE
- file = "assets/line.png"
- border = {0, 0, 1, 0}
- }
-
- #########
- # Focus #
- #########
-
- image {
- function = FOCUS
- file = "assets/focus.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- }
-
- ###########
- # Handles #
- ###########
-
- image {
- function = HANDLE
- detail = "handlebox"
- overlay_file = "assets/handle.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = HANDLE
- file = "assets/handle-horz.png"
- border = {0, 0, 4, 4}
- orientation = HORIZONTAL
- }
-
- image {
- function = HANDLE
- file = "assets/handle-vert.png"
- border = {4, 4, 0, 0}
- orientation = VERTICAL
- }
-
- image {
- function = RESIZE_GRIP
- }
-
- #############
- # Expanders #
- #############
-
- image {
- function = EXPANDER
- expander_style = EXPANDED
- file = "assets/pan-down.png"
- }
-
- # LTR
-
- image {
- function = EXPANDER
- expander_style = COLLAPSED
- file = "assets/pan-right.png"
- direction = LTR
- }
-
- image {
- function = EXPANDER
- expander_style = SEMI_COLLAPSED
- file = "assets/pan-right-semi.png"
- direction = LTR
- }
-
- image {
- function = EXPANDER
- expander_style = SEMI_EXPANDED
- file = "assets/pan-right-semi.png"
- direction = LTR
- }
-
- # RTL
-
- image {
- function = EXPANDER
- expander_style = COLLAPSED
- file = "assets/pan-left.png"
- direction = RTL
- }
-
- image {
- function = EXPANDER
- expander_style = SEMI_COLLAPSED
- file = "assets/pan-left-semi.png"
- direction = RTL
- }
-
- image {
- function = EXPANDER
- expander_style = SEMI_EXPANDED
- file = "assets/pan-left-semi.png"
- direction = RTL
- }
-
- #############
- # Notebooks #
- #############
-
- # Left
-
- image {
- function = EXTENSION
- state = NORMAL
- file = "assets/tab-left-active.png"
- border = {3, 0, 3, 3}
- stretch = TRUE
- gap_side = RIGHT
- }
-
- image {
- function = EXTENSION
- file = "assets/tab-left.png"
- border = {3, 0, 3, 3}
- stretch = TRUE
- gap_side = RIGHT
- }
-
- # Right
-
- image {
- function = EXTENSION
- state = NORMAL
- file = "assets/tab-right-active.png"
- border = {0, 3, 3, 3}
- stretch = TRUE
- gap_side = LEFT
- }
-
- image {
- function = EXTENSION
- file = "assets/tab-right.png"
- border = {0, 3, 3, 3}
- stretch = TRUE
- gap_side = LEFT
- }
-
- # Up
-
- image {
- function = EXTENSION
- state = NORMAL
- file = "assets/tab-up-active.png"
- border = {3, 3, 3, 0}
- stretch = TRUE
- gap_side = BOTTOM
- }
-
- image {
- function = EXTENSION
- file = "assets/tab-up.png"
- border = {3, 3, 3, 0}
- stretch = TRUE
- gap_side = BOTTOM
- }
-
- # Down
-
- image {
- function = EXTENSION
- state = NORMAL
- file = "assets/tab-down-active.png"
- border = {3, 3, 0, 3}
- stretch = TRUE
- gap_side = TOP
- }
-
- image {
- function = EXTENSION
- file = "assets/tab-down.png"
- border = {3, 3, 0, 3}
- stretch = TRUE
- gap_side = TOP
- }
-
- # Inner frame
-
- image {
- function = BOX_GAP
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_file = "assets/tab-vert-gap.png"
- gap_border = {1, 0, 1, 1}
- gap_side = LEFT
- }
-
- image {
- function = BOX_GAP
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_file = "assets/tab-vert-gap.png"
- gap_border = {0, 1, 1, 1}
- gap_side = RIGHT
- }
-
- image {
- function = BOX_GAP
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_file = "assets/tab-horz-gap.png"
- gap_border = {1, 1, 1, 0}
- gap_side = TOP
- }
-
- image {
- function = BOX_GAP
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_file = "assets/tab-horz-gap.png"
- gap_border = {1, 1, 0, 1}
- gap_side = BOTTOM
- }
-
- # Standalone frame
- image {
- function = BOX
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- }
-
- ##############
- # Scrollbars #
- ##############
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/scrollbar-horz-trough.png"
- border = {0, 0, 1, 0}
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/scrollbar-vert-trough.png"
- border = {1, 0, 0, 0}
- orientation = VERTICAL
- direction = LTR
- }
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/scrollbar-vert-trough-rtl.png"
- border = {0, 1, 0, 0}
- orientation = VERTICAL
- direction = RTL
- }
-
-
- # Disable insensitive sliders
-
- image {
- function = SLIDER
- state = INSENSITIVE
- detail = "slider"
- }
-
- # Horizontal sliders
-
- image {
- function = SLIDER
- state = NORMAL
- detail = "slider"
- file = "assets/scrollbar-horz-slider.png"
- border = {6, 6, 7, 6 }
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "slider"
- file = "assets/scrollbar-horz-slider-hover.png"
- border = {6, 6, 7, 6 }
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "slider"
- file = "assets/scrollbar-horz-slider-active.png"
- border = {6, 6, 7, 6 }
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- # Vertical sliders
-
- image {
- function = SLIDER
- state = NORMAL
- detail = "slider"
- file = "assets/scrollbar-vert-slider.png"
- border = {7, 6, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = LTR
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "slider"
- file = "assets/scrollbar-vert-slider-hover.png"
- border = {7, 6, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = LTR
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "slider"
- file = "assets/scrollbar-vert-slider-active.png"
- border = {7, 6, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = LTR
- }
-
- # RTL
-
- image {
- function = SLIDER
- state = NORMAL
- detail = "slider"
- file = "assets/scrollbar-vert-slider-rtl.png"
- border = {6, 7, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = RTL
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "slider"
- file = "assets/scrollbar-vert-slider-hover-rtl.png"
- border = {6, 7, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = RTL
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "slider"
- file = "assets/scrollbar-vert-slider-active-rtl.png"
- border = {6, 7, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = RTL
- }
-
- ##########
- # Scales #
- ##########
-
- # Troughs, overrided later on. We set them here too because some widgets
- # don't specify their orientation.
-
- image {
- function = BOX
- detail = "trough-upper"
- file = "assets/scale-horz-trough.png"
- border = {10, 10, 0, 0}
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "trough-lower"
- file = "assets/scale-horz-trough-active.png"
- border = {10, 10, 0, 0}
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "trough-upper"
- file = "assets/scale-vert-trough.png"
- border = {0, 0, 10, 10}
- stretch = TRUE
- orientation = VERTICAL
- }
-
- image {
- function = BOX
- detail = "trough-lower"
- file = "assets/scale-vert-trough-active.png"
- border = {0, 0, 10, 10}
- stretch = TRUE
- orientation = VERTICAL
- }
-
- # Sliders
-
- image {
- function = SLIDER
- state = NORMAL
- detail = "hscale"
- file = "assets/scale-slider.png"
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "hscale"
- file = "assets/scale-slider-hover.png"
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "hscale"
- file = "assets/scale-slider-active.png"
- }
-
- image {
- function = SLIDER
- state = INSENSITIVE
- detail = "hscale"
- file = "assets/scale-slider-insensitive.png"
- }
- image {
- function = SLIDER
- state = NORMAL
- detail = "vscale"
- file = "assets/scale-slider.png"
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "vscale"
- file = "assets/scale-slider-hover.png"
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "vscale"
- file = "assets/scale-slider-active.png"
- }
-
- image {
- function = SLIDER
- state = INSENSITIVE
- detail = "vscale"
- file = "assets/scale-slider-insensitive.png"
- }
-
- ###########
- # Menubar #
- ###########
-
- image {
- function = BOX
- detail = "menubar"
- file = "assets/line.png"
- border = {0, 0, 0, 1}
- }
-
- #########
- # Menus #
- #########
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "menu_scroll_arrow_up"
- file = "assets/line.png"
- }
-
- image {
- function = BOX
- detail = "menu_scroll_arrow_up"
- file = "assets/line.png"
- border = {0, 0, 0, 1}
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "menu_scroll_arrow_down"
- file = "assets/line.png"
- }
-
- image {
- function = BOX
- detail = "menu_scroll_arrow_down"
- file = "assets/line.png"
- border = {0, 0, 1, 0}
- }
-
- ###########
- # Entries #
- ###########
-
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- detail = "entry"
- file = "assets/entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = FLAT_BOX
- state = ACTIVE
- detail = "entry_bg"
- file = "assets/entry-background.png"
- }
-
- image {
- function = FLAT_BOX
- state = INSENSITIVE
- detail = "entry_bg"
- file = "assets/entry-background-insensitive.png"
- }
-
- image {
- function = FLAT_BOX
- detail = "entry_bg"
- file = "assets/entry-background.png"
- }
- #########
- # Spins #
- #########
-
- # Spin-Up LTR
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_up"
- file = "assets/spin-ltr-up.png"
- border = {1, 4, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_up"
- file = "assets/spin-ltr-up-hover.png"
- border = {1, 4, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_up"
- file = "assets/spin-ltr-up-active.png"
- border = {1, 4, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_up"
- file = "assets/spin-ltr-up-insensitive.png"
- border = {1, 4, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up-insensitive.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- # Spin-Up RTL
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_up"
- file = "assets/spin-rtl-up.png"
- border = {4, 1, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_up"
- file = "assets/spin-rtl-up-hover.png"
- border = {4, 1, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_up"
- file = "assets/spin-rtl-up-hover.png"
- border = {4, 1, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_up"
- file = "assets/spin-rtl-up-insensitive.png"
- border = {4, 1, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up-insensitive.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- # Spin-Down LTR
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_down"
- file = "assets/spin-ltr-down.png"
- border = {1, 4, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_down"
- file = "assets/spin-ltr-down-hover.png"
- border = {1, 4, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_down"
- file = "assets/spin-ltr-down-active.png"
- border = {1, 4, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_down"
- file = "assets/spin-ltr-down-insensitive.png"
- border = {1, 4, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down-insensitive.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- # Spin-Down RTL
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_down"
- file = "assets/spin-rtl-down.png"
- border = {4, 1, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_down"
- file = "assets/spin-rtl-down-hover.png"
- border = {4, 1, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_down"
- file = "assets/spin-rtl-down-active.png"
- border = {4, 1, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_down"
- file = "assets/spin-rtl-down-insensitive.png"
- border = {4, 1, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down-insensitive.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- ##############
- # Scrollbars #
- ##############
-
- image {
- function = BOX
- detail = "bar"
- file = "assets/progressbar-horz.png"
- stretch = TRUE
- border = {2, 2, 1, 1}
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "bar"
- file = "assets/progressbar-vert.png"
- stretch = TRUE
- border = {1, 1, 2, 2}
- orientation = VERTICAL
- }
-
- #############
- # Treeviews #
- #############
-
- # Disable active the column highlight
- # We need to match specific cells or we break stuff
- # Looking at you deadbeef
-
- image {
- function = FLAT_BOX
- detail = "cell_even_sorted"
- state = NORMAL
- }
-
- image {
- function = FLAT_BOX
- detail = "cell_odd_sorted"
- state = NORMAL
- }
-
- # Disable all the other shadows
- # This prevents the Raleigh effect
- image {
- function = SHADOW
- }
-
- }
-
-}
-
-style "menubar" {
-
- # Needed to fix Firefox's menubar text
- bg[NORMAL] = @menubar_bg
- bg[SELECTED] = @selected_fg_color
- fg[SELECTED] = @link_color
-}
-
-style "menubar_item" {
-
- xthickness = 3
- ythickness = 4
-
- fg[NORMAL] = @menubar_insensitive_fg
- fg[PRELIGHT] = @menubar_fg
-
- engine "pixmap" {
- image {
- function = BOX
- state = PRELIGHT
- file = "assets/menubar-item-active.png"
- border = {0, 0, 0, 3}
- }
- }
-
-}
-
-style "menu" {
-
- xthickness = 0
- ythickness = 0
-
- bg[NORMAL] = @menu_color
- bg[INSENSITIVE] = @menu_color
- bg[PRELIGHT] = @menu_color
- bg[SELECTED] = @selected_bg_color
-
-}
-
-style "menu_item" {
-
- xthickness = 3
- ythickness = 4
-
- bg[PRELIGHT] = @menu_hover_color
- # Chromium uses this setting
- bg[SELECTED] = @menu_hover_color
-
- fg[PRELIGHT] = @fg_color
- fg[SELECTED] = @fg_color
- text[NORMAL] = @fg_color
- text[PRELIGHT] = @fg_color
- text[ACTIVE] = @fg_color
- text[SELECTED] = @fg_color
-
- # Some widgets use text, we need to handle that
- # Don't know what this comment is about but maybe we've nulled it
-
- # Unfortunately we can't tell regular and menu checks/radios apart
- # Without the heirarchy
- engine "pixmap" {
-
- #################
- # Check Buttons #
- #################
-
- image {
- function = CHECK
- state = NORMAL
- shadow = OUT
- overlay_file = "assets/menu-checkbox.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = OUT
- overlay_file = "assets/menu-checkbox.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = OUT
- overlay_file = "assets/menu-checkbox.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = OUT
- overlay_file = "assets/menu-checkbox-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = NORMAL
- shadow = IN
- overlay_file = "assets/menu-checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = IN
- overlay_file = "assets/menu-checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = IN
- overlay_file = "assets/menu-checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = IN
- overlay_file = "assets/menu-checkbox-checked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = NORMAL
- shadow = ETCHED_IN
- overlay_file = "assets/menu-checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = ETCHED_IN
- overlay_file = "assets/menu-checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = ETCHED_IN
- overlay_file = "assets/menu-checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = ETCHED_IN
- overlay_file = "assets/menu-checkbox-mixed-insensitive.png"
- overlay_stretch = FALSE
- }
-
- #################
- # Radio Buttons #
- #################
-
- image {
- function = OPTION
- state = NORMAL
- shadow = OUT
- overlay_file = "assets/menu-radio.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = OUT
- overlay_file = "assets/menu-radio.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = OUT
- overlay_file = "assets/menu-radio.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = OUT
- overlay_file = "assets/menu-radio-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = NORMAL
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = IN
- overlay_file = "assets/menu-radio-checked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = NORMAL
- shadow = ETCHED_IN
- overlay_file = "assets/menu-radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = ETCHED_IN
- overlay_file = "assets/menu-radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = ETCHED_IN
- overlay_file = "assets/menu-radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = ETCHED_IN
- overlay_file = "assets/menu-radio-mixed-insensitive.png"
- overlay_stretch = FALSE
- }
-
-
-
- }
-
-}
-
-style "separator_menu_item" {
-
- xthickness = 0
- ythickness = 0
-
- engine "pixmap" {
- image {
- function = BOX
- file = "assets/line.png"
- }
- }
-
-}
-
-style "button" {
-
- xthickness = 2
- ythickness = 2
-
- # For the sake of sanity style buttons this way
- engine "pixmap" {
-
- ###########
- # Buttons #
- ###########
-
- image {
- function = BOX
- state = NORMAL
- file = "assets/button.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = BOX
- state = PRELIGHT
- shadow = OUT
- file = "assets/button-hover.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- # Don't add hover effect on pressed buttons
- image {
- function = BOX
- state = PRELIGHT
- shadow = IN
- file = "assets/button-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = BOX
- state = ACTIVE
- file = "assets/button-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- file = "assets/button-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
- }
-}
-
-style "link_button" {
-
- # Disable the button effect, leave just the link
- engine "pixmap" {
- image {
- function = BOX
- }
- }
-
-}
-
-style "entry" {
-
- # We set this same as the border of the border of the entry
- # This way there's no overlap
- xthickness = 4
- ythickness = 4
-
-}
-
-style "combobox" {
-
- xthickness = 6
- ythickness = 4
-
- # This affects only the button beside an entry
- GtkButton::inner-border = {0, 0, 0, 0}
-
-}
-
-style "combobox_cellview" {
- text[NORMAL] = @fg_color
- text[PRELIGHT] = @fg_color
-}
-
-style "combobox_entry" {
-
- # Since one side of the button is missing, we need to shift the arrow a little to the right
- GtkButton::inner-border = {0, 1, 0, 0}
-
- engine "pixmap" {
-
- #############
- # LTR entry #
- #############
-
- image {
- function = SHADOW
- state = NORMAL
- detail = "entry"
- file = "assets/combo-entry-ltr-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/combo-entry-ltr-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/combo-entry-ltr-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- #############
- # RTL entry #
- #############
-
- image {
- function = SHADOW
- state = NORMAL
- detail = "entry"
- file = "assets/combo-entry-rtl-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/combo-entry-rtl-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/combo-entry-rtl-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- ##############
- # LTR button #
- ##############
-
- image {
- function = BOX
- state = NORMAL
- detail = "button"
- file = "assets/combo-entry-ltr-button.png"
- border = {0, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "button"
- file = "assets/combo-entry-ltr-button-hover.png"
- border = {0, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "button"
- file = "assets/combo-entry-ltr-button-active.png"
- border = {0, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "button"
- file = "assets/combo-entry-ltr-button-insensitive.png"
- border = {0, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- ##############
- # RTL button #
- ##############
-
- image {
- function = BOX
- state = NORMAL
- detail = "button"
- file = "assets/combo-entry-rtl-button.png"
- border = {4, 0, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "button"
- file = "assets/combo-entry-rtl-button-hover.png"
- border = {4, 0, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "button"
- file = "assets/combo-entry-rtl-button-active.png"
- border = {4, 0, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "button"
- file = "assets/combo-entry-rtl-button-insensitive.png"
- border = {4, 0, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- }
-
-}
-
-style "combo_button_padding" {
-
- # Since one side of the button is missing, we need to shift the arrow a
- # little to the right.
- # This is the same thing we've done above but the combo, unlike the combobox,
- # uses padding the same way as a button.
- GtkButton::inner-border = {6, 8, 4, 4}
-
-}
-
-style "notebook" {
-
- xthickness = 5
- ythickness = 2
-
-}
-
-style "notebook_viewport" {
- bg[NORMAL] = @base_color
-}
-
-style "notebook_bg" {
- bg[NORMAL] = @base_color
- bg[PRELIGHT] = @base_color
- bg[INSENSITIVE] = @base_color
-}
-
-style "notebook_entry" {
-
- engine "pixmap" {
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/notebook-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/notebook-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- detail = "entry"
- file = "assets/notebook-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
- }
-}
-
-style "normal_bg" {
- bg[NORMAL] = @bg_color
- bg[PRELIGHT] = @bg_color
- bg[INSENSITIVE] = @insensitive_bg_color
-}
-
-style "normal_entry" {
-
- engine "pixmap" {
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- detail = "entry"
- file = "assets/entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
- }
-}
-
-style "notebook_combo" {
-
- engine "pixmap" {
-
- #############
- # LTR entry #
- #############
-
- image {
- function = SHADOW
- state = NORMAL
- detail = "entry"
- file = "assets/notebook-combo-entry-ltr-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/notebook-combo-entry-ltr-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/notebook-combo-entry-ltr-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- #############
- # RTL entry #
- #############
-
- image {
- function = SHADOW
- state = NORMAL
- detail = "entry"
- file = "assets/notebook-combo-entry-rtl-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/notebook-combo-entry-rtl-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/notebook-combo-entry-rtl-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- }
-
-}
-
-style "textview" {
- bg[NORMAL] = @base_color
-}
-
-style "scale_horz" {
-
- engine "pixmap" {
-
- image {
- function = BOX
- detail = "trough-upper"
- file = "assets/scale-horz-trough.png"
- border = {10, 10, 0, 0}
- stretch = TRUE
- }
-
- image {
- function = BOX
- detail = "trough-lower"
- file = "assets/scale-horz-trough-active.png"
- border = {10, 10, 0, 0}
- stretch = TRUE
- }
-
- }
-
-}
-
-style "scale_vert" {
-
- engine "pixmap" {
-
- image {
- function = BOX
- detail = "trough-upper"
- file = "assets/scale-vert-trough.png"
- border = {0, 0, 10, 10}
- stretch = TRUE
- }
-
- image {
- function = BOX
- detail = "trough-lower"
- file = "assets/scale-vert-trough-active.png"
- border = {0, 0, 10, 10}
- stretch = TRUE
- }
-
- }
-
-}
-
-style "progressbar" {
-
- xthickness = 1
- ythickness = 1
-
- fg[PRELIGHT] = @selected_fg_color
-
- engine "pixmap" {
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/progressbar-horz-trough.png"
- border = {3, 3, 2, 2}
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/progressbar-vert-trough.png"
- border = {2, 2, 3, 3}
- stretch = TRUE
- orientation = VERTICAL
- }
-
- }
-
-}
-
-style "treeview_header_button" {
-
- engine "pixmap" {
- image {
- function = SHADOW
- state = NORMAL
- file = "assets/treeview-header-button.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
- }
-
-}
-
-style "treeview_header_label" {
-
- xthickness = 1
- ythickness = 0
-
- font_name = "Bold"
-
- GtkButton::inner-border = {5, 5, 0, 1}
-
- engine "pixmap" {
-
- image {
- function = BOX
- file = "assets/treeview-separator-ltr.png"
- border = {0, 1, 0, 1}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = BOX
- file = "assets/treeview-separator-rtl.png"
- border = {1, 0, 0, 1}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/treeview-pan-up.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/treeview-pan-up-hover.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/treeview-pan-up-active.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/treeview-pan-down.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/treeview-pan-down-hover.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/treeview-pan-down-active.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- }
-
-}
-
-style "scrolled_window" {
-
- engine "pixmap" {
- image {
- function = SHADOW
- file = "assets/frame.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- }
- }
-
-}
-
-style "frame" {
-
- engine "pixmap" {
-
- image {
- function = SHADOW
- shadow = NONE
- }
-
- image {
- function = SHADOW
- file = "assets/frame.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- }
-
- image {
- function = SHADOW_GAP
- file = "assets/frame.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_start_file = "assets/border.png"
- gap_end_file = "assets/border.png"
- }
-
- }
-
-}
-
-style "toolbar_button" {
-
- xthickness = 2
- ythickness = 2
-
- GtkButton::inner-border = {2, 2, 2, 2}
-
-}
-
-style "toolbar_separator" {
-
- GtkWidget::wide-separators = 1
- GtkWidget::separator-width = 1
- GtkWidget::separator-height = 1
-
- engine "pixmap" {
- image {
- function = BOX
- file = "assets/line.png"
- }
- }
-
-}
-
-style "inline_toolbar" {
-
- GtkToolbar::button-relief = GTK_RELIEF_NORMAL
-
- engine "pixmap" {
- image {
- function = SHADOW
- file = "assets/frame-inline.png"
- border = {1, 1, 0, 1}
- stretch = TRUE
- }
- }
-
-}
-
-style "tooltip" {
-
- xthickness = 13
- ythickness = 13
-
- bg[NORMAL] = @tooltip_bg_color
- fg[NORMAL] = @tooltip_fg_color
- bg[SELECTED] = @tooltip_bg_color
-
-}
-
-style "disable_separator" {
-
- xthickness = 0
- ythickness = 0
-
- GtkWidget::wide-separators = 1
-
-}
-
-# Default style, containing theme properties and trying to match every widget as
-# much as possible, which is not only faster than trying to match every widget
-# by its own but also less bug-prune and more consistent. However there is some
-# widget specific stuff that needs to be taken care of, which is the point of
-# every other style below.
-class "GtkWidget" style "default"
-
- ######################################
- # Override padding, style and colour #
- ######################################
-
-class "GtkButton" style "button"
-class "GtkLinkButton" style "link_button"
-class "GtkEntry" style "entry"
-class "GtkOldEditable" style "entry"
-class "GtkNotebook" style "notebook"
-class "GtkHScale" style "scale_horz"
-class "GtkVScale" style "scale_vert"
-class "GtkProgressBar" style "progressbar"
-class "GtkScrolledWindow" style "scrolled_window"
-class "GtkFrame" style "frame"
-class "GtkSeparatorToolItem" style "toolbar_separator"
-class "GtkMenuBar" style "menubar"
-class "GtkMenu" style "menu"
-class "GtkTextView" style "textview"
-
-# Menu and menubar items
-widget_class "**" style "menu_item"
-widget_class "*.*" style "menubar_item"
-widget_class "**" style "menubar_item"
-widget_class "**" style "separator_menu_item"
-
-# Treeview buttons
-widget_class "***" style "treeview_header_label"
-widget_class "**" style "treeview_header_button"
-
-# Give the file chooser toolbar a border
-widget_class "**" style "inline_toolbar"
-
-# Fix padding on regular comboboxes
-widget_class "*." style "combobox"
-# And disable separators on them
-widget_class "*.*" style "disable_separator"
-
-# Join together the ComboBoxEntry entry and button
-widget_class "**" style "combobox_entry"
-
-# Join the Combo entry and button
-widget_class "**" style "combobox_entry"
-# Tweak the padding on the button a little bit because it
-# uses it a bit differently
-widget_class "*." style "combo_button_padding"
-
-# Alas we cannot do the same for ComboBoxText because there
-# isn't a way to apply the style to only the comboboxes that
-# have an entry inside
-
-# Toolbar buttons have different paddings
-widget_class "**" style "toolbar_button"
-
-# Notebooks are white, act accordingly
-widget_class "**" style "notebook_entry"
-widget_class "**" style "notebook_bg"
-widget_class "**" style "notebook_bg"
-widget_class "***" style "notebook_bg"
-widget_class "**" style "notebook_bg"
-widget_class "*.*" style "notebook_bg"
-widget_class "***" style "notebook_combo"
-widget_class "***" style "notebook_combo"
-
-# However, stuff inside eventboxes inside notebooks is grey
-# again, react
-widget_class "***" style "normal_entry"
-widget_class "***" style "normal_bg"
-widget_class "***" style "normal_bg"
-widget_class "****" style "combobox_entry"
-widget_class "****" style "combobox_entry"
-widget_class "***." style "combo_button_padding"
-
-# ComboBoxes tend to draw the button label with text[]
-# instead of fg[], we need to fix that
-widget_class "**" style "combobox_cellview"
-
-# GTK tooltips
-widget "gtk-tooltip*" style "tooltip"
diff --git a/gtk/src/default/gtk-2.0/render-all-assets.sh b/gtk/src/default/gtk-2.0/render-all-assets.sh
deleted file mode 100755
index 82b9a4280e..0000000000
--- a/gtk/src/default/gtk-2.0/render-all-assets.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="inkscape"
-OPTIPNG="optipng"
-
-SRC_FILE="assets.svg"
-ASSETS_DIR="assets"
-INDEX="assets.txt"
-
-rm assets/*.png
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
- echo $ASSETS_DIR/$i.png exists.
-else
- echo
- echo Rendering $ASSETS_DIR/$i.png
- $INKSCAPE --export-id=$i \
- --export-id-only \
- -o $ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
- && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png
-fi
-done
-exit 0
diff --git a/gtk/src/default/gtk-2.0/render-assets-external.sh b/gtk/src/default/gtk-2.0/render-assets-external.sh
deleted file mode 100755
index 5f5c2c2e7b..0000000000
--- a/gtk/src/default/gtk-2.0/render-assets-external.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="inkscape"
-OPTIPNG="optipng"
-
-SRC_FILE="assets-external.svg"
-ASSETS_DIR="assets"
-INDEX="assets-external.txt"
-
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
- echo $ASSETS_DIR/$i.png exists.
-else
- echo
- echo Rendering $ASSETS_DIR/$i.png
- $INKSCAPE --export-id=$i \
- --export-id-only \
- --export-background-opacity=0 \
- --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
- && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png
-fi
-done
-exit 0
diff --git a/gtk/src/default/gtk-4.0/render-assets.sh b/gtk/src/default/gtk-4.0/render-assets.sh
deleted file mode 100755
index da256d701a..0000000000
--- a/gtk/src/default/gtk-4.0/render-assets.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="/usr/bin/inkscape"
-OPTIPNG="/usr/bin/optipng"
-
-INDEX="assets.txt"
-
-SRC_FILE="assets.svg"
-ASSETS_DIR="assets"
-
-for i in `cat $INDEX`
-do
- if [ -f $ASSETS_DIR/$i.png ]; then
- echo $ASSETS_DIR/$i.png exists.
- else
- echo
- echo Rendering $ASSETS_DIR/$i.png
- $INKSCAPE --export-id=$i \
- --export-id-only \
- --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null #\
- # && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png
- fi
- if [ -f $ASSETS_DIR/$i@2.png ]; then
- echo $ASSETS_DIR/$i@2.png exists.
- else
- echo
- echo Rendering $ASSETS_DIR/$i@2.png
- $INKSCAPE --export-id=$i \
- --export-dpi=180 \
- --export-id-only \
- --export-png=$ASSETS_DIR/$i@2.png $SRC_FILE >/dev/null #\
- # && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i@2.png
- fi
-done
-exit 0
diff --git a/gtk/src/bark-dark/gtk-2.0/apps.rc b/gtk/src/gtk-2.0/dark/apps.rc
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/apps.rc
rename to gtk/src/gtk-2.0/dark/apps.rc
diff --git a/gtk/src/dark/gtk-2.0/assets-external.svg b/gtk/src/gtk-2.0/dark/assets-external.svg
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets-external.svg
rename to gtk/src/gtk-2.0/dark/assets-external.svg
diff --git a/gtk/src/bark-dark/gtk-2.0/assets-external.txt b/gtk/src/gtk-2.0/dark/assets-external.txt
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets-external.txt
rename to gtk/src/gtk-2.0/dark/assets-external.txt
diff --git a/gtk/src/dark/gtk-2.0/assets.svg b/gtk/src/gtk-2.0/dark/assets.svg
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets.svg
rename to gtk/src/gtk-2.0/dark/assets.svg
diff --git a/gtk/src/bark-dark/gtk-2.0/assets.txt b/gtk/src/gtk-2.0/dark/assets.txt
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets.txt
rename to gtk/src/gtk-2.0/dark/assets.txt
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/border.png b/gtk/src/gtk-2.0/dark/assets/border.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/border.png
rename to gtk/src/gtk-2.0/dark/assets/border.png
diff --git a/gtk/src/bark/gtk-2.0/assets/button-active.png b/gtk/src/gtk-2.0/dark/assets/button-active.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/button-active.png
rename to gtk/src/gtk-2.0/dark/assets/button-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/button-hover.png b/gtk/src/gtk-2.0/dark/assets/button-hover.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/button-hover.png
rename to gtk/src/gtk-2.0/dark/assets/button-hover.png
diff --git a/gtk/src/bark/gtk-2.0/assets/button-insensitive.png b/gtk/src/gtk-2.0/dark/assets/button-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/button-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/button-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/button.png b/gtk/src/gtk-2.0/dark/assets/button.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/button.png
rename to gtk/src/gtk-2.0/dark/assets/button.png
diff --git a/gtk/src/dark/gtk-2.0/assets/checkbox-checked-active.png b/gtk/src/gtk-2.0/dark/assets/checkbox-checked-active.png
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets/checkbox-checked-active.png
rename to gtk/src/gtk-2.0/dark/assets/checkbox-checked-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/checkbox-checked-insensitive.png b/gtk/src/gtk-2.0/dark/assets/checkbox-checked-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/checkbox-checked-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/checkbox-checked-insensitive.png
diff --git a/gtk/src/dark/gtk-2.0/assets/checkbox-checked.png b/gtk/src/gtk-2.0/dark/assets/checkbox-checked.png
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets/checkbox-checked.png
rename to gtk/src/gtk-2.0/dark/assets/checkbox-checked.png
diff --git a/gtk/src/dark/gtk-2.0/assets/checkbox-mixed-active.png b/gtk/src/gtk-2.0/dark/assets/checkbox-mixed-active.png
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets/checkbox-mixed-active.png
rename to gtk/src/gtk-2.0/dark/assets/checkbox-mixed-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/checkbox-mixed-insensitive.png b/gtk/src/gtk-2.0/dark/assets/checkbox-mixed-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/checkbox-mixed-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/checkbox-mixed-insensitive.png
diff --git a/gtk/src/dark/gtk-2.0/assets/checkbox-mixed.png b/gtk/src/gtk-2.0/dark/assets/checkbox-mixed.png
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets/checkbox-mixed.png
rename to gtk/src/gtk-2.0/dark/assets/checkbox-mixed.png
diff --git a/gtk/src/bark/gtk-2.0/assets/checkbox-unchecked-active.png b/gtk/src/gtk-2.0/dark/assets/checkbox-unchecked-active.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/checkbox-unchecked-active.png
rename to gtk/src/gtk-2.0/dark/assets/checkbox-unchecked-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/checkbox-unchecked-hover.png b/gtk/src/gtk-2.0/dark/assets/checkbox-unchecked-hover.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/checkbox-unchecked-hover.png
rename to gtk/src/gtk-2.0/dark/assets/checkbox-unchecked-hover.png
diff --git a/gtk/src/bark/gtk-2.0/assets/checkbox-unchecked-insensitive.png b/gtk/src/gtk-2.0/dark/assets/checkbox-unchecked-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/checkbox-unchecked-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/checkbox-unchecked-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/checkbox-unchecked.png b/gtk/src/gtk-2.0/dark/assets/checkbox-unchecked.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/checkbox-unchecked.png
rename to gtk/src/gtk-2.0/dark/assets/checkbox-unchecked.png
diff --git a/gtk/src/bark/gtk-2.0/assets/combo-entry-ltr-button-active.png b/gtk/src/gtk-2.0/dark/assets/combo-entry-ltr-button-active.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/combo-entry-ltr-button-active.png
rename to gtk/src/gtk-2.0/dark/assets/combo-entry-ltr-button-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/combo-entry-ltr-button-hover.png b/gtk/src/gtk-2.0/dark/assets/combo-entry-ltr-button-hover.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/combo-entry-ltr-button-hover.png
rename to gtk/src/gtk-2.0/dark/assets/combo-entry-ltr-button-hover.png
diff --git a/gtk/src/bark/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png b/gtk/src/gtk-2.0/dark/assets/combo-entry-ltr-button-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/combo-entry-ltr-button-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/combo-entry-ltr-button.png b/gtk/src/gtk-2.0/dark/assets/combo-entry-ltr-button.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/combo-entry-ltr-button.png
rename to gtk/src/gtk-2.0/dark/assets/combo-entry-ltr-button.png
diff --git a/gtk/src/default/gtk-2.0/assets/combo-entry-ltr-entry-active.png b/gtk/src/gtk-2.0/dark/assets/combo-entry-ltr-entry-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/combo-entry-ltr-entry-active.png
rename to gtk/src/gtk-2.0/dark/assets/combo-entry-ltr-entry-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png b/gtk/src/gtk-2.0/dark/assets/combo-entry-ltr-entry-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/combo-entry-ltr-entry-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/combo-entry-ltr-entry.png b/gtk/src/gtk-2.0/dark/assets/combo-entry-ltr-entry.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/combo-entry-ltr-entry.png
rename to gtk/src/gtk-2.0/dark/assets/combo-entry-ltr-entry.png
diff --git a/gtk/src/bark/gtk-2.0/assets/combo-entry-rtl-button-active.png b/gtk/src/gtk-2.0/dark/assets/combo-entry-rtl-button-active.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/combo-entry-rtl-button-active.png
rename to gtk/src/gtk-2.0/dark/assets/combo-entry-rtl-button-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/combo-entry-rtl-button-hover.png b/gtk/src/gtk-2.0/dark/assets/combo-entry-rtl-button-hover.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/combo-entry-rtl-button-hover.png
rename to gtk/src/gtk-2.0/dark/assets/combo-entry-rtl-button-hover.png
diff --git a/gtk/src/bark/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png b/gtk/src/gtk-2.0/dark/assets/combo-entry-rtl-button-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/combo-entry-rtl-button-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/combo-entry-rtl-button.png b/gtk/src/gtk-2.0/dark/assets/combo-entry-rtl-button.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/combo-entry-rtl-button.png
rename to gtk/src/gtk-2.0/dark/assets/combo-entry-rtl-button.png
diff --git a/gtk/src/default/gtk-2.0/assets/combo-entry-rtl-entry-active.png b/gtk/src/gtk-2.0/dark/assets/combo-entry-rtl-entry-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/combo-entry-rtl-entry-active.png
rename to gtk/src/gtk-2.0/dark/assets/combo-entry-rtl-entry-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png b/gtk/src/gtk-2.0/dark/assets/combo-entry-rtl-entry-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/combo-entry-rtl-entry-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/combo-entry-rtl-entry.png b/gtk/src/gtk-2.0/dark/assets/combo-entry-rtl-entry.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/combo-entry-rtl-entry.png
rename to gtk/src/gtk-2.0/dark/assets/combo-entry-rtl-entry.png
diff --git a/gtk/src/default/gtk-2.0/assets/entry-active.png b/gtk/src/gtk-2.0/dark/assets/entry-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/entry-active.png
rename to gtk/src/gtk-2.0/dark/assets/entry-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/entry-background-insensitive.png b/gtk/src/gtk-2.0/dark/assets/entry-background-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/entry-background-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/entry-background-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/entry-background.png b/gtk/src/gtk-2.0/dark/assets/entry-background.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/entry-background.png
rename to gtk/src/gtk-2.0/dark/assets/entry-background.png
diff --git a/gtk/src/bark/gtk-2.0/assets/entry-insensitive.png b/gtk/src/gtk-2.0/dark/assets/entry-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/entry-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/entry-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/entry.png b/gtk/src/gtk-2.0/dark/assets/entry.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/entry.png
rename to gtk/src/gtk-2.0/dark/assets/entry.png
diff --git a/gtk/src/default/gtk-2.0/assets/focus.png b/gtk/src/gtk-2.0/dark/assets/focus.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/focus.png
rename to gtk/src/gtk-2.0/dark/assets/focus.png
diff --git a/gtk/src/bark/gtk-2.0/assets/frame-inline.png b/gtk/src/gtk-2.0/dark/assets/frame-inline.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/frame-inline.png
rename to gtk/src/gtk-2.0/dark/assets/frame-inline.png
diff --git a/gtk/src/bark/gtk-2.0/assets/frame-notebook.png b/gtk/src/gtk-2.0/dark/assets/frame-notebook.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/frame-notebook.png
rename to gtk/src/gtk-2.0/dark/assets/frame-notebook.png
diff --git a/gtk/src/bark/gtk-2.0/assets/frame.png b/gtk/src/gtk-2.0/dark/assets/frame.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/frame.png
rename to gtk/src/gtk-2.0/dark/assets/frame.png
diff --git a/gtk/src/bark/gtk-2.0/assets/handle-horz.png b/gtk/src/gtk-2.0/dark/assets/handle-horz.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/handle-horz.png
rename to gtk/src/gtk-2.0/dark/assets/handle-horz.png
diff --git a/gtk/src/bark/gtk-2.0/assets/handle-vert.png b/gtk/src/gtk-2.0/dark/assets/handle-vert.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/handle-vert.png
rename to gtk/src/gtk-2.0/dark/assets/handle-vert.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/handle.png b/gtk/src/gtk-2.0/dark/assets/handle.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/handle.png
rename to gtk/src/gtk-2.0/dark/assets/handle.png
diff --git a/gtk/src/bark/gtk-2.0/assets/line.png b/gtk/src/gtk-2.0/dark/assets/line.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/line.png
rename to gtk/src/gtk-2.0/dark/assets/line.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-border.png b/gtk/src/gtk-2.0/dark/assets/menu-border.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-border.png
rename to gtk/src/gtk-2.0/dark/assets/menu-border.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-checkbox-checked-insensitive.png b/gtk/src/gtk-2.0/dark/assets/menu-checkbox-checked-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-checkbox-checked-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/menu-checkbox-checked-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-checkbox-checked.png b/gtk/src/gtk-2.0/dark/assets/menu-checkbox-checked.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-checkbox-checked.png
rename to gtk/src/gtk-2.0/dark/assets/menu-checkbox-checked.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-checkbox-hover.png b/gtk/src/gtk-2.0/dark/assets/menu-checkbox-hover.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-checkbox-hover.png
rename to gtk/src/gtk-2.0/dark/assets/menu-checkbox-hover.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-checkbox-insensitive.png b/gtk/src/gtk-2.0/dark/assets/menu-checkbox-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-checkbox-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/menu-checkbox-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png b/gtk/src/gtk-2.0/dark/assets/menu-checkbox-mixed-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/menu-checkbox-mixed-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-checkbox-mixed.png b/gtk/src/gtk-2.0/dark/assets/menu-checkbox-mixed.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-checkbox-mixed.png
rename to gtk/src/gtk-2.0/dark/assets/menu-checkbox-mixed.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-checkbox.png b/gtk/src/gtk-2.0/dark/assets/menu-checkbox.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-checkbox.png
rename to gtk/src/gtk-2.0/dark/assets/menu-checkbox.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-pan-down-insensitive.png b/gtk/src/gtk-2.0/dark/assets/menu-pan-down-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-pan-down-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/menu-pan-down-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-pan-down.png b/gtk/src/gtk-2.0/dark/assets/menu-pan-down.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-pan-down.png
rename to gtk/src/gtk-2.0/dark/assets/menu-pan-down.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-pan-left-hover.png b/gtk/src/gtk-2.0/dark/assets/menu-pan-left-hover.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-pan-left-hover.png
rename to gtk/src/gtk-2.0/dark/assets/menu-pan-left-hover.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-pan-left-insensitive.png b/gtk/src/gtk-2.0/dark/assets/menu-pan-left-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-pan-left-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/menu-pan-left-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-pan-left.png b/gtk/src/gtk-2.0/dark/assets/menu-pan-left.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-pan-left.png
rename to gtk/src/gtk-2.0/dark/assets/menu-pan-left.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-pan-right-hover.png b/gtk/src/gtk-2.0/dark/assets/menu-pan-right-hover.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-pan-right-hover.png
rename to gtk/src/gtk-2.0/dark/assets/menu-pan-right-hover.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-pan-right-insensitive.png b/gtk/src/gtk-2.0/dark/assets/menu-pan-right-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-pan-right-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/menu-pan-right-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-pan-right.png b/gtk/src/gtk-2.0/dark/assets/menu-pan-right.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-pan-right.png
rename to gtk/src/gtk-2.0/dark/assets/menu-pan-right.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-pan-up-insensitive.png b/gtk/src/gtk-2.0/dark/assets/menu-pan-up-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-pan-up-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/menu-pan-up-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-pan-up.png b/gtk/src/gtk-2.0/dark/assets/menu-pan-up.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-pan-up.png
rename to gtk/src/gtk-2.0/dark/assets/menu-pan-up.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-radio-checked-insensitive.png b/gtk/src/gtk-2.0/dark/assets/menu-radio-checked-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-radio-checked-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/menu-radio-checked-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-radio-checked.png b/gtk/src/gtk-2.0/dark/assets/menu-radio-checked.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-radio-checked.png
rename to gtk/src/gtk-2.0/dark/assets/menu-radio-checked.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-radio-hover.png b/gtk/src/gtk-2.0/dark/assets/menu-radio-hover.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-radio-hover.png
rename to gtk/src/gtk-2.0/dark/assets/menu-radio-hover.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-radio-insensitive.png b/gtk/src/gtk-2.0/dark/assets/menu-radio-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-radio-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/menu-radio-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-radio-mixed-insensitive.png b/gtk/src/gtk-2.0/dark/assets/menu-radio-mixed-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-radio-mixed-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/menu-radio-mixed-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-radio-mixed.png b/gtk/src/gtk-2.0/dark/assets/menu-radio-mixed.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-radio-mixed.png
rename to gtk/src/gtk-2.0/dark/assets/menu-radio-mixed.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-radio.png b/gtk/src/gtk-2.0/dark/assets/menu-radio.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-radio.png
rename to gtk/src/gtk-2.0/dark/assets/menu-radio.png
diff --git a/gtk/src/dark/gtk-2.0/assets/menubar-item-active.png b/gtk/src/gtk-2.0/dark/assets/menubar-item-active.png
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets/menubar-item-active.png
rename to gtk/src/gtk-2.0/dark/assets/menubar-item-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png b/gtk/src/gtk-2.0/dark/assets/notebook-combo-entry-ltr-entry-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png
rename to gtk/src/gtk-2.0/dark/assets/notebook-combo-entry-ltr-entry-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png b/gtk/src/gtk-2.0/dark/assets/notebook-combo-entry-ltr-entry-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/notebook-combo-entry-ltr-entry-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png b/gtk/src/gtk-2.0/dark/assets/notebook-combo-entry-ltr-entry.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png
rename to gtk/src/gtk-2.0/dark/assets/notebook-combo-entry-ltr-entry.png
diff --git a/gtk/src/default/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png b/gtk/src/gtk-2.0/dark/assets/notebook-combo-entry-rtl-entry-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png
rename to gtk/src/gtk-2.0/dark/assets/notebook-combo-entry-rtl-entry-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png b/gtk/src/gtk-2.0/dark/assets/notebook-combo-entry-rtl-entry-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/notebook-combo-entry-rtl-entry-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png b/gtk/src/gtk-2.0/dark/assets/notebook-combo-entry-rtl-entry.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png
rename to gtk/src/gtk-2.0/dark/assets/notebook-combo-entry-rtl-entry.png
diff --git a/gtk/src/default/gtk-2.0/assets/notebook-entry-active.png b/gtk/src/gtk-2.0/dark/assets/notebook-entry-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/notebook-entry-active.png
rename to gtk/src/gtk-2.0/dark/assets/notebook-entry-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/notebook-entry-insensitive.png b/gtk/src/gtk-2.0/dark/assets/notebook-entry-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/notebook-entry-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/notebook-entry-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/notebook-entry.png b/gtk/src/gtk-2.0/dark/assets/notebook-entry.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/notebook-entry.png
rename to gtk/src/gtk-2.0/dark/assets/notebook-entry.png
diff --git a/gtk/src/bark/gtk-2.0/assets/pan-down-insensitive.png b/gtk/src/gtk-2.0/dark/assets/pan-down-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/pan-down-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/pan-down-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/pan-down.png b/gtk/src/gtk-2.0/dark/assets/pan-down.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/pan-down.png
rename to gtk/src/gtk-2.0/dark/assets/pan-down.png
diff --git a/gtk/src/bark/gtk-2.0/assets/pan-left-insensitive.png b/gtk/src/gtk-2.0/dark/assets/pan-left-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/pan-left-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/pan-left-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/pan-left-semi.png b/gtk/src/gtk-2.0/dark/assets/pan-left-semi.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/pan-left-semi.png
rename to gtk/src/gtk-2.0/dark/assets/pan-left-semi.png
diff --git a/gtk/src/bark/gtk-2.0/assets/pan-left.png b/gtk/src/gtk-2.0/dark/assets/pan-left.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/pan-left.png
rename to gtk/src/gtk-2.0/dark/assets/pan-left.png
diff --git a/gtk/src/bark/gtk-2.0/assets/pan-right-insensitive.png b/gtk/src/gtk-2.0/dark/assets/pan-right-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/pan-right-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/pan-right-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/pan-right-semi.png b/gtk/src/gtk-2.0/dark/assets/pan-right-semi.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/pan-right-semi.png
rename to gtk/src/gtk-2.0/dark/assets/pan-right-semi.png
diff --git a/gtk/src/bark/gtk-2.0/assets/pan-right.png b/gtk/src/gtk-2.0/dark/assets/pan-right.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/pan-right.png
rename to gtk/src/gtk-2.0/dark/assets/pan-right.png
diff --git a/gtk/src/bark/gtk-2.0/assets/pan-up-insensitive.png b/gtk/src/gtk-2.0/dark/assets/pan-up-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/pan-up-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/pan-up-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/pan-up.png b/gtk/src/gtk-2.0/dark/assets/pan-up.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/pan-up.png
rename to gtk/src/gtk-2.0/dark/assets/pan-up.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/progressbar-horz-trough.png b/gtk/src/gtk-2.0/dark/assets/progressbar-horz-trough.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/progressbar-horz-trough.png
rename to gtk/src/gtk-2.0/dark/assets/progressbar-horz-trough.png
diff --git a/gtk/src/default/gtk-2.0/assets/progressbar-horz.png b/gtk/src/gtk-2.0/dark/assets/progressbar-horz.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/progressbar-horz.png
rename to gtk/src/gtk-2.0/dark/assets/progressbar-horz.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/progressbar-vert-trough.png b/gtk/src/gtk-2.0/dark/assets/progressbar-vert-trough.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/progressbar-vert-trough.png
rename to gtk/src/gtk-2.0/dark/assets/progressbar-vert-trough.png
diff --git a/gtk/src/default/gtk-2.0/assets/progressbar-vert.png b/gtk/src/gtk-2.0/dark/assets/progressbar-vert.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/progressbar-vert.png
rename to gtk/src/gtk-2.0/dark/assets/progressbar-vert.png
diff --git a/gtk/src/dark/gtk-2.0/assets/radio-checked-active.png b/gtk/src/gtk-2.0/dark/assets/radio-checked-active.png
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets/radio-checked-active.png
rename to gtk/src/gtk-2.0/dark/assets/radio-checked-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/radio-checked-insensitive.png b/gtk/src/gtk-2.0/dark/assets/radio-checked-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/radio-checked-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/radio-checked-insensitive.png
diff --git a/gtk/src/dark/gtk-2.0/assets/radio-checked.png b/gtk/src/gtk-2.0/dark/assets/radio-checked.png
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets/radio-checked.png
rename to gtk/src/gtk-2.0/dark/assets/radio-checked.png
diff --git a/gtk/src/dark/gtk-2.0/assets/radio-mixed-active.png b/gtk/src/gtk-2.0/dark/assets/radio-mixed-active.png
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets/radio-mixed-active.png
rename to gtk/src/gtk-2.0/dark/assets/radio-mixed-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/radio-mixed-insensitive.png b/gtk/src/gtk-2.0/dark/assets/radio-mixed-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/radio-mixed-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/radio-mixed-insensitive.png
diff --git a/gtk/src/dark/gtk-2.0/assets/radio-mixed.png b/gtk/src/gtk-2.0/dark/assets/radio-mixed.png
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets/radio-mixed.png
rename to gtk/src/gtk-2.0/dark/assets/radio-mixed.png
diff --git a/gtk/src/bark/gtk-2.0/assets/radio-unchecked-active.png b/gtk/src/gtk-2.0/dark/assets/radio-unchecked-active.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/radio-unchecked-active.png
rename to gtk/src/gtk-2.0/dark/assets/radio-unchecked-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/radio-unchecked-hover.png b/gtk/src/gtk-2.0/dark/assets/radio-unchecked-hover.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/radio-unchecked-hover.png
rename to gtk/src/gtk-2.0/dark/assets/radio-unchecked-hover.png
diff --git a/gtk/src/bark/gtk-2.0/assets/radio-unchecked-insensitive.png b/gtk/src/gtk-2.0/dark/assets/radio-unchecked-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/radio-unchecked-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/radio-unchecked-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/radio-unchecked.png b/gtk/src/gtk-2.0/dark/assets/radio-unchecked.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/radio-unchecked.png
rename to gtk/src/gtk-2.0/dark/assets/radio-unchecked.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scale-horz-focus.png b/gtk/src/gtk-2.0/dark/assets/scale-horz-focus.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/scale-horz-focus.png
rename to gtk/src/gtk-2.0/dark/assets/scale-horz-focus.png
diff --git a/gtk/src/default/gtk-2.0/assets/scale-horz-trough-active.png b/gtk/src/gtk-2.0/dark/assets/scale-horz-trough-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scale-horz-trough-active.png
rename to gtk/src/gtk-2.0/dark/assets/scale-horz-trough-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scale-horz-trough.png b/gtk/src/gtk-2.0/dark/assets/scale-horz-trough.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/scale-horz-trough.png
rename to gtk/src/gtk-2.0/dark/assets/scale-horz-trough.png
diff --git a/gtk/src/dark/gtk-2.0/assets/scale-slider-active.png b/gtk/src/gtk-2.0/dark/assets/scale-slider-active.png
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets/scale-slider-active.png
rename to gtk/src/gtk-2.0/dark/assets/scale-slider-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/scale-slider-hover.png b/gtk/src/gtk-2.0/dark/assets/scale-slider-hover.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scale-slider-hover.png
rename to gtk/src/gtk-2.0/dark/assets/scale-slider-hover.png
diff --git a/gtk/src/bark/gtk-2.0/assets/scale-slider-insensitive.png b/gtk/src/gtk-2.0/dark/assets/scale-slider-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/scale-slider-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/scale-slider-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/scale-slider.png b/gtk/src/gtk-2.0/dark/assets/scale-slider.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/scale-slider.png
rename to gtk/src/gtk-2.0/dark/assets/scale-slider.png
diff --git a/gtk/src/default/gtk-2.0/assets/scale-vert-trough-active.png b/gtk/src/gtk-2.0/dark/assets/scale-vert-trough-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scale-vert-trough-active.png
rename to gtk/src/gtk-2.0/dark/assets/scale-vert-trough-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scale-vert-trough.png b/gtk/src/gtk-2.0/dark/assets/scale-vert-trough.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/scale-vert-trough.png
rename to gtk/src/gtk-2.0/dark/assets/scale-vert-trough.png
diff --git a/gtk/src/dark/gtk-2.0/assets/scrollbar-arrow-down.png b/gtk/src/gtk-2.0/dark/assets/scrollbar-arrow-down.png
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets/scrollbar-arrow-down.png
rename to gtk/src/gtk-2.0/dark/assets/scrollbar-arrow-down.png
diff --git a/gtk/src/dark/gtk-2.0/assets/scrollbar-arrow-left.png b/gtk/src/gtk-2.0/dark/assets/scrollbar-arrow-left.png
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets/scrollbar-arrow-left.png
rename to gtk/src/gtk-2.0/dark/assets/scrollbar-arrow-left.png
diff --git a/gtk/src/dark/gtk-2.0/assets/scrollbar-arrow-right.png b/gtk/src/gtk-2.0/dark/assets/scrollbar-arrow-right.png
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets/scrollbar-arrow-right.png
rename to gtk/src/gtk-2.0/dark/assets/scrollbar-arrow-right.png
diff --git a/gtk/src/dark/gtk-2.0/assets/scrollbar-arrow-up.png b/gtk/src/gtk-2.0/dark/assets/scrollbar-arrow-up.png
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets/scrollbar-arrow-up.png
rename to gtk/src/gtk-2.0/dark/assets/scrollbar-arrow-up.png
diff --git a/gtk/src/dark/gtk-2.0/assets/scrollbar-horz-slider-active.png b/gtk/src/gtk-2.0/dark/assets/scrollbar-horz-slider-active.png
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets/scrollbar-horz-slider-active.png
rename to gtk/src/gtk-2.0/dark/assets/scrollbar-horz-slider-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/scrollbar-horz-slider-hover.png b/gtk/src/gtk-2.0/dark/assets/scrollbar-horz-slider-hover.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/scrollbar-horz-slider-hover.png
rename to gtk/src/gtk-2.0/dark/assets/scrollbar-horz-slider-hover.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scrollbar-horz-slider.png b/gtk/src/gtk-2.0/dark/assets/scrollbar-horz-slider.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/scrollbar-horz-slider.png
rename to gtk/src/gtk-2.0/dark/assets/scrollbar-horz-slider.png
diff --git a/gtk/src/bark/gtk-2.0/assets/scrollbar-horz-trough.png b/gtk/src/gtk-2.0/dark/assets/scrollbar-horz-trough.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/scrollbar-horz-trough.png
rename to gtk/src/gtk-2.0/dark/assets/scrollbar-horz-trough.png
diff --git a/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png b/gtk/src/gtk-2.0/dark/assets/scrollbar-vert-slider-active-rtl.png
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png
rename to gtk/src/gtk-2.0/dark/assets/scrollbar-vert-slider-active-rtl.png
diff --git a/gtk/src/dark/gtk-2.0/assets/scrollbar-vert-slider-active.png b/gtk/src/gtk-2.0/dark/assets/scrollbar-vert-slider-active.png
similarity index 100%
rename from gtk/src/dark/gtk-2.0/assets/scrollbar-vert-slider-active.png
rename to gtk/src/gtk-2.0/dark/assets/scrollbar-vert-slider-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png b/gtk/src/gtk-2.0/dark/assets/scrollbar-vert-slider-hover-rtl.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png
rename to gtk/src/gtk-2.0/dark/assets/scrollbar-vert-slider-hover-rtl.png
diff --git a/gtk/src/bark/gtk-2.0/assets/scrollbar-vert-slider-hover.png b/gtk/src/gtk-2.0/dark/assets/scrollbar-vert-slider-hover.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/scrollbar-vert-slider-hover.png
rename to gtk/src/gtk-2.0/dark/assets/scrollbar-vert-slider-hover.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scrollbar-vert-slider-rtl.png b/gtk/src/gtk-2.0/dark/assets/scrollbar-vert-slider-rtl.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/scrollbar-vert-slider-rtl.png
rename to gtk/src/gtk-2.0/dark/assets/scrollbar-vert-slider-rtl.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scrollbar-vert-slider.png b/gtk/src/gtk-2.0/dark/assets/scrollbar-vert-slider.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/scrollbar-vert-slider.png
rename to gtk/src/gtk-2.0/dark/assets/scrollbar-vert-slider.png
diff --git a/gtk/src/bark/gtk-2.0/assets/scrollbar-vert-trough-rtl.png b/gtk/src/gtk-2.0/dark/assets/scrollbar-vert-trough-rtl.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/scrollbar-vert-trough-rtl.png
rename to gtk/src/gtk-2.0/dark/assets/scrollbar-vert-trough-rtl.png
diff --git a/gtk/src/bark/gtk-2.0/assets/scrollbar-vert-trough.png b/gtk/src/gtk-2.0/dark/assets/scrollbar-vert-trough.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/scrollbar-vert-trough.png
rename to gtk/src/gtk-2.0/dark/assets/scrollbar-vert-trough.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-down-insensitive.png b/gtk/src/gtk-2.0/dark/assets/spin-down-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-down-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/spin-down-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-down.png b/gtk/src/gtk-2.0/dark/assets/spin-down.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-down.png
rename to gtk/src/gtk-2.0/dark/assets/spin-down.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-ltr-down-active.png b/gtk/src/gtk-2.0/dark/assets/spin-ltr-down-active.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-ltr-down-active.png
rename to gtk/src/gtk-2.0/dark/assets/spin-ltr-down-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-ltr-down-hover.png b/gtk/src/gtk-2.0/dark/assets/spin-ltr-down-hover.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-ltr-down-hover.png
rename to gtk/src/gtk-2.0/dark/assets/spin-ltr-down-hover.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-ltr-down-insensitive.png b/gtk/src/gtk-2.0/dark/assets/spin-ltr-down-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-ltr-down-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/spin-ltr-down-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-ltr-down.png b/gtk/src/gtk-2.0/dark/assets/spin-ltr-down.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-ltr-down.png
rename to gtk/src/gtk-2.0/dark/assets/spin-ltr-down.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-ltr-up-active.png b/gtk/src/gtk-2.0/dark/assets/spin-ltr-up-active.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-ltr-up-active.png
rename to gtk/src/gtk-2.0/dark/assets/spin-ltr-up-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-ltr-up-hover.png b/gtk/src/gtk-2.0/dark/assets/spin-ltr-up-hover.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-ltr-up-hover.png
rename to gtk/src/gtk-2.0/dark/assets/spin-ltr-up-hover.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-ltr-up-insensitive.png b/gtk/src/gtk-2.0/dark/assets/spin-ltr-up-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-ltr-up-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/spin-ltr-up-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-ltr-up.png b/gtk/src/gtk-2.0/dark/assets/spin-ltr-up.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-ltr-up.png
rename to gtk/src/gtk-2.0/dark/assets/spin-ltr-up.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-rtl-down-active.png b/gtk/src/gtk-2.0/dark/assets/spin-rtl-down-active.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-rtl-down-active.png
rename to gtk/src/gtk-2.0/dark/assets/spin-rtl-down-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-rtl-down-hover.png b/gtk/src/gtk-2.0/dark/assets/spin-rtl-down-hover.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-rtl-down-hover.png
rename to gtk/src/gtk-2.0/dark/assets/spin-rtl-down-hover.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-rtl-down-insensitive.png b/gtk/src/gtk-2.0/dark/assets/spin-rtl-down-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-rtl-down-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/spin-rtl-down-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-rtl-down.png b/gtk/src/gtk-2.0/dark/assets/spin-rtl-down.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-rtl-down.png
rename to gtk/src/gtk-2.0/dark/assets/spin-rtl-down.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-rtl-up-active.png b/gtk/src/gtk-2.0/dark/assets/spin-rtl-up-active.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-rtl-up-active.png
rename to gtk/src/gtk-2.0/dark/assets/spin-rtl-up-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-rtl-up-hover.png b/gtk/src/gtk-2.0/dark/assets/spin-rtl-up-hover.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-rtl-up-hover.png
rename to gtk/src/gtk-2.0/dark/assets/spin-rtl-up-hover.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-rtl-up-insensitive.png b/gtk/src/gtk-2.0/dark/assets/spin-rtl-up-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-rtl-up-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/spin-rtl-up-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-rtl-up.png b/gtk/src/gtk-2.0/dark/assets/spin-rtl-up.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-rtl-up.png
rename to gtk/src/gtk-2.0/dark/assets/spin-rtl-up.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-up-insensitive.png b/gtk/src/gtk-2.0/dark/assets/spin-up-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-up-insensitive.png
rename to gtk/src/gtk-2.0/dark/assets/spin-up-insensitive.png
diff --git a/gtk/src/bark/gtk-2.0/assets/spin-up.png b/gtk/src/gtk-2.0/dark/assets/spin-up.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/spin-up.png
rename to gtk/src/gtk-2.0/dark/assets/spin-up.png
diff --git a/gtk/src/bark/gtk-2.0/assets/tab-down-active.png b/gtk/src/gtk-2.0/dark/assets/tab-down-active.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/tab-down-active.png
rename to gtk/src/gtk-2.0/dark/assets/tab-down-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/tab-down.png b/gtk/src/gtk-2.0/dark/assets/tab-down.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/tab-down.png
rename to gtk/src/gtk-2.0/dark/assets/tab-down.png
diff --git a/gtk/src/bark/gtk-2.0/assets/tab-horz-gap.png b/gtk/src/gtk-2.0/dark/assets/tab-horz-gap.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/tab-horz-gap.png
rename to gtk/src/gtk-2.0/dark/assets/tab-horz-gap.png
diff --git a/gtk/src/bark/gtk-2.0/assets/tab-left-active.png b/gtk/src/gtk-2.0/dark/assets/tab-left-active.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/tab-left-active.png
rename to gtk/src/gtk-2.0/dark/assets/tab-left-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/tab-left.png b/gtk/src/gtk-2.0/dark/assets/tab-left.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/tab-left.png
rename to gtk/src/gtk-2.0/dark/assets/tab-left.png
diff --git a/gtk/src/bark/gtk-2.0/assets/tab-right-active.png b/gtk/src/gtk-2.0/dark/assets/tab-right-active.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/tab-right-active.png
rename to gtk/src/gtk-2.0/dark/assets/tab-right-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/tab-right.png b/gtk/src/gtk-2.0/dark/assets/tab-right.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/tab-right.png
rename to gtk/src/gtk-2.0/dark/assets/tab-right.png
diff --git a/gtk/src/bark/gtk-2.0/assets/tab-up-active.png b/gtk/src/gtk-2.0/dark/assets/tab-up-active.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/tab-up-active.png
rename to gtk/src/gtk-2.0/dark/assets/tab-up-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/tab-up.png b/gtk/src/gtk-2.0/dark/assets/tab-up.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/tab-up.png
rename to gtk/src/gtk-2.0/dark/assets/tab-up.png
diff --git a/gtk/src/bark/gtk-2.0/assets/tab-vert-gap.png b/gtk/src/gtk-2.0/dark/assets/tab-vert-gap.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/tab-vert-gap.png
rename to gtk/src/gtk-2.0/dark/assets/tab-vert-gap.png
diff --git a/gtk/src/bark/gtk-2.0/assets/treeview-header-button.png b/gtk/src/gtk-2.0/dark/assets/treeview-header-button.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/treeview-header-button.png
rename to gtk/src/gtk-2.0/dark/assets/treeview-header-button.png
diff --git a/gtk/src/bark/gtk-2.0/assets/treeview-pan-down-active.png b/gtk/src/gtk-2.0/dark/assets/treeview-pan-down-active.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/treeview-pan-down-active.png
rename to gtk/src/gtk-2.0/dark/assets/treeview-pan-down-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/treeview-pan-down-hover.png b/gtk/src/gtk-2.0/dark/assets/treeview-pan-down-hover.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/treeview-pan-down-hover.png
rename to gtk/src/gtk-2.0/dark/assets/treeview-pan-down-hover.png
diff --git a/gtk/src/bark/gtk-2.0/assets/treeview-pan-down.png b/gtk/src/gtk-2.0/dark/assets/treeview-pan-down.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/treeview-pan-down.png
rename to gtk/src/gtk-2.0/dark/assets/treeview-pan-down.png
diff --git a/gtk/src/bark/gtk-2.0/assets/treeview-pan-up-active.png b/gtk/src/gtk-2.0/dark/assets/treeview-pan-up-active.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/treeview-pan-up-active.png
rename to gtk/src/gtk-2.0/dark/assets/treeview-pan-up-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/treeview-pan-up-hover.png b/gtk/src/gtk-2.0/dark/assets/treeview-pan-up-hover.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/treeview-pan-up-hover.png
rename to gtk/src/gtk-2.0/dark/assets/treeview-pan-up-hover.png
diff --git a/gtk/src/bark/gtk-2.0/assets/treeview-pan-up.png b/gtk/src/gtk-2.0/dark/assets/treeview-pan-up.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/treeview-pan-up.png
rename to gtk/src/gtk-2.0/dark/assets/treeview-pan-up.png
diff --git a/gtk/src/bark/gtk-2.0/assets/treeview-separator-ltr.png b/gtk/src/gtk-2.0/dark/assets/treeview-separator-ltr.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/treeview-separator-ltr.png
rename to gtk/src/gtk-2.0/dark/assets/treeview-separator-ltr.png
diff --git a/gtk/src/bark/gtk-2.0/assets/treeview-separator-rtl.png b/gtk/src/gtk-2.0/dark/assets/treeview-separator-rtl.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/treeview-separator-rtl.png
rename to gtk/src/gtk-2.0/dark/assets/treeview-separator-rtl.png
diff --git a/gtk/src/gtk-2.0/dark/gtkrc.in b/gtk/src/gtk-2.0/dark/gtkrc.in
new file mode 100644
index 0000000000..692fbabebc
--- /dev/null
+++ b/gtk/src/gtk-2.0/dark/gtkrc.in
@@ -0,0 +1,50 @@
+# Based on Bridge by ScionicSpectre
+# vim:set ts=2 sw=2 sts=2 ai et:
+#
+# This is the GTK+ 2 version of Adwaita. It's whole purpose is to look as the
+# GTK+ 3 version as much as possible until GTK+ 2 dies completely.
+#
+# Note: comments for explaining styles are on the bottom of each file beside the
+# widget matches.
+
+# Declare the colours used throughout the theme.
+# There shouldn't be any fiddling with them in the theme files themselves in
+# order to not mess up the dark theme.
+
+# Text/base
+gtk-color-scheme = "text_color:#5D5D5D\nbase_color:#FFFFFF"
+# Foreground/background
+gtk-color-scheme = "fg_color:#3D3D3D\nbg_color:#F5F6F7"
+# Selected foreground/background
+gtk-color-scheme = "selected_fg_color:#ffffff\nselected_bg_color:@selected_bg_color@"
+# Insensitive foreground/background
+gtk-color-scheme = "insensitive_fg_color:#8b8e8f\ninsensitive_bg_color:#f1f1f1"
+# Menus
+gtk-color-scheme = "menu_color:#fafafa\nmenubar_bg:#f5f6f7"
+gtk-color-scheme = "menubar_fg:#3d3d3d\nmenubar_insensitive_fg:#3d3d3d"
+# Links
+gtk-color-scheme = "link_color:#19B6EE\nvisited_link_color:#0b7196"
+# Treeview headers
+gtk-color-scheme = "column_header_color:#979a9b\nhover_column_header_color:#636769"
+# Window decoration
+gtk-color-scheme = "menu_hover_color:#e2e2e2\nwindow_color:#f4f4f4"
+# Tooltips
+gtk-color-scheme = "tooltip_fg_color:#ffffff\ntooltip_bg_color:#343434"
+
+# Set GTK settings
+gtk-auto-mnemonics = 1
+gtk-primary-button-warps-slider = 1
+gtk-icon-sizes="gtk-menu=16,16:
+gtk-button=16,16:
+gtk-small-toolbar=16,16:
+
+gtk-dnd=16,16:
+gtk-dialog=16,16"
+gtk-toolbar-style = GTK_TOOLBAR_ICONS
+gtk-menu-images = 0
+gtk-menu-popup-delay = 0
+
+# And hand over the control to the theme files
+include "main.rc"
+include "apps.rc"
+include "hacks.rc"
diff --git a/gtk/src/bark-dark/gtk-2.0/hacks.rc b/gtk/src/gtk-2.0/dark/hacks.rc
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/hacks.rc
rename to gtk/src/gtk-2.0/dark/hacks.rc
diff --git a/gtk/src/bark-dark/gtk-2.0/main.rc b/gtk/src/gtk-2.0/dark/main.rc
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/main.rc
rename to gtk/src/gtk-2.0/dark/main.rc
diff --git a/gtk/src/bark/gtk-2.0/apps.rc b/gtk/src/gtk-2.0/default/apps.rc
similarity index 100%
rename from gtk/src/bark/gtk-2.0/apps.rc
rename to gtk/src/gtk-2.0/default/apps.rc
diff --git a/gtk/src/default/gtk-2.0/assets-external.svg b/gtk/src/gtk-2.0/default/assets-external.svg
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets-external.svg
rename to gtk/src/gtk-2.0/default/assets-external.svg
diff --git a/gtk/src/bark/gtk-2.0/assets-external.txt b/gtk/src/gtk-2.0/default/assets-external.txt
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets-external.txt
rename to gtk/src/gtk-2.0/default/assets-external.txt
diff --git a/gtk/src/default/gtk-2.0/assets.svg b/gtk/src/gtk-2.0/default/assets.svg
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets.svg
rename to gtk/src/gtk-2.0/default/assets.svg
diff --git a/gtk/src/bark/gtk-2.0/assets.txt b/gtk/src/gtk-2.0/default/assets.txt
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets.txt
rename to gtk/src/gtk-2.0/default/assets.txt
diff --git a/gtk/src/bark/gtk-2.0/assets/border.png b/gtk/src/gtk-2.0/default/assets/border.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/border.png
rename to gtk/src/gtk-2.0/default/assets/border.png
diff --git a/gtk/src/blue/gtk-2.0/assets/button-active.png b/gtk/src/gtk-2.0/default/assets/button-active.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/button-active.png
rename to gtk/src/gtk-2.0/default/assets/button-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/button-hover.png b/gtk/src/gtk-2.0/default/assets/button-hover.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/button-hover.png
rename to gtk/src/gtk-2.0/default/assets/button-hover.png
diff --git a/gtk/src/blue/gtk-2.0/assets/button-insensitive.png b/gtk/src/gtk-2.0/default/assets/button-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/button-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/button-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/button.png b/gtk/src/gtk-2.0/default/assets/button.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/button.png
rename to gtk/src/gtk-2.0/default/assets/button.png
diff --git a/gtk/src/default/gtk-2.0/assets/checkbox-checked-active.png b/gtk/src/gtk-2.0/default/assets/checkbox-checked-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/checkbox-checked-active.png
rename to gtk/src/gtk-2.0/default/assets/checkbox-checked-active.png
diff --git a/gtk/src/gtk-2.0/default/assets/checkbox-checked-insensitive.png b/gtk/src/gtk-2.0/default/assets/checkbox-checked-insensitive.png
new file mode 100644
index 0000000000..b63e138b3e
Binary files /dev/null and b/gtk/src/gtk-2.0/default/assets/checkbox-checked-insensitive.png differ
diff --git a/gtk/src/default/gtk-2.0/assets/checkbox-checked.png b/gtk/src/gtk-2.0/default/assets/checkbox-checked.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/checkbox-checked.png
rename to gtk/src/gtk-2.0/default/assets/checkbox-checked.png
diff --git a/gtk/src/default/gtk-2.0/assets/checkbox-mixed-active.png b/gtk/src/gtk-2.0/default/assets/checkbox-mixed-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/checkbox-mixed-active.png
rename to gtk/src/gtk-2.0/default/assets/checkbox-mixed-active.png
diff --git a/gtk/src/gtk-2.0/default/assets/checkbox-mixed-insensitive.png b/gtk/src/gtk-2.0/default/assets/checkbox-mixed-insensitive.png
new file mode 100644
index 0000000000..33fc17d651
Binary files /dev/null and b/gtk/src/gtk-2.0/default/assets/checkbox-mixed-insensitive.png differ
diff --git a/gtk/src/default/gtk-2.0/assets/checkbox-mixed.png b/gtk/src/gtk-2.0/default/assets/checkbox-mixed.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/checkbox-mixed.png
rename to gtk/src/gtk-2.0/default/assets/checkbox-mixed.png
diff --git a/gtk/src/blue/gtk-2.0/assets/checkbox-unchecked-active.png b/gtk/src/gtk-2.0/default/assets/checkbox-unchecked-active.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/checkbox-unchecked-active.png
rename to gtk/src/gtk-2.0/default/assets/checkbox-unchecked-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/checkbox-unchecked-hover.png b/gtk/src/gtk-2.0/default/assets/checkbox-unchecked-hover.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/checkbox-unchecked-hover.png
rename to gtk/src/gtk-2.0/default/assets/checkbox-unchecked-hover.png
diff --git a/gtk/src/blue/gtk-2.0/assets/checkbox-unchecked-insensitive.png b/gtk/src/gtk-2.0/default/assets/checkbox-unchecked-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/checkbox-unchecked-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/checkbox-unchecked-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/checkbox-unchecked.png b/gtk/src/gtk-2.0/default/assets/checkbox-unchecked.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/checkbox-unchecked.png
rename to gtk/src/gtk-2.0/default/assets/checkbox-unchecked.png
diff --git a/gtk/src/blue/gtk-2.0/assets/combo-entry-ltr-button-active.png b/gtk/src/gtk-2.0/default/assets/combo-entry-ltr-button-active.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/combo-entry-ltr-button-active.png
rename to gtk/src/gtk-2.0/default/assets/combo-entry-ltr-button-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/combo-entry-ltr-button-hover.png b/gtk/src/gtk-2.0/default/assets/combo-entry-ltr-button-hover.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/combo-entry-ltr-button-hover.png
rename to gtk/src/gtk-2.0/default/assets/combo-entry-ltr-button-hover.png
diff --git a/gtk/src/blue/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png b/gtk/src/gtk-2.0/default/assets/combo-entry-ltr-button-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/combo-entry-ltr-button-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/combo-entry-ltr-button.png b/gtk/src/gtk-2.0/default/assets/combo-entry-ltr-button.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/combo-entry-ltr-button.png
rename to gtk/src/gtk-2.0/default/assets/combo-entry-ltr-button.png
diff --git a/gtk/src/gtk-2.0/default/assets/combo-entry-ltr-entry-active.png b/gtk/src/gtk-2.0/default/assets/combo-entry-ltr-entry-active.png
new file mode 100644
index 0000000000..543e9a1e64
Binary files /dev/null and b/gtk/src/gtk-2.0/default/assets/combo-entry-ltr-entry-active.png differ
diff --git a/gtk/src/blue/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png b/gtk/src/gtk-2.0/default/assets/combo-entry-ltr-entry-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/combo-entry-ltr-entry-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/combo-entry-ltr-entry.png b/gtk/src/gtk-2.0/default/assets/combo-entry-ltr-entry.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/combo-entry-ltr-entry.png
rename to gtk/src/gtk-2.0/default/assets/combo-entry-ltr-entry.png
diff --git a/gtk/src/blue/gtk-2.0/assets/combo-entry-rtl-button-active.png b/gtk/src/gtk-2.0/default/assets/combo-entry-rtl-button-active.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/combo-entry-rtl-button-active.png
rename to gtk/src/gtk-2.0/default/assets/combo-entry-rtl-button-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/combo-entry-rtl-button-hover.png b/gtk/src/gtk-2.0/default/assets/combo-entry-rtl-button-hover.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/combo-entry-rtl-button-hover.png
rename to gtk/src/gtk-2.0/default/assets/combo-entry-rtl-button-hover.png
diff --git a/gtk/src/blue/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png b/gtk/src/gtk-2.0/default/assets/combo-entry-rtl-button-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/combo-entry-rtl-button-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/combo-entry-rtl-button.png b/gtk/src/gtk-2.0/default/assets/combo-entry-rtl-button.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/combo-entry-rtl-button.png
rename to gtk/src/gtk-2.0/default/assets/combo-entry-rtl-button.png
diff --git a/gtk/src/gtk-2.0/default/assets/combo-entry-rtl-entry-active.png b/gtk/src/gtk-2.0/default/assets/combo-entry-rtl-entry-active.png
new file mode 100644
index 0000000000..57b2fddba5
Binary files /dev/null and b/gtk/src/gtk-2.0/default/assets/combo-entry-rtl-entry-active.png differ
diff --git a/gtk/src/blue/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png b/gtk/src/gtk-2.0/default/assets/combo-entry-rtl-entry-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/combo-entry-rtl-entry-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/combo-entry-rtl-entry.png b/gtk/src/gtk-2.0/default/assets/combo-entry-rtl-entry.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/combo-entry-rtl-entry.png
rename to gtk/src/gtk-2.0/default/assets/combo-entry-rtl-entry.png
diff --git a/gtk/src/gtk-2.0/default/assets/entry-active.png b/gtk/src/gtk-2.0/default/assets/entry-active.png
new file mode 100644
index 0000000000..53559e3e41
Binary files /dev/null and b/gtk/src/gtk-2.0/default/assets/entry-active.png differ
diff --git a/gtk/src/blue/gtk-2.0/assets/entry-background-insensitive.png b/gtk/src/gtk-2.0/default/assets/entry-background-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/entry-background-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/entry-background-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/entry-background.png b/gtk/src/gtk-2.0/default/assets/entry-background.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/entry-background.png
rename to gtk/src/gtk-2.0/default/assets/entry-background.png
diff --git a/gtk/src/blue/gtk-2.0/assets/entry-insensitive.png b/gtk/src/gtk-2.0/default/assets/entry-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/entry-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/entry-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/entry.png b/gtk/src/gtk-2.0/default/assets/entry.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/entry.png
rename to gtk/src/gtk-2.0/default/assets/entry.png
diff --git a/gtk/src/gtk-2.0/default/assets/focus.png b/gtk/src/gtk-2.0/default/assets/focus.png
new file mode 100644
index 0000000000..354bf07c94
Binary files /dev/null and b/gtk/src/gtk-2.0/default/assets/focus.png differ
diff --git a/gtk/src/blue/gtk-2.0/assets/frame-inline.png b/gtk/src/gtk-2.0/default/assets/frame-inline.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/frame-inline.png
rename to gtk/src/gtk-2.0/default/assets/frame-inline.png
diff --git a/gtk/src/blue/gtk-2.0/assets/frame-notebook.png b/gtk/src/gtk-2.0/default/assets/frame-notebook.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/frame-notebook.png
rename to gtk/src/gtk-2.0/default/assets/frame-notebook.png
diff --git a/gtk/src/blue/gtk-2.0/assets/frame.png b/gtk/src/gtk-2.0/default/assets/frame.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/frame.png
rename to gtk/src/gtk-2.0/default/assets/frame.png
diff --git a/gtk/src/blue/gtk-2.0/assets/handle-horz.png b/gtk/src/gtk-2.0/default/assets/handle-horz.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/handle-horz.png
rename to gtk/src/gtk-2.0/default/assets/handle-horz.png
diff --git a/gtk/src/blue/gtk-2.0/assets/handle-vert.png b/gtk/src/gtk-2.0/default/assets/handle-vert.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/handle-vert.png
rename to gtk/src/gtk-2.0/default/assets/handle-vert.png
diff --git a/gtk/src/bark/gtk-2.0/assets/handle.png b/gtk/src/gtk-2.0/default/assets/handle.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/handle.png
rename to gtk/src/gtk-2.0/default/assets/handle.png
diff --git a/gtk/src/blue/gtk-2.0/assets/line.png b/gtk/src/gtk-2.0/default/assets/line.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/line.png
rename to gtk/src/gtk-2.0/default/assets/line.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-border.png b/gtk/src/gtk-2.0/default/assets/menu-border.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-border.png
rename to gtk/src/gtk-2.0/default/assets/menu-border.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-checkbox-checked-insensitive.png b/gtk/src/gtk-2.0/default/assets/menu-checkbox-checked-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-checkbox-checked-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/menu-checkbox-checked-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-checkbox-checked.png b/gtk/src/gtk-2.0/default/assets/menu-checkbox-checked.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-checkbox-checked.png
rename to gtk/src/gtk-2.0/default/assets/menu-checkbox-checked.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-checkbox-hover.png b/gtk/src/gtk-2.0/default/assets/menu-checkbox-hover.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-checkbox-hover.png
rename to gtk/src/gtk-2.0/default/assets/menu-checkbox-hover.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-checkbox-insensitive.png b/gtk/src/gtk-2.0/default/assets/menu-checkbox-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-checkbox-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/menu-checkbox-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png b/gtk/src/gtk-2.0/default/assets/menu-checkbox-mixed-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/menu-checkbox-mixed-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-checkbox-mixed.png b/gtk/src/gtk-2.0/default/assets/menu-checkbox-mixed.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-checkbox-mixed.png
rename to gtk/src/gtk-2.0/default/assets/menu-checkbox-mixed.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-checkbox.png b/gtk/src/gtk-2.0/default/assets/menu-checkbox.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-checkbox.png
rename to gtk/src/gtk-2.0/default/assets/menu-checkbox.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-pan-down-insensitive.png b/gtk/src/gtk-2.0/default/assets/menu-pan-down-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-pan-down-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/menu-pan-down-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-pan-down.png b/gtk/src/gtk-2.0/default/assets/menu-pan-down.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-pan-down.png
rename to gtk/src/gtk-2.0/default/assets/menu-pan-down.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-pan-left-hover.png b/gtk/src/gtk-2.0/default/assets/menu-pan-left-hover.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-pan-left-hover.png
rename to gtk/src/gtk-2.0/default/assets/menu-pan-left-hover.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-pan-left-insensitive.png b/gtk/src/gtk-2.0/default/assets/menu-pan-left-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-pan-left-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/menu-pan-left-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-pan-left.png b/gtk/src/gtk-2.0/default/assets/menu-pan-left.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-pan-left.png
rename to gtk/src/gtk-2.0/default/assets/menu-pan-left.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-pan-right-hover.png b/gtk/src/gtk-2.0/default/assets/menu-pan-right-hover.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-pan-right-hover.png
rename to gtk/src/gtk-2.0/default/assets/menu-pan-right-hover.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-pan-right-insensitive.png b/gtk/src/gtk-2.0/default/assets/menu-pan-right-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-pan-right-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/menu-pan-right-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-pan-right.png b/gtk/src/gtk-2.0/default/assets/menu-pan-right.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-pan-right.png
rename to gtk/src/gtk-2.0/default/assets/menu-pan-right.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-pan-up-insensitive.png b/gtk/src/gtk-2.0/default/assets/menu-pan-up-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-pan-up-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/menu-pan-up-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-pan-up.png b/gtk/src/gtk-2.0/default/assets/menu-pan-up.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-pan-up.png
rename to gtk/src/gtk-2.0/default/assets/menu-pan-up.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-radio-checked-insensitive.png b/gtk/src/gtk-2.0/default/assets/menu-radio-checked-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-radio-checked-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/menu-radio-checked-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-radio-checked.png b/gtk/src/gtk-2.0/default/assets/menu-radio-checked.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-radio-checked.png
rename to gtk/src/gtk-2.0/default/assets/menu-radio-checked.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-radio-hover.png b/gtk/src/gtk-2.0/default/assets/menu-radio-hover.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-radio-hover.png
rename to gtk/src/gtk-2.0/default/assets/menu-radio-hover.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-radio-insensitive.png b/gtk/src/gtk-2.0/default/assets/menu-radio-insensitive.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-radio-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/menu-radio-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-radio-mixed-insensitive.png b/gtk/src/gtk-2.0/default/assets/menu-radio-mixed-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-radio-mixed-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/menu-radio-mixed-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-radio-mixed.png b/gtk/src/gtk-2.0/default/assets/menu-radio-mixed.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-radio-mixed.png
rename to gtk/src/gtk-2.0/default/assets/menu-radio-mixed.png
diff --git a/gtk/src/bark/gtk-2.0/assets/menu-radio.png b/gtk/src/gtk-2.0/default/assets/menu-radio.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/menu-radio.png
rename to gtk/src/gtk-2.0/default/assets/menu-radio.png
diff --git a/gtk/src/default/gtk-2.0/assets/menubar-item-active.png b/gtk/src/gtk-2.0/default/assets/menubar-item-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/menubar-item-active.png
rename to gtk/src/gtk-2.0/default/assets/menubar-item-active.png
diff --git a/gtk/src/gtk-2.0/default/assets/notebook-combo-entry-ltr-entry-active.png b/gtk/src/gtk-2.0/default/assets/notebook-combo-entry-ltr-entry-active.png
new file mode 100644
index 0000000000..ca6283324a
Binary files /dev/null and b/gtk/src/gtk-2.0/default/assets/notebook-combo-entry-ltr-entry-active.png differ
diff --git a/gtk/src/blue/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png b/gtk/src/gtk-2.0/default/assets/notebook-combo-entry-ltr-entry-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/notebook-combo-entry-ltr-entry-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png b/gtk/src/gtk-2.0/default/assets/notebook-combo-entry-ltr-entry.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png
rename to gtk/src/gtk-2.0/default/assets/notebook-combo-entry-ltr-entry.png
diff --git a/gtk/src/gtk-2.0/default/assets/notebook-combo-entry-rtl-entry-active.png b/gtk/src/gtk-2.0/default/assets/notebook-combo-entry-rtl-entry-active.png
new file mode 100644
index 0000000000..68d0865956
Binary files /dev/null and b/gtk/src/gtk-2.0/default/assets/notebook-combo-entry-rtl-entry-active.png differ
diff --git a/gtk/src/blue/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png b/gtk/src/gtk-2.0/default/assets/notebook-combo-entry-rtl-entry-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/notebook-combo-entry-rtl-entry-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png b/gtk/src/gtk-2.0/default/assets/notebook-combo-entry-rtl-entry.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png
rename to gtk/src/gtk-2.0/default/assets/notebook-combo-entry-rtl-entry.png
diff --git a/gtk/src/gtk-2.0/default/assets/notebook-entry-active.png b/gtk/src/gtk-2.0/default/assets/notebook-entry-active.png
new file mode 100644
index 0000000000..16545f0049
Binary files /dev/null and b/gtk/src/gtk-2.0/default/assets/notebook-entry-active.png differ
diff --git a/gtk/src/blue/gtk-2.0/assets/notebook-entry-insensitive.png b/gtk/src/gtk-2.0/default/assets/notebook-entry-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/notebook-entry-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/notebook-entry-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/notebook-entry.png b/gtk/src/gtk-2.0/default/assets/notebook-entry.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/notebook-entry.png
rename to gtk/src/gtk-2.0/default/assets/notebook-entry.png
diff --git a/gtk/src/blue/gtk-2.0/assets/pan-down-insensitive.png b/gtk/src/gtk-2.0/default/assets/pan-down-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/pan-down-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/pan-down-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/pan-down.png b/gtk/src/gtk-2.0/default/assets/pan-down.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/pan-down.png
rename to gtk/src/gtk-2.0/default/assets/pan-down.png
diff --git a/gtk/src/blue/gtk-2.0/assets/pan-left-insensitive.png b/gtk/src/gtk-2.0/default/assets/pan-left-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/pan-left-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/pan-left-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/pan-left-semi.png b/gtk/src/gtk-2.0/default/assets/pan-left-semi.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/pan-left-semi.png
rename to gtk/src/gtk-2.0/default/assets/pan-left-semi.png
diff --git a/gtk/src/blue/gtk-2.0/assets/pan-left.png b/gtk/src/gtk-2.0/default/assets/pan-left.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/pan-left.png
rename to gtk/src/gtk-2.0/default/assets/pan-left.png
diff --git a/gtk/src/blue/gtk-2.0/assets/pan-right-insensitive.png b/gtk/src/gtk-2.0/default/assets/pan-right-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/pan-right-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/pan-right-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/pan-right-semi.png b/gtk/src/gtk-2.0/default/assets/pan-right-semi.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/pan-right-semi.png
rename to gtk/src/gtk-2.0/default/assets/pan-right-semi.png
diff --git a/gtk/src/blue/gtk-2.0/assets/pan-right.png b/gtk/src/gtk-2.0/default/assets/pan-right.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/pan-right.png
rename to gtk/src/gtk-2.0/default/assets/pan-right.png
diff --git a/gtk/src/blue/gtk-2.0/assets/pan-up-insensitive.png b/gtk/src/gtk-2.0/default/assets/pan-up-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/pan-up-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/pan-up-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/pan-up.png b/gtk/src/gtk-2.0/default/assets/pan-up.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/pan-up.png
rename to gtk/src/gtk-2.0/default/assets/pan-up.png
diff --git a/gtk/src/bark/gtk-2.0/assets/progressbar-horz-trough.png b/gtk/src/gtk-2.0/default/assets/progressbar-horz-trough.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/progressbar-horz-trough.png
rename to gtk/src/gtk-2.0/default/assets/progressbar-horz-trough.png
diff --git a/gtk/src/gtk-2.0/default/assets/progressbar-horz.png b/gtk/src/gtk-2.0/default/assets/progressbar-horz.png
new file mode 100644
index 0000000000..82c48aef5e
Binary files /dev/null and b/gtk/src/gtk-2.0/default/assets/progressbar-horz.png differ
diff --git a/gtk/src/bark/gtk-2.0/assets/progressbar-vert-trough.png b/gtk/src/gtk-2.0/default/assets/progressbar-vert-trough.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/progressbar-vert-trough.png
rename to gtk/src/gtk-2.0/default/assets/progressbar-vert-trough.png
diff --git a/gtk/src/gtk-2.0/default/assets/progressbar-vert.png b/gtk/src/gtk-2.0/default/assets/progressbar-vert.png
new file mode 100644
index 0000000000..a701792b4b
Binary files /dev/null and b/gtk/src/gtk-2.0/default/assets/progressbar-vert.png differ
diff --git a/gtk/src/default/gtk-2.0/assets/radio-checked-active.png b/gtk/src/gtk-2.0/default/assets/radio-checked-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/radio-checked-active.png
rename to gtk/src/gtk-2.0/default/assets/radio-checked-active.png
diff --git a/gtk/src/gtk-2.0/default/assets/radio-checked-insensitive.png b/gtk/src/gtk-2.0/default/assets/radio-checked-insensitive.png
new file mode 100644
index 0000000000..168bcd91ec
Binary files /dev/null and b/gtk/src/gtk-2.0/default/assets/radio-checked-insensitive.png differ
diff --git a/gtk/src/default/gtk-2.0/assets/radio-checked.png b/gtk/src/gtk-2.0/default/assets/radio-checked.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/radio-checked.png
rename to gtk/src/gtk-2.0/default/assets/radio-checked.png
diff --git a/gtk/src/default/gtk-2.0/assets/radio-mixed-active.png b/gtk/src/gtk-2.0/default/assets/radio-mixed-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/radio-mixed-active.png
rename to gtk/src/gtk-2.0/default/assets/radio-mixed-active.png
diff --git a/gtk/src/gtk-2.0/default/assets/radio-mixed-insensitive.png b/gtk/src/gtk-2.0/default/assets/radio-mixed-insensitive.png
new file mode 100644
index 0000000000..69a89ea77e
Binary files /dev/null and b/gtk/src/gtk-2.0/default/assets/radio-mixed-insensitive.png differ
diff --git a/gtk/src/default/gtk-2.0/assets/radio-mixed.png b/gtk/src/gtk-2.0/default/assets/radio-mixed.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/radio-mixed.png
rename to gtk/src/gtk-2.0/default/assets/radio-mixed.png
diff --git a/gtk/src/blue/gtk-2.0/assets/radio-unchecked-active.png b/gtk/src/gtk-2.0/default/assets/radio-unchecked-active.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/radio-unchecked-active.png
rename to gtk/src/gtk-2.0/default/assets/radio-unchecked-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/radio-unchecked-hover.png b/gtk/src/gtk-2.0/default/assets/radio-unchecked-hover.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/radio-unchecked-hover.png
rename to gtk/src/gtk-2.0/default/assets/radio-unchecked-hover.png
diff --git a/gtk/src/blue/gtk-2.0/assets/radio-unchecked-insensitive.png b/gtk/src/gtk-2.0/default/assets/radio-unchecked-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/radio-unchecked-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/radio-unchecked-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/radio-unchecked.png b/gtk/src/gtk-2.0/default/assets/radio-unchecked.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/radio-unchecked.png
rename to gtk/src/gtk-2.0/default/assets/radio-unchecked.png
diff --git a/gtk/src/bark/gtk-2.0/assets/scale-horz-focus.png b/gtk/src/gtk-2.0/default/assets/scale-horz-focus.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/scale-horz-focus.png
rename to gtk/src/gtk-2.0/default/assets/scale-horz-focus.png
diff --git a/gtk/src/gtk-2.0/default/assets/scale-horz-trough-active.png b/gtk/src/gtk-2.0/default/assets/scale-horz-trough-active.png
new file mode 100644
index 0000000000..125a616786
Binary files /dev/null and b/gtk/src/gtk-2.0/default/assets/scale-horz-trough-active.png differ
diff --git a/gtk/src/bark/gtk-2.0/assets/scale-horz-trough.png b/gtk/src/gtk-2.0/default/assets/scale-horz-trough.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/scale-horz-trough.png
rename to gtk/src/gtk-2.0/default/assets/scale-horz-trough.png
diff --git a/gtk/src/default/gtk-2.0/assets/scale-slider-active.png b/gtk/src/gtk-2.0/default/assets/scale-slider-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scale-slider-active.png
rename to gtk/src/gtk-2.0/default/assets/scale-slider-active.png
diff --git a/gtk/src/gtk-2.0/default/assets/scale-slider-hover.png b/gtk/src/gtk-2.0/default/assets/scale-slider-hover.png
new file mode 100644
index 0000000000..8a1effd23b
Binary files /dev/null and b/gtk/src/gtk-2.0/default/assets/scale-slider-hover.png differ
diff --git a/gtk/src/blue/gtk-2.0/assets/scale-slider-insensitive.png b/gtk/src/gtk-2.0/default/assets/scale-slider-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/scale-slider-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/scale-slider-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/scale-slider.png b/gtk/src/gtk-2.0/default/assets/scale-slider.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/scale-slider.png
rename to gtk/src/gtk-2.0/default/assets/scale-slider.png
diff --git a/gtk/src/gtk-2.0/default/assets/scale-vert-trough-active.png b/gtk/src/gtk-2.0/default/assets/scale-vert-trough-active.png
new file mode 100644
index 0000000000..7f3cd2b1b6
Binary files /dev/null and b/gtk/src/gtk-2.0/default/assets/scale-vert-trough-active.png differ
diff --git a/gtk/src/bark/gtk-2.0/assets/scale-vert-trough.png b/gtk/src/gtk-2.0/default/assets/scale-vert-trough.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/scale-vert-trough.png
rename to gtk/src/gtk-2.0/default/assets/scale-vert-trough.png
diff --git a/gtk/src/default/gtk-2.0/assets/scrollbar-arrow-down.png b/gtk/src/gtk-2.0/default/assets/scrollbar-arrow-down.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scrollbar-arrow-down.png
rename to gtk/src/gtk-2.0/default/assets/scrollbar-arrow-down.png
diff --git a/gtk/src/default/gtk-2.0/assets/scrollbar-arrow-left.png b/gtk/src/gtk-2.0/default/assets/scrollbar-arrow-left.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scrollbar-arrow-left.png
rename to gtk/src/gtk-2.0/default/assets/scrollbar-arrow-left.png
diff --git a/gtk/src/default/gtk-2.0/assets/scrollbar-arrow-right.png b/gtk/src/gtk-2.0/default/assets/scrollbar-arrow-right.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scrollbar-arrow-right.png
rename to gtk/src/gtk-2.0/default/assets/scrollbar-arrow-right.png
diff --git a/gtk/src/default/gtk-2.0/assets/scrollbar-arrow-up.png b/gtk/src/gtk-2.0/default/assets/scrollbar-arrow-up.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scrollbar-arrow-up.png
rename to gtk/src/gtk-2.0/default/assets/scrollbar-arrow-up.png
diff --git a/gtk/src/default/gtk-2.0/assets/scrollbar-horz-slider-active.png b/gtk/src/gtk-2.0/default/assets/scrollbar-horz-slider-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scrollbar-horz-slider-active.png
rename to gtk/src/gtk-2.0/default/assets/scrollbar-horz-slider-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/scrollbar-horz-slider-hover.png b/gtk/src/gtk-2.0/default/assets/scrollbar-horz-slider-hover.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/scrollbar-horz-slider-hover.png
rename to gtk/src/gtk-2.0/default/assets/scrollbar-horz-slider-hover.png
diff --git a/gtk/src/bark/gtk-2.0/assets/scrollbar-horz-slider.png b/gtk/src/gtk-2.0/default/assets/scrollbar-horz-slider.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/scrollbar-horz-slider.png
rename to gtk/src/gtk-2.0/default/assets/scrollbar-horz-slider.png
diff --git a/gtk/src/blue/gtk-2.0/assets/scrollbar-horz-trough.png b/gtk/src/gtk-2.0/default/assets/scrollbar-horz-trough.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/scrollbar-horz-trough.png
rename to gtk/src/gtk-2.0/default/assets/scrollbar-horz-trough.png
diff --git a/gtk/src/default/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png b/gtk/src/gtk-2.0/default/assets/scrollbar-vert-slider-active-rtl.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png
rename to gtk/src/gtk-2.0/default/assets/scrollbar-vert-slider-active-rtl.png
diff --git a/gtk/src/default/gtk-2.0/assets/scrollbar-vert-slider-active.png b/gtk/src/gtk-2.0/default/assets/scrollbar-vert-slider-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scrollbar-vert-slider-active.png
rename to gtk/src/gtk-2.0/default/assets/scrollbar-vert-slider-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png b/gtk/src/gtk-2.0/default/assets/scrollbar-vert-slider-hover-rtl.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png
rename to gtk/src/gtk-2.0/default/assets/scrollbar-vert-slider-hover-rtl.png
diff --git a/gtk/src/blue/gtk-2.0/assets/scrollbar-vert-slider-hover.png b/gtk/src/gtk-2.0/default/assets/scrollbar-vert-slider-hover.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/scrollbar-vert-slider-hover.png
rename to gtk/src/gtk-2.0/default/assets/scrollbar-vert-slider-hover.png
diff --git a/gtk/src/bark/gtk-2.0/assets/scrollbar-vert-slider-rtl.png b/gtk/src/gtk-2.0/default/assets/scrollbar-vert-slider-rtl.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/scrollbar-vert-slider-rtl.png
rename to gtk/src/gtk-2.0/default/assets/scrollbar-vert-slider-rtl.png
diff --git a/gtk/src/bark/gtk-2.0/assets/scrollbar-vert-slider.png b/gtk/src/gtk-2.0/default/assets/scrollbar-vert-slider.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/scrollbar-vert-slider.png
rename to gtk/src/gtk-2.0/default/assets/scrollbar-vert-slider.png
diff --git a/gtk/src/blue/gtk-2.0/assets/scrollbar-vert-trough-rtl.png b/gtk/src/gtk-2.0/default/assets/scrollbar-vert-trough-rtl.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/scrollbar-vert-trough-rtl.png
rename to gtk/src/gtk-2.0/default/assets/scrollbar-vert-trough-rtl.png
diff --git a/gtk/src/blue/gtk-2.0/assets/scrollbar-vert-trough.png b/gtk/src/gtk-2.0/default/assets/scrollbar-vert-trough.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/scrollbar-vert-trough.png
rename to gtk/src/gtk-2.0/default/assets/scrollbar-vert-trough.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-down-insensitive.png b/gtk/src/gtk-2.0/default/assets/spin-down-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-down-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/spin-down-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-down.png b/gtk/src/gtk-2.0/default/assets/spin-down.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-down.png
rename to gtk/src/gtk-2.0/default/assets/spin-down.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-ltr-down-active.png b/gtk/src/gtk-2.0/default/assets/spin-ltr-down-active.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-ltr-down-active.png
rename to gtk/src/gtk-2.0/default/assets/spin-ltr-down-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-ltr-down-hover.png b/gtk/src/gtk-2.0/default/assets/spin-ltr-down-hover.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-ltr-down-hover.png
rename to gtk/src/gtk-2.0/default/assets/spin-ltr-down-hover.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-ltr-down-insensitive.png b/gtk/src/gtk-2.0/default/assets/spin-ltr-down-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-ltr-down-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/spin-ltr-down-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-ltr-down.png b/gtk/src/gtk-2.0/default/assets/spin-ltr-down.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-ltr-down.png
rename to gtk/src/gtk-2.0/default/assets/spin-ltr-down.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-ltr-up-active.png b/gtk/src/gtk-2.0/default/assets/spin-ltr-up-active.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-ltr-up-active.png
rename to gtk/src/gtk-2.0/default/assets/spin-ltr-up-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-ltr-up-hover.png b/gtk/src/gtk-2.0/default/assets/spin-ltr-up-hover.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-ltr-up-hover.png
rename to gtk/src/gtk-2.0/default/assets/spin-ltr-up-hover.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-ltr-up-insensitive.png b/gtk/src/gtk-2.0/default/assets/spin-ltr-up-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-ltr-up-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/spin-ltr-up-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-ltr-up.png b/gtk/src/gtk-2.0/default/assets/spin-ltr-up.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-ltr-up.png
rename to gtk/src/gtk-2.0/default/assets/spin-ltr-up.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-rtl-down-active.png b/gtk/src/gtk-2.0/default/assets/spin-rtl-down-active.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-rtl-down-active.png
rename to gtk/src/gtk-2.0/default/assets/spin-rtl-down-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-rtl-down-hover.png b/gtk/src/gtk-2.0/default/assets/spin-rtl-down-hover.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-rtl-down-hover.png
rename to gtk/src/gtk-2.0/default/assets/spin-rtl-down-hover.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-rtl-down-insensitive.png b/gtk/src/gtk-2.0/default/assets/spin-rtl-down-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-rtl-down-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/spin-rtl-down-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-rtl-down.png b/gtk/src/gtk-2.0/default/assets/spin-rtl-down.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-rtl-down.png
rename to gtk/src/gtk-2.0/default/assets/spin-rtl-down.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-rtl-up-active.png b/gtk/src/gtk-2.0/default/assets/spin-rtl-up-active.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-rtl-up-active.png
rename to gtk/src/gtk-2.0/default/assets/spin-rtl-up-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-rtl-up-hover.png b/gtk/src/gtk-2.0/default/assets/spin-rtl-up-hover.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-rtl-up-hover.png
rename to gtk/src/gtk-2.0/default/assets/spin-rtl-up-hover.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-rtl-up-insensitive.png b/gtk/src/gtk-2.0/default/assets/spin-rtl-up-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-rtl-up-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/spin-rtl-up-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-rtl-up.png b/gtk/src/gtk-2.0/default/assets/spin-rtl-up.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-rtl-up.png
rename to gtk/src/gtk-2.0/default/assets/spin-rtl-up.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-up-insensitive.png b/gtk/src/gtk-2.0/default/assets/spin-up-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-up-insensitive.png
rename to gtk/src/gtk-2.0/default/assets/spin-up-insensitive.png
diff --git a/gtk/src/blue/gtk-2.0/assets/spin-up.png b/gtk/src/gtk-2.0/default/assets/spin-up.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/spin-up.png
rename to gtk/src/gtk-2.0/default/assets/spin-up.png
diff --git a/gtk/src/blue/gtk-2.0/assets/tab-down-active.png b/gtk/src/gtk-2.0/default/assets/tab-down-active.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/tab-down-active.png
rename to gtk/src/gtk-2.0/default/assets/tab-down-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/tab-down.png b/gtk/src/gtk-2.0/default/assets/tab-down.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/tab-down.png
rename to gtk/src/gtk-2.0/default/assets/tab-down.png
diff --git a/gtk/src/blue/gtk-2.0/assets/tab-horz-gap.png b/gtk/src/gtk-2.0/default/assets/tab-horz-gap.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/tab-horz-gap.png
rename to gtk/src/gtk-2.0/default/assets/tab-horz-gap.png
diff --git a/gtk/src/blue/gtk-2.0/assets/tab-left-active.png b/gtk/src/gtk-2.0/default/assets/tab-left-active.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/tab-left-active.png
rename to gtk/src/gtk-2.0/default/assets/tab-left-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/tab-left.png b/gtk/src/gtk-2.0/default/assets/tab-left.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/tab-left.png
rename to gtk/src/gtk-2.0/default/assets/tab-left.png
diff --git a/gtk/src/blue/gtk-2.0/assets/tab-right-active.png b/gtk/src/gtk-2.0/default/assets/tab-right-active.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/tab-right-active.png
rename to gtk/src/gtk-2.0/default/assets/tab-right-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/tab-right.png b/gtk/src/gtk-2.0/default/assets/tab-right.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/tab-right.png
rename to gtk/src/gtk-2.0/default/assets/tab-right.png
diff --git a/gtk/src/blue/gtk-2.0/assets/tab-up-active.png b/gtk/src/gtk-2.0/default/assets/tab-up-active.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/tab-up-active.png
rename to gtk/src/gtk-2.0/default/assets/tab-up-active.png
diff --git a/gtk/src/bark/gtk-2.0/assets/tab-up.png b/gtk/src/gtk-2.0/default/assets/tab-up.png
similarity index 100%
rename from gtk/src/bark/gtk-2.0/assets/tab-up.png
rename to gtk/src/gtk-2.0/default/assets/tab-up.png
diff --git a/gtk/src/blue/gtk-2.0/assets/tab-vert-gap.png b/gtk/src/gtk-2.0/default/assets/tab-vert-gap.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/tab-vert-gap.png
rename to gtk/src/gtk-2.0/default/assets/tab-vert-gap.png
diff --git a/gtk/src/blue/gtk-2.0/assets/treeview-header-button.png b/gtk/src/gtk-2.0/default/assets/treeview-header-button.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/treeview-header-button.png
rename to gtk/src/gtk-2.0/default/assets/treeview-header-button.png
diff --git a/gtk/src/blue/gtk-2.0/assets/treeview-pan-down-active.png b/gtk/src/gtk-2.0/default/assets/treeview-pan-down-active.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/treeview-pan-down-active.png
rename to gtk/src/gtk-2.0/default/assets/treeview-pan-down-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/treeview-pan-down-hover.png b/gtk/src/gtk-2.0/default/assets/treeview-pan-down-hover.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/treeview-pan-down-hover.png
rename to gtk/src/gtk-2.0/default/assets/treeview-pan-down-hover.png
diff --git a/gtk/src/blue/gtk-2.0/assets/treeview-pan-down.png b/gtk/src/gtk-2.0/default/assets/treeview-pan-down.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/treeview-pan-down.png
rename to gtk/src/gtk-2.0/default/assets/treeview-pan-down.png
diff --git a/gtk/src/blue/gtk-2.0/assets/treeview-pan-up-active.png b/gtk/src/gtk-2.0/default/assets/treeview-pan-up-active.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/treeview-pan-up-active.png
rename to gtk/src/gtk-2.0/default/assets/treeview-pan-up-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/treeview-pan-up-hover.png b/gtk/src/gtk-2.0/default/assets/treeview-pan-up-hover.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/treeview-pan-up-hover.png
rename to gtk/src/gtk-2.0/default/assets/treeview-pan-up-hover.png
diff --git a/gtk/src/blue/gtk-2.0/assets/treeview-pan-up.png b/gtk/src/gtk-2.0/default/assets/treeview-pan-up.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/treeview-pan-up.png
rename to gtk/src/gtk-2.0/default/assets/treeview-pan-up.png
diff --git a/gtk/src/blue/gtk-2.0/assets/treeview-separator-ltr.png b/gtk/src/gtk-2.0/default/assets/treeview-separator-ltr.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/treeview-separator-ltr.png
rename to gtk/src/gtk-2.0/default/assets/treeview-separator-ltr.png
diff --git a/gtk/src/blue/gtk-2.0/assets/treeview-separator-rtl.png b/gtk/src/gtk-2.0/default/assets/treeview-separator-rtl.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/treeview-separator-rtl.png
rename to gtk/src/gtk-2.0/default/assets/treeview-separator-rtl.png
diff --git a/gtk/src/gtk-2.0/default/gtkrc.in b/gtk/src/gtk-2.0/default/gtkrc.in
new file mode 100644
index 0000000000..56108e464e
--- /dev/null
+++ b/gtk/src/gtk-2.0/default/gtkrc.in
@@ -0,0 +1,50 @@
+# Based on Bridge by ScionicSpectre
+# vim:set ts=2 sw=2 sts=2 ai et:
+#
+# This is the GTK+ 2 version of Adwaita. It's whole purpose is to look as the
+# GTK+ 3 version as much as possible until GTK+ 2 dies completely.
+#
+# Note: comments for explaining styles are on the bottom of each file beside the
+# widget matches.
+
+# Declare the colours used throughout the theme.
+# There shouldn't be any fiddling with them in the theme files themselves in
+# order to not mess up the dark theme.
+
+# Text/base
+gtk-color-scheme = "text_color:@text_color@\nbase_color:@base_color@"
+# Foreground/background
+gtk-color-scheme = "fg_color:@fg_color@\nbg_color:@bg_color@"
+# Selected foreground/background
+gtk-color-scheme = "selected_fg_color:@selected_fg_color@\nselected_bg_color:@selected_bg_color@"
+# Insensitive foreground/background
+gtk-color-scheme = "insensitive_fg_color:@insensitive_fg_color@\ninsensitive_bg_color:@insensitive_bg_color@"
+# Menus
+gtk-color-scheme = "menu_color:@menu_color@\nmenubar_bg:@menubar_bg@"
+gtk-color-scheme = "menubar_fg:@menubar_fg@\nmenubar_insensitive_fg:@menubar_insensitive_fg@"
+# Links
+gtk-color-scheme = "link_color:@link_color@\nvisited_link_color:@visited_link_color@"
+# Treeview headers
+gtk-color-scheme = "column_header_color:@column_header_color@\nhover_column_header_color:@hover_column_header_color@"
+# Window decoration
+gtk-color-scheme = "menu_hover_color:@menu_hover_color@\nwindow_color:@window_color@"
+# Tooltips
+gtk-color-scheme = "tooltip_fg_color:@tooltip_fg_color@\ntooltip_bg_color:@tooltip_bg_color@"
+
+# Set GTK settings
+gtk-auto-mnemonics = 1
+gtk-primary-button-warps-slider = 1
+gtk-icon-sizes="gtk-menu=16,16:
+gtk-button=16,16:
+gtk-small-toolbar=16,16:
+
+gtk-dnd=16,16:
+gtk-dialog=16,16"
+gtk-toolbar-style = GTK_TOOLBAR_ICONS
+gtk-menu-images = 0
+gtk-menu-popup-delay = 0
+
+# And hand over the control to the theme files
+include "main.rc"
+include "apps.rc"
+include "hacks.rc"
diff --git a/gtk/src/bark/gtk-2.0/hacks.rc b/gtk/src/gtk-2.0/default/hacks.rc
similarity index 100%
rename from gtk/src/bark/gtk-2.0/hacks.rc
rename to gtk/src/gtk-2.0/default/hacks.rc
diff --git a/gtk/src/bark/gtk-2.0/main.rc b/gtk/src/gtk-2.0/default/main.rc
similarity index 100%
rename from gtk/src/bark/gtk-2.0/main.rc
rename to gtk/src/gtk-2.0/default/main.rc
diff --git a/gtk/src/blue-dark/gtk-2.0/apps.rc b/gtk/src/gtk-2.0/mate-dark/apps.rc
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/apps.rc
rename to gtk/src/gtk-2.0/mate-dark/apps.rc
diff --git a/gtk/src/mate-dark/gtk-2.0/assets-external.svg b/gtk/src/gtk-2.0/mate-dark/assets-external.svg
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets-external.svg
rename to gtk/src/gtk-2.0/mate-dark/assets-external.svg
diff --git a/gtk/src/blue-dark/gtk-2.0/assets-external.txt b/gtk/src/gtk-2.0/mate-dark/assets-external.txt
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets-external.txt
rename to gtk/src/gtk-2.0/mate-dark/assets-external.txt
diff --git a/gtk/src/mate-dark/gtk-2.0/assets.svg b/gtk/src/gtk-2.0/mate-dark/assets.svg
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets.svg
rename to gtk/src/gtk-2.0/mate-dark/assets.svg
diff --git a/gtk/src/blue-dark/gtk-2.0/assets.txt b/gtk/src/gtk-2.0/mate-dark/assets.txt
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets.txt
rename to gtk/src/gtk-2.0/mate-dark/assets.txt
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/border.png b/gtk/src/gtk-2.0/mate-dark/assets/border.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/border.png
rename to gtk/src/gtk-2.0/mate-dark/assets/border.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/button-active.png b/gtk/src/gtk-2.0/mate-dark/assets/button-active.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/button-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/button-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/button-hover.png b/gtk/src/gtk-2.0/mate-dark/assets/button-hover.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/button-hover.png
rename to gtk/src/gtk-2.0/mate-dark/assets/button-hover.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/button-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/button-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/button-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/button-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/button.png b/gtk/src/gtk-2.0/mate-dark/assets/button.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/button.png
rename to gtk/src/gtk-2.0/mate-dark/assets/button.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/checkbox-checked-active.png b/gtk/src/gtk-2.0/mate-dark/assets/checkbox-checked-active.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/checkbox-checked-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/checkbox-checked-active.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/checkbox-checked-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/checkbox-checked-insensitive.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/checkbox-checked-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/checkbox-checked-insensitive.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/checkbox-checked.png b/gtk/src/gtk-2.0/mate-dark/assets/checkbox-checked.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/checkbox-checked.png
rename to gtk/src/gtk-2.0/mate-dark/assets/checkbox-checked.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/checkbox-mixed-active.png b/gtk/src/gtk-2.0/mate-dark/assets/checkbox-mixed-active.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/checkbox-mixed-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/checkbox-mixed-active.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/checkbox-mixed-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/checkbox-mixed-insensitive.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/checkbox-mixed-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/checkbox-mixed-insensitive.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/checkbox-mixed.png b/gtk/src/gtk-2.0/mate-dark/assets/checkbox-mixed.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/checkbox-mixed.png
rename to gtk/src/gtk-2.0/mate-dark/assets/checkbox-mixed.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/checkbox-unchecked-active.png b/gtk/src/gtk-2.0/mate-dark/assets/checkbox-unchecked-active.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/checkbox-unchecked-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/checkbox-unchecked-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/checkbox-unchecked-hover.png b/gtk/src/gtk-2.0/mate-dark/assets/checkbox-unchecked-hover.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/checkbox-unchecked-hover.png
rename to gtk/src/gtk-2.0/mate-dark/assets/checkbox-unchecked-hover.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/checkbox-unchecked-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/checkbox-unchecked-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/checkbox-unchecked-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/checkbox-unchecked-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/checkbox-unchecked.png b/gtk/src/gtk-2.0/mate-dark/assets/checkbox-unchecked.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/checkbox-unchecked.png
rename to gtk/src/gtk-2.0/mate-dark/assets/checkbox-unchecked.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/combo-entry-ltr-button-active.png b/gtk/src/gtk-2.0/mate-dark/assets/combo-entry-ltr-button-active.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/combo-entry-ltr-button-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/combo-entry-ltr-button-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/combo-entry-ltr-button-hover.png b/gtk/src/gtk-2.0/mate-dark/assets/combo-entry-ltr-button-hover.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/combo-entry-ltr-button-hover.png
rename to gtk/src/gtk-2.0/mate-dark/assets/combo-entry-ltr-button-hover.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/combo-entry-ltr-button-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/combo-entry-ltr-button-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/combo-entry-ltr-button.png b/gtk/src/gtk-2.0/mate-dark/assets/combo-entry-ltr-button.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/combo-entry-ltr-button.png
rename to gtk/src/gtk-2.0/mate-dark/assets/combo-entry-ltr-button.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/combo-entry-ltr-entry-active.png b/gtk/src/gtk-2.0/mate-dark/assets/combo-entry-ltr-entry-active.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/combo-entry-ltr-entry-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/combo-entry-ltr-entry-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/combo-entry-ltr-entry-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/combo-entry-ltr-entry-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/combo-entry-ltr-entry.png b/gtk/src/gtk-2.0/mate-dark/assets/combo-entry-ltr-entry.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/combo-entry-ltr-entry.png
rename to gtk/src/gtk-2.0/mate-dark/assets/combo-entry-ltr-entry.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/combo-entry-rtl-button-active.png b/gtk/src/gtk-2.0/mate-dark/assets/combo-entry-rtl-button-active.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/combo-entry-rtl-button-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/combo-entry-rtl-button-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/combo-entry-rtl-button-hover.png b/gtk/src/gtk-2.0/mate-dark/assets/combo-entry-rtl-button-hover.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/combo-entry-rtl-button-hover.png
rename to gtk/src/gtk-2.0/mate-dark/assets/combo-entry-rtl-button-hover.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/combo-entry-rtl-button-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/combo-entry-rtl-button-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/combo-entry-rtl-button.png b/gtk/src/gtk-2.0/mate-dark/assets/combo-entry-rtl-button.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/combo-entry-rtl-button.png
rename to gtk/src/gtk-2.0/mate-dark/assets/combo-entry-rtl-button.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/combo-entry-rtl-entry-active.png b/gtk/src/gtk-2.0/mate-dark/assets/combo-entry-rtl-entry-active.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/combo-entry-rtl-entry-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/combo-entry-rtl-entry-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/combo-entry-rtl-entry-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/combo-entry-rtl-entry-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/combo-entry-rtl-entry.png b/gtk/src/gtk-2.0/mate-dark/assets/combo-entry-rtl-entry.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/combo-entry-rtl-entry.png
rename to gtk/src/gtk-2.0/mate-dark/assets/combo-entry-rtl-entry.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/entry-active.png b/gtk/src/gtk-2.0/mate-dark/assets/entry-active.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/entry-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/entry-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/entry-background-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/entry-background-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/entry-background-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/entry-background-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/entry-background.png b/gtk/src/gtk-2.0/mate-dark/assets/entry-background.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/entry-background.png
rename to gtk/src/gtk-2.0/mate-dark/assets/entry-background.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/entry-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/entry-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/entry-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/entry-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/entry.png b/gtk/src/gtk-2.0/mate-dark/assets/entry.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/entry.png
rename to gtk/src/gtk-2.0/mate-dark/assets/entry.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/focus.png b/gtk/src/gtk-2.0/mate-dark/assets/focus.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/focus.png
rename to gtk/src/gtk-2.0/mate-dark/assets/focus.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/frame-inline.png b/gtk/src/gtk-2.0/mate-dark/assets/frame-inline.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/frame-inline.png
rename to gtk/src/gtk-2.0/mate-dark/assets/frame-inline.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/frame-notebook.png b/gtk/src/gtk-2.0/mate-dark/assets/frame-notebook.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/frame-notebook.png
rename to gtk/src/gtk-2.0/mate-dark/assets/frame-notebook.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/frame.png b/gtk/src/gtk-2.0/mate-dark/assets/frame.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/frame.png
rename to gtk/src/gtk-2.0/mate-dark/assets/frame.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/handle-horz.png b/gtk/src/gtk-2.0/mate-dark/assets/handle-horz.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/handle-horz.png
rename to gtk/src/gtk-2.0/mate-dark/assets/handle-horz.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/handle-vert.png b/gtk/src/gtk-2.0/mate-dark/assets/handle-vert.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/handle-vert.png
rename to gtk/src/gtk-2.0/mate-dark/assets/handle-vert.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/handle.png b/gtk/src/gtk-2.0/mate-dark/assets/handle.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/handle.png
rename to gtk/src/gtk-2.0/mate-dark/assets/handle.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/line.png b/gtk/src/gtk-2.0/mate-dark/assets/line.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/line.png
rename to gtk/src/gtk-2.0/mate-dark/assets/line.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-border.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-border.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/menu-border.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-border.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-checkbox-checked-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-checkbox-checked-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-checkbox-checked-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-checkbox-checked-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-checkbox-checked.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-checkbox-checked.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-checkbox-checked.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-checkbox-checked.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-checkbox-hover.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-checkbox-hover.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-checkbox-hover.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-checkbox-hover.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-checkbox-insensitive.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-checkbox-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-checkbox-mixed-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-checkbox-mixed-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-checkbox-mixed.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-checkbox-mixed.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-checkbox-mixed.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-checkbox-mixed.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-checkbox.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/menu-checkbox.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-checkbox.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-pan-down-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-pan-down-insensitive.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/menu-pan-down-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-pan-down-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-pan-down.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-pan-down.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-pan-down.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-pan-down.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-pan-left-hover.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-pan-left-hover.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/menu-pan-left-hover.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-pan-left-hover.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-pan-left-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-pan-left-insensitive.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/menu-pan-left-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-pan-left-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-pan-left.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-pan-left.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-pan-left.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-pan-left.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-pan-right-hover.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-pan-right-hover.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/menu-pan-right-hover.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-pan-right-hover.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-pan-right-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-pan-right-insensitive.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/menu-pan-right-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-pan-right-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-pan-right.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-pan-right.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-pan-right.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-pan-right.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-pan-up-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-pan-up-insensitive.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/menu-pan-up-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-pan-up-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-pan-up.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-pan-up.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-pan-up.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-pan-up.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-radio-checked-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-radio-checked-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-radio-checked-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-radio-checked-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-radio-checked.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-radio-checked.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-radio-checked.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-radio-checked.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-radio-hover.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-radio-hover.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-radio-hover.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-radio-hover.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-radio-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-radio-insensitive.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/menu-radio-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-radio-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-radio-mixed-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-radio-mixed-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-radio-mixed-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-radio-mixed-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/menu-radio-mixed.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-radio-mixed.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/menu-radio-mixed.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-radio-mixed.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/menu-radio.png b/gtk/src/gtk-2.0/mate-dark/assets/menu-radio.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/menu-radio.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menu-radio.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/menubar-item-active.png b/gtk/src/gtk-2.0/mate-dark/assets/menubar-item-active.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/menubar-item-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/menubar-item-active.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png b/gtk/src/gtk-2.0/mate-dark/assets/notebook-combo-entry-ltr-entry-active.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/notebook-combo-entry-ltr-entry-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/notebook-combo-entry-ltr-entry-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/notebook-combo-entry-ltr-entry-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png b/gtk/src/gtk-2.0/mate-dark/assets/notebook-combo-entry-ltr-entry.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png
rename to gtk/src/gtk-2.0/mate-dark/assets/notebook-combo-entry-ltr-entry.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png b/gtk/src/gtk-2.0/mate-dark/assets/notebook-combo-entry-rtl-entry-active.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/notebook-combo-entry-rtl-entry-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/notebook-combo-entry-rtl-entry-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/notebook-combo-entry-rtl-entry-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png b/gtk/src/gtk-2.0/mate-dark/assets/notebook-combo-entry-rtl-entry.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png
rename to gtk/src/gtk-2.0/mate-dark/assets/notebook-combo-entry-rtl-entry.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/notebook-entry-active.png b/gtk/src/gtk-2.0/mate-dark/assets/notebook-entry-active.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/notebook-entry-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/notebook-entry-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/notebook-entry-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/notebook-entry-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/notebook-entry-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/notebook-entry-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/notebook-entry.png b/gtk/src/gtk-2.0/mate-dark/assets/notebook-entry.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/notebook-entry.png
rename to gtk/src/gtk-2.0/mate-dark/assets/notebook-entry.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/pan-down-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/pan-down-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/pan-down-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/pan-down-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/pan-down.png b/gtk/src/gtk-2.0/mate-dark/assets/pan-down.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/pan-down.png
rename to gtk/src/gtk-2.0/mate-dark/assets/pan-down.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/pan-left-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/pan-left-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/pan-left-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/pan-left-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/pan-left-semi.png b/gtk/src/gtk-2.0/mate-dark/assets/pan-left-semi.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/pan-left-semi.png
rename to gtk/src/gtk-2.0/mate-dark/assets/pan-left-semi.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/pan-left.png b/gtk/src/gtk-2.0/mate-dark/assets/pan-left.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/pan-left.png
rename to gtk/src/gtk-2.0/mate-dark/assets/pan-left.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/pan-right-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/pan-right-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/pan-right-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/pan-right-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/pan-right-semi.png b/gtk/src/gtk-2.0/mate-dark/assets/pan-right-semi.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/pan-right-semi.png
rename to gtk/src/gtk-2.0/mate-dark/assets/pan-right-semi.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/pan-right.png b/gtk/src/gtk-2.0/mate-dark/assets/pan-right.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/pan-right.png
rename to gtk/src/gtk-2.0/mate-dark/assets/pan-right.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/pan-up-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/pan-up-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/pan-up-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/pan-up-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/pan-up.png b/gtk/src/gtk-2.0/mate-dark/assets/pan-up.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/pan-up.png
rename to gtk/src/gtk-2.0/mate-dark/assets/pan-up.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/progressbar-horz-trough.png b/gtk/src/gtk-2.0/mate-dark/assets/progressbar-horz-trough.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/progressbar-horz-trough.png
rename to gtk/src/gtk-2.0/mate-dark/assets/progressbar-horz-trough.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/progressbar-horz.png b/gtk/src/gtk-2.0/mate-dark/assets/progressbar-horz.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/progressbar-horz.png
rename to gtk/src/gtk-2.0/mate-dark/assets/progressbar-horz.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/progressbar-vert-trough.png b/gtk/src/gtk-2.0/mate-dark/assets/progressbar-vert-trough.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/progressbar-vert-trough.png
rename to gtk/src/gtk-2.0/mate-dark/assets/progressbar-vert-trough.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/progressbar-vert.png b/gtk/src/gtk-2.0/mate-dark/assets/progressbar-vert.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/progressbar-vert.png
rename to gtk/src/gtk-2.0/mate-dark/assets/progressbar-vert.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/radio-checked-active.png b/gtk/src/gtk-2.0/mate-dark/assets/radio-checked-active.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/radio-checked-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/radio-checked-active.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/radio-checked-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/radio-checked-insensitive.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/radio-checked-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/radio-checked-insensitive.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/radio-checked.png b/gtk/src/gtk-2.0/mate-dark/assets/radio-checked.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/radio-checked.png
rename to gtk/src/gtk-2.0/mate-dark/assets/radio-checked.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/radio-mixed-active.png b/gtk/src/gtk-2.0/mate-dark/assets/radio-mixed-active.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/radio-mixed-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/radio-mixed-active.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/radio-mixed-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/radio-mixed-insensitive.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/radio-mixed-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/radio-mixed-insensitive.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/radio-mixed.png b/gtk/src/gtk-2.0/mate-dark/assets/radio-mixed.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/radio-mixed.png
rename to gtk/src/gtk-2.0/mate-dark/assets/radio-mixed.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/radio-unchecked-active.png b/gtk/src/gtk-2.0/mate-dark/assets/radio-unchecked-active.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/radio-unchecked-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/radio-unchecked-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/radio-unchecked-hover.png b/gtk/src/gtk-2.0/mate-dark/assets/radio-unchecked-hover.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/radio-unchecked-hover.png
rename to gtk/src/gtk-2.0/mate-dark/assets/radio-unchecked-hover.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/radio-unchecked-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/radio-unchecked-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/radio-unchecked-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/radio-unchecked-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/radio-unchecked.png b/gtk/src/gtk-2.0/mate-dark/assets/radio-unchecked.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/radio-unchecked.png
rename to gtk/src/gtk-2.0/mate-dark/assets/radio-unchecked.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scale-horz-focus.png b/gtk/src/gtk-2.0/mate-dark/assets/scale-horz-focus.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/scale-horz-focus.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scale-horz-focus.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/scale-horz-trough-active.png b/gtk/src/gtk-2.0/mate-dark/assets/scale-horz-trough-active.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/scale-horz-trough-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scale-horz-trough-active.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scale-horz-trough.png b/gtk/src/gtk-2.0/mate-dark/assets/scale-horz-trough.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/scale-horz-trough.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scale-horz-trough.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/scale-slider-active.png b/gtk/src/gtk-2.0/mate-dark/assets/scale-slider-active.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/scale-slider-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scale-slider-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scale-slider-hover.png b/gtk/src/gtk-2.0/mate-dark/assets/scale-slider-hover.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/scale-slider-hover.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scale-slider-hover.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scale-slider-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/scale-slider-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/scale-slider-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scale-slider-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scale-slider.png b/gtk/src/gtk-2.0/mate-dark/assets/scale-slider.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/scale-slider.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scale-slider.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/scale-vert-trough-active.png b/gtk/src/gtk-2.0/mate-dark/assets/scale-vert-trough-active.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/scale-vert-trough-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scale-vert-trough-active.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scale-vert-trough.png b/gtk/src/gtk-2.0/mate-dark/assets/scale-vert-trough.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/scale-vert-trough.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scale-vert-trough.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/scrollbar-horz-slider-active.png b/gtk/src/gtk-2.0/mate-dark/assets/scrollbar-horz-slider-active.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/scrollbar-horz-slider-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scrollbar-horz-slider-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scrollbar-horz-slider-hover.png b/gtk/src/gtk-2.0/mate-dark/assets/scrollbar-horz-slider-hover.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/scrollbar-horz-slider-hover.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scrollbar-horz-slider-hover.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-horz-slider.png b/gtk/src/gtk-2.0/mate-dark/assets/scrollbar-horz-slider.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/scrollbar-horz-slider.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scrollbar-horz-slider.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scrollbar-horz-trough.png b/gtk/src/gtk-2.0/mate-dark/assets/scrollbar-horz-trough.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/scrollbar-horz-trough.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scrollbar-horz-trough.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png b/gtk/src/gtk-2.0/mate-dark/assets/scrollbar-vert-slider-active-rtl.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scrollbar-vert-slider-active-rtl.png
diff --git a/gtk/src/mate-dark/gtk-2.0/assets/scrollbar-vert-slider-active.png b/gtk/src/gtk-2.0/mate-dark/assets/scrollbar-vert-slider-active.png
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/assets/scrollbar-vert-slider-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scrollbar-vert-slider-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png b/gtk/src/gtk-2.0/mate-dark/assets/scrollbar-vert-slider-hover-rtl.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scrollbar-vert-slider-hover-rtl.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scrollbar-vert-slider-hover.png b/gtk/src/gtk-2.0/mate-dark/assets/scrollbar-vert-slider-hover.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/scrollbar-vert-slider-hover.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scrollbar-vert-slider-hover.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-slider-rtl.png b/gtk/src/gtk-2.0/mate-dark/assets/scrollbar-vert-slider-rtl.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-slider-rtl.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scrollbar-vert-slider-rtl.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-slider.png b/gtk/src/gtk-2.0/mate-dark/assets/scrollbar-vert-slider.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/scrollbar-vert-slider.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scrollbar-vert-slider.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scrollbar-vert-trough-rtl.png b/gtk/src/gtk-2.0/mate-dark/assets/scrollbar-vert-trough-rtl.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/scrollbar-vert-trough-rtl.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scrollbar-vert-trough-rtl.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/scrollbar-vert-trough.png b/gtk/src/gtk-2.0/mate-dark/assets/scrollbar-vert-trough.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/scrollbar-vert-trough.png
rename to gtk/src/gtk-2.0/mate-dark/assets/scrollbar-vert-trough.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-down-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-down-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-down-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-down-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-down.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-down.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-down.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-down.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-ltr-down-active.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-ltr-down-active.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-ltr-down-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-ltr-down-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-ltr-down-hover.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-ltr-down-hover.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-ltr-down-hover.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-ltr-down-hover.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-ltr-down-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-ltr-down-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-ltr-down-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-ltr-down-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-ltr-down.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-ltr-down.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-ltr-down.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-ltr-down.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-ltr-up-active.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-ltr-up-active.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-ltr-up-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-ltr-up-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-ltr-up-hover.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-ltr-up-hover.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-ltr-up-hover.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-ltr-up-hover.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-ltr-up-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-ltr-up-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-ltr-up-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-ltr-up-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-ltr-up.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-ltr-up.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-ltr-up.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-ltr-up.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-rtl-down-active.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-rtl-down-active.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-rtl-down-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-rtl-down-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-rtl-down-hover.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-rtl-down-hover.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-rtl-down-hover.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-rtl-down-hover.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-rtl-down-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-rtl-down-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-rtl-down-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-rtl-down-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-rtl-down.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-rtl-down.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-rtl-down.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-rtl-down.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-rtl-up-active.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-rtl-up-active.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-rtl-up-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-rtl-up-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-rtl-up-hover.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-rtl-up-hover.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-rtl-up-hover.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-rtl-up-hover.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-rtl-up-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-rtl-up-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-rtl-up-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-rtl-up-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-rtl-up.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-rtl-up.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-rtl-up.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-rtl-up.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-up-insensitive.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-up-insensitive.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-up-insensitive.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-up-insensitive.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/spin-up.png b/gtk/src/gtk-2.0/mate-dark/assets/spin-up.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/spin-up.png
rename to gtk/src/gtk-2.0/mate-dark/assets/spin-up.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/tab-down-active.png b/gtk/src/gtk-2.0/mate-dark/assets/tab-down-active.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/tab-down-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/tab-down-active.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/tab-down.png b/gtk/src/gtk-2.0/mate-dark/assets/tab-down.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/tab-down.png
rename to gtk/src/gtk-2.0/mate-dark/assets/tab-down.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/tab-horz-gap.png b/gtk/src/gtk-2.0/mate-dark/assets/tab-horz-gap.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/tab-horz-gap.png
rename to gtk/src/gtk-2.0/mate-dark/assets/tab-horz-gap.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/tab-left-active.png b/gtk/src/gtk-2.0/mate-dark/assets/tab-left-active.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/tab-left-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/tab-left-active.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/tab-left.png b/gtk/src/gtk-2.0/mate-dark/assets/tab-left.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/tab-left.png
rename to gtk/src/gtk-2.0/mate-dark/assets/tab-left.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/tab-right-active.png b/gtk/src/gtk-2.0/mate-dark/assets/tab-right-active.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/tab-right-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/tab-right-active.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/tab-right.png b/gtk/src/gtk-2.0/mate-dark/assets/tab-right.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/tab-right.png
rename to gtk/src/gtk-2.0/mate-dark/assets/tab-right.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/tab-up-active.png b/gtk/src/gtk-2.0/mate-dark/assets/tab-up-active.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/tab-up-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/tab-up-active.png
diff --git a/gtk/src/blue-dark/gtk-2.0/assets/tab-up.png b/gtk/src/gtk-2.0/mate-dark/assets/tab-up.png
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/assets/tab-up.png
rename to gtk/src/gtk-2.0/mate-dark/assets/tab-up.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/tab-vert-gap.png b/gtk/src/gtk-2.0/mate-dark/assets/tab-vert-gap.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/tab-vert-gap.png
rename to gtk/src/gtk-2.0/mate-dark/assets/tab-vert-gap.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/treeview-header-button.png b/gtk/src/gtk-2.0/mate-dark/assets/treeview-header-button.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/treeview-header-button.png
rename to gtk/src/gtk-2.0/mate-dark/assets/treeview-header-button.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/treeview-pan-down-active.png b/gtk/src/gtk-2.0/mate-dark/assets/treeview-pan-down-active.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/treeview-pan-down-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/treeview-pan-down-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/treeview-pan-down-hover.png b/gtk/src/gtk-2.0/mate-dark/assets/treeview-pan-down-hover.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/treeview-pan-down-hover.png
rename to gtk/src/gtk-2.0/mate-dark/assets/treeview-pan-down-hover.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/treeview-pan-down.png b/gtk/src/gtk-2.0/mate-dark/assets/treeview-pan-down.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/treeview-pan-down.png
rename to gtk/src/gtk-2.0/mate-dark/assets/treeview-pan-down.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/treeview-pan-up-active.png b/gtk/src/gtk-2.0/mate-dark/assets/treeview-pan-up-active.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/treeview-pan-up-active.png
rename to gtk/src/gtk-2.0/mate-dark/assets/treeview-pan-up-active.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/treeview-pan-up-hover.png b/gtk/src/gtk-2.0/mate-dark/assets/treeview-pan-up-hover.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/treeview-pan-up-hover.png
rename to gtk/src/gtk-2.0/mate-dark/assets/treeview-pan-up-hover.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/treeview-pan-up.png b/gtk/src/gtk-2.0/mate-dark/assets/treeview-pan-up.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/treeview-pan-up.png
rename to gtk/src/gtk-2.0/mate-dark/assets/treeview-pan-up.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/treeview-separator-ltr.png b/gtk/src/gtk-2.0/mate-dark/assets/treeview-separator-ltr.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/treeview-separator-ltr.png
rename to gtk/src/gtk-2.0/mate-dark/assets/treeview-separator-ltr.png
diff --git a/gtk/src/bark-dark/gtk-2.0/assets/treeview-separator-rtl.png b/gtk/src/gtk-2.0/mate-dark/assets/treeview-separator-rtl.png
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/assets/treeview-separator-rtl.png
rename to gtk/src/gtk-2.0/mate-dark/assets/treeview-separator-rtl.png
diff --git a/gtk/src/mate-dark/gtk-2.0/gtkrc b/gtk/src/gtk-2.0/mate-dark/gtkrc
similarity index 100%
rename from gtk/src/mate-dark/gtk-2.0/gtkrc
rename to gtk/src/gtk-2.0/mate-dark/gtkrc
diff --git a/gtk/src/gtk-2.0/mate-dark/gtkrc.in b/gtk/src/gtk-2.0/mate-dark/gtkrc.in
new file mode 100644
index 0000000000..692fbabebc
--- /dev/null
+++ b/gtk/src/gtk-2.0/mate-dark/gtkrc.in
@@ -0,0 +1,50 @@
+# Based on Bridge by ScionicSpectre
+# vim:set ts=2 sw=2 sts=2 ai et:
+#
+# This is the GTK+ 2 version of Adwaita. It's whole purpose is to look as the
+# GTK+ 3 version as much as possible until GTK+ 2 dies completely.
+#
+# Note: comments for explaining styles are on the bottom of each file beside the
+# widget matches.
+
+# Declare the colours used throughout the theme.
+# There shouldn't be any fiddling with them in the theme files themselves in
+# order to not mess up the dark theme.
+
+# Text/base
+gtk-color-scheme = "text_color:#5D5D5D\nbase_color:#FFFFFF"
+# Foreground/background
+gtk-color-scheme = "fg_color:#3D3D3D\nbg_color:#F5F6F7"
+# Selected foreground/background
+gtk-color-scheme = "selected_fg_color:#ffffff\nselected_bg_color:@selected_bg_color@"
+# Insensitive foreground/background
+gtk-color-scheme = "insensitive_fg_color:#8b8e8f\ninsensitive_bg_color:#f1f1f1"
+# Menus
+gtk-color-scheme = "menu_color:#fafafa\nmenubar_bg:#f5f6f7"
+gtk-color-scheme = "menubar_fg:#3d3d3d\nmenubar_insensitive_fg:#3d3d3d"
+# Links
+gtk-color-scheme = "link_color:#19B6EE\nvisited_link_color:#0b7196"
+# Treeview headers
+gtk-color-scheme = "column_header_color:#979a9b\nhover_column_header_color:#636769"
+# Window decoration
+gtk-color-scheme = "menu_hover_color:#e2e2e2\nwindow_color:#f4f4f4"
+# Tooltips
+gtk-color-scheme = "tooltip_fg_color:#ffffff\ntooltip_bg_color:#343434"
+
+# Set GTK settings
+gtk-auto-mnemonics = 1
+gtk-primary-button-warps-slider = 1
+gtk-icon-sizes="gtk-menu=16,16:
+gtk-button=16,16:
+gtk-small-toolbar=16,16:
+
+gtk-dnd=16,16:
+gtk-dialog=16,16"
+gtk-toolbar-style = GTK_TOOLBAR_ICONS
+gtk-menu-images = 0
+gtk-menu-popup-delay = 0
+
+# And hand over the control to the theme files
+include "main.rc"
+include "apps.rc"
+include "hacks.rc"
diff --git a/gtk/src/blue-dark/gtk-2.0/hacks.rc b/gtk/src/gtk-2.0/mate-dark/hacks.rc
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/hacks.rc
rename to gtk/src/gtk-2.0/mate-dark/hacks.rc
diff --git a/gtk/src/blue-dark/gtk-2.0/main.rc b/gtk/src/gtk-2.0/mate-dark/main.rc
similarity index 100%
rename from gtk/src/blue-dark/gtk-2.0/main.rc
rename to gtk/src/gtk-2.0/mate-dark/main.rc
diff --git a/gtk/src/blue/gtk-2.0/apps.rc b/gtk/src/gtk-2.0/mate/apps.rc
similarity index 100%
rename from gtk/src/blue/gtk-2.0/apps.rc
rename to gtk/src/gtk-2.0/mate/apps.rc
diff --git a/gtk/src/mate/gtk-2.0/assets-external.svg b/gtk/src/gtk-2.0/mate/assets-external.svg
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets-external.svg
rename to gtk/src/gtk-2.0/mate/assets-external.svg
diff --git a/gtk/src/blue/gtk-2.0/assets-external.txt b/gtk/src/gtk-2.0/mate/assets-external.txt
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets-external.txt
rename to gtk/src/gtk-2.0/mate/assets-external.txt
diff --git a/gtk/src/mate/gtk-2.0/assets.svg b/gtk/src/gtk-2.0/mate/assets.svg
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets.svg
rename to gtk/src/gtk-2.0/mate/assets.svg
diff --git a/gtk/src/blue/gtk-2.0/assets.txt b/gtk/src/gtk-2.0/mate/assets.txt
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets.txt
rename to gtk/src/gtk-2.0/mate/assets.txt
diff --git a/gtk/src/blue/gtk-2.0/assets/border.png b/gtk/src/gtk-2.0/mate/assets/border.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/border.png
rename to gtk/src/gtk-2.0/mate/assets/border.png
diff --git a/gtk/src/default/gtk-2.0/assets/button-active.png b/gtk/src/gtk-2.0/mate/assets/button-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/button-active.png
rename to gtk/src/gtk-2.0/mate/assets/button-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/button-hover.png b/gtk/src/gtk-2.0/mate/assets/button-hover.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/button-hover.png
rename to gtk/src/gtk-2.0/mate/assets/button-hover.png
diff --git a/gtk/src/default/gtk-2.0/assets/button-insensitive.png b/gtk/src/gtk-2.0/mate/assets/button-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/button-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/button-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/button.png b/gtk/src/gtk-2.0/mate/assets/button.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/button.png
rename to gtk/src/gtk-2.0/mate/assets/button.png
diff --git a/gtk/src/mate/gtk-2.0/assets/checkbox-checked-active.png b/gtk/src/gtk-2.0/mate/assets/checkbox-checked-active.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/checkbox-checked-active.png
rename to gtk/src/gtk-2.0/mate/assets/checkbox-checked-active.png
diff --git a/gtk/src/mate/gtk-2.0/assets/checkbox-checked-insensitive.png b/gtk/src/gtk-2.0/mate/assets/checkbox-checked-insensitive.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/checkbox-checked-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/checkbox-checked-insensitive.png
diff --git a/gtk/src/mate/gtk-2.0/assets/checkbox-checked.png b/gtk/src/gtk-2.0/mate/assets/checkbox-checked.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/checkbox-checked.png
rename to gtk/src/gtk-2.0/mate/assets/checkbox-checked.png
diff --git a/gtk/src/mate/gtk-2.0/assets/checkbox-mixed-active.png b/gtk/src/gtk-2.0/mate/assets/checkbox-mixed-active.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/checkbox-mixed-active.png
rename to gtk/src/gtk-2.0/mate/assets/checkbox-mixed-active.png
diff --git a/gtk/src/mate/gtk-2.0/assets/checkbox-mixed-insensitive.png b/gtk/src/gtk-2.0/mate/assets/checkbox-mixed-insensitive.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/checkbox-mixed-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/checkbox-mixed-insensitive.png
diff --git a/gtk/src/mate/gtk-2.0/assets/checkbox-mixed.png b/gtk/src/gtk-2.0/mate/assets/checkbox-mixed.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/checkbox-mixed.png
rename to gtk/src/gtk-2.0/mate/assets/checkbox-mixed.png
diff --git a/gtk/src/default/gtk-2.0/assets/checkbox-unchecked-active.png b/gtk/src/gtk-2.0/mate/assets/checkbox-unchecked-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/checkbox-unchecked-active.png
rename to gtk/src/gtk-2.0/mate/assets/checkbox-unchecked-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/checkbox-unchecked-hover.png b/gtk/src/gtk-2.0/mate/assets/checkbox-unchecked-hover.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/checkbox-unchecked-hover.png
rename to gtk/src/gtk-2.0/mate/assets/checkbox-unchecked-hover.png
diff --git a/gtk/src/default/gtk-2.0/assets/checkbox-unchecked-insensitive.png b/gtk/src/gtk-2.0/mate/assets/checkbox-unchecked-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/checkbox-unchecked-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/checkbox-unchecked-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/checkbox-unchecked.png b/gtk/src/gtk-2.0/mate/assets/checkbox-unchecked.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/checkbox-unchecked.png
rename to gtk/src/gtk-2.0/mate/assets/checkbox-unchecked.png
diff --git a/gtk/src/default/gtk-2.0/assets/combo-entry-ltr-button-active.png b/gtk/src/gtk-2.0/mate/assets/combo-entry-ltr-button-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/combo-entry-ltr-button-active.png
rename to gtk/src/gtk-2.0/mate/assets/combo-entry-ltr-button-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/combo-entry-ltr-button-hover.png b/gtk/src/gtk-2.0/mate/assets/combo-entry-ltr-button-hover.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/combo-entry-ltr-button-hover.png
rename to gtk/src/gtk-2.0/mate/assets/combo-entry-ltr-button-hover.png
diff --git a/gtk/src/default/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png b/gtk/src/gtk-2.0/mate/assets/combo-entry-ltr-button-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/combo-entry-ltr-button-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/combo-entry-ltr-button.png b/gtk/src/gtk-2.0/mate/assets/combo-entry-ltr-button.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/combo-entry-ltr-button.png
rename to gtk/src/gtk-2.0/mate/assets/combo-entry-ltr-button.png
diff --git a/gtk/src/mate/gtk-2.0/assets/combo-entry-ltr-entry-active.png b/gtk/src/gtk-2.0/mate/assets/combo-entry-ltr-entry-active.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/combo-entry-ltr-entry-active.png
rename to gtk/src/gtk-2.0/mate/assets/combo-entry-ltr-entry-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png b/gtk/src/gtk-2.0/mate/assets/combo-entry-ltr-entry-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/combo-entry-ltr-entry-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/combo-entry-ltr-entry.png b/gtk/src/gtk-2.0/mate/assets/combo-entry-ltr-entry.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/combo-entry-ltr-entry.png
rename to gtk/src/gtk-2.0/mate/assets/combo-entry-ltr-entry.png
diff --git a/gtk/src/default/gtk-2.0/assets/combo-entry-rtl-button-active.png b/gtk/src/gtk-2.0/mate/assets/combo-entry-rtl-button-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/combo-entry-rtl-button-active.png
rename to gtk/src/gtk-2.0/mate/assets/combo-entry-rtl-button-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/combo-entry-rtl-button-hover.png b/gtk/src/gtk-2.0/mate/assets/combo-entry-rtl-button-hover.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/combo-entry-rtl-button-hover.png
rename to gtk/src/gtk-2.0/mate/assets/combo-entry-rtl-button-hover.png
diff --git a/gtk/src/default/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png b/gtk/src/gtk-2.0/mate/assets/combo-entry-rtl-button-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/combo-entry-rtl-button-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/combo-entry-rtl-button.png b/gtk/src/gtk-2.0/mate/assets/combo-entry-rtl-button.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/combo-entry-rtl-button.png
rename to gtk/src/gtk-2.0/mate/assets/combo-entry-rtl-button.png
diff --git a/gtk/src/mate/gtk-2.0/assets/combo-entry-rtl-entry-active.png b/gtk/src/gtk-2.0/mate/assets/combo-entry-rtl-entry-active.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/combo-entry-rtl-entry-active.png
rename to gtk/src/gtk-2.0/mate/assets/combo-entry-rtl-entry-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png b/gtk/src/gtk-2.0/mate/assets/combo-entry-rtl-entry-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/combo-entry-rtl-entry-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/combo-entry-rtl-entry.png b/gtk/src/gtk-2.0/mate/assets/combo-entry-rtl-entry.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/combo-entry-rtl-entry.png
rename to gtk/src/gtk-2.0/mate/assets/combo-entry-rtl-entry.png
diff --git a/gtk/src/mate/gtk-2.0/assets/entry-active.png b/gtk/src/gtk-2.0/mate/assets/entry-active.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/entry-active.png
rename to gtk/src/gtk-2.0/mate/assets/entry-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/entry-background-insensitive.png b/gtk/src/gtk-2.0/mate/assets/entry-background-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/entry-background-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/entry-background-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/entry-background.png b/gtk/src/gtk-2.0/mate/assets/entry-background.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/entry-background.png
rename to gtk/src/gtk-2.0/mate/assets/entry-background.png
diff --git a/gtk/src/default/gtk-2.0/assets/entry-insensitive.png b/gtk/src/gtk-2.0/mate/assets/entry-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/entry-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/entry-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/entry.png b/gtk/src/gtk-2.0/mate/assets/entry.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/entry.png
rename to gtk/src/gtk-2.0/mate/assets/entry.png
diff --git a/gtk/src/mate/gtk-2.0/assets/focus.png b/gtk/src/gtk-2.0/mate/assets/focus.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/focus.png
rename to gtk/src/gtk-2.0/mate/assets/focus.png
diff --git a/gtk/src/default/gtk-2.0/assets/frame-inline.png b/gtk/src/gtk-2.0/mate/assets/frame-inline.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/frame-inline.png
rename to gtk/src/gtk-2.0/mate/assets/frame-inline.png
diff --git a/gtk/src/default/gtk-2.0/assets/frame-notebook.png b/gtk/src/gtk-2.0/mate/assets/frame-notebook.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/frame-notebook.png
rename to gtk/src/gtk-2.0/mate/assets/frame-notebook.png
diff --git a/gtk/src/default/gtk-2.0/assets/frame.png b/gtk/src/gtk-2.0/mate/assets/frame.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/frame.png
rename to gtk/src/gtk-2.0/mate/assets/frame.png
diff --git a/gtk/src/default/gtk-2.0/assets/handle-horz.png b/gtk/src/gtk-2.0/mate/assets/handle-horz.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/handle-horz.png
rename to gtk/src/gtk-2.0/mate/assets/handle-horz.png
diff --git a/gtk/src/default/gtk-2.0/assets/handle-vert.png b/gtk/src/gtk-2.0/mate/assets/handle-vert.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/handle-vert.png
rename to gtk/src/gtk-2.0/mate/assets/handle-vert.png
diff --git a/gtk/src/blue/gtk-2.0/assets/handle.png b/gtk/src/gtk-2.0/mate/assets/handle.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/handle.png
rename to gtk/src/gtk-2.0/mate/assets/handle.png
diff --git a/gtk/src/default/gtk-2.0/assets/line.png b/gtk/src/gtk-2.0/mate/assets/line.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/line.png
rename to gtk/src/gtk-2.0/mate/assets/line.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-border.png b/gtk/src/gtk-2.0/mate/assets/menu-border.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-border.png
rename to gtk/src/gtk-2.0/mate/assets/menu-border.png
diff --git a/gtk/src/default/gtk-2.0/assets/menu-checkbox-checked-insensitive.png b/gtk/src/gtk-2.0/mate/assets/menu-checkbox-checked-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/menu-checkbox-checked-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/menu-checkbox-checked-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/menu-checkbox-checked.png b/gtk/src/gtk-2.0/mate/assets/menu-checkbox-checked.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/menu-checkbox-checked.png
rename to gtk/src/gtk-2.0/mate/assets/menu-checkbox-checked.png
diff --git a/gtk/src/default/gtk-2.0/assets/menu-checkbox-hover.png b/gtk/src/gtk-2.0/mate/assets/menu-checkbox-hover.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/menu-checkbox-hover.png
rename to gtk/src/gtk-2.0/mate/assets/menu-checkbox-hover.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-checkbox-insensitive.png b/gtk/src/gtk-2.0/mate/assets/menu-checkbox-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-checkbox-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/menu-checkbox-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png b/gtk/src/gtk-2.0/mate/assets/menu-checkbox-mixed-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/menu-checkbox-mixed-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/menu-checkbox-mixed.png b/gtk/src/gtk-2.0/mate/assets/menu-checkbox-mixed.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/menu-checkbox-mixed.png
rename to gtk/src/gtk-2.0/mate/assets/menu-checkbox-mixed.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-checkbox.png b/gtk/src/gtk-2.0/mate/assets/menu-checkbox.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-checkbox.png
rename to gtk/src/gtk-2.0/mate/assets/menu-checkbox.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-pan-down-insensitive.png b/gtk/src/gtk-2.0/mate/assets/menu-pan-down-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-pan-down-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/menu-pan-down-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/menu-pan-down.png b/gtk/src/gtk-2.0/mate/assets/menu-pan-down.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/menu-pan-down.png
rename to gtk/src/gtk-2.0/mate/assets/menu-pan-down.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-pan-left-hover.png b/gtk/src/gtk-2.0/mate/assets/menu-pan-left-hover.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-pan-left-hover.png
rename to gtk/src/gtk-2.0/mate/assets/menu-pan-left-hover.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-pan-left-insensitive.png b/gtk/src/gtk-2.0/mate/assets/menu-pan-left-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-pan-left-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/menu-pan-left-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/menu-pan-left.png b/gtk/src/gtk-2.0/mate/assets/menu-pan-left.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/menu-pan-left.png
rename to gtk/src/gtk-2.0/mate/assets/menu-pan-left.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-pan-right-hover.png b/gtk/src/gtk-2.0/mate/assets/menu-pan-right-hover.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-pan-right-hover.png
rename to gtk/src/gtk-2.0/mate/assets/menu-pan-right-hover.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-pan-right-insensitive.png b/gtk/src/gtk-2.0/mate/assets/menu-pan-right-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-pan-right-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/menu-pan-right-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/menu-pan-right.png b/gtk/src/gtk-2.0/mate/assets/menu-pan-right.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/menu-pan-right.png
rename to gtk/src/gtk-2.0/mate/assets/menu-pan-right.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-pan-up-insensitive.png b/gtk/src/gtk-2.0/mate/assets/menu-pan-up-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-pan-up-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/menu-pan-up-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/menu-pan-up.png b/gtk/src/gtk-2.0/mate/assets/menu-pan-up.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/menu-pan-up.png
rename to gtk/src/gtk-2.0/mate/assets/menu-pan-up.png
diff --git a/gtk/src/default/gtk-2.0/assets/menu-radio-checked-insensitive.png b/gtk/src/gtk-2.0/mate/assets/menu-radio-checked-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/menu-radio-checked-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/menu-radio-checked-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/menu-radio-checked.png b/gtk/src/gtk-2.0/mate/assets/menu-radio-checked.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/menu-radio-checked.png
rename to gtk/src/gtk-2.0/mate/assets/menu-radio-checked.png
diff --git a/gtk/src/default/gtk-2.0/assets/menu-radio-hover.png b/gtk/src/gtk-2.0/mate/assets/menu-radio-hover.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/menu-radio-hover.png
rename to gtk/src/gtk-2.0/mate/assets/menu-radio-hover.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-radio-insensitive.png b/gtk/src/gtk-2.0/mate/assets/menu-radio-insensitive.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-radio-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/menu-radio-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/menu-radio-mixed-insensitive.png b/gtk/src/gtk-2.0/mate/assets/menu-radio-mixed-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/menu-radio-mixed-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/menu-radio-mixed-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/menu-radio-mixed.png b/gtk/src/gtk-2.0/mate/assets/menu-radio-mixed.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/menu-radio-mixed.png
rename to gtk/src/gtk-2.0/mate/assets/menu-radio-mixed.png
diff --git a/gtk/src/blue/gtk-2.0/assets/menu-radio.png b/gtk/src/gtk-2.0/mate/assets/menu-radio.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/menu-radio.png
rename to gtk/src/gtk-2.0/mate/assets/menu-radio.png
diff --git a/gtk/src/mate/gtk-2.0/assets/menubar-item-active.png b/gtk/src/gtk-2.0/mate/assets/menubar-item-active.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/menubar-item-active.png
rename to gtk/src/gtk-2.0/mate/assets/menubar-item-active.png
diff --git a/gtk/src/mate/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png b/gtk/src/gtk-2.0/mate/assets/notebook-combo-entry-ltr-entry-active.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png
rename to gtk/src/gtk-2.0/mate/assets/notebook-combo-entry-ltr-entry-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png b/gtk/src/gtk-2.0/mate/assets/notebook-combo-entry-ltr-entry-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/notebook-combo-entry-ltr-entry-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png b/gtk/src/gtk-2.0/mate/assets/notebook-combo-entry-ltr-entry.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png
rename to gtk/src/gtk-2.0/mate/assets/notebook-combo-entry-ltr-entry.png
diff --git a/gtk/src/mate/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png b/gtk/src/gtk-2.0/mate/assets/notebook-combo-entry-rtl-entry-active.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png
rename to gtk/src/gtk-2.0/mate/assets/notebook-combo-entry-rtl-entry-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png b/gtk/src/gtk-2.0/mate/assets/notebook-combo-entry-rtl-entry-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/notebook-combo-entry-rtl-entry-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png b/gtk/src/gtk-2.0/mate/assets/notebook-combo-entry-rtl-entry.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png
rename to gtk/src/gtk-2.0/mate/assets/notebook-combo-entry-rtl-entry.png
diff --git a/gtk/src/mate/gtk-2.0/assets/notebook-entry-active.png b/gtk/src/gtk-2.0/mate/assets/notebook-entry-active.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/notebook-entry-active.png
rename to gtk/src/gtk-2.0/mate/assets/notebook-entry-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/notebook-entry-insensitive.png b/gtk/src/gtk-2.0/mate/assets/notebook-entry-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/notebook-entry-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/notebook-entry-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/notebook-entry.png b/gtk/src/gtk-2.0/mate/assets/notebook-entry.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/notebook-entry.png
rename to gtk/src/gtk-2.0/mate/assets/notebook-entry.png
diff --git a/gtk/src/default/gtk-2.0/assets/pan-down-insensitive.png b/gtk/src/gtk-2.0/mate/assets/pan-down-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/pan-down-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/pan-down-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/pan-down.png b/gtk/src/gtk-2.0/mate/assets/pan-down.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/pan-down.png
rename to gtk/src/gtk-2.0/mate/assets/pan-down.png
diff --git a/gtk/src/default/gtk-2.0/assets/pan-left-insensitive.png b/gtk/src/gtk-2.0/mate/assets/pan-left-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/pan-left-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/pan-left-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/pan-left-semi.png b/gtk/src/gtk-2.0/mate/assets/pan-left-semi.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/pan-left-semi.png
rename to gtk/src/gtk-2.0/mate/assets/pan-left-semi.png
diff --git a/gtk/src/default/gtk-2.0/assets/pan-left.png b/gtk/src/gtk-2.0/mate/assets/pan-left.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/pan-left.png
rename to gtk/src/gtk-2.0/mate/assets/pan-left.png
diff --git a/gtk/src/default/gtk-2.0/assets/pan-right-insensitive.png b/gtk/src/gtk-2.0/mate/assets/pan-right-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/pan-right-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/pan-right-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/pan-right-semi.png b/gtk/src/gtk-2.0/mate/assets/pan-right-semi.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/pan-right-semi.png
rename to gtk/src/gtk-2.0/mate/assets/pan-right-semi.png
diff --git a/gtk/src/default/gtk-2.0/assets/pan-right.png b/gtk/src/gtk-2.0/mate/assets/pan-right.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/pan-right.png
rename to gtk/src/gtk-2.0/mate/assets/pan-right.png
diff --git a/gtk/src/default/gtk-2.0/assets/pan-up-insensitive.png b/gtk/src/gtk-2.0/mate/assets/pan-up-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/pan-up-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/pan-up-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/pan-up.png b/gtk/src/gtk-2.0/mate/assets/pan-up.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/pan-up.png
rename to gtk/src/gtk-2.0/mate/assets/pan-up.png
diff --git a/gtk/src/blue/gtk-2.0/assets/progressbar-horz-trough.png b/gtk/src/gtk-2.0/mate/assets/progressbar-horz-trough.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/progressbar-horz-trough.png
rename to gtk/src/gtk-2.0/mate/assets/progressbar-horz-trough.png
diff --git a/gtk/src/mate/gtk-2.0/assets/progressbar-horz.png b/gtk/src/gtk-2.0/mate/assets/progressbar-horz.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/progressbar-horz.png
rename to gtk/src/gtk-2.0/mate/assets/progressbar-horz.png
diff --git a/gtk/src/blue/gtk-2.0/assets/progressbar-vert-trough.png b/gtk/src/gtk-2.0/mate/assets/progressbar-vert-trough.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/progressbar-vert-trough.png
rename to gtk/src/gtk-2.0/mate/assets/progressbar-vert-trough.png
diff --git a/gtk/src/mate/gtk-2.0/assets/progressbar-vert.png b/gtk/src/gtk-2.0/mate/assets/progressbar-vert.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/progressbar-vert.png
rename to gtk/src/gtk-2.0/mate/assets/progressbar-vert.png
diff --git a/gtk/src/mate/gtk-2.0/assets/radio-checked-active.png b/gtk/src/gtk-2.0/mate/assets/radio-checked-active.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/radio-checked-active.png
rename to gtk/src/gtk-2.0/mate/assets/radio-checked-active.png
diff --git a/gtk/src/mate/gtk-2.0/assets/radio-checked-insensitive.png b/gtk/src/gtk-2.0/mate/assets/radio-checked-insensitive.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/radio-checked-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/radio-checked-insensitive.png
diff --git a/gtk/src/mate/gtk-2.0/assets/radio-checked.png b/gtk/src/gtk-2.0/mate/assets/radio-checked.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/radio-checked.png
rename to gtk/src/gtk-2.0/mate/assets/radio-checked.png
diff --git a/gtk/src/mate/gtk-2.0/assets/radio-mixed-active.png b/gtk/src/gtk-2.0/mate/assets/radio-mixed-active.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/radio-mixed-active.png
rename to gtk/src/gtk-2.0/mate/assets/radio-mixed-active.png
diff --git a/gtk/src/mate/gtk-2.0/assets/radio-mixed-insensitive.png b/gtk/src/gtk-2.0/mate/assets/radio-mixed-insensitive.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/radio-mixed-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/radio-mixed-insensitive.png
diff --git a/gtk/src/mate/gtk-2.0/assets/radio-mixed.png b/gtk/src/gtk-2.0/mate/assets/radio-mixed.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/radio-mixed.png
rename to gtk/src/gtk-2.0/mate/assets/radio-mixed.png
diff --git a/gtk/src/default/gtk-2.0/assets/radio-unchecked-active.png b/gtk/src/gtk-2.0/mate/assets/radio-unchecked-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/radio-unchecked-active.png
rename to gtk/src/gtk-2.0/mate/assets/radio-unchecked-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/radio-unchecked-hover.png b/gtk/src/gtk-2.0/mate/assets/radio-unchecked-hover.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/radio-unchecked-hover.png
rename to gtk/src/gtk-2.0/mate/assets/radio-unchecked-hover.png
diff --git a/gtk/src/default/gtk-2.0/assets/radio-unchecked-insensitive.png b/gtk/src/gtk-2.0/mate/assets/radio-unchecked-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/radio-unchecked-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/radio-unchecked-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/radio-unchecked.png b/gtk/src/gtk-2.0/mate/assets/radio-unchecked.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/radio-unchecked.png
rename to gtk/src/gtk-2.0/mate/assets/radio-unchecked.png
diff --git a/gtk/src/blue/gtk-2.0/assets/scale-horz-focus.png b/gtk/src/gtk-2.0/mate/assets/scale-horz-focus.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/scale-horz-focus.png
rename to gtk/src/gtk-2.0/mate/assets/scale-horz-focus.png
diff --git a/gtk/src/mate/gtk-2.0/assets/scale-horz-trough-active.png b/gtk/src/gtk-2.0/mate/assets/scale-horz-trough-active.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/scale-horz-trough-active.png
rename to gtk/src/gtk-2.0/mate/assets/scale-horz-trough-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/scale-horz-trough.png b/gtk/src/gtk-2.0/mate/assets/scale-horz-trough.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/scale-horz-trough.png
rename to gtk/src/gtk-2.0/mate/assets/scale-horz-trough.png
diff --git a/gtk/src/mate/gtk-2.0/assets/scale-slider-active.png b/gtk/src/gtk-2.0/mate/assets/scale-slider-active.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/scale-slider-active.png
rename to gtk/src/gtk-2.0/mate/assets/scale-slider-active.png
diff --git a/gtk/src/mate/gtk-2.0/assets/scale-slider-hover.png b/gtk/src/gtk-2.0/mate/assets/scale-slider-hover.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/scale-slider-hover.png
rename to gtk/src/gtk-2.0/mate/assets/scale-slider-hover.png
diff --git a/gtk/src/default/gtk-2.0/assets/scale-slider-insensitive.png b/gtk/src/gtk-2.0/mate/assets/scale-slider-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scale-slider-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/scale-slider-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/scale-slider.png b/gtk/src/gtk-2.0/mate/assets/scale-slider.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scale-slider.png
rename to gtk/src/gtk-2.0/mate/assets/scale-slider.png
diff --git a/gtk/src/mate/gtk-2.0/assets/scale-vert-trough-active.png b/gtk/src/gtk-2.0/mate/assets/scale-vert-trough-active.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/scale-vert-trough-active.png
rename to gtk/src/gtk-2.0/mate/assets/scale-vert-trough-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/scale-vert-trough.png b/gtk/src/gtk-2.0/mate/assets/scale-vert-trough.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/scale-vert-trough.png
rename to gtk/src/gtk-2.0/mate/assets/scale-vert-trough.png
diff --git a/gtk/src/mate/gtk-2.0/assets/scrollbar-horz-slider-active.png b/gtk/src/gtk-2.0/mate/assets/scrollbar-horz-slider-active.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/scrollbar-horz-slider-active.png
rename to gtk/src/gtk-2.0/mate/assets/scrollbar-horz-slider-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/scrollbar-horz-slider-hover.png b/gtk/src/gtk-2.0/mate/assets/scrollbar-horz-slider-hover.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scrollbar-horz-slider-hover.png
rename to gtk/src/gtk-2.0/mate/assets/scrollbar-horz-slider-hover.png
diff --git a/gtk/src/blue/gtk-2.0/assets/scrollbar-horz-slider.png b/gtk/src/gtk-2.0/mate/assets/scrollbar-horz-slider.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/scrollbar-horz-slider.png
rename to gtk/src/gtk-2.0/mate/assets/scrollbar-horz-slider.png
diff --git a/gtk/src/default/gtk-2.0/assets/scrollbar-horz-trough.png b/gtk/src/gtk-2.0/mate/assets/scrollbar-horz-trough.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scrollbar-horz-trough.png
rename to gtk/src/gtk-2.0/mate/assets/scrollbar-horz-trough.png
diff --git a/gtk/src/mate/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png b/gtk/src/gtk-2.0/mate/assets/scrollbar-vert-slider-active-rtl.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png
rename to gtk/src/gtk-2.0/mate/assets/scrollbar-vert-slider-active-rtl.png
diff --git a/gtk/src/mate/gtk-2.0/assets/scrollbar-vert-slider-active.png b/gtk/src/gtk-2.0/mate/assets/scrollbar-vert-slider-active.png
similarity index 100%
rename from gtk/src/mate/gtk-2.0/assets/scrollbar-vert-slider-active.png
rename to gtk/src/gtk-2.0/mate/assets/scrollbar-vert-slider-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png b/gtk/src/gtk-2.0/mate/assets/scrollbar-vert-slider-hover-rtl.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png
rename to gtk/src/gtk-2.0/mate/assets/scrollbar-vert-slider-hover-rtl.png
diff --git a/gtk/src/default/gtk-2.0/assets/scrollbar-vert-slider-hover.png b/gtk/src/gtk-2.0/mate/assets/scrollbar-vert-slider-hover.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scrollbar-vert-slider-hover.png
rename to gtk/src/gtk-2.0/mate/assets/scrollbar-vert-slider-hover.png
diff --git a/gtk/src/blue/gtk-2.0/assets/scrollbar-vert-slider-rtl.png b/gtk/src/gtk-2.0/mate/assets/scrollbar-vert-slider-rtl.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/scrollbar-vert-slider-rtl.png
rename to gtk/src/gtk-2.0/mate/assets/scrollbar-vert-slider-rtl.png
diff --git a/gtk/src/blue/gtk-2.0/assets/scrollbar-vert-slider.png b/gtk/src/gtk-2.0/mate/assets/scrollbar-vert-slider.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/scrollbar-vert-slider.png
rename to gtk/src/gtk-2.0/mate/assets/scrollbar-vert-slider.png
diff --git a/gtk/src/default/gtk-2.0/assets/scrollbar-vert-trough-rtl.png b/gtk/src/gtk-2.0/mate/assets/scrollbar-vert-trough-rtl.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scrollbar-vert-trough-rtl.png
rename to gtk/src/gtk-2.0/mate/assets/scrollbar-vert-trough-rtl.png
diff --git a/gtk/src/default/gtk-2.0/assets/scrollbar-vert-trough.png b/gtk/src/gtk-2.0/mate/assets/scrollbar-vert-trough.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/scrollbar-vert-trough.png
rename to gtk/src/gtk-2.0/mate/assets/scrollbar-vert-trough.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-down-insensitive.png b/gtk/src/gtk-2.0/mate/assets/spin-down-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-down-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/spin-down-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-down.png b/gtk/src/gtk-2.0/mate/assets/spin-down.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-down.png
rename to gtk/src/gtk-2.0/mate/assets/spin-down.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-ltr-down-active.png b/gtk/src/gtk-2.0/mate/assets/spin-ltr-down-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-ltr-down-active.png
rename to gtk/src/gtk-2.0/mate/assets/spin-ltr-down-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-ltr-down-hover.png b/gtk/src/gtk-2.0/mate/assets/spin-ltr-down-hover.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-ltr-down-hover.png
rename to gtk/src/gtk-2.0/mate/assets/spin-ltr-down-hover.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-ltr-down-insensitive.png b/gtk/src/gtk-2.0/mate/assets/spin-ltr-down-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-ltr-down-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/spin-ltr-down-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-ltr-down.png b/gtk/src/gtk-2.0/mate/assets/spin-ltr-down.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-ltr-down.png
rename to gtk/src/gtk-2.0/mate/assets/spin-ltr-down.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-ltr-up-active.png b/gtk/src/gtk-2.0/mate/assets/spin-ltr-up-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-ltr-up-active.png
rename to gtk/src/gtk-2.0/mate/assets/spin-ltr-up-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-ltr-up-hover.png b/gtk/src/gtk-2.0/mate/assets/spin-ltr-up-hover.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-ltr-up-hover.png
rename to gtk/src/gtk-2.0/mate/assets/spin-ltr-up-hover.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-ltr-up-insensitive.png b/gtk/src/gtk-2.0/mate/assets/spin-ltr-up-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-ltr-up-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/spin-ltr-up-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-ltr-up.png b/gtk/src/gtk-2.0/mate/assets/spin-ltr-up.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-ltr-up.png
rename to gtk/src/gtk-2.0/mate/assets/spin-ltr-up.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-rtl-down-active.png b/gtk/src/gtk-2.0/mate/assets/spin-rtl-down-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-rtl-down-active.png
rename to gtk/src/gtk-2.0/mate/assets/spin-rtl-down-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-rtl-down-hover.png b/gtk/src/gtk-2.0/mate/assets/spin-rtl-down-hover.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-rtl-down-hover.png
rename to gtk/src/gtk-2.0/mate/assets/spin-rtl-down-hover.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-rtl-down-insensitive.png b/gtk/src/gtk-2.0/mate/assets/spin-rtl-down-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-rtl-down-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/spin-rtl-down-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-rtl-down.png b/gtk/src/gtk-2.0/mate/assets/spin-rtl-down.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-rtl-down.png
rename to gtk/src/gtk-2.0/mate/assets/spin-rtl-down.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-rtl-up-active.png b/gtk/src/gtk-2.0/mate/assets/spin-rtl-up-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-rtl-up-active.png
rename to gtk/src/gtk-2.0/mate/assets/spin-rtl-up-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-rtl-up-hover.png b/gtk/src/gtk-2.0/mate/assets/spin-rtl-up-hover.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-rtl-up-hover.png
rename to gtk/src/gtk-2.0/mate/assets/spin-rtl-up-hover.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-rtl-up-insensitive.png b/gtk/src/gtk-2.0/mate/assets/spin-rtl-up-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-rtl-up-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/spin-rtl-up-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-rtl-up.png b/gtk/src/gtk-2.0/mate/assets/spin-rtl-up.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-rtl-up.png
rename to gtk/src/gtk-2.0/mate/assets/spin-rtl-up.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-up-insensitive.png b/gtk/src/gtk-2.0/mate/assets/spin-up-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-up-insensitive.png
rename to gtk/src/gtk-2.0/mate/assets/spin-up-insensitive.png
diff --git a/gtk/src/default/gtk-2.0/assets/spin-up.png b/gtk/src/gtk-2.0/mate/assets/spin-up.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/spin-up.png
rename to gtk/src/gtk-2.0/mate/assets/spin-up.png
diff --git a/gtk/src/default/gtk-2.0/assets/tab-down-active.png b/gtk/src/gtk-2.0/mate/assets/tab-down-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/tab-down-active.png
rename to gtk/src/gtk-2.0/mate/assets/tab-down-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/tab-down.png b/gtk/src/gtk-2.0/mate/assets/tab-down.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/tab-down.png
rename to gtk/src/gtk-2.0/mate/assets/tab-down.png
diff --git a/gtk/src/default/gtk-2.0/assets/tab-horz-gap.png b/gtk/src/gtk-2.0/mate/assets/tab-horz-gap.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/tab-horz-gap.png
rename to gtk/src/gtk-2.0/mate/assets/tab-horz-gap.png
diff --git a/gtk/src/default/gtk-2.0/assets/tab-left-active.png b/gtk/src/gtk-2.0/mate/assets/tab-left-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/tab-left-active.png
rename to gtk/src/gtk-2.0/mate/assets/tab-left-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/tab-left.png b/gtk/src/gtk-2.0/mate/assets/tab-left.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/tab-left.png
rename to gtk/src/gtk-2.0/mate/assets/tab-left.png
diff --git a/gtk/src/default/gtk-2.0/assets/tab-right-active.png b/gtk/src/gtk-2.0/mate/assets/tab-right-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/tab-right-active.png
rename to gtk/src/gtk-2.0/mate/assets/tab-right-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/tab-right.png b/gtk/src/gtk-2.0/mate/assets/tab-right.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/tab-right.png
rename to gtk/src/gtk-2.0/mate/assets/tab-right.png
diff --git a/gtk/src/default/gtk-2.0/assets/tab-up-active.png b/gtk/src/gtk-2.0/mate/assets/tab-up-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/tab-up-active.png
rename to gtk/src/gtk-2.0/mate/assets/tab-up-active.png
diff --git a/gtk/src/blue/gtk-2.0/assets/tab-up.png b/gtk/src/gtk-2.0/mate/assets/tab-up.png
similarity index 100%
rename from gtk/src/blue/gtk-2.0/assets/tab-up.png
rename to gtk/src/gtk-2.0/mate/assets/tab-up.png
diff --git a/gtk/src/default/gtk-2.0/assets/tab-vert-gap.png b/gtk/src/gtk-2.0/mate/assets/tab-vert-gap.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/tab-vert-gap.png
rename to gtk/src/gtk-2.0/mate/assets/tab-vert-gap.png
diff --git a/gtk/src/default/gtk-2.0/assets/treeview-header-button.png b/gtk/src/gtk-2.0/mate/assets/treeview-header-button.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/treeview-header-button.png
rename to gtk/src/gtk-2.0/mate/assets/treeview-header-button.png
diff --git a/gtk/src/default/gtk-2.0/assets/treeview-pan-down-active.png b/gtk/src/gtk-2.0/mate/assets/treeview-pan-down-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/treeview-pan-down-active.png
rename to gtk/src/gtk-2.0/mate/assets/treeview-pan-down-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/treeview-pan-down-hover.png b/gtk/src/gtk-2.0/mate/assets/treeview-pan-down-hover.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/treeview-pan-down-hover.png
rename to gtk/src/gtk-2.0/mate/assets/treeview-pan-down-hover.png
diff --git a/gtk/src/default/gtk-2.0/assets/treeview-pan-down.png b/gtk/src/gtk-2.0/mate/assets/treeview-pan-down.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/treeview-pan-down.png
rename to gtk/src/gtk-2.0/mate/assets/treeview-pan-down.png
diff --git a/gtk/src/default/gtk-2.0/assets/treeview-pan-up-active.png b/gtk/src/gtk-2.0/mate/assets/treeview-pan-up-active.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/treeview-pan-up-active.png
rename to gtk/src/gtk-2.0/mate/assets/treeview-pan-up-active.png
diff --git a/gtk/src/default/gtk-2.0/assets/treeview-pan-up-hover.png b/gtk/src/gtk-2.0/mate/assets/treeview-pan-up-hover.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/treeview-pan-up-hover.png
rename to gtk/src/gtk-2.0/mate/assets/treeview-pan-up-hover.png
diff --git a/gtk/src/default/gtk-2.0/assets/treeview-pan-up.png b/gtk/src/gtk-2.0/mate/assets/treeview-pan-up.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/treeview-pan-up.png
rename to gtk/src/gtk-2.0/mate/assets/treeview-pan-up.png
diff --git a/gtk/src/default/gtk-2.0/assets/treeview-separator-ltr.png b/gtk/src/gtk-2.0/mate/assets/treeview-separator-ltr.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/treeview-separator-ltr.png
rename to gtk/src/gtk-2.0/mate/assets/treeview-separator-ltr.png
diff --git a/gtk/src/default/gtk-2.0/assets/treeview-separator-rtl.png b/gtk/src/gtk-2.0/mate/assets/treeview-separator-rtl.png
similarity index 100%
rename from gtk/src/default/gtk-2.0/assets/treeview-separator-rtl.png
rename to gtk/src/gtk-2.0/mate/assets/treeview-separator-rtl.png
diff --git a/gtk/src/mate/gtk-2.0/gtkrc b/gtk/src/gtk-2.0/mate/gtkrc
similarity index 100%
rename from gtk/src/mate/gtk-2.0/gtkrc
rename to gtk/src/gtk-2.0/mate/gtkrc
diff --git a/gtk/src/gtk-2.0/mate/gtkrc.in b/gtk/src/gtk-2.0/mate/gtkrc.in
new file mode 100644
index 0000000000..56108e464e
--- /dev/null
+++ b/gtk/src/gtk-2.0/mate/gtkrc.in
@@ -0,0 +1,50 @@
+# Based on Bridge by ScionicSpectre
+# vim:set ts=2 sw=2 sts=2 ai et:
+#
+# This is the GTK+ 2 version of Adwaita. It's whole purpose is to look as the
+# GTK+ 3 version as much as possible until GTK+ 2 dies completely.
+#
+# Note: comments for explaining styles are on the bottom of each file beside the
+# widget matches.
+
+# Declare the colours used throughout the theme.
+# There shouldn't be any fiddling with them in the theme files themselves in
+# order to not mess up the dark theme.
+
+# Text/base
+gtk-color-scheme = "text_color:@text_color@\nbase_color:@base_color@"
+# Foreground/background
+gtk-color-scheme = "fg_color:@fg_color@\nbg_color:@bg_color@"
+# Selected foreground/background
+gtk-color-scheme = "selected_fg_color:@selected_fg_color@\nselected_bg_color:@selected_bg_color@"
+# Insensitive foreground/background
+gtk-color-scheme = "insensitive_fg_color:@insensitive_fg_color@\ninsensitive_bg_color:@insensitive_bg_color@"
+# Menus
+gtk-color-scheme = "menu_color:@menu_color@\nmenubar_bg:@menubar_bg@"
+gtk-color-scheme = "menubar_fg:@menubar_fg@\nmenubar_insensitive_fg:@menubar_insensitive_fg@"
+# Links
+gtk-color-scheme = "link_color:@link_color@\nvisited_link_color:@visited_link_color@"
+# Treeview headers
+gtk-color-scheme = "column_header_color:@column_header_color@\nhover_column_header_color:@hover_column_header_color@"
+# Window decoration
+gtk-color-scheme = "menu_hover_color:@menu_hover_color@\nwindow_color:@window_color@"
+# Tooltips
+gtk-color-scheme = "tooltip_fg_color:@tooltip_fg_color@\ntooltip_bg_color:@tooltip_bg_color@"
+
+# Set GTK settings
+gtk-auto-mnemonics = 1
+gtk-primary-button-warps-slider = 1
+gtk-icon-sizes="gtk-menu=16,16:
+gtk-button=16,16:
+gtk-small-toolbar=16,16:
+
+gtk-dnd=16,16:
+gtk-dialog=16,16"
+gtk-toolbar-style = GTK_TOOLBAR_ICONS
+gtk-menu-images = 0
+gtk-menu-popup-delay = 0
+
+# And hand over the control to the theme files
+include "main.rc"
+include "apps.rc"
+include "hacks.rc"
diff --git a/gtk/src/blue/gtk-2.0/hacks.rc b/gtk/src/gtk-2.0/mate/hacks.rc
similarity index 100%
rename from gtk/src/blue/gtk-2.0/hacks.rc
rename to gtk/src/gtk-2.0/mate/hacks.rc
diff --git a/gtk/src/blue/gtk-2.0/main.rc b/gtk/src/gtk-2.0/mate/main.rc
similarity index 100%
rename from gtk/src/blue/gtk-2.0/main.rc
rename to gtk/src/gtk-2.0/mate/main.rc
diff --git a/gtk/src/gtk-2.0/meson.build b/gtk/src/gtk-2.0/meson.build
new file mode 100644
index 0000000000..46cbff70bd
--- /dev/null
+++ b/gtk/src/gtk-2.0/meson.build
@@ -0,0 +1,146 @@
+# GTK-2.0 Build Logic
+# Generates themed GTK-2 assets and configuration
+
+gtk_ver = '2.0'
+gtk_dir = 'gtk-@0@'.format(gtk_ver)
+
+# Track previous flavour's assets target to enforce sequential builds
+gtk2_prev_assets_target = []
+
+foreach flavour: yaru_flavours
+ message('Configuring flavour ' + flavour + ' for GTK-2.0')
+ suffix = flavour == 'default' ? '' : '-@0@'.format(flavour)
+ theme_name = meson.project_name() + suffix
+ is_dark = flavour == 'dark' or flavour.endswith('-dark')
+ base_theme_name = is_dark ? flavour.split('-dark')[0] : flavour
+ is_accent = enabled_accent_colors.contains(base_theme_name)
+ theme_dir = join_paths(get_option('datadir'), 'themes', theme_name)
+ accent = is_accent ? base_theme_name : ''
+
+ if is_accent
+ accent_configuration = {
+ 'yaru_dark_variant': is_dark ? 'true' : 'false',
+ 'yaru_accent_color': accent,
+ }
+
+ accent_info_css = configure_file(
+ configuration: accent_configuration + {
+ 'yaru_theme_entry_point': '/dev/null',
+ },
+ input: accent_colors_definitions_scss,
+ output: '@0@-@1@-accent-color-info.scss'.format(theme_name, accent),
+ )
+
+ accent_parser = run_command(sassc,
+ yaru_sass_global_paths,
+ accent_info_css).stderr().strip()
+
+ accent_color_code = accent_parser.split(' Accent color is ')[1].split('\n')[0]
+ assert(accent_color_code.startswith('#'), 'No accent color code found')
+
+ accent_color_optimized_code = accent_parser.split(' Contrast optimized accent is ')[1].split('\n')[0]
+ assert(accent_color_optimized_code.startswith('#'), 'No accent color code found')
+ message('Accent color code is', accent_color_code)
+ message('Accent optimized color code is', accent_color_optimized_code)
+ endif
+
+ install_path = theme_dir / gtk_dir
+
+ # GTK-2: Determine base directory for this flavour
+ # mate variants use their own directories, others use default/dark
+ if flavour.startswith('mate')
+ gtk2_base_dir = flavour
+ else
+ gtk2_base_dir = is_dark ? 'dark' : 'default'
+ endif
+
+ gtk2_gtkrc_template = gtk2_base_dir / 'gtkrc.in'
+
+ # Set the selected_bg_color: use accent color if specified, otherwise default orange
+ gtk2_selected_bg_color = is_accent ? accent_color_code : '#E95420'
+
+ # Generate gtkrc from template
+ install_data(
+ configure_file(
+ input: gtk2_gtkrc_template,
+ output: '@0@-gtkrc'.format(theme_name),
+ configuration: {
+ 'selected_bg_color': gtk2_selected_bg_color,
+ }
+ ),
+ install_dir: install_path,
+ rename: 'gtkrc',
+ )
+
+ # Install static RC files from base directory
+ install_data(
+ gtk2_base_dir / 'main.rc',
+ gtk2_base_dir / 'apps.rc',
+ gtk2_base_dir / 'hacks.rc',
+ install_dir: install_path
+ )
+
+ # For accent colors, recolor SVG assets; otherwise use original
+ gtk2_assets_svg = gtk2_base_dir / 'assets.svg'
+ gtk2_assets_txt = gtk2_base_dir / 'assets.txt'
+ gtk2_render_script = 'render-all-assets.sh'
+
+ if is_accent
+ # Recolor SVG with accent color
+ gtk2_recolored_svg = custom_target(
+ '@0@-gtk2-assets-svg'.format(theme_name),
+ input: gtk2_assets_svg,
+ output: '@0@-assets.svg'.format(theme_name),
+ command: [
+ 'sed',
+ '-e', 's/#e55730/@0@/gi'.format(accent_color_code),
+ '-e', 's/#c34113/@0@/gi'.format(accent_color_optimized_code),
+ '-e', 's/#fea691/@0@/gi'.format(accent_color_optimized_code),
+ '-e', 's/#f6b6a0/@0@/gi'.format(accent_color_optimized_code),
+ '-e', 's/#f1a78d/@0@/gi'.format(accent_color_optimized_code),
+ '-e', 's/#f85731/@0@/gi'.format(accent_color_code),
+ '@INPUT@'
+ ],
+ capture: true,
+ )
+ gtk2_svg_to_use = gtk2_recolored_svg
+ else
+ gtk2_svg_to_use = gtk2_assets_svg
+ endif
+
+ # Generate PNG assets from SVG using render-all-assets.sh script
+ gtk2_render_script_path = meson.current_source_dir() / gtk2_render_script
+
+ # Create assets directory and run the render script directly
+ # Add dependency on previous flavour to enforce sequential building
+ gtk2_assets_target = custom_target(
+ '@0@-gtk2-assets'.format(theme_name),
+ input: [gtk2_svg_to_use, gtk2_assets_txt],
+ output: '@0@-gtk2-assets.stamp'.format(theme_name),
+ command: [
+ 'bash', gtk2_render_script_path,
+ '@INPUT0@', # SVG file
+ '@INPUT1@', # assets.txt
+ '@PRIVATE_DIR@/assets', # output directory
+ '--clean'
+ ],
+ depends: gtk2_prev_assets_target,
+ build_by_default: true,
+ )
+
+ # Update previous target for next iteration
+ gtk2_prev_assets_target = gtk2_assets_target
+
+ # Install generated assets
+ gtk2_assets_list = run_command(
+ 'cat', meson.current_source_dir() / gtk2_assets_txt
+ ).stdout().strip().split('\n')
+
+ foreach asset_name: gtk2_assets_list
+ if asset_name != ''
+ meson.add_install_script('sh', '-c',
+ 'install -Dm644 "$MESON_BUILD_ROOT/gtk/src/gtk-2.0/@0@-gtk2-assets.stamp.p/assets/@1@.png" "$MESON_INSTALL_DESTDIR_PREFIX/@2@/assets/@1@.png"'.format(theme_name, asset_name, install_path)
+ )
+ endif
+ endforeach
+endforeach
diff --git a/gtk/src/gtk-2.0/render-all-assets.sh b/gtk/src/gtk-2.0/render-all-assets.sh
new file mode 100755
index 0000000000..167267ab5a
--- /dev/null
+++ b/gtk/src/gtk-2.0/render-all-assets.sh
@@ -0,0 +1,42 @@
+#! /bin/bash
+
+INKSCAPE="inkscape"
+OPTIPNG="optipng"
+
+# Accept parameters: SVG_FILE INDEX_FILE ASSETS_DIR [--clean]
+SRC_FILE="${1:-assets.svg}"
+INDEX="${2:-assets.txt}"
+ASSETS_DIR="${3:-assets}"
+
+# Check if --clean flag is passed
+CLEAN_FLAG=false
+for arg in "$@"; do
+ if [ "$arg" == "--clean" ]; then
+ CLEAN_FLAG=true
+ break
+ fi
+done
+
+# Clean existing assets if requested
+if [ "$CLEAN_FLAG" == "true" ] && [ -d "$ASSETS_DIR" ]; then
+ rm -f "$ASSETS_DIR"/*.png
+fi
+
+# Ensure assets directory exists
+mkdir -p "$ASSETS_DIR"
+
+# Render assets
+for i in `cat "$INDEX"`
+do
+if [ -f "$ASSETS_DIR/$i.png" ]; then
+ echo "$ASSETS_DIR/$i.png exists."
+else
+ echo
+ echo "Rendering $ASSETS_DIR/$i.png"
+ $INKSCAPE --export-id=$i \
+ --export-id-only \
+ -o "$ASSETS_DIR/$i.png" "$SRC_FILE" >/dev/null \
+ && $OPTIPNG -o7 --quiet "$ASSETS_DIR/$i.png"
+fi
+done
+exit 0
diff --git a/gtk/src/bark-dark/gtk-2.0/render-assets-external.sh b/gtk/src/gtk-2.0/render-assets-external.sh
similarity index 100%
rename from gtk/src/bark-dark/gtk-2.0/render-assets-external.sh
rename to gtk/src/gtk-2.0/render-assets-external.sh
diff --git a/gtk/src/default/gtk-3.0/README b/gtk/src/gtk-3.0/dark/README
similarity index 100%
rename from gtk/src/default/gtk-3.0/README
rename to gtk/src/gtk-3.0/dark/README
diff --git a/gtk/src/default/gtk-3.0/_apps.scss b/gtk/src/gtk-3.0/dark/_apps.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/_apps.scss
rename to gtk/src/gtk-3.0/dark/_apps.scss
diff --git a/gtk/src/default/gtk-3.0/_colors-public.scss b/gtk/src/gtk-3.0/dark/_colors-public.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/_colors-public.scss
rename to gtk/src/gtk-3.0/dark/_colors-public.scss
diff --git a/gtk/src/default/gtk-3.0/_colors.scss b/gtk/src/gtk-3.0/dark/_colors.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/_colors.scss
rename to gtk/src/gtk-3.0/dark/_colors.scss
diff --git a/gtk/src/default/gtk-3.0/_common.scss b/gtk/src/gtk-3.0/dark/_common.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/_common.scss
rename to gtk/src/gtk-3.0/dark/_common.scss
diff --git a/gtk/src/default/gtk-3.0/_drawing.scss b/gtk/src/gtk-3.0/dark/_drawing.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/_drawing.scss
rename to gtk/src/gtk-3.0/dark/_drawing.scss
diff --git a/gtk/src/default/gtk-3.0/_palette.scss b/gtk/src/gtk-3.0/dark/_palette.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/_palette.scss
rename to gtk/src/gtk-3.0/dark/_palette.scss
diff --git a/gtk/src/default/gtk-3.0/_tweaks.scss b/gtk/src/gtk-3.0/dark/_tweaks.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/_tweaks.scss
rename to gtk/src/gtk-3.0/dark/_tweaks.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_brisk-menu.scss b/gtk/src/gtk-3.0/dark/apps/_brisk-menu.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_brisk-menu.scss
rename to gtk/src/gtk-3.0/dark/apps/_brisk-menu.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_caja.scss b/gtk/src/gtk-3.0/dark/apps/_caja.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_caja.scss
rename to gtk/src/gtk-3.0/dark/apps/_caja.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_ding.scss b/gtk/src/gtk-3.0/dark/apps/_ding.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_ding.scss
rename to gtk/src/gtk-3.0/dark/apps/_ding.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_evince.scss b/gtk/src/gtk-3.0/dark/apps/_evince.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_evince.scss
rename to gtk/src/gtk-3.0/dark/apps/_evince.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_evolution.scss b/gtk/src/gtk-3.0/dark/apps/_evolution.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_evolution.scss
rename to gtk/src/gtk-3.0/dark/apps/_evolution.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_firefox.scss b/gtk/src/gtk-3.0/dark/apps/_firefox.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_firefox.scss
rename to gtk/src/gtk-3.0/dark/apps/_firefox.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_geary.scss b/gtk/src/gtk-3.0/dark/apps/_geary.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_geary.scss
rename to gtk/src/gtk-3.0/dark/apps/_geary.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_gedit.scss b/gtk/src/gtk-3.0/dark/apps/_gedit.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_gedit.scss
rename to gtk/src/gtk-3.0/dark/apps/_gedit.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_gnome-disks.scss b/gtk/src/gtk-3.0/dark/apps/_gnome-disks.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_gnome-disks.scss
rename to gtk/src/gtk-3.0/dark/apps/_gnome-disks.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_gnome-software.scss b/gtk/src/gtk-3.0/dark/apps/_gnome-software.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_gnome-software.scss
rename to gtk/src/gtk-3.0/dark/apps/_gnome-software.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_gnome-terminal.scss b/gtk/src/gtk-3.0/dark/apps/_gnome-terminal.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_gnome-terminal.scss
rename to gtk/src/gtk-3.0/dark/apps/_gnome-terminal.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_gnome-todo.scss b/gtk/src/gtk-3.0/dark/apps/_gnome-todo.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_gnome-todo.scss
rename to gtk/src/gtk-3.0/dark/apps/_gnome-todo.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_guake.scss b/gtk/src/gtk-3.0/dark/apps/_guake.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_guake.scss
rename to gtk/src/gtk-3.0/dark/apps/_guake.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_mate-control-center.scss b/gtk/src/gtk-3.0/dark/apps/_mate-control-center.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_mate-control-center.scss
rename to gtk/src/gtk-3.0/dark/apps/_mate-control-center.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_mate-multimedia-osd.scss b/gtk/src/gtk-3.0/dark/apps/_mate-multimedia-osd.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_mate-multimedia-osd.scss
rename to gtk/src/gtk-3.0/dark/apps/_mate-multimedia-osd.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_mate-terminal.scss b/gtk/src/gtk-3.0/dark/apps/_mate-terminal.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_mate-terminal.scss
rename to gtk/src/gtk-3.0/dark/apps/_mate-terminal.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_mate.scss b/gtk/src/gtk-3.0/dark/apps/_mate.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_mate.scss
rename to gtk/src/gtk-3.0/dark/apps/_mate.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_nautilus.scss b/gtk/src/gtk-3.0/dark/apps/_nautilus.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_nautilus.scss
rename to gtk/src/gtk-3.0/dark/apps/_nautilus.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_nemo.scss b/gtk/src/gtk-3.0/dark/apps/_nemo.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_nemo.scss
rename to gtk/src/gtk-3.0/dark/apps/_nemo.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_not-csd.scss b/gtk/src/gtk-3.0/dark/apps/_not-csd.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_not-csd.scss
rename to gtk/src/gtk-3.0/dark/apps/_not-csd.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_tweak-tool.scss b/gtk/src/gtk-3.0/dark/apps/_tweak-tool.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_tweak-tool.scss
rename to gtk/src/gtk-3.0/dark/apps/_tweak-tool.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_ubiquity.scss b/gtk/src/gtk-3.0/dark/apps/_ubiquity.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_ubiquity.scss
rename to gtk/src/gtk-3.0/dark/apps/_ubiquity.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_unity7.scss b/gtk/src/gtk-3.0/dark/apps/_unity7.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_unity7.scss
rename to gtk/src/gtk-3.0/dark/apps/_unity7.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_usb-creator-gtk.scss b/gtk/src/gtk-3.0/dark/apps/_usb-creator-gtk.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_usb-creator-gtk.scss
rename to gtk/src/gtk-3.0/dark/apps/_usb-creator-gtk.scss
diff --git a/gtk/src/default/gtk-3.0/apps/_xfce.scss b/gtk/src/gtk-3.0/dark/apps/_xfce.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/apps/_xfce.scss
rename to gtk/src/gtk-3.0/dark/apps/_xfce.scss
diff --git a/gtk/src/default/gtk-3.0/assets.svg b/gtk/src/gtk-3.0/dark/assets.svg
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets.svg
rename to gtk/src/gtk-3.0/dark/assets.svg
diff --git a/gtk/src/default/gtk-3.0/assets.txt b/gtk/src/gtk-3.0/dark/assets.txt
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets.txt
rename to gtk/src/gtk-3.0/dark/assets.txt
diff --git a/gtk/src/default/gtk-3.0/assets/bullet-symbolic.svg b/gtk/src/gtk-3.0/dark/assets/bullet-symbolic.svg
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/bullet-symbolic.svg
rename to gtk/src/gtk-3.0/dark/assets/bullet-symbolic.svg
diff --git a/gtk/src/default/gtk-3.0/assets/bullet-symbolic.symbolic.png b/gtk/src/gtk-3.0/dark/assets/bullet-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/bullet-symbolic.symbolic.png
rename to gtk/src/gtk-3.0/dark/assets/bullet-symbolic.symbolic.png
diff --git a/gtk/src/default/gtk-3.0/assets/check-symbolic.svg b/gtk/src/gtk-3.0/dark/assets/check-symbolic.svg
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/check-symbolic.svg
rename to gtk/src/gtk-3.0/dark/assets/check-symbolic.svg
diff --git a/gtk/src/default/gtk-3.0/assets/check-symbolic.symbolic.png b/gtk/src/gtk-3.0/dark/assets/check-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/check-symbolic.symbolic.png
rename to gtk/src/gtk-3.0/dark/assets/check-symbolic.symbolic.png
diff --git a/gtk/src/default/gtk-3.0/assets/dash-symbolic.svg b/gtk/src/gtk-3.0/dark/assets/dash-symbolic.svg
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/dash-symbolic.svg
rename to gtk/src/gtk-3.0/dark/assets/dash-symbolic.svg
diff --git a/gtk/src/default/gtk-3.0/assets/dash-symbolic.symbolic.png b/gtk/src/gtk-3.0/dark/assets/dash-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/dash-symbolic.symbolic.png
rename to gtk/src/gtk-3.0/dark/assets/dash-symbolic.symbolic.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-active-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-active-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-active-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-active-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-active-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-active-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-active-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-active-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-active.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-active.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-active.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-active.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-active@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-active@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-active@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-active@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-backdrop-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-backdrop-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-backdrop.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-backdrop.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-backdrop@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-backdrop@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-hover-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-hover-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-hover-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-hover-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-hover-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-hover.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-hover.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-hover.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-hover.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-hover@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-hover@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-hover@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-hover@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-insensitive-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-insensitive.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-insensitive.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-insensitive.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-insensitive@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-insensitive@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above-insensitive@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above-insensitive@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-above@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-above@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-active-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-active-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-active-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-active-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-active-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-active-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-active-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-active-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-active.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-active.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-active.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-active.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-active@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-active@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-active@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-active@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-backdrop-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-backdrop-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-backdrop.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-backdrop.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-backdrop@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-backdrop@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-hover-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-hover-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-hover-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-hover-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-hover-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-hover.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-hover.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-hover.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-hover.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-hover@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-hover@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-hover@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-hover@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-insensitive-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-insensitive.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-insensitive.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-insensitive.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-insensitive@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-insensitive@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below-insensitive@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below-insensitive@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below@2.png b/gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-horz-scale-has-marks-below@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-horz-scale-has-marks-below@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-active-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-active-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-active-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-active-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-active-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-active-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-active-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-active-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-active.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-active.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-active.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-active.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-active@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-active@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-active@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-active@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-backdrop-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-backdrop-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-backdrop.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-backdrop.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-backdrop@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-backdrop@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-hover-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-hover-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-hover-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-hover-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-hover-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-hover.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-hover.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-hover.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-hover.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-hover@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-hover@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-hover@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-hover@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-insensitive-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-insensitive.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-insensitive.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-insensitive.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-insensitive@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-insensitive@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above-insensitive@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above-insensitive@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-above@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-above@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-active-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-active-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-active-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-active-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-active-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-active-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-active-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-active-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-active.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-active.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-active.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-active.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-active@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-active@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-active@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-active@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-backdrop-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-backdrop-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-backdrop.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-backdrop.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-backdrop@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-backdrop@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-hover-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-hover-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-hover-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-hover-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-hover-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-hover.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-hover.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-hover.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-hover.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-hover@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-hover@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-hover@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-hover@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-insensitive-dark.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-insensitive.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-insensitive.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-insensitive.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-insensitive@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-insensitive@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below-insensitive@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below-insensitive@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below.png
diff --git a/gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below@2.png b/gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/slider-vert-scale-has-marks-below@2.png
rename to gtk/src/gtk-3.0/dark/assets/slider-vert-scale-has-marks-below@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-end-active-dark.png b/gtk/src/gtk-3.0/dark/assets/text-select-end-active-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-end-active-dark.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-end-active-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-end-active-dark@2.png b/gtk/src/gtk-3.0/dark/assets/text-select-end-active-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-end-active-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-end-active-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-end-active.png b/gtk/src/gtk-3.0/dark/assets/text-select-end-active.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-end-active.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-end-active.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-end-active@2.png b/gtk/src/gtk-3.0/dark/assets/text-select-end-active@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-end-active@2.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-end-active@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-end-dark.png b/gtk/src/gtk-3.0/dark/assets/text-select-end-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-end-dark.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-end-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-end-dark@2.png b/gtk/src/gtk-3.0/dark/assets/text-select-end-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-end-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-end-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-end-hover-dark.png b/gtk/src/gtk-3.0/dark/assets/text-select-end-hover-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-end-hover-dark.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-end-hover-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-end-hover-dark@2.png b/gtk/src/gtk-3.0/dark/assets/text-select-end-hover-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-end-hover-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-end-hover-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-end-hover.png b/gtk/src/gtk-3.0/dark/assets/text-select-end-hover.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-end-hover.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-end-hover.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-end-hover@2.png b/gtk/src/gtk-3.0/dark/assets/text-select-end-hover@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-end-hover@2.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-end-hover@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-end.png b/gtk/src/gtk-3.0/dark/assets/text-select-end.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-end.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-end.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-end@2.png b/gtk/src/gtk-3.0/dark/assets/text-select-end@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-end@2.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-end@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-start-active-dark.png b/gtk/src/gtk-3.0/dark/assets/text-select-start-active-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-start-active-dark.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-start-active-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-start-active-dark@2.png b/gtk/src/gtk-3.0/dark/assets/text-select-start-active-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-start-active-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-start-active-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-start-active.png b/gtk/src/gtk-3.0/dark/assets/text-select-start-active.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-start-active.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-start-active.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-start-active@2.png b/gtk/src/gtk-3.0/dark/assets/text-select-start-active@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-start-active@2.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-start-active@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-start-dark.png b/gtk/src/gtk-3.0/dark/assets/text-select-start-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-start-dark.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-start-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-start-dark@2.png b/gtk/src/gtk-3.0/dark/assets/text-select-start-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-start-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-start-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-start-hover-dark.png b/gtk/src/gtk-3.0/dark/assets/text-select-start-hover-dark.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-start-hover-dark.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-start-hover-dark.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-start-hover-dark@2.png b/gtk/src/gtk-3.0/dark/assets/text-select-start-hover-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-start-hover-dark@2.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-start-hover-dark@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-start-hover.png b/gtk/src/gtk-3.0/dark/assets/text-select-start-hover.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-start-hover.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-start-hover.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-start-hover@2.png b/gtk/src/gtk-3.0/dark/assets/text-select-start-hover@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-start-hover@2.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-start-hover@2.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-start.png b/gtk/src/gtk-3.0/dark/assets/text-select-start.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-start.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-start.png
diff --git a/gtk/src/default/gtk-3.0/assets/text-select-start@2.png b/gtk/src/gtk-3.0/dark/assets/text-select-start@2.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/assets/text-select-start@2.png
rename to gtk/src/gtk-3.0/dark/assets/text-select-start@2.png
diff --git a/gtk/src/default/gtk-3.0/gtk-dark.scss b/gtk/src/gtk-3.0/dark/gtk-dark.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/gtk-dark.scss
rename to gtk/src/gtk-3.0/dark/gtk-dark.scss
diff --git a/gtk/src/default/gtk-3.0/gtk.scss b/gtk/src/gtk-3.0/dark/gtk.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/gtk.scss
rename to gtk/src/gtk-3.0/dark/gtk.scss
diff --git a/gtk/src/default/gtk-3.0/libhandy/_Adwaita-base.scss b/gtk/src/gtk-3.0/dark/libhandy/_Adwaita-base.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/libhandy/_Adwaita-base.scss
rename to gtk/src/gtk-3.0/dark/libhandy/_Adwaita-base.scss
diff --git a/gtk/src/default/gtk-3.0/libhandy/_definitions.scss b/gtk/src/gtk-3.0/dark/libhandy/_definitions.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/libhandy/_definitions.scss
rename to gtk/src/gtk-3.0/dark/libhandy/_definitions.scss
diff --git a/gtk/src/default/gtk-3.0/libhandy/_fallback-base.scss b/gtk/src/gtk-3.0/dark/libhandy/_fallback-base.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/libhandy/_fallback-base.scss
rename to gtk/src/gtk-3.0/dark/libhandy/_fallback-base.scss
diff --git a/gtk/src/default/gtk-3.0/libhandy/_shared-base.scss b/gtk/src/gtk-3.0/dark/libhandy/_shared-base.scss
similarity index 100%
rename from gtk/src/default/gtk-3.0/libhandy/_shared-base.scss
rename to gtk/src/gtk-3.0/dark/libhandy/_shared-base.scss
diff --git a/gtk/src/default/gtk-3.0/render-assets.sh b/gtk/src/gtk-3.0/dark/render-assets.sh
similarity index 100%
rename from gtk/src/default/gtk-3.0/render-assets.sh
rename to gtk/src/gtk-3.0/dark/render-assets.sh
diff --git a/gtk/src/default/gtk-3.0/thumbnail.png b/gtk/src/gtk-3.0/dark/thumbnail.png
similarity index 100%
rename from gtk/src/default/gtk-3.0/thumbnail.png
rename to gtk/src/gtk-3.0/dark/thumbnail.png
diff --git a/gtk/src/gtk-3.0/default/README b/gtk/src/gtk-3.0/default/README
new file mode 100644
index 0000000000..eef07e4d04
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/README
@@ -0,0 +1,37 @@
+Summary
+-------
+
+* Do not edit the CSS directly, edit the source SCSS files
+* To be able to use the latest/adequate version of SASS, install sassc
+* Meson will detect whether or not you have sassc installed;
+ if you do, it will regenerate the CSS every time you modify the SCSS files
+ and rebuild GTK+.
+* When submitting a MR with SCSS changes remember to also include the
+ corresponding CSS changes (generated locally by Meson as described earlier
+ or manually generated by running parse-sass.sh script).
+
+How to tweak the theme
+----------------------
+
+Adwaita is a complex theme, so to keep it maintainable it's written and processed in SASS. The
+generated CSS is then transformed into a GResource file during GTK+ build and used at runtime in a
+non-legible or editable form.
+
+It is very likely your change will happen in the _common.scss file. That's where all the widget
+selectors are defined. Here's a rundown of the "supporting" stylesheets, that are unlikely to be the
+right place for a drive by stylesheet fix:
+
+_colors.scss - global color definitions. We keep the number of defined colors to a necessary minimum,
+ most colors are derived form a handful of basics. It covers both the light variant and
+ the dark variant.
+
+_colors-public.scss - SCSS colors exported through gtk to allow for 3rd party apps color mixing.
+
+_drawing.scss - drawing helper mixings/functions to allow easier definition of widget drawing under
+ specific context. This is why Adwaita isn't 15000 LOC.
+
+_common.scss - actual definitions of style for each widget. This is where you are likely to add/remove
+ your changes.
+
+You can read about SASS at http://sass-lang.com/documentation/. Once you make
+your changes to the _common.scss file, GTK+ will rebuild the CSS files.
diff --git a/gtk/src/gtk-3.0/default/_apps.scss b/gtk/src/gtk-3.0/default/_apps.scss
new file mode 100644
index 0000000000..77674487b1
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/_apps.scss
@@ -0,0 +1,25 @@
+@import 'apps/tweak-tool';
+@import 'apps/nautilus';
+@import 'apps/gnome-terminal';
+@import 'apps/gnome-software';
+@import 'apps/gedit';
+@import 'apps/gnome-disks';
+@import 'apps/nemo';
+@import 'apps/not-csd';
+@import 'apps/gnome-todo';
+@import 'apps/guake';
+@import 'apps/firefox';
+@import 'apps/ubiquity';
+@import 'apps/geary';
+@import 'apps/usb-creator-gtk';
+@import 'apps/evolution';
+@import 'apps/unity7';
+@import 'apps/xfce';
+@import 'apps/mate'; // Have to be included before all other mate files due to vars
+@import 'apps/brisk-menu';
+@import 'apps/caja';
+@import 'apps/mate-control-center';
+@import 'apps/mate-multimedia-osd';
+@import 'apps/mate-terminal';
+@import 'apps/ding';
+@import 'apps/evince';
diff --git a/gtk/src/gtk-3.0/default/_colors-public.scss b/gtk/src/gtk-3.0/default/_colors-public.scss
new file mode 100644
index 0000000000..3b638e2bf6
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/_colors-public.scss
@@ -0,0 +1,119 @@
+//apps rely on some named colors to be exported
+/* GTK NAMED COLORS
+ ----------------
+ use responsibly! */
+
+// Sass thinks we're using the colors in the variables as strings and may shoot
+// warning, it's innocuous and can be defeated by using "" + $var
+/*
+widget text/foreground color */
+@define-color theme_fg_color #{"" +$fg_color};
+
+/*
+text color for entries, views and content in general */
+@define-color theme_text_color #{"" +$text_color};
+
+/*
+widget base background color */
+@define-color theme_bg_color #{"" +$bg_color};
+
+/*
+text widgets and the like base background color */
+@define-color theme_base_color #{"" +$base_color};
+
+/*
+base background color of selections */
+@define-color theme_selected_bg_color #{"" +$selected_bg_color};
+
+/*
+text/foreground color of selections */
+@define-color theme_selected_fg_color #{"" +$selected_fg_color};
+
+/*
+base background color of insensitive widgets */
+@define-color insensitive_bg_color #{"" +$insensitive_bg_color};
+
+/*
+text foreground color of insensitive widgets */
+@define-color insensitive_fg_color #{"" +$insensitive_fg_color};
+
+/*
+insensitive text widgets and the like base background color */
+@define-color insensitive_base_color #{"" +$base_color};
+
+/*
+widget text/foreground color on backdrop windows */
+@define-color theme_unfocused_fg_color #{"" +$backdrop_fg_color};
+
+/*
+text color for entries, views and content in general on backdrop windows */
+@define-color theme_unfocused_text_color #{"" +$text_color};
+
+/*
+widget base background color on backdrop windows */
+@define-color theme_unfocused_bg_color #{"" +$backdrop_bg_color};
+
+/*
+text widgets and the like base background color on backdrop windows */
+@define-color theme_unfocused_base_color #{"" +$backdrop_base_color};
+
+/*
+base background color of selections on backdrop windows */
+@define-color theme_unfocused_selected_bg_color #{"" +$selected_bg_color};
+
+/*
+text/foreground color of selections on backdrop windows */
+@define-color theme_unfocused_selected_fg_color #{"" + $selected_fg_color};
+
+/*
+insensitive color on backdrop windows*/
+@define-color unfocused_insensitive_color #{"" + $backdrop_insensitive_color};
+
+/*
+widgets main borders color */
+@define-color borders #{"" +$borders_color};
+
+/*
+widgets main borders color on backdrop windows */
+@define-color unfocused_borders #{"" +$backdrop_borders_color};
+
+/*
+these are pretty self explicative */
+@define-color warning_color #{"" +$warning_color};
+@define-color error_color #{"" +$error_color};
+@define-color success_color #{"" +$success_color};
+//@define-color destructive_color #{$destructive_color}
+
+//WM
+
+$_wm_highlight: if($variant=='light', $top_hilight, // Sass gets mad if this is
+ transparentize(black,1)); // done directly in the
+ // color definition
+
+/*
+these colors are exported for the window manager and shouldn't be used in applications,
+read if you used those and something break with a version upgrade you're on your own... */
+@define-color wm_title shade(#{$fg_color}, 1.8);
+@define-color wm_unfocused_title #{$backdrop_fg_color};
+@define-color wm_highlight #{"" + $_wm_highlight};
+@define-color wm_borders_edge #{"" + $borders_edge};
+
+@define-color wm_bg_a shade(#{$bg_color}, 1.2);
+@define-color wm_bg_b #{$bg_color};
+
+@define-color wm_shadow alpha(black, 0.35);
+@define-color wm_border alpha(black, 0.18);
+
+@define-color wm_button_hover_color_a shade(#{$bg_color}, 1.3);
+@define-color wm_button_hover_color_b #{$bg_color};
+@define-color wm_button_active_color_a shade(#{$bg_color}, 0.85);
+@define-color wm_button_active_color_b shade(#{$bg_color}, 0.89);
+@define-color wm_button_active_color_c shade(#{$bg_color}, 0.9);
+
+//FIXME this is really an API
+
+/* content view background such as thumbnails view in Photos or Boxes */
+@define-color content_view_bg #{"" + $base_color};
+
+/* Very contrasty background for text views (@theme_text_color foreground) */
+@define-color text_view_bg #{"" + if($variant == 'light', $base_color, darken($base_color,6%))};
diff --git a/gtk/src/gtk-3.0/default/_colors.scss b/gtk/src/gtk-3.0/default/_colors.scss
new file mode 100644
index 0000000000..886211e55e
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/_colors.scss
@@ -0,0 +1,98 @@
+// When color definition differs for dark and light variant
+// it gets @if ed depending on $variant
+@import 'palette';
+
+$base_color: if($variant == 'light', #ffffff, lighten($jet, 6%));
+$text_color: if($variant == 'light', black, white);
+$caret_color: if($variant == 'light', lighten($text_color, 5%), darken($text_color, 3%));
+$bg_color: if($variant == 'light', #FAFAFA, lighten($jet, 8%));
+$fg_color: if($variant == 'light', $inkstone, $porcelain);
+
+$selected_fg_color: $accent_fg_color;
+$selected_bg_color: if($variant == 'light', $accent_bg_color, darken($accent_bg_color, 4%));
+
+// Yaru: Ignore transformations when using dark accent colors
+$selected_bg_color: $accent_bg_color;
+
+$selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 30%));
+$borders_color: if($variant == 'light', darken($bg_color, 20%), darken($bg_color, 8%));
+$alt_borders_color: if($variant == 'light', darken($bg_color, 24%), darken($bg_color, 8%));
+$borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
+$link_color: if($variant == 'light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 20%));
+$link_visited_color: if($variant == 'light', darken($selected_bg_color, 20%), lighten($selected_bg_color, 10%));
+$top_hilight: $borders_edge;
+$dark_fill: mix($borders_color, $bg_color, 50%);
+$headerbar_color: if($variant == 'light', lighten($bg_color, 5%), darken($bg_color, 3%));
+$menu_color: if($variant == 'light', $bg_color, lighten($jet, 2%));
+$popover_bg_color: $menu_color;
+$popover_hover_color: transparentize($fg_color, 0.85);
+
+$scrollbar_bg_color: if($variant == 'light', mix($bg_color, $fg_color, 80%), mix($base_color, $bg_color, 50%));
+$scrollbar_slider_color: mix($fg_color, $bg_color, 60%);
+$scrollbar_slider_hover_color: mix($fg_color, $bg_color, 80%);
+$scrollbar_slider_active_color: if($variant=='light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 10%));
+
+$warning_color: $yellow;
+$error_color: $red;
+$success_color: lighten($green, 5%);
+$destructive_color: if($variant == 'light', $red, darken($red, 10%));
+
+$osd_fg_color: #eeeeec;
+$osd_text_color: white;
+$osd_bg_color: transparentize(lighten($jet, 2%),0.025);
+$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
+$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
+$osd_borders_color: transparentize(black, 0.3);
+
+$sidebar_bg_color: mix($bg_color, $base_color, 50%);
+$base_hover_color: transparentize($fg_color, 0.95);
+
+$tooltip_borders_color: transparentize(white, 0.9);
+$shadow_color: transparentize(black, 0.9);
+
+$drop_target_color: $success_color;
+
+//insensitive state derived colors
+$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
+$insensitive_bg_color: mix($bg_color, $base_color, 60%);
+$insensitive_borders_color: $borders_color;
+
+//colors for the backdrop state, derived from the main colors.
+$backdrop_base_color: if($variant == 'light', darken($base_color, 1%), lighten($base_color, 3%));
+$backdrop_text_color: if($variant == 'light', transparentize($text_color, 0.31), transparentize(white, 0.45));
+$backdrop_bg_color: if($variant == 'light', $bg_color, lighten($bg_color, 3%));
+$backdrop_fg_color: if($variant == 'light', mix($fg_color, $backdrop_bg_color, 80%), transparentize(white, 0.35));
+$backdrop_insensitive_color: if($variant == 'light', darken($backdrop_bg_color, 15%), lighten($backdrop_bg_color, 15%));
+$backdrop_selected_fg_color: if($variant == 'light', $backdrop_base_color, $backdrop_text_color);
+$backdrop_borders_color: mix($borders_color, $bg_color, 80%);
+$backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, 35%);
+$backdrop_sidebar_bg_color: mix($backdrop_bg_color, $backdrop_base_color, 50%);
+
+$backdrop_scrollbar_bg_color: darken($backdrop_bg_color, 3%);
+$backdrop_scrollbar_slider_color: mix($backdrop_fg_color, $backdrop_bg_color, 40%);
+
+$backdrop_menu_color: if($variant == 'light', $backdrop_base_color, mix($backdrop_bg_color, $backdrop_base_color, 20%));
+
+//special cased widget colors
+$panel_bg_color: if($variant == 'light', darken($porcelain, 4%), $jet);
+$panel_fg_color: $fg_color;
+$suggested_bg_color: if($accent_bg_color == $orange, if($variant == 'light', lighten($green, 5%), darken($green, 5%)), $accent_bg_color);
+$suggested_border_color: if($variant=='light', darken($suggested_bg_color, 5%), darken($suggested_bg_color, 10%));
+$progress_bg_color: if($variant== 'light', lighten($accent_bg_color, 10%), lighten($accent_bg_color, 5%));
+$progress_border_color: $progress_bg_color;
+$checkradio_bg_color: if($variant=='light', lighten($accent_bg_color, 5%), $accent_bg_color);
+$checkradio_fg_color: $accent_fg_color;
+$checkradio_borders_color: if($variant == 'light', darken($checkradio_bg_color, 10%), darken($checkradio_bg_color,40%));
+$focus_border_color: transparentize(lighten($accent_bg_color, 14%), 0.3);
+$coloured_focus_border_color: transparentize(white, 0.3);
+
+// Yaru: Ignore transformations when using dark accent colors
+$progress_bg_color: $accent_bg_color;
+$checkradio_bg_color: $accent_bg_color;
+
+// Optimize accent-color definition for default background colors
+@import 'sass-utils';
+$contrast_target: if($variant=='light', 6, 5.5);
+$link_color: optimize-contrast($bg_color, $accent_bg_color, $target: $contrast_target);
+$link_visited_color: if($variant=='light', darken($link_color, 10%),
+ optimize-contrast($bg_color, $accent_bg_color));
diff --git a/gtk/src/gtk-3.0/default/_common.scss b/gtk/src/gtk-3.0/default/_common.scss
new file mode 100644
index 0000000000..57247739e1
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/_common.scss
@@ -0,0 +1,4852 @@
+@function gtkalpha($c,$a) {
+ @return unquote("alpha(#{$c},#{$a})");
+}
+
+$ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
+$asset_suffix: if($variant=='dark', '-dark', '');
+$backdrop_transition: 200ms ease-out;
+$button_transition: all 200ms $ease-out-quad;
+$button_radius: 6px; // Yaru change: sync radius with Gtk4
+$menu_radius: 6px; // Yaru change: ↑↑↑
+$window_radius: $button_radius + 6; // Yaru change: ↑↑↑
+$popover_radius: $window_radius; // Yaru change: ↑↑↑
+
+// Optional compact sizes for buttons, headerbar and headerbar widgets
+$_sizevariant: 'default'; //compact otherwise
+$_headerbar_height: if($_sizevariant=='default', 46px, 40px);
+$_entry_height: if($_sizevariant=='default', 32px, 28px);
+$_btn_pad: if($_sizevariant=='default', 4px 9px, 2px 6px);
+$_hb_btn_pad: if($_sizevariant=='default', 6px, 5px);
+$_img_btn_pad: if($_sizevariant=='default', 5px, 2px);
+$_sel_menu_pad: if($_sizevariant=='default', 6px 10px, 4px 10px);
+$_circ_btn_pad: if($_sizevariant=='default', 4px, 2px);
+$_switch_margin: if($_sizevariant=='default', 10px, 7px);
+
+* {
+ padding: 0;
+ -GtkToolButton-icon-spacing: 4;
+ -GtkTextView-error-underline-color: $error_color;
+
+ // The size for scrollbars. The slider is 2px smaller, but we keep it
+ // up so that the whole area is sensitive to button presses for the
+ // slider. The stepper button is larger in both directions, the slider
+ // only in the width
+
+ -GtkScrolledWindow-scrollbar-spacing: 0;
+
+ -GtkToolItemGroup-expander-size: 11;
+
+ -GtkWidget-text-handle-width: 20;
+ -GtkWidget-text-handle-height: 24;
+
+ -GtkDialog-button-spacing: 4;
+ -GtkDialog-action-area-border: 0;
+
+ // We use the outline properties to signal the focus properties
+ // to the adwaita engine: using real CSS properties is faster,
+ // and we don't use any outlines for now.
+
+ outline-color: gtkalpha(currentColor, 0.3);
+ outline-style: dashed;
+ outline-offset: -3px;
+ outline-width: 1px;
+ -gtk-outline-radius: $button-radius - 2;
+
+ -gtk-secondary-caret-color: $selected_bg_color
+}
+
+
+/***************
+ * Base States *
+ ***************/
+.background {
+ color: $fg_color;
+ background-color: $bg_color;
+
+ &:backdrop {
+ color: $backdrop_fg_color;
+ background-color: $backdrop_bg_color;
+ text-shadow: none;
+ -gtk-icon-shadow: none;
+ }
+}
+
+/*
+ These wildcard seems unavoidable, need to investigate.
+ Wildcards are bad and troublesome, use them with care,
+ or better, just don't.
+ Everytime a wildcard is used a kitten dies, painfully.
+*/
+
+*:disabled { -gtk-icon-effect: dim; }
+
+.gtkstyle-fallback {
+ color: $fg_color;
+ background-color: $bg_color;
+
+ &:hover {
+ color: $fg_color;
+ background-color: lighten($bg_color, 10%);
+ }
+
+ &:active {
+ color: $fg_color;
+ background-color: darken($bg_color, 10%);
+ }
+
+ &:disabled {
+ color: $insensitive_fg_color;
+ background-color: $insensitive_bg_color;
+ }
+
+ &:selected {
+ color: $selected_fg_color;
+ background-color: $selected_bg_color;
+ }
+}
+
+.view,
+%view {
+ color: $text_color;
+ caret-color: $caret_color;
+ background-color: $base_color;
+
+ &:backdrop {
+ color: $backdrop_text_color;
+ background-color: $backdrop_base_color;
+ &:disabled { color: $backdrop_insensitive_color; }
+ }
+
+ &:disabled {
+ color: $insensitive_fg_color;
+ background-color: $insensitive_bg_color;
+ }
+
+ &:selected {
+ &:focus, & {
+ @extend %selected_items;
+
+ border-radius: 3px;
+ }
+ }
+}
+
+.view,
+textview {
+ text {
+ @extend %view;
+
+ selection { &:focus, & { @extend %selected_items; }}
+ }
+}
+
+textview border { background-color: mix($bg_color, $base_color, 50%); }
+
+iconview { @extend .view; }
+
+.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;
+
+ &:selected {
+ @extend %selected_items;
+
+ outline-offset: -2px;
+ }
+ }
+}
+
+.content-view .tile {
+ margin: 2px;
+ background-color: if($variant=='light', transparent, black);
+ border-radius: 0;
+ padding: 0;
+
+ &:backdrop { background-color: if($variant=='light', transparent, darken($backdrop_base_color,5%)); }
+ &:active, &:selected { background-color: if($variant=='light', transparent, $selected_bg_color); }
+ &:disabled { background-color: if($variant=='light', transparent, $insensitive_bg_color); }
+}
+
+label {
+ caret-color: currentColor; // this shouldn't be needed.
+
+ &.separator {
+ @extend .dim-label;
+ }
+
+ &:selected { @extend %nobg_selected_items; }
+
+ selection {
+ background-color: $selected_bg_color;
+ color: $selected_fg_color;
+ }
+
+ &:disabled {
+ color: $insensitive_fg_color;
+
+ button & { color: inherit; }
+
+ &:backdrop {
+ color: $backdrop_insensitive_color;
+
+ button & { color: inherit; }
+ }
+
+ selection { @extend %selected_items_disabled; }
+ }
+
+ &:backdrop {
+ selection { @extend %selected_items_backdrop; }
+ }
+
+ &.error {
+ color: $error_color;
+ &:disabled { color: transparentize($error_color,0.5); }
+ &:disabled:backdrop { color: transparentize($error_color,0.6); }
+ }
+}
+
+.dim-label {
+ opacity: 0.55;
+ text-shadow: none;
+}
+
+assistant {
+ .sidebar {
+ background-color: $base_color;
+ border-top: 1px solid $borders_color;
+
+ &:backdrop {
+ background-color: $backdrop_base_color;
+ border-color: $backdrop_borders_color;
+ }
+ }
+
+ &.csd .sidebar { border-top-style: none; }
+
+ .sidebar label { padding: 6px 12px; }
+
+ .sidebar label.highlight { background-color: mix($bg_color, $fg_color, 80%); }
+}
+
+%osd,
+.osd {
+ color: $osd_fg_color;
+ border: none;
+ background-color: $osd_bg_color;
+ background-clip: padding-box;
+ text-shadow: 0 1px black;
+ -gtk-icon-shadow: 0 1px black;
+
+ &:backdrop {
+ text-shadow: none;
+ -gtk-icon-shadow: none;
+ }
+}
+
+
+/*********************
+ * Spinner Animation *
+ *********************/
+@keyframes spin {
+ to { -gtk-icon-transform: rotate(1turn); }
+}
+
+spinner {
+ background: none;
+ &:backdrop { color: $backdrop_fg_color; }
+ 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;
+}
+.title-2 {
+ font-weight: 800;
+ font-size: 15pt;
+}
+.title-3 {
+ font-weight: 700;
+ font-size: 15pt;
+}
+.title-4 {
+ font-weight: 700;
+ font-size: 13pt;
+}
+.heading {
+ font-weight: 700;
+ font-size: 11pt;
+}
+.body {
+ font-weight: 400;
+ font-size: 11pt;
+}
+.caption-heading {
+ font-weight: 700;
+ font-size: 9pt;
+}
+.caption {
+ font-weight: 400;
+ font-size: 9pt;
+}
+
+/****************
+ * Text Entries *
+ ****************/
+
+%entry,
+entry {
+ %entry_basic, & {
+ min-height: $_entry_height;
+ padding-left: 8px;
+ padding-right: 8px;
+ border: 1px solid;
+ border-radius: $button_radius;
+ transition: all 200ms $ease-out-quad;
+
+ @include entry(normal);
+
+ image { // icons inside the entry
+ &.left { margin-right: 6px; }
+ &.right { margin-left: 6px; }
+ }
+
+
+ &.flat {
+ &:focus, &:backdrop, &:disabled, &:backdrop:disabled, & {
+ min-height: 0;
+ padding: 2px;
+ background-color: transparent;
+ border-color: transparent;
+ border-radius: 0;
+ }
+ }
+
+ &:focus { @include entry(focus); }
+
+ &:disabled { @include entry(insensitive); }
+
+ &:backdrop {
+ @include entry(backdrop);
+
+ transition: $backdrop_transition;
+ }
+
+ &:backdrop:disabled { @include entry(backdrop-insensitive); }
+
+ selection { @extend %selected_items; }
+
+ // entry error and warning style
+ @each $e_type, $e_color in (error, $error_color),
+ (warning, $warning_color) {
+ &.#{$e_type} {
+ color: $e_color;
+ border-color: entry_focus_border($e_color);
+
+ &:focus { @include entry(focus, $e_color); }
+
+ selection { background-color: $e_color; }
+ }
+ }
+
+ image { // entry icons colors
+ color: mix($fg_color, $base_color, 80%);
+
+ &:hover { color: $fg_color; }
+
+ &:active { color: $selected_bg_color; }
+
+ &:backdrop { color: mix($backdrop_fg_color, $backdrop_base_color, 80%); }
+ }
+
+ &:drop(active) {
+ &:focus, & {
+ border-color: $drop_target_color;
+ box-shadow: inset 0 0 0 1px $drop_target_color;
+ }
+ }
+
+ .osd & {
+ @include entry(osd);
+
+ &:focus { @include entry(osd-focus); }
+
+ &:backdrop { @include entry(osd-backdrop); }
+
+ &:disabled { @include entry(osd-insensitive); }
+ }
+ }
+
+ progress {
+ margin: 2px -6px;
+ background-color: transparent;
+ background-image: none;
+ border-radius: 0;
+ border-width: 0 0 2px;
+ border-color: $progress_bg_color;
+ border-style: solid;
+ box-shadow: none;
+
+ &:backdrop { background-color: transparent; }
+ }
+
+ // linked entries
+ .linked:not(.vertical) > & { @extend %linked; }
+ .linked:not(.vertical) > &:focus + &,
+ .linked:not(.vertical) > &:focus + button,
+ .linked:not(.vertical) > &:focus + combobox > box > button.combo { border-left-color: entry_focus_border(); }
+
+ .linked:not(.vertical) > &:focus.error + &,
+ .linked:not(.vertical) > &:focus.error + button,
+ .linked:not(.vertical) > &:focus.error + combobox > box > button.combo { border-left-color: entry_focus_border($error_color); }
+
+ .linked:not(.vertical) > &:drop(active) + &,
+ .linked:not(.vertical) > &:drop(active) + button,
+ .linked:not(.vertical) > &:drop(active) + combobox > box > button.combo { border-left-color: $drop_target_color; }
+
+ // Vertically linked entries
+ // FIXME: take care of "colored" entries
+ .linked.vertical > & {
+ @extend %linked_vertical;
+
+ // brighter border between linked entries
+ &:not(:disabled) + entry:not(:disabled),
+ &:not(:disabled) + %entry:not(:disabled) {
+ border-top-color: mix($borders_color, $base_color, 30%);
+
+ &:backdrop { border-top-color: mix($backdrop_borders_color, $backdrop_base_color, 30%); }
+ }
+
+ // brighter border between linked insensitive entries
+ &:disabled + %entry:disabled,
+ &:disabled + entry:disabled { border-top-color: mix($borders_color, $base_color, 30%); }
+
+ // color back the top border of a linked focused entry following another entry.
+ // :not(:only-child) is a specificity bump hack.
+ + %entry:focus:not(:only-child),
+ + entry:focus:not(:only-child) { border-top-color: entry_focus_border(); }
+
+ + %entry:focus.error:not(:only-child),
+ + entry:focus.error:not(:only-child) { border-top-color: entry_focus_border($error_color); }
+
+ + %entry:drop(active):not(:only-child),
+ + entry:drop(active):not(:only-child) { border-top-color: $drop_target_color; }
+
+ // this takes care of coloring the top border of the focused entry subsequent widget.
+ // :not(:only-child) is a specificity bump hack.
+ &:focus:not(:only-child) {
+ + %entry,
+ + entry,
+ + button,
+ + combobox > box > button.combo { border-top-color: entry_focus_border(); }
+ }
+
+ &:focus.error:not(:only-child) {
+ + %entry,
+ + entry,
+ + button,
+ + combobox > box > button.combo { border-top-color: entry_focus_border($error_color); }
+ }
+
+ &:drop(active):not(:only-child) {
+ + %entry,
+ + entry,
+ + button,
+ + combobox > box > button.combo { border-top-color: $drop_target_color; }
+ }
+ }
+
+ &.error { color: $error_color; }
+}
+
+treeview entry {
+ &:focus {
+ &: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 { border-color: $selected_bg_color; }
+ }
+}
+
+.entry-tag {
+ // sizing
+ padding: 5px;
+
+ margin-top: 2px;
+ margin-bottom: 2px;
+
+ // side margins: compensate the entry padding with a negative margin
+ // then the negative margin itself
+ :dir(ltr) & {
+ margin-left: 8px;
+ margin-right: -5px;
+ }
+ :dir(rtl) & {
+ margin-left: -5px;
+ margin-right: 8px;
+ }
+
+ border-style: none;
+
+ $_entry_tag_color: if($variant=='light', $selected_fg_color, $base_color);
+ color: $_entry_tag_color;
+
+ $_entry_tag_bg: if($variant=='light', $selected_bg_color, mix($fg_color, $base_color, 50%));
+ background-color: $_entry_tag_bg;
+
+ &:hover {
+ background-color: lighten($_entry_tag_bg, 10%);
+ }
+
+ :backdrop & {
+ color: $backdrop_base_color;
+ background-color: if($variant=='light', $selected_bg_color,
+ mix($backdrop_fg_color, $backdrop_base_color, 50%));
+ }
+
+ &.button {
+ background-color: transparent;
+ color: transparentize($_entry_tag_color, 0.3);
+ }
+
+ :not(:backdrop) &.button {
+ &:hover {
+ border: 1px solid $_entry_tag_bg;
+ color: $_entry_tag_color;
+ }
+ &:active {
+ background-color: $_entry_tag_bg;
+ color: transparentize($_entry_tag_color, 0.3);
+ }
+ }
+}
+
+/***********
+ * Buttons *
+ ***********/
+// stuff for .needs-attention
+$_dot_color: if($variant=='light', $selected_bg_color,
+ lighten($selected_bg_color,15%));
+@debug("Selected dot color is " + $_dot_color + ", BG color " + $selected_bg_color);
+@keyframes needs_attention {
+ from {
+ background-image: -gtk-gradient(radial,
+ center center, 0,
+ center center, 0.01,
+ to($_dot_color),
+ to(transparent));
+ }
+
+ to {
+ background-image: -gtk-gradient(radial,
+ center center, 0,
+ center center, 0.5,
+ to($selected_bg_color),
+ to(transparent));
+ }
+}
+
+%button,
+button {
+ @at-root %button_basic, & {
+
+ min-height: 24px;
+ min-width: 16px;
+ padding: $_btn_pad;
+ border: 1px solid;
+ border-radius: $button_radius;
+ transition: $button_transition;
+
+ @include button(normal);
+
+ @at-root %button_basic_flat,
+ &.flat {
+ @include button(undecorated);
+ // to avoid adiacent buttons borders clashing when transitioning, the transition on the normal state is set
+ // to none, while it's added back in the hover state, so the button decoration will fade in on hover, but
+ // it won't fade out when the pointer leave the button allocation area. To make the transition more evident
+ // in this case the duration is increased.
+ transition: none;
+
+ &:hover {
+ transition: $button_transition;
+ transition-duration: 500ms;
+
+ &:active { transition: $button_transition; }
+ }
+ }
+
+ &:hover {
+ @include button(hover);
+ -gtk-icon-effect: highlight;
+ }
+
+ &:active,
+ &:checked {
+ @include button(active);
+
+ transition-duration: 50ms;
+ }
+
+ &:backdrop {
+ &.flat, & {
+ @include button(backdrop);
+
+ transition: $backdrop_transition;
+ -gtk-icon-effect: none;
+
+ &:active,
+ &:checked { @include button(backdrop-active); }
+
+ &:disabled {
+ @include button(backdrop-insensitive);
+
+ &:active,
+ &:checked { @include button(backdrop-insensitive-active); }
+ }
+ }
+ }
+
+ @at-root %button_basic_flat,
+ &.flat { &:backdrop, &:disabled, &:backdrop:disabled { @include button(undecorated); }}
+
+ &:disabled {
+ @include button(insensitive);
+
+ &:active,
+ &:checked { @include button(insensitive-active); }
+ }
+
+ &.image-button {
+ min-width: 24px;
+ padding-left: $_img_btn_pad;
+ padding-right: $_img_btn_pad;
+ }
+
+ &.text-button {
+ padding-left: 16px;
+ padding-right: 16px;
+ }
+
+ &.text-button.image-button {
+ padding-left: 8px;
+ padding-right: 8px;
+
+ label {
+ padding-left: 8px;
+ padding-right: 8px;
+ }
+ }
+
+ @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;
+ }
+ }
+
+ @at-root %button_selected, & {
+ row:selected & {
+ @if $variant == 'light' { border-color: $selected_borders_color; }
+ }
+
+ @at-root %button_selected_flat, &.flat {
+ row:selected & {
+ &:not(:active):not(:checked):not(:hover):not(disabled) {
+ color: $selected_fg_color;
+ border-color: transparent;
+
+ &:backdrop { color: if($variant=='light', $backdrop_base_color, $backdrop_fg_color); }
+ }
+ }
+ }
+ }
+
+
+ // big standalone buttons like in Documents pager
+ &.osd {
+ min-width: 26px;
+ min-height: 32px;
+
+ &.image-button { min-width: 34px; }
+
+ color: $osd_fg_color;
+ border-radius: 5px;
+
+ @include button(osd);
+
+ border: none;
+ box-shadow: none;
+
+ &:hover {
+ @include button(osd-hover);
+
+ border: none;
+ box-shadow: none;
+ }
+
+ &:active,
+ &:checked {
+ @include button(osd-active);
+
+ border: none;
+ box-shadow: none;
+ }
+
+ &:disabled {
+ &:backdrop, & {
+ @include button(osd-insensitive);
+
+ border: none;
+ }
+ }
+
+ &:backdrop {
+ @include button(osd-backdrop);
+
+ border: none;
+ }
+ }
+
+ //overlay / OSD style
+ @at-root %osd_button,
+ .osd & {
+ @include button(osd);
+
+ &:hover { @include button(osd-hover); }
+
+ &:active,
+ &:checked { &:backdrop, & { @include button(osd-active); }}
+
+ &:disabled { &:backdrop, & { @include button(osd-insensitive); }}
+
+ &:backdrop { @include button(osd-backdrop); }
+
+ &.flat {
+ @include button(undecorated);
+
+ box-shadow: none; //FIXME respect no edge on the button mixin
+ text-shadow: 0 1px black;
+ -gtk-icon-shadow: 0 1px black;
+
+ &:hover { @include button(osd-hover); }
+
+ &:disabled {
+ @include button(osd-insensitive);
+ background-image: none;
+ border-color: transparent;
+ box-shadow: none;
+ }
+
+ &:backdrop { @include button(undecorated); }
+
+ &:active,
+ &:checked { @include button(osd-active); }
+ }
+ }
+
+ // Suggested and Destructive Action buttons
+ @each $b_type, $b_color in (suggested-action, $suggested_bg_color),
+ (destructive-action, $destructive_color) {
+ &.#{$b_type} {
+ @include button(normal, $b_color, white);
+
+ &.flat {
+ @include button(undecorated);
+
+ color: $b_color; //FIXME: does it work on the dark variant?
+ }
+
+ &:hover { @include button(hover, $b_color, white); }
+
+ &:active,
+ &:checked { @include button(active, $b_color, white); }
+
+ &:backdrop,
+ &.flat:backdrop {
+ @include button(backdrop, $b_color, white);
+
+ &:active,
+ &:checked { @include button(backdrop-active, $b_color, white); }
+
+ &:disabled {
+ @include button(backdrop-insensitive);
+
+ &:active,
+ &:checked { @include button(backdrop-insensitive-active, $b_color, white); }
+ }
+ }
+
+ &.flat {
+ &:backdrop, &:disabled, &:backdrop:disabled {
+ @include button(undecorated);
+
+ color: transparentize($b_color, 0.2);
+ }
+ }
+
+ &:disabled {
+ @include button(insensitive);
+
+ &:active,
+ &:checked { @include button(insensitive-active, $b_color, white); }
+ }
+
+ .osd & {
+ @include button(osd, $b_color);
+
+ &:hover { @include button(osd-hover, $b_color); }
+
+ &:active,
+ &:checked { &:backdrop, & { @include button(osd-active, $b_color); }}
+
+ &:disabled { &:backdrop, & { @include button(osd-insensitive, $b_color); }}
+
+ &:backdrop { @include button(osd-backdrop, $b_color); }
+ }
+ }
+ }
+
+ .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 overriden by GtkRadioButton outline-offset
+
+ > label {
+ padding-left: 6px; // label padding
+ padding-right: 6px; //
+ }
+
+ > image {
+ padding-left: 6px; // image padding
+ padding-right: 6px; //
+ padding-top: 3px; //
+ padding-bottom: 3px; //
+ }
+
+ &.text-button {
+ // compensate text-button paddings
+ padding-left: 10px;
+ padding-right: 10px;
+ }
+
+ &.image-button {
+ // we want image buttons to have a 1:1 aspect ratio, so compensation
+ // of the padding added to the GtkImage is needed
+ 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; }}
+
+ &.font { > box > box > label { font-weight: bold; }}
+
+ // inline-toolbar buttons
+ .inline-toolbar & { @extend %linked; }
+
+ .primary-toolbar & { -gtk-icon-shadow: none; } // tango icons don't need shadows
+
+ .linked > & { @extend %linked; }
+
+ .linked.vertical > & { @extend %linked_vertical; }
+
+ &.circular { // The Bloody Circul Button
+ border-radius: 9999px;
+ -gtk-outline-radius: 9999px;
+ padding: $_circ_btn_pad; /* circles instead of ellipses */
+
+ label { padding: 0; }
+
+ // the followind code is needed since we use a darker bottom border on buttons, which looks pretty
+ // bad with a 100% border radius (see https://bugzilla.gnome.org/show_bug.cgi?id=771205 for details),
+ // so on relevant states we an additional background-image with a gradient clipped on the border-box,
+ // so setting a transparent border would reveal it.
+
+ $_border_bg: linear-gradient(to top, $alt-borders-color 25%, $borders-color 50%);
+
+ &:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
+ @include button(normal);
+
+ background-image: $button_fill, $_border_bg;
+ border-color: transparent;
+ }
+
+ &:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
+ @include button(hover);
+
+ background-image: $button_fill, $_border_bg;
+ border-color: transparent;
+ }
+
+ background-origin: padding-box, border-box;
+ background-clip: padding-box, border-box;
+ }
+}
+
+%needs_attention {
+ animation: needs_attention 150ms ease-in;
+ $_dot_shadow: _text_shadow_color();
+ $_dot_shadow_r: if($variant=='light',0.5,0.45);
+ background-image: -gtk-gradient(radial,
+ center center, 0,
+ center center, 0.5,
+ to($_dot_color),
+ to(transparent)),
+ -gtk-gradient(radial,
+ center center, 0,
+ center center, $_dot_shadow_r,
+ to($_dot_shadow),
+ to(transparent));
+ 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; }
+ }
+}
+
+
+// all the following is for the +|- buttons on inline toolbars, that way
+// should really be deprecated...
+.inline-toolbar toolbutton > button { // redefining the button look is
+ // needed since those are flat...
+ @include button(normal);
+
+ &:hover { @include button(hover); }
+
+ &:active,
+ &:checked{ @include button(active); }
+
+ &:disabled {
+ @include button(insensitive);
+
+ &:active,
+ &:checked { @include button(insensitive-active); }
+ }
+
+ &:backdrop {
+ @include button(backdrop);
+
+ &:active,
+ &:checked { @include button(backdrop-active); }
+
+ &:disabled {
+ @include button(backdrop-insensitive);
+
+ &:active,
+ &:checked { @include button(backdrop-insensitive-active); }
+ }
+ }
+}
+
+// More inline toolbar buttons
+toolbar.inline-toolbar toolbutton {
+ > button.flat { @extend %linked_middle; }
+
+ &:first-child > button.flat { @extend %linked_left; }
+
+ &:last-child > button.flat { @extend %linked_right; }
+
+ &:only-child > button.flat { @extend %linked_only_child; }
+}
+
+%linked_middle {
+ border-right-style: none;
+ border-radius: 0;
+ -gtk-outline-radius: 0;
+}
+
+%linked_left {
+ border-top-left-radius: $button_radius;
+ border-bottom-left-radius: $button_radius;
+ -gtk-outline-top-left-radius: $button_radius;
+ -gtk-outline-bottom-left-radius: $button_radius;
+}
+
+%linked_right {
+ border-right-style: solid;
+ border-top-right-radius: $button_radius;
+ border-bottom-right-radius: $button_radius;
+ -gtk-outline-top-right-radius: $button_radius;
+ -gtk-outline-bottom-right-radius: $button_radius;
+}
+
+%linked_only_child {
+ border-style: solid;
+ border-radius: $button_radius;
+ -gtk-outline-radius: $button_radius;
+}
+
+// .linked assumes Box, which reverses nodes in RTL, so 1st child is always left
+%linked {
+ @extend %linked_middle;
+
+ &:first-child { @extend %linked_left; }
+ &:last-child { @extend %linked_right; }
+
+ &:only-child { @extend %linked_only_child; }
+}
+
+// Other widgets use widget child order, so 1st/last child are at text start/end
+%linked_flippable {
+ @extend %linked_middle;
+
+ &:dir(ltr) {
+ &:first-child { @extend %linked_left; }
+ &:last-child { @extend %linked_right; }
+ }
+
+ &:dir(rtl) {
+ &:first-child { @extend %linked_right; }
+ &:last-child { @extend %linked_left; }
+ }
+
+ &:only-child { @extend %linked_only_child; }
+}
+
+%linked_vertical_middle {
+ border-style: solid solid none solid;
+ border-radius: 0;
+ -gtk-outline-radius: 0;
+}
+
+%linked_vertical_top {
+ border-top-left-radius: $button_radius;
+ border-top-right-radius: $button_radius;
+ -gtk-outline-top-left-radius: $button_radius;
+ -gtk-outline-top-right-radius: $button_radius;
+}
+
+%linked_vertical_bottom {
+ border-bottom-style: solid;
+ border-bottom-left-radius: $button_radius;
+ border-bottom-right-radius: $button_radius;
+ -gtk-outline-bottom-left-radius: $button_radius;
+ -gtk-outline-bottom-right-radius: $button_radius;
+}
+
+%linked_vertical_only_child {
+ border-style: solid;
+ border-radius: $button_radius;
+ -gtk-outline-radius: $button_radius;
+}
+
+%linked_vertical {
+ @extend %linked_vertical_middle;
+
+ &:first-child { @extend %linked_vertical_top; }
+
+ &:last-child { @extend %linked_vertical_bottom; }
+
+ &:only-child { @extend %linked_vertical_only_child; }
+}
+
+%undecorated_button {
+ background-color: transparent;
+ background-image: none;
+ border-color: transparent;
+ box-shadow: inset 0 1px transparentize(white, 1),
+ 0 1px transparentize(white, 1);
+ text-shadow: none;
+ -gtk-icon-shadow: none;
+}
+
+/* menu buttons */
+modelbutton.flat,
+.menuitem.button.flat {
+ min-height: 26px;
+ padding-left: 5px;
+ padding-right: 5px;
+ border-radius: $button_radius;
+ outline-offset: -2px;
+
+ @extend %undecorated_button;
+
+ &:hover { background-color: $popover_hover_color; }
+
+ &:selected { @extend %selected_items; }
+
+ &:backdrop,
+ &:backdrop:hover { @extend %undecorated_button; }
+}
+
+modelbutton.flat arrow {
+ background: none;
+
+ &:hover { background: none; }
+
+ &.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
+
+ &.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
+}
+
+button.color {
+ padding: 4px;
+
+ colorswatch:only-child {
+ &, overlay { border-radius: 0; }
+
+ @if $variant == 'light' {
+ box-shadow: 0 1px _text_shadow_color();
+
+ .osd & { box-shadow: none; }
+ }
+ }
+
+ @if $variant == 'light' {
+ .osd &, & {
+ &:disabled,
+ &:backdrop,
+ &:active,
+ &:checked { colorswatch:only-child { box-shadow: none; }}
+ }
+ }
+}
+
+/* list buttons */
+/* tone down as per new designs, see issue #1473, #1748 */
+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); }
+}
+
+/*********
+ * Links *
+ *********/
+
+%link,
+*:link {
+ color: $link_color;
+
+ &:visited {
+ color: $link_visited_color;
+
+ *:selected & { color: mix($selected_fg_color, $link_visited_color, 60%); }
+ }
+
+ &:hover {
+ $_fg: lighten($link_color, 10%);
+ color: $_fg;
+
+ *:selected & { color: mix($selected_fg_color, $_fg, 90%); }
+ }
+
+ &:active {
+ color: $link_color;
+
+ *:selected & { color: mix($selected_fg_color, $link_color, 80%); }
+ }
+
+ &:disabled, &:disabled:backdrop { color: transparentize(desaturate($link_color, 100%), 0.2); }
+
+ &:backdrop { &:backdrop:hover, &:backdrop:hover:selected, & { color: transparentize($link_color, 0.1); }}
+
+ @at-root %link_selected,
+ &:selected,
+ *:selected & { color: mix($selected_fg_color, $link_color, 80%); }
+}
+
+button:link,
+button:visited {
+ @extend %undecorated_button;
+
+ @extend %link;
+
+ text-shadow: none;
+
+ &:hover,
+ &:active,
+ &:checked {
+ @extend %undecorated_button;
+
+ text-shadow: none;
+ }
+
+ > label {
+ @extend %link;
+
+ text-decoration-line: underline;
+
+ }
+}
+
+
+/*****************
+ * GtkSpinButton *
+ *****************/
+spinbutton {
+ &:not(.vertical) {
+ // in this horizontal configuration, the whole spinbutton
+ // behaves as the entry, so we extend the entry styling
+ // and nuke the style on the internal entry
+ @extend %entry;
+
+ padding: 0;
+
+ %spinbutton_horz_entry {
+ min-width: 28px;
+ // reset all the other props since the spinbutton node is styled here
+ margin: 0;
+ background: none;
+ background-color: transparent;
+ border: none;
+ border-radius: 0;
+ box-shadow: none;
+
+ &:backdrop:disabled { background-color: transparent; }
+ }
+
+ entry {
+ @extend %spinbutton_horz_entry;
+ }
+
+ button {
+ min-height: 16px;
+ margin: 0;
+ padding-bottom: 0;
+ padding-top: 0;
+ color: mix($fg_color, $base_color, 90%);
+ background-image: none;
+ border-style: none none none solid;
+ border-color: transparentize($borders_color, 0.7);
+ border-radius: 0;
+ box-shadow: none;
+
+ &:dir(rtl) { border-style: none solid none none; }
+
+ &:hover {
+ color: $fg_color;
+ background-color: $base_hover_color;
+ }
+
+ &:disabled {
+ color: transparentize($insensitive_fg_color, 0.7);
+ background-color: transparent;
+ }
+
+ &:active {
+ background-color: transparentize(black, 0.9);
+ box-shadow: inset 0 2px 3px -1px transparentize(black, 0.8);
+ }
+
+ &:backdrop {
+ color: mix($backdrop_fg_color, $backdrop_base_color, 90%);
+ background-color: transparent;
+ border-color: transparentize($backdrop_borders_color, 0.7);
+ transition: $backdrop_transition;
+ }
+
+ &:backdrop:disabled {
+ color: transparentize($backdrop_insensitive_color,0.7);
+ background-color: transparent;
+ background-image: none;
+ border-style: none none none solid; // It is needed or it gets overridden
+
+ &:dir(rtl) { border-style: none solid none none; }
+ }
+
+ &:dir(ltr):last-child { border-radius: 0 $button_radius $button_radius 0; }
+
+ &:dir(rtl):first-child { border-radius: $button_radius 0 0 $button_radius; }
+ }
+ }
+
+ // OSD horizontal
+ .osd &:not(.vertical) {
+ entry {
+ @extend %spinbutton_horz_entry;
+ }
+
+ button {
+ @include button(undecorated);
+
+ color: $osd_fg_color;
+ border-style: none none none solid;
+ border-color: transparentize($osd_borders_color, 0.3);
+ border-radius: 0;
+ box-shadow: none;
+ -gtk-icon-shadow: 0 1px black;
+
+ &:dir(rtl) { border-style: none solid none none; }
+
+ &:hover {
+ @include button(undecorated);
+
+ color: $osd_fg_color;
+ border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
+ background-color: transparentize($osd_fg_color, 0.9);
+ -gtk-icon-shadow: 0 1px black;
+ box-shadow: none;
+ }
+
+ &:backdrop {
+ @include button(undecorated);
+
+ color: $osd_fg_color;
+ border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
+ -gtk-icon-shadow: none;
+ box-shadow: none;
+ }
+
+ &:disabled {
+ @include button(undecorated);
+
+ color: $osd_insensitive_fg_color;
+ border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
+ -gtk-icon-shadow: none;
+ box-shadow: none;
+ }
+
+ &:dir(ltr):last-child { border-radius: 0 $button_radius $button_radius 0; }
+
+ &:dir(rtl):first-child { border-radius: $button_radius 0 0 $button_radius; }
+ }
+ }
+
+ // Vertical
+ &.vertical {
+ // in the vertical configuration, we treat the spinbutton
+ // as a box, and tweak the style of the entry in the middle
+ // so that it's linked
+
+ // FIXME: this should not be set at all, but otherwise it gets the wrong
+ // color
+ &:disabled { color: $insensitive_fg_color; }
+
+ &:backdrop:disabled { color: $backdrop_insensitive_color; }
+
+ &:drop(active) {
+ border-color: transparent;
+ box-shadow: none;
+ }
+
+ entry {
+ min-height: 32px;
+ min-width: 32px;
+ padding: 0;
+ border-radius: 0;
+ }
+
+ button {
+ min-height: 32px;
+ min-width: 32px;
+ padding: 0;
+
+ &.up { @extend %top_button; }
+
+ &.down { @extend %bottom_button; }
+ }
+
+ %top_button {
+ border-radius: $button_radius $button_radius 0 0;
+ border-style: solid solid none solid;
+ }
+
+ %bottom_button {
+ border-radius: 0 0 $button_radius $button_radius;
+ border-style: none solid solid solid;
+ }
+ }
+
+ // OSD vertical
+ .osd &.vertical button:first-child {
+ @include button(osd);
+
+ &:hover { @include button(osd-hover);}
+
+ &:active { @include button(osd-active); }
+
+ &:disabled { @include button(osd-insensitive); }
+
+ &:backdrop { @include button(osd-backdrop); }
+ }
+
+ // Misc
+ treeview &:not(.vertical) {
+ min-height: 0;
+ border-style: none;
+ border-radius: 0;
+
+ entry {
+ min-height: 0;
+ padding: 1px 2px;
+ }
+ }
+ font-feature-settings: "tnum";
+}
+
+
+/**************
+ * ComboBoxes *
+ **************/
+combobox {
+ arrow {
+ -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
+ min-height: 16px;
+ min-width: 16px;
+ }
+
+ &.linked {
+ button:nth-child(2) {
+ &:dir(ltr) { @extend %linked_right; }
+ &:dir(rtl) { @extend %linked_left; }
+ }
+ }
+
+ &:drop(active) { // FIXME: untested
+ box-shadow: none;
+
+ button.combo { @extend %button_basic_drop_active; }
+ }
+}
+
+// the combo is a composite widget so the way we do button linking doesn't
+// work, special case needed. See
+// https://bugzilla.gnome.org/show_bug.cgi?id=733979
+
+.linked:not(.vertical) > combobox > box > button.combo { @extend %linked_middle; }
+.linked:not(.vertical) > combobox:first-child > box > button.combo { @extend %linked_left; }
+.linked:not(.vertical) > combobox:last-child > box > button.combo { @extend %linked_right; }
+.linked:not(.vertical) > combobox:only-child > box > button.combo { @extend %linked_only_child; }
+
+.linked.vertical > combobox > box > button.combo { @extend %linked_vertical_middle; }
+.linked.vertical > combobox:first-child > box > button.combo { @extend %linked_vertical_top; }
+.linked.vertical > combobox:last-child > box > button.combo { @extend %linked_vertical_bottom; }
+.linked.vertical > combobox:only-child > box > button.combo { @extend %linked_vertical_only_child; }
+
+
+/************
+ * Toolbars *
+ ************/
+%toolbar {
+ -GtkWidget-window-dragging: true;
+ padding: 4px;
+ background-color: $bg_color;
+}
+
+toolbar {
+ @extend %toolbar;
+
+ padding: 4px 3px 3px 4px;
+
+ // on OSD
+ .osd & { background-color: transparent; }
+
+ // stand-alone OSD toolbars
+ &.osd {
+ padding: 13px;
+ border: none;
+ border-radius: 5px;
+ background-color: $osd_bg_color;
+
+ &.left,
+ &.right,
+ &.top,
+ &.bottom { border-radius: 0; } // positional classes for `attached` osd toolbars
+ }
+
+ // toolbar separators
+ &.horizontal separator { margin: 0 7px 1px 6px; }
+ &.vertical separator { margin: 6px 1px 7px 0; }
+
+ &:not(.inline-toolbar):not(.osd) {
+ // workaround: add margins to the children of tool items to simulate
+ // spacing, ignore the overflow button (.toggle) and the overflow menu
+ // (.popup)
+ > *:not(.toggle):not(.popup) > * {
+ margin-right: 1px;
+ margin-bottom: 1px;
+ }
+ }
+}
+
+//searchbar, location-bar & inline-toolbar
+.inline-toolbar {
+ @extend %toolbar;
+
+ @extend %darkbar;
+
+ padding: 3px;
+ border-width: 0 1px 1px;
+ border-radius: 0 0 5px 5px;
+}
+
+searchbar > revealer > box,
+.location-bar {
+ @extend %toolbar;
+
+ @extend %darkbar;
+
+ border-width: 0 0 1px;
+ padding: 3px;
+}
+
+searchbar > revealer > box {
+ // workaround: undo the GtkContainer:border-width and use CSS padding instead
+ margin: -6px;
+ padding: 6px;
+}
+
+%darkbar {
+ border-style: solid;
+ border-color: $borders_color;
+ $_bg: mix($bg_color, $borders_color, 70%);
+ background-color: $_bg;
+
+ &:backdrop {
+ border-color: $backdrop_borders_color;
+ background-color: $backdrop_dark_fill;
+ box-shadow: none;
+ transition: $backdrop_transition;
+ }
+}
+
+
+/***************
+ * Header bars *
+ ***************/
+%titlebar,
+headerbar {
+ padding: 0 6px;
+ min-height: $_headerbar_height;
+ border-width: 0 0 1px;
+ border-style: solid;
+ border-color: $alt_borders_color;
+ border-radius: 0;
+
+ @include headerbar_fill(if($variant == 'light', darken($bg_color, 6%), darken($bg_color, 10%))); // Yaru change: sync light headerbar bg color with Gtk4 (a bit lighten)
+
+ &:backdrop {
+ border-color: $backdrop_borders_color;
+ background-color: $bg_color;
+ background-image: none;
+ box-shadow: inset 0 1px $top_hilight;
+
+ transition: $backdrop_transition;
+ }
+
+ .title {
+ padding-left: 12px;
+ padding-right: 12px;
+ font-weight: bold;
+ }
+
+ .subtitle {
+ font-size: smaller;
+ padding-left: 12px;
+ padding-right: 12px;
+
+ @extend .dim-label;
+ }
+
+ /* Darken switchbuttons for headerbars. issue #1588 */
+ stackswitcher button:checked,
+ button.toggle:checked {
+
+ background: if($variant == 'light', image(darken($bg_color, 17%)), image(darken($bg_color, 9%)));
+ border-color: darken($borders_color, 6%); // Yaru change: with our button styling we do not want a stronger bottom border
+ // border-top-color: darken($borders_color, 8%);
+ &:backdrop {
+ @include button(backdrop-active);
+ }
+ }
+
+ .selection-mode &,
+ &.selection-mode {
+ $_hc: mix($top_hilight, $suggested_bg_color, 50%); // hilight color
+
+ color: $selected_fg_color;
+ border-color: $suggested_border_color;
+ text-shadow: 0 -1px transparentize(black, 0.5);
+
+ @include headerbar_fill($suggested_bg_color, $_hc);
+
+ &:backdrop {
+ background-color: $suggested_bg_color;
+ background-image: none;
+ box-shadow: inset 0 1px mix($top_hilight, $suggested_bg_color, 60%);
+
+ label {
+ text-shadow: none;
+ color: $selected_fg_color;
+ }
+ }
+
+ .subtitle:link { @extend %link_selected; }
+
+ button {
+ @include button(normal, $suggested_bg_color, $selected_fg_color);
+
+ @at-root %selection_mode_button_flat,
+ &.flat { @include button(undecorated); }
+
+ &:hover { @include button(hover, $suggested_bg_color, $selected_fg_color); }
+
+ &:active,
+ &:checked,
+ &.toggle:checked,
+ &.toggle:active { @include button(active, $suggested_bg_color, $selected_fg_color); }
+
+ &:backdrop {
+ &.flat, & {
+ @include button(backdrop, $suggested_bg_color, $selected_fg_color);
+
+ -gtk-icon-effect: none;
+ border-color: $suggested_border_color;
+
+ &:active,
+ &:checked {
+ @include button(backdrop-active, $suggested_bg_color, $selected_fg_color);
+
+ border-color: $suggested_border_color;
+ }
+
+ &:disabled {
+ @include button(backdrop-insensitive, $suggested_bg_color, $selected_fg_color);
+
+ border-color: $suggested_border_color;
+
+ &:active, &:checked {
+ @include button(backdrop-insensitive-active, $suggested_bg_color, $selected_fg_color);
+
+ border-color: $suggested_border_color;
+ }
+ }
+ }
+ }
+
+ @at-root %selection_mode_button_flat,
+ &.flat { &:backdrop, &:disabled, &:backdrop:disabled { @include button(undecorated); }}
+
+ &:disabled {
+ @include button(insensitive, $suggested_bg_color, $selected_fg_color);
+
+ &:active,
+ &:checked { @include button(insensitive-active, $suggested_bg_color, $selected_fg_color); }
+ }
+
+ &.suggested-action {
+ @include button(normal);
+
+ border-color: $suggested_border_color;
+
+ &:hover {
+ @include button(hover);
+
+ border-color: $suggested_border_color;
+ }
+
+ &:active {
+ @include button(active);
+
+ border-color: $suggested_border_color;
+ }
+
+ &:disabled {
+ @include button(insensitive);
+
+ border-color: $suggested_border_color;
+ }
+
+ &:backdrop {
+ @include button(backdrop);
+
+ border-color: $suggested_border_color;
+ }
+
+ &:backdrop:disabled {
+ @include button(backdrop-insensitive);
+
+ border-color: $suggested_border_color;
+ }
+ }
+ }
+
+ .selection-menu {
+ &:backdrop, & {
+ border-color: transparentize($suggested_bg_color, 1);
+ background-color: transparentize($suggested_bg_color, 1);
+ background-image: none;
+ box-shadow: none;
+ min-height: 20px;
+ padding: $_sel_menu_pad;
+
+ arrow { -GtkArrow-arrow-scaling: 1; }
+
+ .arrow {
+ -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
+ color: transparentize($selected_fg_color,0.5);
+ -gtk-icon-shadow: none;
+ }
+ }
+ }
+ }
+
+ // squared corners when the window is maximized, tiled, or fullscreen
+ .tiled &,
+ .tiled-top &,
+ .tiled-right &,
+ .tiled-bottom &,
+ .tiled-left &,
+ .maximized &,
+ .fullscreen & {
+ &:backdrop, & {
+ border-radius: 0;
+ }
+ }
+
+ &.default-decoration {
+ min-height: 28px;
+ padding: 4px;
+
+ button.titlebutton {
+ min-height: 26px;
+ min-width: 26px;
+ margin: 0;
+ padding: 0;
+ }
+ }
+
+
+
+ separator.titlebutton { opacity: 0; } /* hide the close button separator */
+
+ .solid-csd & {
+ &:backdrop, & {
+ &:dir(rtl), &:dir(ltr) { // specificity bump
+ margin-left: -1px;
+ margin-right: -1px;
+ margin-top: -1px;
+ border-radius: 0;
+ box-shadow: none;
+ }
+ }
+ }
+}
+
+headerbar {
+ // add vertical margins to common widget on the headerbar to avoid them spanning the whole height
+ entry,
+ spinbutton,
+ separator:not(.sidebar),
+ button {
+ margin-top: $_hb_btn_pad;
+ margin-bottom: $_hb_btn_pad;
+ }
+ switch {
+ margin-top: $_switch_margin;
+ margin-bottom: $_switch_margin;
+ }
+
+ &.titlebar headerbar:not(.titlebar) {
+ // Drop the background of non-titlebar nested headerbars. This is needed to
+ // work around headerbar sliding animation issues without refactoring
+ // Adwaita's support of titlebars and headerbars as it may break
+ // applications.
+ // See https://gitlab.gnome.org/GNOME/gtk/issues/1264 for more information.
+ background: none;
+ box-shadow: none;
+ }
+}
+
+.background .titlebar {
+ &:backdrop, & {
+ border-top-left-radius: $window_radius;
+ border-top-right-radius: $window_radius;
+ }
+}
+
+.background.tiled .titlebar,
+.background.tiled-top .titlebar,
+.background.tiled-right .titlebar,
+.background.tiled-bottom .titlebar,
+.background.tiled-left .titlebar,
+.background.maximized .titlebar,
+.background.solid-csd .titlebar {
+ &:backdrop, & {
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+ }
+}
+
+headerbar { // headerbar border rounding
+
+ window separator:first-child + &,
+ window &:first-child { &:backdrop, & { border-top-left-radius: $window_radius + 1px; }} // Yaru change: sync window radius with Gtk4
+ window &:last-child { &:backdrop, & { border-top-right-radius: $window_radius + 1px; }} // Yaru change: sync window radius with Gtk4
+
+ window stack & { // tackles the stacked headerbars case
+ &:first-child, &:last-child {
+ &:backdrop, & {
+ border-top-left-radius: $window_radius + 1px; // Yaru change: sync window radius with Gtk4
+ border-top-right-radius: $window_radius + 1px; // Yaru change: sync window radius with Gtk4
+ }
+ }
+ }
+
+ window.tiled &,
+ window.tiled-top &,
+ window.tiled-right &,
+ window.tiled-bottom &,
+ window.tiled-left &,
+ window.maximized &,
+ window.fullscreen &,
+ window.solid-csd & {
+ &, &:backdrop {
+ &,
+ &:first-child,
+ &:last-child,
+ &:only-child {
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+ }
+ }
+ }
+}
+
+.titlebar:not(headerbar) {
+ window.csd > & {
+ // in csd we assume every titlebar is a headerbar so reset anything, this is needed for split toolbars cases
+ padding: 0;
+ background-color: transparent;
+ background-image: none;
+ border-style: none;
+ border-color: transparent;
+ box-shadow: none;
+ }
+
+ separator { background-color: $borders_color; } // FIXME: use darker border?
+
+ @extend %titlebar;
+}
+
+// Development versions of apps to use a differently styled headerbar
+
+window.devel {
+ headerbar.titlebar:not(.selection-mode) {
+ $c: darken($bg_color, 10%);
+ $gradient: cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat,
+ linear-gradient(to right, transparent 65%, transparentize($selected_bg_color, 0.8)),
+ linear-gradient(to top, darken($c, 3%), $c 3px, lighten($c, 6%));
+ @if $variant == 'dark' {
+ $gradient: cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat,
+ linear-gradient(to right, transparent 65%, transparentize($selected_bg_color, 0.9)),
+ linear-gradient(to top, lighten($c, 3%) 3px, lighten($c, 5%));
+ }
+
+ background: $bg_color $gradient;
+
+ &:backdrop {
+ background: $bg_color cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat,
+ image($bg_color); /* background-color would flash */
+ }
+ }
+}
+
+/************
+ * Pathbars *
+ ************/
+
+// GtkPathBar does not work with just .linked, so we must override that. But we
+// can’t simply remove .linked from the widget as that might break other themes.
+// Note also we select on filechooser to avoid interfering with NautilusPathBar.
+filechooser .path-bar.linked > button {
+ @extend %linked_flippable;
+}
+
+.path-bar button {
+ &.text-button, &.image-button, & {
+ padding-left: 4px;
+ padding-right: 4px;
+ }
+
+ &.text-button.image-button label {
+ padding-left: 0;
+ padding-right: 0;
+ }
+
+ &.text-button.image-button, & {
+ label:last-child { padding-right: 8px; }
+ label:first-child { padding-left: 8px; }
+ }
+
+ image {
+ padding-left: 4px;
+ padding-right: 4px;
+ }
+
+ &.slider-button {
+ padding-left: 0;
+ padding-right: 0;
+ }
+}
+
+
+/**************
+ * Tree Views *
+ **************/
+treeview.view {
+ @at-root * {
+ -GtkTreeView-horizontal-separator: 4;
+ -GtkTreeView-grid-line-width: 1;
+ -GtkTreeView-grid-line-pattern: '';
+ -GtkTreeView-tree-line-width: 1;
+ -GtkTreeView-tree-line-pattern: '';
+ -GtkTreeView-expander-size: 16;
+ }
+
+ border-left-color: mix($fg_color, $base_color, 50%); // this is actually the tree lines color,
+ border-top-color: $bg_color; // while this is the grid lines color, better then nothing
+
+ rubberband { @extend rubberband; } // to avoid borders being overridden by the previously set props
+
+ &:selected {
+ &:focus, & {
+ border-radius: 0;
+
+ @extend %selected_items;
+ }
+
+ &:backdrop, & {
+ border-left-color: mix($selected_fg_color, $selected_bg_color, 50%);
+ border-top-color: transparentize($fg_color, 0.9); // doesn't work unfortunatelly
+ }
+ }
+
+ &:disabled {
+ color: $insensitive_fg_color;
+
+ /*&:selected {
+ color: mix($selected_fg_color, $selected_bg_color, 40%);
+ &:backdrop { color: mix($backdrop_selected_fg_color, $selected_bg_color, 30%); }
+ }*/
+
+ &:backdrop { color: $backdrop_insensitive_color; }
+ }
+
+ &.separator {
+ min-height: 2px;
+ color: $bg_color;
+
+ &:backdrop { color: transparentize($bg_color, 0.9); }
+ }
+
+ &:backdrop {
+ border-left-color: mix($backdrop_fg_color, $backdrop_bg_color, 50%);
+ border-top: $backdrop_bg_color;
+ }
+ &: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($text_color, $base_color, 70%);
+
+ &:hover { color: $text_color; }
+
+ &:selected {
+ color: mix($selected_fg_color, $selected_bg_color, 70%);
+
+ &:hover { color: $selected_fg_color; }
+
+ &:backdrop { color: mix($backdrop_selected_fg_color, $selected_bg_color, 70%); }
+ }
+
+ &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); }
+
+ &:backdrop { color: mix($backdrop_fg_color, $backdrop_base_color, 70%); }
+ }
+
+ &.progressbar { // progress bar in treeviews
+ @if $variant == light { color: $base_color; }
+
+ background-color: $progress_bg_color;
+ background-image: image($progress_bg_color);
+ box-shadow: none;
+
+ &:selected {
+ &:focus, & {
+
+ @if $variant == 'light' {
+ color: $selected_bg_color;
+
+ }
+
+ @else { box-shadow: inset 0 1px transparentize(white, 0.95); }
+
+ background-image: image($base_color);
+
+ &:backdrop {
+ @if $variant == 'light' {
+ color: $selected_bg_color;
+ }
+ background-color: $backdrop_base_color;
+ }
+ }
+ }
+
+ &:backdrop {
+ @if $variant == 'light' { color: $backdrop_base_color; }
+
+ @else { border-color: $backdrop_base_color; }
+ background-image: none;
+ box-shadow: none;
+ }
+ }
+
+ &.trough { // progress bar trough in treeviews
+ background-color: transparentize($fg_color,0.9);
+
+ &:selected {
+ &:focus, & {
+ background-color: if($variant == 'light',
+ transparentize($selected_fg_color, 0.7),
+ darken($selected_bg_color, 10%));
+
+ }
+ }
+ }
+
+ header {
+ button {
+ $_column_header_color: mix($fg_color, $base_color, 50%);
+
+ @extend %column_header_button;
+
+ color: $_column_header_color;
+ background-color: $base_color;
+ font-weight: bold;
+ text-shadow: none;
+ box-shadow: none;
+
+ &:hover {
+ @extend %column_header_button;
+
+ color: mix($_column_header_color, $fg_color, 50%);
+ box-shadow: none;
+ transition: none; //I shouldn't need this
+ }
+
+ &:active {
+ @extend %column_header_button;
+
+ color: $fg_color;
+ transition: none; //I shouldn't need this
+ }
+ }
+ }
+
+ button.dnd,
+ header.button.dnd { // for treeview-like derive widgets
+ &:active, &:selected, &:hover, & {
+ padding: 0 6px;
+ color: $base_color;
+ background-image: none;
+ background-color: $selected_bg_color;
+ border-style: none;
+ border-radius: 0;
+ box-shadow: inset 0 0 0 1px $base_color;
+ text-shadow: none;
+ transition: none;
+ }
+ }
+
+ acceleditor > label { background-color: $selected_bg_color; } // see tests/testaccel to test
+}
+
+%column_header_button {
+ padding: 0 6px;
+ background-image: none;
+ border-style: none solid solid none;
+ border-color: $bg_color;
+ border-radius: 0;
+ text-shadow: none;
+
+ &:disabled {
+ border-color: $bg_color;
+ background-image: none;
+ }
+
+ &:backdrop {
+ color: mix($backdrop_fg_color, $backdrop_bg_color, 50%);
+ border-color: $backdrop_bg_color;
+ border-style: none solid solid none;
+ background-image: none;
+ background-color: $backdrop_base_color;
+
+ &:disabled {
+ border-color: $backdrop_bg_color;
+ background-image: none;
+ }
+ }
+
+ &:last-child { &:backdrop, & { border-right-style: none; }}
+}
+
+
+
+/*********
+ * Menus *
+ *********/
+menubar,
+.menubar {
+ -GtkWidget-window-dragging: true;
+ padding: 0px;
+ box-shadow: inset 0 -1px transparentize(black, 0.9);
+
+ &:backdrop { background-color: $backdrop_bg_color; }
+
+ > menuitem {
+ min-height: 16px;
+ padding: 4px 8px;
+
+ // remove padding and rounding from menubar submenus
+ menu {
+ &:dir(rtl), &:dir(ltr) { // specificity bump
+ border-radius: 0;
+ padding: 0;
+ }
+ }
+
+ &:hover { //Seems like it :hover even with keyboard focus
+ box-shadow: inset 0 -3px $selected_bg_color;
+ color: $link_color;
+ }
+
+ &:disabled {
+ color: $insensitive_fg_color;
+ box-shadow: none;
+ }
+ }
+
+ // remove padding and rounding from menubar submenu decoration
+ .csd.popup decoration {border-radius:0;}
+}
+
+// Needed to make the border-radius of menus work
+// otherwise the background bleeds out of the menu edges
+.background.popup { background-color: transparent; }
+
+menu,
+.menu,
+.context-menu {
+ margin: 4px; // see https://bugzilla.gnome.org/show_bug.cgi?id=591258
+ padding: 4px 0px;
+ background-color: $menu_color;
+ border: 1px solid $borders_color; // adds borders in a non composited env
+
+ .csd & {
+ border: none; // axes borders in a composited env
+ border-radius: $menu_radius;
+ }
+
+ &:backdrop { background-color: $backdrop_menu_color; }
+
+ menuitem {
+ min-height: 16px;
+ min-width: 40px;
+ padding: 4px 6px;
+ text-shadow: none;
+
+ &:hover {
+ color: $selected_fg_color;
+ background-color: $selected_bg_color;
+ }
+
+ &:disabled {
+ color: $insensitive_fg_color;
+ &:backdrop { color: $backdrop_insensitive_color; }
+ }
+
+ &:backdrop,
+ &:backdrop:hover {
+ color: $backdrop_fg_color;
+ background-color: transparent;
+ }
+
+ // submenu indicators
+ arrow {
+ min-height: 16px;
+ min-width: 16px;
+
+ &:dir(ltr) {
+ -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
+ margin-left: 10px;
+ }
+
+ &:dir(rtl) {
+ -gtk-icon-source:-gtk-icontheme('pan-end-symbolic-rtl');
+ margin-right: 10px;
+ }
+ }
+
+ // avoids labels color being overridden, see
+ // https://bugzilla.gnome.org/show_bug.cgi?id=767058
+ label { &:dir(rtl), &:dir(ltr) { color: inherit; }}
+ }
+
+ // overflow arrows
+ > arrow {
+ @include button(undecorated);
+
+ min-height: 16px;
+ min-width: 16px;
+ padding: 4px;
+ background-color: $menu_color;
+ border-radius: 0;
+
+ &.top {
+ margin-top: -4px;
+ border-bottom: 1px solid mix($fg_color, $base_color, 10%);
+ border-top-right-radius: $menu_radius;
+ border-top-left-radius: $menu_radius;
+ -gtk-icon-source: -gtk-icontheme('pan-up-symbolic');
+ }
+
+ &.bottom {
+ margin-top: 8px;
+ margin-bottom: -12px;
+ border-top: 1px solid mix($fg_color, $base_color, 10%);
+ border-bottom-right-radius: $menu_radius;
+ border-bottom-left-radius: $menu_radius;
+ -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
+ }
+
+ &:hover { background-color: mix($fg_color, $base_color, 10%); }
+
+ &:backdrop { background-color: $backdrop_menu_color; }
+
+ &:disabled {
+ color: transparent;
+ background-color: transparent;
+ border-color: transparent ;
+ }
+ }
+}
+
+menuitem {
+ accelerator { color: gtkalpha(currentColor,0.55); }
+
+ check,
+ radio {
+ min-height: 16px;
+ min-width: 16px;
+
+ &:dir(ltr) { margin-right: 7px; }
+ &:dir(rtl) { margin-left: 7px; }
+ }
+}
+
+/***************
+ * Popovers *
+ ***************/
+
+popover.background {
+ padding: 2px;
+ background-color: $popover_bg_color;
+
+ .csd &, & {
+ border: 1px solid $borders_color;
+ border-radius: $popover_radius;
+ }
+
+ .csd & {
+ $_popover_border: if($variant=='light', transparentize(black, 0.77), transparentize($borders_color, 0.1));
+
+ background-clip: padding-box;
+ border-color: $_popover_border;
+ }
+
+ box-shadow: 0 1px 2px transparentize(black, 0.7);
+
+ &:backdrop {
+ background-color: $backdrop_bg_color;
+ box-shadow: none;
+ }
+
+ > list,
+ > .view,
+ > toolbar {
+ border-style: none;
+ background-color: transparent;
+ }
+
+ .csd &, & {
+ &.touch-selection,
+ &.magnifier {
+ @extend %osd;
+
+ border: 1px solid transparentize(white, 0.9);
+
+ button { @extend %osd_button };
+ }
+
+ &.osd { @extend %osd; }
+ }
+
+ separator { margin: 3px; }
+
+ list separator { margin: 0px; }
+}
+
+/*************
+ * Notebooks *
+ *************/
+notebook {
+ > header {
+ padding: 1px;
+ border-color: $borders_color;
+ border-width: 1px;
+ background-color: $dark_fill;
+
+ &:backdrop {
+ border-color: $backdrop_borders_color;
+ background-color: $backdrop_dark_fill;
+ }
+
+ tabs { margin: -1px; }
+
+ &.top {
+ border-bottom-style: solid;
+ > tabs {
+ margin-bottom: -2px;
+ > tab {
+ &:hover { box-shadow: inset 0 -3px $borders_color; } // Yaru change: 4px underlines are too much
+
+ &:backdrop { box-shadow: none; }
+
+ &:checked { box-shadow: inset 0 -3px $selected_bg_color; } // Yaru change: 4px underlines are too much
+ }
+ }
+ }
+
+ &.bottom {
+ border-top-style: solid;
+ > tabs {
+ margin-top: -2px;
+ > tab {
+ &:hover { box-shadow: inset 0 3px $borders_color; } // Yaru change: 4px underlines are too much
+
+ &:backdrop { box-shadow: none; }
+
+ &:checked { box-shadow: inset 0 3px $selected_bg_color; } // Yaru change: 4px underlines are too much
+ }
+ }
+ }
+
+ &.left {
+ border-right-style: solid;
+ > tabs {
+ margin-right: -2px;
+ > tab {
+ &:hover { box-shadow: inset -3px 0 $borders_color; } // Yaru change: 4px underlines are too much
+
+ &:backdrop { box-shadow: none; }
+
+ &:checked { box-shadow: inset -3px 0 $selected_bg_color; } // Yaru change: 4px underlines are too much
+ }
+ }
+ }
+
+ &.right {
+ border-left-style: solid;
+ > tabs {
+ margin-left: -2px;
+ > tab {
+ &:hover { box-shadow: inset 3px 0 $borders_color; } // Yaru change: 4px underlines are too much
+
+ &:backdrop { box-shadow: none; }
+
+ &:checked { box-shadow: inset 3px 0 $selected_bg_color; } // Yaru change: 4px underlines are too much
+ }
+ }
+ }
+
+ &.top > tabs > arrow {
+ @extend %notebook_vert_arrows;
+
+ border-top-style: none;
+ }
+
+ &.bottom > tabs > arrow {
+ @extend %notebook_vert_arrows;
+
+ border-bottom-style: none;
+ }
+
+ @at-root %notebook_vert_arrows {
+ margin-left: -5px;
+ margin-right: -5px;
+ padding-left: 4px;
+ padding-right: 4px;
+
+ &.down { -gtk-icon-source: -gtk-icontheme('pan-start-symbolic'); }
+
+ &.up { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); }
+ }
+
+ &.left > tabs > arrow {
+ @extend %notebook_horz_arrows;
+
+ border-left-style: none;
+ }
+
+ &.right > tabs > arrow {
+ @extend %notebook_horz_arrows;
+
+ border-right-style: none;
+ }
+
+ @at-root %notebook_horz_arrows {
+ margin-top: -5px;
+ margin-bottom: -5px;
+ padding-top: 4px;
+ padding-bottom: 4px;
+
+ &.down { -gtk-icon-source: -gtk-icontheme('pan-up-symbolic'); }
+
+ &.up { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); }
+ }
+
+ > tabs > arrow {
+ @extend %button_basic;
+
+ @extend %button_basic_flat;
+
+ min-height: 16px;
+ min-width: 16px;
+ border-radius: 0;
+
+ &:hover:not(:active):not(:backdrop) {
+ background-clip: padding-box;
+ background-image: none;
+ background-color: transparentize(white, 0.7);
+ border-color: transparent;
+ box-shadow: none;
+ }
+
+ &:disabled { @include button(undecorated); }
+ }
+
+ tab {
+ min-height: 30px;
+ min-width: 30px;
+ padding: 3px 12px;
+
+ outline-offset: -5px;
+
+ color: $fg_color;
+ font-weight: normal;
+
+ border-width: 1px; // for reorderable tabs
+ border-color: transparent; //
+
+ &:hover {
+ color: $fg_color;
+ background-color: darken($bg_color,4%);
+
+ &.reorderable-page {
+ border-color: transparentize($borders_color, 0.7);
+ background-color: transparentize($bg_color, 0.8);
+ }
+ }
+
+ &:backdrop {
+ color: mix($backdrop_fg_color, $backdrop_bg_color, 60%);
+
+ &.reorderable-page {
+ border-color: transparent;
+ background-color: transparent;
+ }
+ }
+
+ &:checked {
+ color: $fg_color;
+ &.reorderable-page {
+ border-color: transparentize($borders_color, 0.5);
+ background-color: transparentize($bg_color, 0.5);
+
+ &:hover { background-color: transparentize($bg_color, 0.3); }
+ }
+ }
+
+ &:backdrop:checked {
+ color: $backdrop_fg_color;
+
+ &.reorderable-page {
+ border-color: $backdrop_borders_color;
+ background-color: $backdrop_bg_color;
+ }
+ }
+
+ // colors the button like the label, overridden otherwise
+ button.flat {
+ &:hover { color: currentColor; }
+
+ &, &:backdrop { color: gtkalpha(currentColor, 0.3); }
+
+ padding: 0;
+ margin-top: 4px;
+ margin-bottom: 4px;
+ // FIXME: generalize .small-button?
+ min-width: 20px;
+ min-height: 20px;
+
+ &:last-child {
+ margin-left: 4px;
+ margin-right: -4px;
+ }
+
+ &:first-child {
+ margin-left: -4px;
+ margin-right: 4px;
+ }
+ }
+ }
+
+ &.top,
+ &.bottom {
+ tabs {
+ padding-left: 4px;
+ padding-right: 4px;
+
+ &:not(:only-child) {
+ margin-left: 3px;
+ margin-right: 3px;
+
+ &:first-child { margin-left: -1px; }
+ &:last-child { margin-right: -1px; }
+ }
+
+ tab {
+ margin-left: 4px;
+ margin-right: 4px;
+
+ &.reorderable-page { border-style: none solid; }
+ }
+ }
+ }
+
+ &.left,
+ &.right {
+ tabs {
+ padding-top: 4px;
+ padding-bottom: 4px;
+
+ &:not(:only-child) {
+ margin-top: 3px;
+ margin-bottom: 3px;
+
+ &:first-child { margin-top: -1px; }
+ &:last-child { margin-bottom: -1px; }
+ }
+
+ tab {
+ margin-top: 4px;
+ margin-bottom: 4px;
+
+ &.reorderable-page { border-style: solid none; }
+ }
+ }
+ }
+
+ &.top tab { padding-bottom: 4px; }
+ &.bottom tab { padding-top: 4px; }
+ }
+
+ > stack:not(:only-child) { // the :not(:only-child) is for "hidden" notebooks
+ background-color: $base_color;
+
+ &:backdrop { background-color: $backdrop_base_color; }
+ }
+}
+
+
+/**************
+ * Scrollbars *
+ **************/
+scrollbar {
+ $_slider_min_length: 40px;
+
+ // disable steppers
+ @at-root * {
+ -GtkScrollbar-has-backward-stepper: false;
+ -GtkScrollbar-has-forward-stepper: false;
+ }
+
+ background-color: $scrollbar_bg_color;
+ 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; }
+
+ &:backdrop {
+ background-color: $backdrop_scrollbar_bg_color;
+ border-color: $backdrop_borders_color;
+ transition: $backdrop_transition;
+ }
+
+ // slider
+ slider {
+ min-width: 6px;
+ min-height: 6px;
+ margin: -1px;
+ border: 4px solid transparent;
+ border-radius: 8px;
+ background-clip: padding-box;
+ background-color: $scrollbar_slider_color;
+
+ &:hover { background-color: $scrollbar_slider_hover_color; }
+
+ &:hover:active { background-color: $scrollbar_slider_active_color; }
+
+ &:backdrop { background-color: $backdrop_scrollbar_slider_color; }
+
+ &:disabled { background-color: transparent; }
+ }
+
+ &.fine-tune {
+ slider {
+ min-width: 4px;
+ min-height: 4px;
+ }
+
+ &.horizontal slider { border-width: 5px 4px; }
+ &.vertical slider { border-width: 4px 5px; }
+ }
+
+ &.overlay-indicator {
+ &:not(.dragging):not(.hovering) {
+ border-color: transparent;
+ opacity: 0.4;
+ background-color: transparent;
+
+ slider {
+ margin: 0;
+ min-width: 3px;
+ min-height: 3px;
+ background-color: $fg_color;
+ border: 1px solid if($variant == 'light', white, black);
+ }
+
+ button {
+ min-width: 5px;
+ min-height: 5px;
+ background-color: $fg_color;
+ background-clip: padding-box;
+ border-radius: 100%;
+ border: 1px solid if($variant == 'light', white, black);
+ -gtk-icon-source: none;
+ }
+
+ &.horizontal {
+ slider {
+ margin: 0 2px;
+ min-width: $_slider_min_length;
+ }
+
+ button {
+ margin: 1px 2px;
+ min-width: 5px;
+ }
+ }
+
+ &.vertical {
+ slider {
+ margin: 2px 0;
+ min-height: $_slider_min_length;
+ }
+
+ button {
+ margin: 2px 1px;
+ min-height: 5px;
+ }
+ }
+ }
+
+ &.dragging,
+ &.hovering { opacity: 0.8; }
+ }
+
+ &.horizontal slider { min-width: $_slider_min_length; }
+
+ &.vertical slider { min-height: $_slider_min_length; }
+
+ // button styling
+ button {
+ padding: 0;
+ min-width: 12px;
+ min-height: 12px;
+ border-style: none;
+ border-radius: 0;
+ transition-property: min-height, min-width, color;
+
+ @include button(undecorated);
+
+ color: $scrollbar_slider_color;
+
+ &:hover {
+ @include button(undecorated);
+
+ color: $scrollbar_slider_hover_color;
+ }
+ &:active, &:checked {
+ @include button(undecorated);
+
+ color: $scrollbar_slider_active_color;
+ }
+ &:disabled {
+ @include button(undecorated);
+
+ color: transparentize($scrollbar_slider_color, 0.8);
+ }
+ &:backdrop {
+ @include button(undecorated);
+
+ color: $backdrop_scrollbar_slider_color;
+
+ &:disabled {
+ @include button(undecorated);
+
+ color: transparentize($backdrop_scrollbar_slider_color, 0.8);
+ }
+ }
+ }
+
+ // button icons
+ &.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-end-symbolic'); }
+
+ &.up { -gtk-icon-source: -gtk-icontheme('pan-start-symbolic'); }
+ }
+ }
+}
+
+treeview ~ scrollbar.vertical {
+ border-top: 1px solid $borders_color;
+ margin-top: -1px;
+}
+
+/**********
+ * Switch *
+ **********/
+switch {
+ outline-offset: -4px;
+
+ // similar to the .scale
+ border: 1px solid $borders_color;
+ border-radius: 14px;
+ color: $fg_color;
+ background-color: $dark_fill;
+ text-shadow: 0 1px transparentize(black, 0.9);
+
+ &:checked {
+ color: $selected_fg_color;
+ border-color: $checkradio_borders_color;
+ background-color: $checkradio_bg_color;
+ text-shadow: 0 1px transparentize($selected_borders_color, 0.5),
+ 0 0 2px transparentize(white, 0.4);
+ }
+
+ &:disabled {
+ color: $insensitive_fg_color;
+ border-color: $borders_color;
+ background-color: $insensitive_bg_color;
+ text-shadow: none;
+ }
+
+ &:backdrop {
+ color: $backdrop_fg_color;
+ border-color: $backdrop_borders_color;
+ background-color: $backdrop_dark_fill;
+ text-shadow: none;
+ transition: $backdrop_transition;
+
+ &:checked {
+ @if $variant == 'light' { color: $backdrop_bg_color; }
+ border-color: if($variant == 'light', $checkradio_borders_color,
+ $selected_borders_color);
+ background-color: $checkradio_bg_color;
+ }
+
+ &:disabled {
+ color: $backdrop_insensitive_color;
+ border-color: $backdrop_borders_color;
+ background-color: $insensitive_bg_color;
+ }
+ }
+
+ slider {
+ margin: -1px;
+ min-width: 24px;
+ min-height: 24px;
+ border: 1px solid;
+ border-radius: 50%;
+ transition: $button_transition;
+ -gtk-outline-radius: 20px;
+
+ @if $variant == 'light' {
+ @include button(normal-alt, $edge: $shadow_color);
+ }
+ @else {
+ @include button(normal-alt, $c: lighten($bg_color,6%), $edge: $shadow_color);
+ }
+ }
+
+ image { color: transparent; } /* only show i / o for the accessible theme */
+
+ &:hover slider {
+ @if $variant == 'light' {
+ @include button(hover-alt, $edge: $shadow_color);
+ }
+ @else {
+ @include button(hover-alt, $c: lighten($bg_color,6%), $edge: $shadow_color);
+ }
+ }
+
+ &:checked > slider { border: 1px solid $checkradio_borders_color; }
+
+ &:disabled slider { @include button(insensitive); }
+
+ &:backdrop {
+ slider {
+ transition: $backdrop_transition;
+
+ @include button(backdrop);
+ }
+
+ &:checked > slider { border-color: $checkradio_borders_color; }
+
+ &:disabled slider { @include button(backdrop-insensitive); }
+ }
+
+ row:selected & {
+ @if $variant == 'light' {
+ box-shadow: none;
+ border-color: $checkradio_borders_color;
+
+ &:backdrop { border-color: $checkradio_borders_color; }
+
+ > slider { &:checked, & { border-color: $checkradio_borders_color; } }
+ }
+ }
+
+}
+
+
+/*************************
+ * Check and Radio items *
+ *************************/
+// draw regular check and radio items using our PNG assets
+// all assets are rendered from assets.svg. never add pngs directly
+
+
+//selection-mode
+@each $check_state, $check_icon, $check_color, $check_background in
+ ('', 'none', 'transparent', $checkradio_bg_color),
+ (':hover', 'none', 'transparent', $checkradio_bg_color),
+ (':active', 'none', 'transparent', $checkradio_bg_color),
+ (':backdrop', 'none', 'transparent', '#{desaturate($checkradio_bg_color, 100%)}'),
+ (':checked', '-gtk-icontheme(\'object-select-symbolic\')', $osd_fg_color, $checkradio_bg_color),
+ (':checked:hover', '-gtk-icontheme(\'object-select-symbolic\')', $osd_fg_color, $checkradio_bg_color),
+ (':checked:active', '-gtk-icontheme(\'object-select-symbolic\')', $osd_fg_color, $checkradio_bg_color),
+ (':backdrop:checked', '-gtk-icontheme(\'object-select-symbolic\')', '#{transparentize($osd_fg_color, 0.2)}', '#{desaturate($checkradio_bg_color, 100%)}'), {
+
+ .view.content-view.check#{$check_state}:not(list),
+ .content-view:not(list) check#{$check_state} {
+ margin: 4px;
+ min-width: 32px;
+ min-height: 32px;
+ color: #{$check_color};
+ background-color: #{$check_background};
+ border-radius: 5px;
+ background-image: none;
+ transition: 200ms;
+ box-shadow: none;
+ border-width: 0;
+ -gtk-icon-source: #{$check_icon};
+ -gtk-icon-shadow: none;
+ }
+}
+
+checkbutton.text-button, radiobutton.text-button {
+ // this is for a nice focus on check and radios text
+ padding: 2px 0;
+ outline-offset: 0;
+
+ label:not(:only-child) {
+ &:first-child { margin-left: 4px; }
+ &:last-child { margin-right: 4px; }
+ }
+}
+
+check,
+radio {
+ margin: 0 4px;
+
+ &:only-child { margin: 0; }
+
+ popover & { // when in a popover add more space between the label and the check, reset the other side margin.
+ // See https://bugzilla.gnome.org/show_bug.cgi?id=779570 for details.
+ &.left:dir(rtl) {
+ margin-left: 0;
+ margin-right: 12px;
+ }
+
+ &.right:dir(ltr) {
+ margin-left: 12px;
+ margin-right: 0;
+ }
+ }
+
+ min-height: 14px;
+ min-width: 14px;
+ border: 1px solid;
+ -gtk-icon-source: none;
+
+ & {
+ // for unchecked
+ $_c: if($variant=='light', white, $bg_color);
+
+ @each $state, $t in ("", "normal"),
+ (":hover", "hover"),
+ (":active", "active"),
+ (":disabled", "insensitive"),
+ (":backdrop", "backdrop"),
+ (":backdrop:disabled", 'backdrop-insensitive') {
+ &#{$state} {
+ @include check($t, $_c);
+ }
+ }
+ }
+
+ & {
+ // for checked
+ @each $t in (':checked'), (':indeterminate') {
+ &#{$t} {
+ @each $state, $t in ("", "normal"),
+ (":hover", "hover"),
+ (":active", "active"),
+ (":disabled", "insensitive"),
+ (":backdrop", "backdrop"),
+ (":backdrop:disabled", 'backdrop-insensitive') {
+ &#{$state} {
+ @include check($t, $checkradio_bg_color, $checkradio_fg_color, $checked: true);
+ }
+ }
+ }
+ }
+ }
+
+ &:backdrop { transition: $backdrop_transition; }
+
+ @if $variant == 'light' {
+ // the borders of the light variant versions of checks and radios are too similar in luminosity to the selected background
+ // color, hence we need special casing.
+ row:selected & { border-color: $checkradio_borders_color; }
+ }
+
+ .osd & {
+ @include button(osd);
+
+ &:hover { @include button(osd); }
+ &:active { @include button(osd-active); }
+ &:backdrop { @include button(osd-backdrop); }
+ &:disabled { @include button(osd-insensitive); }
+ }
+
+ menu menuitem & {
+ margin: 0; // this is a workaround for a menu check/radio size allocation issue
+
+ &, &:checked, &:indeterminate {
+ &, &:hover, &:disabled { //FIXME use button reset mixin
+ min-height: 14px;
+ min-width: 14px;
+ background-image: none;
+ background-color: transparent;
+ box-shadow: none;
+ -gtk-icon-shadow: none;
+ color: inherit;
+ border-color: currentColor;
+ }
+ }
+ }
+}
+
+%check,
+check {
+ border-radius: 3px;
+
+ &:checked { -gtk-icon-source: image(-gtk-recolor(url("assets/check-symbolic.svg")),
+ -gtk-recolor(url("assets/check-symbolic.symbolic.png"))); }
+
+ &:indeterminate { -gtk-icon-source: image(-gtk-recolor(url("assets/dash-symbolic.svg")),
+ -gtk-recolor(url("assets/dash-symbolic.symbolic.png"))); }
+}
+
+%radio,
+radio {
+ border-radius: 100%;
+
+ &:checked { -gtk-icon-source: image(-gtk-recolor(url("assets/bullet-symbolic.svg")),
+ -gtk-recolor(url("assets/bullet-symbolic.symbolic.png"))); }
+
+ &:indeterminate { -gtk-icon-source: image(-gtk-recolor(url("assets/dash-symbolic.svg")),
+ -gtk-recolor(url("assets/dash-symbolic.symbolic.png"))); }
+}
+
+// ANIMATION:
+// this is made with those pretty convoluted transitions, since checks and radios have to animate only on state changes,
+// the transformation is set on the active state and it get reset on the checked state.
+radio:not(:indeterminate):not(:checked):active:not(:backdrop) { -gtk-icon-transform: scale(0); }
+
+check:not(:indeterminate):not(:checked):active:not(:backdrop) { -gtk-icon-transform: translate(6px, -3px) rotate(-45deg) scaleY(0.2) rotate(45deg) scaleX(0); }
+
+radio,
+check {
+ &:active { -gtk-icon-transform: scale(0, 1); } // should tackle the indeterminate state, untested
+
+ &:checked:not(:backdrop), &:indeterminate:not(:backdrop) {
+ -gtk-icon-transform: unset;
+ transition: 400ms;
+ }
+}
+
+menu menuitem {
+ radio,
+ check {
+ &:checked:not(:backdrop), &:indeterminate:not(:backdrop) { transition: none; }
+ }
+}
+
+treeview.view check,
+treeview.view radio {
+ &:selected {
+ &:focus, & {
+ color: $checkradio_fg_color;
+
+ @if $variant == 'light' { border-color: $selected_borders_color; }
+ }
+ }
+}
+
+treeview.view radio:selected { &:focus, & { @extend %radio; }} // This is a workaround */
+
+
+/************
+ * GtkScale *
+ ************/
+%scale_trough {
+ border: 1px solid $borders_color;
+ border-radius: 3px;
+ background-color: $dark_fill;
+
+ &:disabled { background-color: $insensitive_bg_color; }
+
+ &:backdrop {
+ background-color: $backdrop_dark_fill;
+ border-color: $backdrop_borders_color;
+ transition: $backdrop_transition;
+
+ &:disabled { background-color: $insensitive_bg_color; }
+ }
+
+ // ...on selected list rows
+ row:selected & { &:disabled, & { border-color: $selected_borders_color; }}
+
+ // OSD
+ .osd & {
+ border-color: $osd_borders_color;
+ background-color: transparentize($osd_borders_color, 0.2);
+
+ &:disabled { background-color: $osd_insensitive_bg_color; }
+ }
+}
+
+%scale_highlight {
+ border: 1px solid $progress_border_color;
+ border-radius: 3px;
+ background-color: $progress_bg_color;
+
+ &:disabled {
+ background-color: transparent;
+ border-color: transparent;
+ }
+
+ &:backdrop {
+ border-color: if($variant=='light', $progress_bg_color,
+ $progress_border_color);
+ &:disabled {
+ background-color: transparent;
+ border-color: transparent;
+ }
+ }
+
+ // ...on selected list rows
+ row:selected & { &:disabled, & { border-color: $selected_borders_color; }}
+
+ // OSD
+ .osd & {
+ border-color: $osd_borders_color;
+
+ &:disabled { border-color: transparent; }
+ }
+}
+
+scale {
+ // sizing
+ $_marks_length: 6px;
+ $_marks_distance: 6px;
+
+ min-height: 10px;
+ min-width: 10px;
+ padding: 12px;
+
+ // those are inside the trough node, I need them to show their own border over the trough one, so negative margin
+ fill,
+ highlight { margin: -1px; }
+
+ // the slider is inside the trough, so to have make it bigger there's a negative margin
+
+ slider {
+ min-height: 18px;
+ min-width: 18px;
+ margin: -9px;
+ }
+
+ // click-and-hold the slider to activate
+ &.fine-tune {
+ &.horizontal {
+ padding-top: 9px;
+ padding-bottom: 9px;
+ min-height: 16px;
+ }
+
+ &.vertical {
+ padding-left: 9px;
+ padding-right: 9px;
+ min-width: 16px;
+ }
+
+ // to make the trough grow in fine-tune mode
+ slider { margin: -6px; }
+
+ fill,
+ highlight,
+ trough {
+ border-radius: 5px;
+ -gtk-outline-radius: 7px;
+ }
+ }
+
+ // the backing bit
+ trough {
+ @extend %scale_trough;
+
+ outline-offset: 2px;
+ -gtk-outline-radius: 5px;
+ }
+
+ // the colored part of the backing bit
+ highlight { @extend %scale_highlight; }
+
+ // this is another differently styled part of the backing bit, the most relevant use case is for example
+ // in media player to indicate how much video stream as been cached
+ fill {
+ @extend %scale_trough;
+
+ &:backdrop, & { background-color: $borders_color; }
+
+ &:disabled {
+ &:backdrop, & {
+ border-color: transparent;
+ background-color: transparent;
+ }
+ }
+
+ // OSD
+ .osd & {
+ background-color: mix($osd_fg_color, $osd_borders_color, 25%);
+
+ &:disabled {
+ &:backdrop, & {
+ border-color: transparent;
+ background-color: transparent;
+ }
+ }
+ }
+ }
+
+ slider {
+ @include button(normal-alt, $edge: $shadow_color);
+
+ border: 1px solid darken($alt_borders_color, 3%);
+ border-radius: 100%;
+ transition: $button_transition;
+ transition-property: background, border, box-shadow;
+
+ &:hover { @include button(hover-alt, $edge: $shadow_color); }
+
+ &:active { border-color: $progress_border_color; }
+
+ &:disabled { @include button(insensitive); }
+
+ &:backdrop {
+ transition: $backdrop_transition;
+
+ @include button(backdrop);
+
+ &:disabled { @include button(backdrop-insensitive); }
+ }
+
+ // ...on selected list rows
+ row:selected & { &:disabled, & { border-color: $selected_borders_color; } }
+
+ // OSD
+ .osd & {
+ @include button(osd);
+ border-color: darken($osd_borders_color, 3%);
+ background-color: opacify($osd_bg_color, 1); // solid background needed here
+
+ &:hover {
+ @include button(osd-hover);
+ background-color: opacify($osd_bg_color, 1); // solid background needed here
+ }
+
+ &:active {
+ @include button(osd-active);
+ background-color: opacify($osd_bg_color, 1); // solid background needed here
+ }
+
+ &:disabled {
+ @include button(osd-insensitive);
+ background-color: opacify($osd_bg_color, 1); // solid background needed here
+ }
+
+ &:backdrop {
+ @include button(osd-backdrop);
+ background-color: opacify($osd_bg_color, 1); // solid background needed here
+
+ &:disabled {
+ @include button(osd-backdrop-insensitive);
+ background-color: opacify($osd_bg_color, 1); // solid background needed here
+ }
+ }
+ }
+ }
+
+ marks,
+ value {
+ color: gtkalpha(currentColor, 0.55);
+ font-feature-settings: "tnum";
+ }
+
+ //marks margins
+ @each $scale_orient, $marks_class, $marks_pos, $marks_margin in (horizontal, top, top, bottom),
+ (horizontal, bottom, bottom, top),
+ (vertical, top, left, right),
+ (vertical, bottom, right, left) {
+ &.#{$scale_orient} marks {
+ &.#{$marks_class} {
+ margin-#{$marks_margin}: $_marks_distance;
+ margin-#{$marks_pos}: -($_marks_distance + $_marks_length);
+ }
+ }
+
+ &.#{$scale_orient}.fine-tune marks {
+ &.#{$marks_class} {
+ margin-#{$marks_margin}: $_marks_distance;
+ margin-#{$marks_pos}: -($_marks_distance + $_marks_length - 3px);
+ }
+ }
+ }
+
+ &.horizontal {
+ indicator {
+ min-height: $_marks_length;
+ min-width: 1px;
+ }
+
+ &.fine-tune indicator { min-height: ($_marks_length - 3px); }
+ }
+
+ &.vertical {
+ indicator {
+ min-height: 1px;
+ min-width: $_marks_length;
+ }
+
+ &.fine-tune indicator { min-width: ($_marks_length - 3px); }
+ }
+
+ // *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'),
+ (':backdrop', '-backdrop'),
+ (':backdrop:disabled', '-backdrop-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}#{$suffix}';
+ 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: 22px;
+
+ @if $marks_infix == 'scale-has-marks-above' {
+ margin-top: -14px;
+
+ $_scale_slider_bg_pos: top;
+ }
+
+ @else { margin-bottom: -14px; }
+ }
+
+ @else {
+ min-height: 22px;
+ 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; }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ &.color {
+ min-height: 0;
+ min-width: 0;
+
+ trough {
+ background-image: image($borders_color);
+ background-repeat: no-repeat;
+ }
+
+ &.horizontal {
+ padding: 0 0 15px 0;
+
+ trough {
+ padding-bottom: 4px;
+ background-position: 0 -3px;
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+ }
+
+ slider {
+ &:dir(ltr), &:dir(rtl) { // specificity bumb
+ &:hover, &:backdrop, &:disabled, &:backdrop:disabled, & {
+ margin-bottom: -15px;
+ margin-top: 6px;
+ }
+ }
+ }
+ }
+
+ &.vertical {
+ &:dir(ltr) {
+ padding: 0 0 0 15px;
+
+ trough {
+ padding-left: 4px;
+ background-position: 3px 0;
+ border-bottom-right-radius: 0;
+ border-top-right-radius: 0;
+ }
+
+ slider {
+ &:hover, &:backdrop, &:disabled, &:backdrop:disabled, & {
+ margin-left: -15px;
+ margin-right: 6px;
+ }
+ }
+ }
+
+ &:dir(rtl) {
+ padding: 0 15px 0 0;
+
+ trough {
+ padding-right: 4px;
+ background-position: -3px 0;
+ border-bottom-left-radius: 0;
+ border-top-left-radius: 0;
+ }
+
+ slider {
+ &:hover, &:backdrop, &:disabled, &:backdrop:disabled, & {
+ margin-right: -15px;
+ margin-left: 6px;
+ }
+ }
+ }
+ }
+
+ &.fine-tune {
+ &.horizontal {
+ &:dir(ltr), &:dir(rtl) { // specificity bump
+ padding: 0 0 12px 0;
+
+ trough {
+ padding-bottom: 7px;
+ background-position: 0 -6px;
+ }
+
+ slider {
+ margin-bottom: -15px;
+ margin-top: 6px;
+ }
+ }
+ }
+
+ &.vertical {
+ &:dir(ltr) {
+ padding: 0 0 0 12px;
+
+ trough {
+ padding-left: 7px;
+ background-position: 6px 0;
+ }
+
+ slider {
+ margin-left: -15px;
+ margin-right: 6px;
+ }
+ }
+
+ &:dir(rtl) {
+ padding: 0 12px 0 0;
+
+ trough {
+ padding-right: 7px;
+ background-position: -6px 0;
+ }
+
+ slider {
+ margin-right: -15px;
+ margin-left: 6px;
+ }
+ }
+ }
+ }
+ }
+}
+
+
+/*****************
+ * Progress bars *
+ *****************/
+progressbar {
+ // sizing
+ &.horizontal {
+ trough,
+ progress { min-height: 2px; }
+ }
+
+ &.vertical {
+ trough,
+ progress { min-width: 2px; }
+ }
+
+ &.horizontal progress { margin: 0 -1px; } // the progress node is positioned after the trough border
+ &.vertical progress { margin: -1px 0; } // this moves it over it.
+
+
+ // FIXME: insensitive state missing and some other state should be set probably
+ font-size: smaller;
+ color: transparentize($fg_color, 0.6);
+ font-feature-settings: "tnum";
+
+ &:backdrop {
+ box-shadow: none;
+ transition: $backdrop_transition;
+ }
+
+ trough { @extend %scale_trough; }
+
+ progress {
+ @extend %scale_highlight;
+
+ border-radius: 1.5px;
+
+ &.left {
+ border-top-left-radius: 2px;
+ border-bottom-left-radius: 2px;
+ }
+
+ &.right {
+ border-top-right-radius: 2px;
+ border-bottom-right-radius: 2px;
+ }
+
+ &.top {
+ border-top-right-radius: 2px;
+ border-top-left-radius: 2px;
+ }
+
+ &.bottom {
+ border-bottom-right-radius: 2px;
+ border-bottom-left-radius: 2px;
+ }
+ }
+
+ &.osd { // progressbar.osd used for epiphany page loading progress
+ min-width: 3px;
+ min-height: 3px;
+ background-color: transparent;
+
+ trough {
+ border-style: none;
+ border-radius: 0;
+ background-color: transparent;
+ box-shadow: none;
+ }
+
+ progress {
+ border-style: none;
+ border-radius: 0;
+ }
+ }
+
+ trough.empty progress { all: unset; } // makes the progress indicator disappear, when the fraction is 0
+}
+
+
+/*************
+ * Level Bar *
+ *************/
+levelbar {
+ &.horizontal {
+ block {
+ min-height: 1px;
+ }
+
+ &.discrete block {
+ margin: 0 1px;
+ min-width: 32px;
+ }
+ }
+
+ &.vertical {
+ block {
+ min-width: 1px;
+ }
+
+ &.discrete block {
+ margin: 1px 0;
+ min-height: 32px;
+ }
+ }
+
+ &:backdrop { transition: $backdrop_transition; }
+
+ trough {
+ border: 1px solid;
+ padding: 2px;
+ border-radius: 3px;
+ @include entry(normal);
+
+ &:backdrop { @include entry(backdrop); }
+ }
+
+ block {
+ border: 1px solid;
+ border-radius: 1px;
+
+ &.low {
+ border-color: if($variant == 'light', darken($warning_color, 20%), $warning_color);
+ background-color: $warning_color;
+
+ &:backdrop { border-color: $warning_color; };
+ }
+
+ &.high,
+ &:not(.empty) {
+ border-color: if($variant == 'light', darken($progress_bg_color, 20%), $progress_bg_color);
+ background-color: $progress_bg_color;
+
+ &:backdrop { border-color: $progress_bg_color; }
+ }
+
+ &.full {
+ border-color: if($variant == 'light', darken($success_color, 20%), $success_color);
+ background-color: $success_color;
+
+ &:backdrop { border-color: $success_color; };
+ }
+
+ &.empty {
+ background-color: transparent;
+ border-color: if($variant == 'light', transparentize($fg_color,0.8), transparentize($fg_color,0.9));
+
+ &:backdrop { border-color: transparentize($backdrop_fg_color,0.85); }
+ }
+ }
+}
+
+
+/****************
+ * Print dialog *
+*****************/
+printdialog {
+ paper {
+ color: $fg_color;
+ border: 1px solid $borders_color;
+ background: white;
+ padding: 0;
+
+ &:backdrop {
+ color: $backdrop_fg_color;
+ border-color: $backdrop_borders_color;
+ }
+ }
+
+ .dialog-action-box { margin: 12px; }
+}
+
+
+/**********
+ * Frames *
+ **********/
+frame > border,
+.frame {
+ box-shadow: none;
+ margin: 0;
+ padding: 0;
+ border-radius: 0;
+ border: 1px solid $borders_color;
+
+ &.flat { border-style: none; }
+
+ &:backdrop { border-color: $backdrop_borders_color; }
+}
+
+actionbar > revealer > box {
+ padding: 6px;
+ border-top: 1px solid $borders_color;
+
+ &:backdrop { border-color: $backdrop_borders_color; }
+}
+
+scrolledwindow {
+ viewport.frame { // avoid double borders when viewport inside scrolled window
+ border-style: none;
+ }
+
+ // This is used when content is touch-dragged past boundaries.
+ // draws a box on top of the content, the size changes programmatically.
+ overshoot {
+ &.top {
+ @include overshoot(top);
+
+ &:backdrop { @include overshoot(top, backdrop); }
+ }
+
+ &.bottom {
+ @include overshoot(bottom);
+
+ &:backdrop { @include overshoot(bottom, backdrop); }
+ }
+
+ &.left {
+ @include overshoot(left);
+
+ &:backdrop { @include overshoot(left, backdrop); }
+ }
+
+ &.right {
+ @include overshoot(right);
+
+ &:backdrop { @include overshoot(right, backdrop); }
+ }
+ }
+
+
+ junction { // the small square between two scrollbars
+ border-color: transparent;
+ // the border image is used to add the missing dot between the borders, details, details, details...
+ border-image: linear-gradient(to bottom, $borders_color 1px, transparent 1px) 0 0 0 1 / 0 1px stretch;
+ background-color: $scrollbar_bg_color;
+
+ &:dir(rtl) { border-image-slice: 0 1 0 0; }
+
+ &:backdrop {
+ border-image-source: linear-gradient(to bottom, $backdrop_borders_color 1px, transparent 1px);
+ background-color: $backdrop_scrollbar_bg_color;
+ transition: $backdrop_transition;
+ }
+ }
+}
+
+//vbox and hbox separators
+separator {
+ background: transparentize(black, 0.9);
+ min-width: 1px;
+ min-height: 1px;
+}
+
+
+/*********
+ * Lists *
+ *********/
+list {
+ color: $text_color;
+ background-color: $base_color;
+ border-color: $borders_color;
+
+ &:backdrop {
+ color: $backdrop_text_color;
+ background-color: $backdrop_base_color;
+ border-color: $backdrop_borders_color;
+ }
+
+ row { padding: 2px; }
+}
+
+row {
+ transition: all 150ms $ease-out-quad;
+
+ &:hover { transition: none; }
+
+ &:backdrop { transition: $backdrop_transition; }
+
+ &.activatable {
+ &.has-open-popup, // this is for indicathing which row generated a popover see https://bugzilla.gnome.org/show_bug.cgi?id=754411
+
+ &:hover { background-color: if(variant == light, transparentize($fg_color, 0.9), transparentize($fg_color, 0.95)); }
+
+ &:active { box-shadow: inset 0 2px 2px -2px transparentize(black, 0.8); }
+
+ &:backdrop:hover { background-color: transparent; }
+
+ &:selected {
+ &:active { box-shadow: inset 0 2px 3px -1px transparentize(black, 0.5); }
+
+ &.has-open-popup,
+ &:hover { background-color: mix($fg_color, $selected_bg_color, 10%); }
+
+ &:backdrop { background-color: $selected_bg_color; }
+ }
+ }
+
+ &:selected { @extend %selected_items; }
+}
+
+
+/*********************
+ * App Notifications *
+ *********************/
+.app-notification,
+.app-notification.frame {
+ @extend %osd;
+
+ padding: 10px;
+ border-radius: 0 0 5px 5px;
+ background-color: $osd_bg_color;
+ background-image: linear-gradient(to bottom, transparentize(black, 0.8),
+ transparent 2px);
+ background-clip: padding-box;
+
+ &:backdrop {
+ background-image: none;
+ transition: $backdrop_transition;
+ }
+
+ button { @extend %osd_button; }
+
+ border { border: none; }
+}
+
+
+/*************
+ * Expanders *
+ *************/
+expander {
+ title > arrow {
+ 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
+ &:disabled { color: $insensitive_fg_color; }
+ &:disabled:backdrop { color: $backdrop_insensitive_color; }
+
+ &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); }
+ }
+}
+
+
+/************
+ * Calendar *
+ ***********/
+calendar {
+ color: $text_color;
+ border: 1px solid $borders_color;
+
+ &:selected {
+ @extend %selected_items;
+
+ border-radius: 3px;
+ }
+
+ &.header {
+ border-bottom-color: transparentize(black, 0.9);
+
+ &:backdrop { border-bottom-color: transparentize(black, 0.9); }
+ }
+
+ &.button {
+ @extend %undecorated_button;
+
+ color: transparentize($fg_color, 0.55);
+
+ &:hover { color: $fg_color; }
+
+ &:backdrop { color: transparentize($backdrop_fg_color,0.55); }
+
+ &:disabled { color: transparentize($insensitive_fg_color,0.55); }
+ }
+
+ &.highlight {
+ color: $insensitive_fg_color;
+
+ &:backdrop { color: $backdrop_insensitive_color; }
+ }
+
+ &:backdrop {
+ color: $backdrop_text_color;
+ border-color: $backdrop_borders_color;
+ }
+
+ &:indeterminate { color: gtkalpha(currentColor, 0.1); }
+}
+
+
+/***********
+ * Dialogs *
+ ***********/
+messagedialog { // Message Dialog styling
+ .titlebar {
+ min-height: 20px;
+ background-image: none;
+ background-color: $bg_color;
+ border-style: none;
+ border-top-left-radius: $window_radius+1; // Yaru change: sync radii with Gtk4
+ border-top-right-radius: $window_radius+1; // Yaru change: sync radii with Gtk4
+ }
+
+ &.csd { // rounded bottom border styling for csd version
+ &.background {
+ // bigger radius for better antialiasing
+ border-bottom-left-radius: $window_radius+1;
+ border-bottom-right-radius: $window_radius+1;
+ }
+
+ .dialog-action-area button {
+ padding: 10px 14px; // labels are not vertically centered on message dialog, this is a workaround
+ border-right-style: none;
+ border-bottom-style: none;
+ border-radius: 0;
+ -gtk-outline-radius: 0;
+
+ &:first-child {
+ border-left-style: none;
+ border-bottom-left-radius: $window_radius+1; // Yaru change: sync radii with Gtk4
+ -gtk-outline-bottom-left-radius: $window_radius+1; // Yaru change: sync radii with Gtk4
+ }
+
+ &:last-child {
+ border-bottom-right-radius: $window_radius+1; // Yaru change: sync radii with Gtk4
+ -gtk-outline-bottom-right-radius: $window_radius+1; // Yaru change: sync radii with Gtk4
+ }
+ }
+ }
+}
+
+filechooser {
+ .dialog-action-box {
+ border-top: 1px solid $borders_color;
+
+ &:backdrop { border-top-color: $backdrop_borders_color; }
+ }
+
+ #pathbarbox { border-bottom: 1px solid $bg_color; }
+}
+
+filechooserbutton:drop(active) {
+ box-shadow: none;
+ border-color: transparent;
+}
+
+
+/***********
+ * Sidebar *
+ ***********/
+.sidebar {
+ border-style: none;
+ background-color: mix($bg_color, $base_color, 50%);
+
+ &:not(separator) {
+ @at-root %sidebar_left,
+ &:dir(ltr),
+ &.left,
+ &.left:dir(rtl) {
+ border-right: 1px solid $borders_color;
+ border-left-style: none;
+ }
+
+ @at-root %sidebar_right,
+ &:dir(rtl),
+ &.right {
+ border-left: 1px solid $borders_color;
+ border-right-style: none;
+ }
+ }
+
+ &:backdrop {
+ background-color: $backdrop_sidebar_bg_color;
+ border-color: $backdrop_borders_color;
+ transition: $backdrop_transition;
+ }
+
+ list { background-color: transparent; }
+
+ paned & { &.left, &.right, &.left:dir(rtl), &:dir(rtl), &:dir(ltr), & { border-style: none; }}
+}
+
+stacksidebar {
+ &.sidebar {
+ &:dir(ltr),
+ &.left,
+ &.left:dir(rtl) { list { @extend %sidebar_left; }}
+
+ &:dir(rtl),
+ &.right { list { @extend %sidebar_right; }}
+ }
+
+ row {
+ padding: 10px 4px;
+
+ > label {
+ padding-left: 6px;
+ padding-right: 6px;
+ }
+
+ &.needs-attention > label {
+ @extend %needs_attention;
+
+ background-size: 6px 6px, 0 0;
+ }
+ }
+}
+
+separator.sidebar {
+ background-color: $borders_color;
+
+ &:backdrop {
+ background-color: $backdrop_borders_color;
+ }
+
+ &.selection-mode,
+ .selection-mode & {
+ background-color: darken($suggested_bg_color, 20%);
+ }
+}
+
+
+/****************
+ * File chooser *
+ ****************/
+$_placesidebar_icons_opacity: 0.7;
+
+row image.sidebar-icon { opacity: $_placesidebar_icons_opacity; } // dim the sidebar icons
+ // see bug #786613 for details
+ // on this oddity
+
+placessidebar {
+ > viewport.frame { border-style: none; }
+
+ row {
+ // Needs overriding of the GtkListBoxRow padding
+ min-height: 36px;
+ padding: 0px;
+
+ // Using margins/padding directly in the SidebarRow
+ // will make the animation of the new bookmark row jump
+ > revealer { padding: 0 14px; }
+
+ &:selected { color: $selected_fg_color; }
+
+ &:disabled { color: $insensitive_fg_color; }
+
+ &:backdrop {
+ color: $backdrop_fg_color;
+
+ &:selected { color: $backdrop_selected_fg_color; }
+
+ &:disabled { color: $backdrop_insensitive_color; }
+ }
+
+ image.sidebar-icon {
+ &:dir(ltr) { padding-right: 8px; }
+ &:dir(rtl) { padding-left: 8px; }
+ }
+
+ label.sidebar-label {
+ &:dir(ltr) { padding-right: 2px; }
+ &:dir(rtl) { padding-left: 2px; }
+ }
+
+ @at-root button.sidebar-button {
+ @extend %button_basic_flat;
+
+ @extend %button_selected_flat;
+
+ min-height: 26px;
+ min-width: 26px;
+ margin-top: 3px;
+ margin-bottom: 3px;
+ padding: 0;
+ border-radius: 100%;
+ -gtk-outline-radius: 100%;
+
+ &:not(:hover):not(:active),
+ &:backdrop { > image { opacity: $_placesidebar_icons_opacity; }}
+ }
+
+ // in the sidebar case it makes no sense to click the selected row
+ &:selected:active { box-shadow: none; }
+
+ &.sidebar-placeholder-row {
+ padding: 0 8px;
+ min-height: 2px;
+ background-image: image($drop_target_color);
+ background-clip: content-box;
+ }
+
+ &.sidebar-new-bookmark-row { color: $selected_bg_color; }
+
+ &:drop(active):not(:disabled) {
+ color: $drop_target_color;
+ box-shadow: inset 0 1px $drop_target_color,
+ inset 0 -1px $drop_target_color;
+
+ &:selected {
+ color: $selected_fg_color;
+ background-color: $drop_target_color;
+ }
+ }
+ }
+}
+
+placesview {
+ .server-list-button > image {
+ transition: 200ms $ease-out-quad;
+ -gtk-icon-transform: rotate(0turn);
+ }
+
+ .server-list-button:checked > image {
+ transition: 200ms $ease-out-quad;
+ -gtk-icon-transform: rotate(-0.5turn);
+ }
+
+ row.activatable:hover { background-color: transparent; }
+
+ // 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; // defeats the ugly default handle decoration
+ border-style: none; // just to be sure
+ background-color: transparent;
+ // workaround, using background istead of a border since the border will get rendered twice (?)
+ background-image: image($borders_color);
+ background-size: 1px 1px;
+
+ &:selected { background-image: image($selected_bg_color); } // FIXME is this needed?
+
+ &:backdrop { background-image: image($backdrop_borders_color); }
+
+ &.wide {
+ min-width: 5px;
+ min-height: 5px;
+ background-color: $bg_color;
+ background-image: image($borders_color), image($borders_color);
+ background-size: 1px 1px, 1px 1px;
+
+ &:backdrop {
+ background-color: $backdrop_bg_color;
+ background-image: image($backdrop_borders_color),
+ image($backdrop_borders_color);
+ }
+ }
+ }
+
+ &.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;
+ }
+ }
+}
+
+
+/**************
+ * GtkInfoBar *
+ **************/
+infobar {
+ border-style: none;
+
+ &.action:hover > revealer > box {
+ background-color: if($variant == 'light', desaturate(lighten(invert($selected_bg_color), 47%), 30%),
+ desaturate(darken(invert($selected_bg_color),42%), 70%));
+ border-bottom: 1px solid lighten($borders_color, 5%);
+ }
+
+ &.info,
+ &.question,
+ &.warning,
+ &.error {
+ &:backdrop > revealer > box, & > revealer > box {
+ label, & { color: $fg_color; }
+ background-color: if($variant == 'light', desaturate(lighten(invert($selected_bg_color), 45%), 30%),
+ desaturate(darken(invert($selected_bg_color),40%), 70%));
+ border-bottom: 1px solid lighten($borders_color, 5%);
+ }
+
+ text-shadow: none;
+
+ &:backdrop { text-shadow: none; }
+
+ button {
+ // FIXME: extend selection mode buttons
+ @include button(normal, $bg_color, $fg_color, none);
+
+ &:hover { @include button(hover, $bg_color, $fg_color, none); }
+
+ &:active,
+ &:checked { @include button(active, $bg_color, $fg_color, none); }
+
+ &:disabled { @include button(insensitive,$bg_color,$fg_color,none); }
+
+ &:backdrop {
+ @include button(backdrop, $bg_color, $fg_color, none);
+ border-color: _border_color($bg_color);
+
+ &:disabled {
+ @include button(backdrop-insensitive, $bg_color,
+ $fg_color, none);
+ border-color: _border_color($bg_color);
+ }
+ }
+ &:backdrop, & {
+ label, & { color: $fg_color; }
+ }
+ }
+
+ selection { background-color: darken($bg_color, 10%); }
+
+ *:link { color: $link_color; }
+ }
+}
+
+
+/************
+ * 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: transparentize(black, 0.2);
+ background-clip: padding-box;
+ border: 1px solid $tooltip_borders_color; // this suble border is meant to
+ // not make the tooltip melt with
+ // very dark backgrounds
+ }
+
+ padding: 4px; /* not working */
+ border-radius: 5px;
+ box-shadow: none; // otherwise it gets inherited by windowframe.csd
+ text-shadow: 0 1px black;
+
+ // FIXME: we need a border or tooltips vanish on black background.
+ decoration { background-color: transparent; }
+
+ * { // Yeah this is ugly
+ padding: 4px;
+ background-color: transparent;
+ color: white;
+ }
+}
+
+
+/*****************
+ * Color Chooser *
+ *****************/
+colorswatch {
+ // This widget is made of two boxes one on top of the other, the lower box is colorswatch {} the other one
+ // is colorswatch overlay {}, colorswatch has the programmatically set background, so most of the style is
+ // applied to the overlay box.
+
+ &:drop(active), & { border-style: none; } // FIXME: implement a proper drop(active) state
+
+ $_colorswatch_radius: 5px;
+
+ // base color corners rounding
+ // to avoid the artifacts caused by rounded corner anti-aliasing the base color
+ // sports a bigger radius.
+ // nth-child is needed by the custom color strip.
+
+ &.top {
+ border-top-left-radius: $_colorswatch_radius + 0.5px;
+ border-top-right-radius: $_colorswatch_radius + 0.5px;
+
+ 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.5px;
+
+ 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 {
+ outline-color: transparentize(white, 0.4);
+
+ overlay {
+ color: white;
+
+ &:hover { border-color: if($variant == 'light', transparentize(black, 0.2), $borders_color); }
+
+ &:backdrop { color: transparentize(white, 0.5); }
+ }
+ }
+
+ &.light {
+ outline-color: transparentize(black, 0.4);
+
+ overlay {
+ color: black;
+
+ &:hover { border-color: if($variant == 'light', transparentize(black, 0.5), $borders_color); }
+
+ &:backdrop { color: transparentize(black, 0.5); }
+ }
+ }
+
+ &:drop(active) {
+ box-shadow: none;
+
+ &.light overlay {
+ border-color: $drop_target_color;
+ box-shadow: inset 0 0 0 2px if($variant == 'light', darken($drop_target_color, 7%), $borders_color),
+ inset 0 0 0 1px $drop_target_color;
+ }
+
+ &.dark overlay {
+ border-color: $drop_target_color;
+ box-shadow: inset 0 0 0 2px if($variant == 'light', transparentize(black, 0.7), $borders_color),
+ inset 0 0 0 1px $drop_target_color;
+ }
+ }
+
+ overlay {
+ border: 1px solid if($variant == 'light', transparentize(black, 0.7), $borders_color);
+
+ &:hover {
+ box-shadow: inset 0 1px transparentize(white, 0.6),
+ inset 0 -1px transparentize(black, 0.8);
+ }
+
+ &:backdrop, &:backdrop:hover {
+ border-color: if($variant == 'light', transparentize(black, 0.7), $borders_color);
+ box-shadow: none;
+ }
+ }
+
+ &#add-color-button {
+ border-radius: $_colorswatch_radius $_colorswatch_radius 0 0;
+
+ &:only-child { border-radius: $_colorswatch_radius; }
+
+ overlay {
+ @include button(normal);
+
+ &:hover { @include button(hover); }
+
+ &:backdrop { @include button(backdrop); }
+ }
+ }
+
+ &:disabled {
+ opacity: 0.5;
+
+ overlay {
+ border-color: transparentize(black, 0.4);
+ box-shadow: none;
+ }
+ }
+
+ row:selected & { box-shadow: 0 0 0 2px $selected_fg_color; }
+ &#editor-color-sample {
+ border-radius: 4px;
+
+ overlay { border-radius: 4.5px; }
+ }
+}
+
+// colorscale popup
+colorchooser .popover.osd { border-radius: 5px; }
+
+/********
+ * Misc *
+ ********/
+//content view (grid/list)
+.content-view {
+ background-color: darken($bg_color,7%);
+
+ &:hover { -gtk-icon-effect: highlight; }
+
+ &:backdrop { background-color: darken($bg_color,7%); }
+
+ rubberband, .rubberband { @extend rubberband; }
+}
+
+.scale-popup {
+ .osd & { @extend %osd; }
+
+ .osd & button.flat { //FIXME: quick hack, redo properly
+ border-style: none;
+ border-radius: 5px;
+ }
+
+ button { // +/- buttons on GtkVolumeButton popup
+ &:hover {
+ @extend %undecorated_button;
+ background-color: transparentize($fg_color,0.9);
+ border-radius: 5px;
+ }
+
+ &:backdrop { &:hover, &:disabled, & { @extend %undecorated_button; }}
+ }
+}
+
+
+/**********************
+ * Window Decorations *
+ *********************/
+decoration {
+ border-radius: $window_radius $window_radius 0 0;
+ // lamefun trick to get rounded borders regardless of CSD use
+ border-width: 0px;
+
+ // this needs to be transparent
+ // see bug #722563
+ $_wm_border: if($variant=='light', transparentize(black, 0.77), transparentize(black, 0.25));
+ $_wm_border_backdrop: if($variant=='light', transparentize(black, 0.82), transparentize(black, 0.25));
+
+ box-shadow: 0 3px 9px 1px transparentize(black, 0.5),
+ 0 0 0 1px $_wm_border; //doing borders with box-shadow
+
+ // FIXME rationalize shadows
+
+ // this is used for the resize cursor area
+ margin: 10px;
+
+ &:backdrop {
+ // the transparent shadow here is to enforce that the shadow extents don't
+ // change when we go to backdrop, to prevent jumping windows.
+ // The biggest shadow should be in the same order then in the active state
+ // or the jumping will happen during the transition.
+ box-shadow: 0 3px 9px 1px transparent,
+ 0 2px 6px 2px transparentize(black, 0.8),
+ 0 0 0 1px $_wm_border_backdrop;
+ transition: $backdrop_transition;
+ }
+
+ .maximized &,
+ .fullscreen & { border-radius: 0; box-shadow: none; }
+
+ .tiled &,
+ .tiled-top &,
+ .tiled-right &,
+ .tiled-bottom &,
+ .tiled-left & {
+ border-radius: 0;
+ box-shadow: 0 0 0 1px $_wm_border_backdrop,
+ 0 0 0 20px transparent; //transparent control workaround -- #3670
+
+ &:backdrop { box-shadow: 0 0 0 1px $_wm_border_backdrop,
+ 0 0 0 20px transparent; // #3670
+ }
+ }
+
+ .popup & { box-shadow: none; }
+
+ // server-side decorations as used by mutter
+ // just doing borders, wm draws actual shadows
+ .ssd & { box-shadow: 0 0 0 1px $_wm_border; }
+ .ssd &:backdrop { box-shadow: 0 0 0 1px $_wm_border_backdrop; }
+ .ssd.maximized &,
+ .ssd.maximized &:backdrop { box-shadow: none; }
+
+ .csd.popup & {
+ border-radius: $menu_radius;
+ box-shadow: 0 1px 2px transparentize(black, 0.8),
+ 0 0 0 1px transparentize($_wm_border, 0.1);
+ }
+
+ tooltip.csd & {
+ border-radius: 5px;
+ box-shadow: none;
+ }
+
+ messagedialog.csd & {
+ border-radius: $window_radius;
+ box-shadow: 0 1px 2px transparentize(black, 0.8),
+ 0 0 0 1px transparentize($_wm_border, 0.1);
+ }
+
+ .solid-csd & {
+ margin: 0;
+ padding: 4px;
+ background-color: $borders_color;
+ border: solid 1px $borders_color;
+ border-radius: 0;
+ box-shadow: inset 0 0 0 3px $headerbar_color, inset 0 1px $top_hilight;
+
+ &:backdrop { box-shadow: inset 0 0 0 3px $backdrop_bg_color, inset 0 1px $top_hilight; }
+ }
+}
+
+// Window Close button
+button.titlebutton {
+ @extend %button_basic;
+
+ @extend %button_basic_flat;
+
+ @include _button_text_shadow;
+
+ &:not(.appmenu) {
+ border-radius: 9999px;
+ padding: $_hb_btn_pad;
+ margin: 0 2px;
+ min-width: 0;
+ min-height: 0;
+ }
+
+ .selection-mode & {
+ @extend %selection_mode_button_flat;
+
+ @extend %nobg_selected_items;
+ }
+
+ &:backdrop { -gtk-icon-shadow: none; }
+}
+
+.selection-mode headerbar button.titlebutton,
+.selection-mode .titlebar button.titlebutton,
+headerbar.selection-mode button.titlebutton,
+.titlebar.selection-mode button.titlebutton {
+ @include _button_text_shadow(white, $suggested_bg_color);
+
+ &:backdrop { -gtk-icon-shadow: none; }
+}
+
+// catch all extend :)
+
+%selected_items {
+ background-color: $selected_bg_color;
+
+ @at-root %nobg_selected_items, & {
+ color: $selected_fg_color;
+
+ @at-root %selected_items_disabled,
+ &:disabled { color: mix($selected_fg_color, $selected_bg_color, 50%); }
+
+ @at-root %selected_items_backdrop,
+ &:backdrop {
+ color: $backdrop_selected_fg_color;
+
+ &:disabled { color: mix($backdrop_selected_fg_color, $selected_bg_color, 30%); }
+ }
+ }
+}
+
+.monospace { font-family: monospace; }
+
+
+/**********************
+ * Touch Copy & Paste *
+ *********************/
+//touch selection handlebars for the Popover.osd above
+cursor-handle {
+ background-color: transparent;
+ background-image: none;
+ box-shadow: none;
+ border-style: none;
+
+ @each $s,$as in ('',''),
+ (':hover','-hover'),
+ (':active','-active') { //no need for insensitive and backdrop
+ &.top#{$s}:dir(ltr), &.bottom#{$s}:dir(rtl) {
+ $_url: 'assets/text-select-start#{$as}#{$asset_suffix}';
+ -gtk-icon-source: -gtk-scaled(url('#{$_url}.png'),
+ url('#{$_url}@2.png'));
+ padding-left: 10px;
+ }
+
+ &.bottom#{$s}:dir(ltr), &.top#{$s}:dir(rtl) {
+ $_url: 'assets/text-select-end#{$as}#{$asset_suffix}';
+ -gtk-icon-source: -gtk-scaled(url('#{$_url}.png'),
+ url('#{$_url}@2.png'));
+ padding-right: 10px;
+ }
+
+ &.insertion-cursor#{$s}:dir(ltr), &.insertion-cursor#{$s}:dir(rtl) {
+ $_url: 'assets/slider-horz-scale-has-marks-above#{$as}#{$asset_suffix}';
+ -gtk-icon-source: -gtk-scaled(url('#{$_url}.png'),
+ url('#{$_url}@2.png'));
+ }
+ }
+}
+
+.context-menu { font: initial; } // Decouple the font of context menus from their entry/textview
+
+// shortcut window keys
+.keycap {
+ min-width: 20px;
+ min-height: 25px;
+ margin-top: 2px;
+ padding-bottom: 3px;
+ padding-left: 6px;
+ padding-right: 6px;
+
+ color: $fg_color;
+ background-color: $base_color;
+ border: 1px solid;
+ border-color: if($variant == 'light', mix($borders_color, $bg_color, 50%), $borders_color);
+ border-radius: 5px;
+ box-shadow: if($variant == 'light', inset 0 -3px mix($base_color, $bg_color, 20%), inset 0 -3px mix($borders_color, $base_color, 60%));
+ font-size: smaller;
+
+ &:backdrop {
+ background-color: $backdrop_base_color;
+ color: $backdrop_fg_color;
+ transition: $backdrop_transition;
+ }
+}
+
+:not(decoration):not(window):drop(active):focus,
+:not(decoration):not(window):drop(active) { // FIXME needs to be done widget by widget, this wildcard should really die
+ border-color: $drop_target_color;
+ box-shadow: inset 0 0 0 1px $drop_target_color;
+ caret-color: $drop_target_color;
+}
+
+stackswitcher button.text-button { min-width: 100px; } // FIXME aggregate with buttons
+
+stackswitcher button.circular,
+stackswitcher button.text-button.circular { // FIXME aggregate with buttons
+ min-width: 32px;
+ min-height: 32px;
+ padding: 0;
+}
+
+/*************
+ * App Icons *
+ *************/
+/* Outline for low res icons */
+.lowres-icon {
+ -gtk-icon-shadow: 0 -1px rgba(0,0,0,0.05),
+ 1px 0 rgba(0,0,0,0.1),
+ 0 1px rgba(0,0,0,0.3),
+ -1px 0 rgba(0,0,0,0.1);
+}
+
+/* Dropshadow for large icons */
+.icon-dropshadow {
+ -gtk-icon-shadow: 0 1px 12px rgba(0,0,0,0.05),
+ 0 -1px rgba(0,0,0,0.05),
+ 1px 0 rgba(0,0,0,0.1),
+ 0 1px rgba(0,0,0,0.3),
+ -1px 0 rgba(0,0,0,0.1);
+}
+
+/*********
+ * Emoji *
+ ********/
+
+popover.emoji-picker {
+ padding-left: 0;
+ padding-right: 0;
+
+ entry.search { margin: 3px 5px 5px 5px; }
+}
+
+button.emoji-section {
+ border-color: transparent;
+ border-width: 3px;
+ border-style: none none solid;
+ border-radius: 0;
+
+ margin: 2px 4px 2px 4px;
+ padding: 3px 0 0;
+ min-width: 32px;
+ min-height: 28px;
+
+ /* reset props inherited from the button style */
+ background: none;
+ box-shadow: none;
+ text-shadow: none;
+
+ outline-offset: -5px;
+
+ &:first-child { margin-left: 7px; }
+ &:last-child { margin-right: 7px; }
+
+ &:backdrop:not(:checked) { border-color: transparent; }
+ &:hover { border-color: if($variant == 'light', $borders_color, transparentize($fg_color, .9)); }
+ &:checked { border-color: $selected_bg_color; }
+
+ label {
+ padding: 0;
+
+ opacity: 0.55;
+ }
+
+ &:hover label { opacity: 0.775; }
+ &:checked label { opacity: 1; }
+}
+
+popover.emoji-picker .emoji {
+ font-size: x-large;
+ padding: 6px;
+
+ :hover {
+ background: $selected_bg_color;
+ border-radius: 6px;
+ }
+}
+
+popover.emoji-completion arrow {
+ border: none;
+ background: none;
+}
+
+popover.emoji-completion contents row box {
+ padding: 2px 10px;
+}
+
+popover.emoji-completion .emoji:hover {
+ background: $popover_hover_color;
+}
diff --git a/gtk/src/gtk-3.0/default/_drawing.scss b/gtk/src/gtk-3.0/default/_drawing.scss
new file mode 100644
index 0000000000..50b6b0f826
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/_drawing.scss
@@ -0,0 +1,640 @@
+// Drawing mixins
+
+// generic drawing of more complex things
+
+@function _widget_edge($c:$borders_edge) {
+// outer highlight "used" on most widgets
+ @if $c == none { @return none; }
+ @else { @return 0 1px $c; }
+}
+
+@mixin _shadows($list...) {
+//
+// Helper mixin to stack up to box-shadows;
+//
+ $shadows: null;
+
+ @each $shadow in $list {
+ @if $shadow!=none { $shadows: $shadows, $shadow; }
+ }
+
+ box-shadow: $shadows;
+}
+
+// entries // Yaru change: we detached focus from selection
+@function entry_focus_border($fc:$focus_border_color) {
+ @if $variant == 'light' { @return $fc; }
+ @else { @return $focus_border_color }
+}
+
+@function entry_focus_shadow($fc:$focus_border_color) { @return inset 0 0 0 1px $fc; } // Yaru change: we detached focus from selection
+
+@mixin entry($t, $fc:$focus_border_color, $edge: none) { // Yaru change: we detached focus from selection
+//
+// Entries drawing function
+//
+// $t: entry type
+// $fc: focus color
+// $edge: set to none to not draw the bottom edge or specify a color to not
+// use the default one
+//
+// possible $t values:
+// normal, focus, insensitive, backdrop, backdrop-insensitive, osd, osd-focus, osd-backdrop;
+//
+
+ $_blank_edge: if($edge == none, none, 0 1px transparentize($edge, 1));
+ $_entry_edge: if($edge == none, none, _widget_edge($edge));
+
+ @if $t==normal {
+ color: $text_color;
+ border-color: $borders_color;
+ background-color: $base_color;
+ @include _shadows(entry_focus_shadow(transparentize($fc, 1)), $_entry_edge);
+ // for the transition to work the number of shadows in different states needs to match, hence the transparent shadow here.
+ }
+ @if $t==focus {
+ @include _shadows(entry_focus_shadow($fc), $_entry_edge);
+ border-color: entry_focus_border($fc);
+ }
+ @if $t==insensitive {
+ color: $insensitive_fg_color;
+ border-color: $borders_color;
+ background-color: $insensitive_bg_color;
+ box-shadow: $_entry_edge;
+ }
+ @if $t==backdrop {
+ color: $backdrop_text_color;
+ border-color: $backdrop_borders_color;
+ background-color: $backdrop_base_color;
+ box-shadow: $_blank_edge;
+ }
+ @if $t==backdrop-insensitive {
+ color: $backdrop_insensitive_color;
+ border-color: $backdrop_borders_color;
+ background-color: $insensitive_bg_color;
+ box-shadow: $_blank_edge;
+ }
+ @if $t==osd {
+ color: $osd_text_color;
+ border-color: $osd_borders_color;
+ background-color: transparentize(opacify($osd_borders_color, 1), 0.5);
+ background-clip: padding-box;
+ box-shadow: none;
+ text-shadow: 0 1px black;
+ -gtk-icon-shadow: 0 1px black;
+ }
+ @if $t==osd-focus {
+ color: $osd_text_color;
+ border-color: $selected_bg_color;
+ background-color: transparentize(opacify($osd_borders_color, 1), 0.5);
+ background-clip: padding-box;
+ box-shadow: entry_focus_shadow($fc);
+ text-shadow: 0 1px black;
+ -gtk-icon-shadow: 0 1px black;
+ }
+ @if $t==osd-insensitive {
+ color: $osd_insensitive_fg_color;
+ border-color: $osd_borders_color;
+ background-color: $osd_insensitive_bg_color;
+ background-clip: padding-box;
+ box-shadow: none;
+ text-shadow: none;
+ -gtk-icon-shadow: none;
+ }
+ @if $t==osd-backdrop {
+ color: $osd_text_color;
+ border-color: $osd_borders_color;
+ background-color: transparentize(opacify($osd_borders_color, 1), 0.5);
+ background-clip: padding-box;
+ box-shadow: none;
+ text-shadow: none;
+ -gtk-icon-shadow: none;
+ }
+}
+
+// buttons
+
+@function _border_color($c, $darker: false) {
+ @if $darker == true { @return darken($c, 20%); }
+ @else { @return darken($c, 10%); }
+}
+
+@function _text_shadow_color ($tc: $fg_color, $bg: $bg_color) {
+//
+// calculate the color of text shadows
+//
+// $tc is the text color
+// $bg is the background color
+//
+ $_lbg: lightness($bg)/100%;
+ @if lightness($tc)<50% { @return transparentize(white, 1-$_lbg/($_lbg*1.3)); }
+ @else { @return transparentize(black, $_lbg*0.8); }
+}
+
+@function _button_hilight_color($c) {
+//
+// calculate the right top hilight color for buttons
+//
+// $c: base color;
+//
+ @if lightness($c)>95% { @return white; }
+ @else if lightness($c)>90% { @return transparentize(white, 0.2); }
+ @else if lightness($c)>80% { @return transparentize(white, 0.5); }
+ @else if lightness($c)>50% { @return transparentize(white, 0.8); }
+ @else if lightness($c)>40% { @return transparentize(white, 0.9); }
+ @else { @return transparentize(white, 0.98); }
+}
+
+@mixin _button_text_shadow ($tc:$fg_color, $bg:$bg_color) {
+//
+// helper function for the text emboss effect
+//
+// $tc is the optional text color, not the shadow color
+//
+// TODO: this functions needs a way to deal with special cases
+//
+
+ $_shadow: _text_shadow_color($tc, $bg);
+
+ @if lightness($tc)<50% {
+ text-shadow: 0 1px $_shadow;
+ -gtk-icon-shadow: 0 1px $_shadow;
+ }
+ @else {
+ text-shadow: 0 -1px $_shadow;
+ -gtk-icon-shadow: 0 -1px $_shadow;
+ }
+}
+
+@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: none) {
+//
+// Button drawing function
+//
+// $t: button type,
+// $c: base button color for colored* types
+// $tc: optional text color for colored* types
+// $edge: set to none to not draw the bottom edge or specify a color to not
+// use the default one
+//
+// possible $t values:
+// normal, hover, active, insensitive, insensitive-active,
+// backdrop, backdrop-active, backdrop-insensitive, backdrop-insensitive-active,
+// osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated
+//
+// This mixin sets the $button_fill global variable which containts the button background-image
+//
+ $_hilight_color: _button_hilight_color($c);
+ $_button_edge: if($edge == none, none, _widget_edge($edge));
+ $_blank_edge: if($edge == none, none, _widget_edge(transparentize($edge,1)));
+ $_button_shadow: 0 1px 2px transparentize($shadow_color, 0.03);
+
+ @if $t==normal {
+ //
+ // normal button
+ //
+ color: $tc;
+ outline-color: $focus_border_color; // Yaru change: we detached focus from selection
+ border-color: if($c != $bg_color, _border_color($c), $borders_color);
+ // border-bottom-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
+ // Yaru change: we don't want to use gradients on buttons
+ $button_fill: if($c == $bg_color, if($variant == 'light', image(lighten($c, 2%)), image(lighten($c, 4%))), image(lighten($c, 2%))) !global;
+ background-image: $button_fill;
+ @include _button_text_shadow($tc, $c);
+ @include _shadows(none); // Yaru change: drop shadow
+ }
+
+ @else if $t==hover {
+ //
+ // hovered button
+ //
+ color: $tc;
+ outline-color: $focus_border_color; // Yaru change: we detached focus from selection
+ border-color: if($c != $bg_color, _border_color($c), $borders_color);
+ border-bottom-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
+ @if $variant == 'light' {
+ $button_fill: linear-gradient(to top, $c, lighten($c, 1%) 1px) !global;
+ @include _button_text_shadow($tc, lighten($c, 6%));
+ @include _shadows(inset 0 1px _button_hilight_color(lighten($c, 6%)), $_button_edge, $_button_shadow);
+ }
+ @else {
+ $button_fill: linear-gradient(to top, darken($c,1%), lighten($c, 1%) 1px) !global;
+ @include _button_text_shadow($tc,lighten($c, 6%));
+ @include _shadows(inset 0 1px _button_hilight_color(darken($c, 2%)), $_button_edge, $_button_shadow);
+ }
+ box-shadow: none; // Yaru change: remove shadow
+ background-image: if($c == $bg_color, if($variant == 'light', image(darken($c, 2%)), image(lighten($c, 6%))), image(lighten($c, 4%))); // Yaru change: darker bg on hover on light theme
+ }
+
+ @if $t==normal-alt {
+ //
+ // normal button alternative look
+ //
+ color: $tc;
+ outline-color: $focus_border_color; // Yaru change: we detached focus from selection
+ border-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
+ @include _button_text_shadow($tc, $c);
+ @if $variant == 'light' {
+ background-image: linear-gradient(to bottom, lighten($c, 5%) 20%, $c 90%);
+ @include _shadows(inset 0 1px _button_hilight_color(lighten($c, 6%)),
+ $_button_edge, $_button_shadow);
+ }
+ @else {
+ background-image: linear-gradient(to bottom, darken($c, 3%) 20%, darken($c, 6%) 90%);
+ @include _shadows(inset 0 1px $_hilight_color,
+ $_button_edge, $_button_shadow);
+ }
+ @include _shadows(none); // Yaru change: remove shadow
+ background-image: image(darken(white, 1%)); // Yaru change: brighter alt
+ background-clip: padding-box; // Yaru change: fix background overflow
+ }
+
+ @else if $t==hover-alt {
+ //
+ // hovered button alternative look
+ //
+ color: $tc;
+ outline-color: $focus_border_color; // Yaru change: we detached focus from selection
+ border-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
+ @if $variant == 'light' {
+ $button_fill: linear-gradient(to bottom, lighten($c, 9%) 10%, lighten($c, 4%) 90%) !global;
+ @include _shadows(inset 0 1px _button_hilight_color(lighten($c, 6%)),
+ $_button_edge, $_button_shadow);
+ }
+ @else {
+ $button_fill: linear-gradient(to bottom, $c 20%, darken($c, 4%) 90%) !global;
+ @include _shadows(inset 0 1px $_hilight_color,
+ $_button_edge, $_button_shadow);
+ }
+ background-image: image(white); // Yaru change: brighter alt hover
+ box-shadow: none; // Yaru change: remove shadow
+ }
+
+ @else if $t==active {
+ //
+ // pushed button
+ //
+ color: $tc;
+ outline-color: $focus_border_color; // Yaru change: we detached focus from selection
+ border-color: if($c != $bg_color, _border_color($c), $borders_color);
+ $button_fill: if($variant == 'light', image(darken($c, 14%)), image(darken($c, 9%))) !global;
+ background-image: $button_fill;
+ @include _shadows(inset 0 1px transparentize($_hilight_color, 1), $_button_edge);
+
+ text-shadow: none;
+ -gtk-icon-shadow: none;
+ }
+
+ @else if $t==insensitive {
+ //
+ // insensitive button
+ //
+ $_bg: if($c != $bg_color, mix($c, $base_color, 85%), $insensitive_bg_color);
+
+ color: if($tc != $fg_color, mix($tc, $_bg, 50%), $insensitive_fg_color);
+ border-color: if($c != $bg_color, _border_color($c), $insensitive_borders_color);
+ $button_fill: image($_bg) !global;
+ background-image: $button_fill;
+ text-shadow: none;
+ -gtk-icon-shadow: none;
+ // white with 0 alpha to avoid an ugly transition, since no color means
+ // black with 0 alpha
+ @include _shadows(inset 0 1px transparentize(white, 1), $_button_edge);
+ }
+
+ @else if $t==insensitive-active {
+ //
+ // insensitive pushed button
+ //
+ $_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 6%));
+ $_bc: if($c != $bg_color, _border_color($c), $insensitive_borders_color);
+
+ color: if($c != $bg_color, mix($tc, $_bg, 60%), $insensitive_fg_color);
+ border-color: $_bc;
+ $button_fill: image($_bg) !global;
+ background-image: $button_fill;
+ // white with 0 alpha to avoid an ugly transition, since no color means
+ // black with 0 alpha
+ @include _shadows(inset 0 1px transparentize(white, 1), $_button_edge);
+ }
+
+ @else if $t==backdrop {
+ //
+ // backdrop button
+ //
+ $_bg: if($c != $bg_color, $c, $backdrop_bg_color);
+ $_bc: if($variant == 'light', $c, _border_color($c));
+
+ color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color);
+ border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
+ $button_fill: image($_bg) !global;
+ background-image: $button_fill;
+ text-shadow: none;
+ -gtk-icon-shadow: none;
+ @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
+ }
+
+ @else if $t==backdrop-active {
+ //
+ // backdrop pushed button
+ //
+ $_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 4%));
+ $_bc: if($variant == 'light', $_bg ,_border_color($c));
+
+ color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color);
+ border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
+ $button_fill: image($_bg) !global;
+ background-image: $button_fill;
+ @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
+ }
+
+ @else if $t==backdrop-insensitive {
+ //
+ // backdrop insensitive button
+ //
+
+ $_bg: if($c != $bg_color, mix($c, $base_color, 85%), if($variant=='light', $insensitive_bg_color, lighten($insensitive_bg_color, 3%))); // Yaru change
+ $_bc: if($variant == 'light', $_bg,_border_color($c));
+
+ color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color);
+ border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
+ $button_fill: image($_bg) !global;
+ background-image: $button_fill;
+ text-shadow: none;
+ -gtk-icon-shadow: none;
+ // white with 0 alpha to avoid an ugly transition, since no color means
+ // black with 0 alpha
+ @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
+ }
+
+ @else if $t==backdrop-insensitive-active {
+ //
+ // backdrop insensitive pushed button
+ //
+
+ $_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 4%));
+ $_bc: if($variant == 'light', $_bg, _border_color($c));
+
+ color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color);
+ border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
+ $button_fill: image($_bg) !global;
+ background-image: $button_fill;
+ @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
+ }
+
+ @else if $t==osd {
+ //
+ // normal osd button
+ //
+ $_bg: if($c != $bg_color, transparentize($c, 0.5), lighten($osd_bg_color, 9%)); // Yaru change: make osd buttons visible
+
+ color: $osd_fg_color;
+ border-color: $osd_borders_color;
+ background-color: transparent;
+ $button_fill: image($_bg) !global;
+ background-image: $button_fill;
+ background-clip: padding-box;
+ // box-shadow: inset 0 1px transparentize(white, 0.9); // Yaru change: remove the shadow
+ text-shadow: 0 1px black;
+ -gtk-icon-shadow: 0 1px black;
+ outline-color: transparentize($osd_fg_color, 0.7);
+ }
+
+ @else if $t==osd-hover {
+ //
+ // active osd button
+ //
+ $_bg: if($c != $bg_color, transparentize($c, 0.3), lighten($osd_bg_color, 12%));
+
+ color: white;
+ border-color: $osd_borders_color;
+ background-color: transparent;
+ $button_fill: image($_bg) !global;
+ background-image: $button_fill;
+ background-clip: padding-box;
+ // box-shadow: inset 0 1px transparentize(white, 0.9); // Yaru change: remove the shadow
+ text-shadow: 0 1px black;
+ -gtk-icon-shadow: 0 1px black;
+ outline-color: transparentize($osd_fg_color, 0.7);
+ }
+
+ @else if $t==osd-active {
+ //
+ // active osd button
+ //
+ $_bg: if($c != $bg_color, $c, $osd_borders_color);
+
+ color: white;
+ border-color: $osd_borders_color;
+ background-color: transparent;
+ $button_fill: image($_bg) !global;
+ background-image: $button_fill;
+ background-clip: padding-box;
+ box-shadow: none;
+ text-shadow: none;
+ -gtk-icon-shadow: none;
+ outline-color: transparentize($osd_fg_color, 0.7);
+ }
+
+ @else if $t==osd-insensitive {
+ //
+ // insensitive osd button
+ //
+ color: $osd_insensitive_fg_color;
+ border-color: $osd_borders_color;
+ background-color: transparent;
+ $button_fill: image($osd_insensitive_bg_color) !global;
+ background-image: $button_fill;
+ background-clip: padding-box;
+ box-shadow: none;
+ text-shadow: none;
+ -gtk-icon-shadow: none;
+ }
+
+ @else if $t==osd-backdrop {
+ //
+ // backdrop osd button
+ //
+ $_bg: if($c != $bg_color, transparentize($c, 0.5), $osd_bg_color);
+
+ color: $osd_fg_color;
+ border-color: $osd_borders_color;
+ background-color: transparent;
+ $button_fill: image($_bg) !global;
+ background-image: $button_fill;
+ background-clip: padding-box;
+ box-shadow: none;
+ text-shadow: none;
+ -gtk-icon-shadow: none;
+ }
+
+ @else if $t==undecorated {
+ //
+ // reset
+ //
+ border-color: transparent;
+ background-color: transparent;
+ $button_fill: none !global;
+ background-image: $button_fill;
+
+ @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
+
+ text-shadow: none;
+ -gtk-icon-shadow: none;
+ }
+}
+
+@mixin headerbar_fill($c:$headerbar_color, $hc:$top_hilight, $ov: none) {
+//
+// headerbar fill
+//
+// $c: base color
+// $hc: top highlight color
+// $ov: a background layer for background shorthand (hence no commas!)
+//
+ $gradient: linear-gradient(to top, darken($c, 0%), lighten($c, 0%)); // Yaru change: no gradients
+
+ @if $variant == 'dark' { $gradient: linear-gradient(to top, lighten($c, 6%), lighten($c, 6%)); } // Yaru change: no gradients
+
+ @if $ov != none { background: $c $ov, $gradient; }
+ @else { background: $c $gradient; }
+
+ box-shadow: inset 0 1px $hc; // top highlight
+}
+
+@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
+//
+
+ $_small_gradient_length: 5%;
+ $_big_gradient_length: 100%;
+
+ $_position: center top;
+ $_small_gradient_size: 100% $_small_gradient_length;
+ $_big_gradient_size: 100% $_big_gradient_length;
+
+ @if $p==bottom {
+ $_position: center bottom;
+ $_linear_gradient_direction: to top;
+ }
+
+ @else if $p==right {
+ $_position: right center;
+ $_small_gradient_size: $_small_gradient_length 100%;
+ $_big_gradient_size: $_big_gradient_length 100%;
+ }
+
+ @else if $p==left {
+ $_position: left center;
+ $_small_gradient_size: $_small_gradient_length 100%;
+ $_big_gradient_size: $_big_gradient_length 100%;
+ }
+
+ $_small_gradient_color: $c;
+ $_big_gradient_color: $c;
+
+ @if $c==$fg_color {
+ $_small_gradient_color: darken($borders_color, 10%);
+ $_big_gradient_color: $fg_color;
+
+ @if $t==backdrop { $_small_gradient_color: $backdrop_borders_color; }
+ }
+
+ $_small_gradient: -gtk-gradient(radial,
+ $_position, 0,
+ $_position, 0.5,
+ to($_small_gradient_color),
+ to(transparentize($_small_gradient_color, 1)));
+
+ $_big_gradient: -gtk-gradient(radial,
+ $_position, 0,
+ $_position, 0.6,
+ from(transparentize($_big_gradient_color, 0.93)),
+ to(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-repeat: no-repeat;
+ background-position: $_position;
+
+ background-color: transparent; // reset some properties to be sure to not inherit them somehow
+ border: none; //
+ box-shadow: none; //
+}
+
+/***************************
+ * Check and Radio buttons *
+ ***************************/
+
+ @mixin check($t, $c:$bg_color, $tc:$fg_color, $checked: false) {
+ // Check/Radio drawing function
+ //
+ // $t: check/radio type,
+ // $c: base button color for colored* types
+ // $tc: optional text color for colored* types
+ // $checked: bool to chose between checked/unchecked
+ //
+ // possible $t values:
+ // normal, hover, active, insensitive, backdrop, backdrop-insensitive
+
+ $_border_color: if($c==$checkradio_bg_color, $c, $alt_borders_color);
+ $_dim_border_color: transparentize($_border_color, if($variant == 'light', 0.3, 0.7));
+
+ @if $t==normal { // Yaru change: no gradients, better borders
+ background-clip: if($checked, border-box, padding-box);
+ background-image: image(lighten($c, if($variant=='dark', if($c==$checkradio_bg_color, 0%, 5%), 0%)));
+ border-color: $_border_color;
+ box-shadow: 0 1px transparentize(black, 0.95);
+ color: $tc;
+ }
+
+ @if $t==hover {
+ background-image: image(if($c==$checkradio_bg_color, lighten($c, 7%), if($variant=='light', darken($c, 4%), lighten($c, 7%))));
+ border-color: if($c == $checkradio_bg_color, lighten($c, 7%), $alt_borders_color);
+ }
+
+ @if $t==active {
+ border-color: if($c==white, $_border_color, darken($c, 7%));
+ background-image: image(if($c==white, $_border_color, darken($c, 7%)));
+ box-shadow: none;
+ }
+
+ @if $t==insensitive {
+ box-shadow: none;
+ color: $insensitive_fg_color;
+ border-color: $insensitive_borders_color;
+ background-image: image($insensitive_bg_color);
+ }
+
+ @if $t==backdrop {
+ background-image: image($c);
+ border-color: $_border_color;
+ box-shadow: none;
+ color: $tc;
+ }
+
+ @if $t==backdrop-insensitive {
+ box-shadow: none;
+ color: $backdrop_fg_color;
+ border-color: $insensitive_borders_color;
+ background-image: image($insensitive_bg_color);
+ }
+}
diff --git a/gtk/src/default/gtk-4.0/_palette.scss b/gtk/src/gtk-3.0/default/_palette.scss
similarity index 100%
rename from gtk/src/default/gtk-4.0/_palette.scss
rename to gtk/src/gtk-3.0/default/_palette.scss
diff --git a/gtk/src/gtk-3.0/default/_tweaks.scss b/gtk/src/gtk-3.0/default/_tweaks.scss
new file mode 100644
index 0000000000..5a3af91e98
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/_tweaks.scss
@@ -0,0 +1,519 @@
+$_base_hover_color: transparentize($fg_color, 0.85);
+$_base_active_color: transparentize($fg_color, 0.75);
+$_close_button_color: transparentize($fg_color, 0.9);
+$_titlebutton_height: 20px;
+
+@mixin draw_circle($c, $size:$_titlebutton_height) {
+ $button_size: $size + 2px * 2;
+ $circle_size: 20px / $button_size / 2;
+
+ background-image: -gtk-gradient(radial,
+ center center, 0,
+ center center, $circle_size,
+ to($c),
+ to(transparent));
+}
+
+@mixin undershoot($p) {
+ //
+ // undershoot
+ //
+ // $p: position
+ //
+ // possible $p values:
+ // top, bottom, right, left
+ //
+
+ $_us_shadow_color: if($variant=='light', $silk, $jet);
+ $_us_shadow_alpha: 0.8;
+
+ $_gradient_dir: left;
+ $_dash_bg_size: 10px 1px;
+ $_gradient_repeat: repeat-x;
+ $_bg_pos: center $p;
+
+ background-color: transparent; // shouldn't be needed, but better to be sure;
+
+ @if ($p == left) or ($p == right) {
+ $_gradient_dir: top;
+ $_dash_bg_size: 1px 10px;
+ $_gradient_repeat: repeat-y;
+ $_bg_pos: $p center;
+ }
+
+ padding-#{$p}: 1px;
+ background-size: $_dash_bg_size;
+ background-repeat: $_gradient_repeat;
+ background-origin: content-box;
+ background-position: $_bg_pos;
+ border: none;
+
+ @if ($p == left) {
+ box-shadow: inset 2px 0 0 transparentize($_us_shadow_color, $_us_shadow_alpha),
+ inset 1px 0 0 transparentize(darken($_us_shadow_color, 20%), $_us_shadow_alpha);
+ }
+ @else if ($p == right) {
+ box-shadow: inset -2px 0 0 transparentize($_us_shadow_color, $_us_shadow_alpha),
+ inset -1px 0 0 transparentize(darken($_us_shadow_color, 20%), $_us_shadow_alpha);
+ }
+ @else if ($p == top) {
+ box-shadow: inset 0 2px 0 0 transparentize($_us_shadow_color, $_us_shadow_alpha),
+ inset 0 1px 0 0 transparentize(darken($_us_shadow_color, 20%), $_us_shadow_alpha);
+ }
+ @else if ($p == bottom) {
+ box-shadow: inset 0 -2px 0 0 transparentize($_us_shadow_color, $_us_shadow_alpha),
+ inset 0 -1px 0 0 transparentize(darken($_us_shadow_color, 20%), $_us_shadow_alpha);
+ }
+}
+
+// with a flatter headerbar and buttons, we dont need that heavy shadows, remove this when upstream agrees
+headerbar *, button * {
+ text-shadow: none;
+ -gtk-icon-shadow: none;
+}
+
+// titlebutton
+button.titlebutton:not(.appmenu) {
+
+ &,
+ &:hover,
+ &:active {
+
+ headerbar &,
+ .titlebar &,
+ headerbar.selection-mode & {
+
+ // spec bump otherwise :backdrop will still have a bg
+ &,
+ &:backdrop {
+ @extend %undecorated_button;
+ }
+ }
+ }
+
+ // Important - otherwise the circle size is wrong
+ min-height: $_titlebutton_height;
+ min-width: $_titlebutton_height;
+ padding: 4px;
+
+ headerbar &,
+ .titlebar &,
+ headerbar.selection-mode &,
+ & {
+ &.maximize, &.minimize, &.close {
+ @include draw_circle($_close_button_color);
+
+ &:hover {
+ @include draw_circle($_base_hover_color);
+ }
+
+ &:active {
+ @include draw_circle($_base_active_color);
+ }
+
+ &:backdrop {
+ background: none;
+ }
+ }
+
+ window.toolbox &.close { // Special selector to target unified window (see #2980)
+ color: $fg_color;
+
+ &:hover {
+ @include draw_circle($_base_hover_color);
+ }
+
+ &:active {
+ @include draw_circle($_base_active_color);
+ }
+
+ &:backdrop {
+ background: none;
+ }
+ }
+ }
+}
+
+// we prefered our gray hover for menus and popovers, orange is a very strong color
+menu,
+.menu,
+.context-menu {
+ menuitem {
+
+ &:hover {
+ color: $fg_color;
+ background-color: $popover_hover_color;
+ }
+ }
+}
+
+// We don't want menuitems to look like links, we should propose this upstream
+menubar,
+.menubar {
+ > menuitem {
+ &:hover {
+ color: $fg_color;
+ background-color: $popover_hover_color;
+ }
+ }
+}
+
+// 2 pixel transparentized focus rings
+// upstream is also interested in this
+
+*:not(button) {
+ outline-color: $focus_border_color;
+ outline-style: solid;
+ outline-offset: -2px;
+ outline-width: 2px;
+ -gtk-outline-radius: $button-radius;
+ :selected & { outline-color: $coloured_focus_border_color; }
+}
+
+button {
+ outline-color: $focus_border_color;
+ outline-style: solid;
+ outline-offset: -2px;
+ outline-width: 2px;
+ -gtk-outline-radius: $button-radius;
+ &.suggested-action, &.destructive-action{ &, &:hover, &:active { outline-color: $coloured_focus_border_color; } }
+}
+
+switch {
+ &, &:hover { slider { outline-color: transparent; } }
+ &:focus {
+ box-shadow: 0 0 0 3px if($variant=='light', lighten(opacify($focus_border_color, 1), 20%), $focus_border_color);
+ }
+}
+
+checkbutton,
+radiobutton {
+ outline-color: $focus_border_color;
+ outline-offset: 1px;
+ outline-width: 2px;
+ row:selected & , treeview:selected & { outline-color: $coloured_focus_border_color; }
+}
+
+treeview {
+ outline-color: $focus_border_color;
+ -gtk-outline-radius: 0px;
+
+ &:selected {
+ outline-color: $coloured_focus_border_color;
+ }
+}
+
+notebook > header {
+ &, &:backdrop { background: transparent; }
+ tabs {
+ &, &:hover, &:backdrop {
+ &, &.right, &.left, &.top, &.bottom {
+ background-color: transparent;
+ tab {
+ outline-width: 1px;
+ outline-offset: -2px;
+ &, &:dir(ltr), &:dir(rtl) {
+ &, &:backdrop {
+ &, &:checked {
+ &, &:hover, &:active {
+ background-color: transparent;
+ border-color: transparent;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
+// With the conservative tab styling scrolled windows need the undershoots
+
+scrolledwindow {
+ undershoot {
+ &.top { @include undershoot(top); }
+
+ &.bottom { @include undershoot(bottom); }
+
+ &.left { @include undershoot(left); }
+
+ &.right { @include undershoot(right); }
+ }
+}
+
+// Check/radios in menus do not need a border
+
+check,
+radio {
+ menu menuitem & {
+ &, &:checked, &:indeterminate {
+ &, &:hover, &:disabled {
+ border-color: transparent;
+ }
+ }
+ }
+}
+// Fixes selected disabled check/radios leaking selected_bg_color, should move to upstream
+treeview.view check,
+treeview.view radio {
+ &:selected {
+ &:focus, & {
+ &:disabled { color: $insensitive_fg_color; }
+ }
+ }
+}
+
+// Reducing the amount of the palette's background colors to two
+
+.sidebar { background-color: $bg_color; }
+
+scale {
+ slider {
+ .osd & {
+ @include button(osd);
+ background-image: image(darken($osd_fg_color, 2%));
+
+ &:hover {
+ background-image: image(darken($osd_fg_color, 10%));
+ }
+
+ &:active {
+ background-image: image(darken($osd_fg_color, 25%));
+ }
+ }
+ }
+}
+
+// Rubberband selection shall match with shell's tile-preview
+.rubberband,
+rubberband {
+ background-color: transparentize($ash, 0.8);
+ border: 1px solid if($variant == 'light', transparentize($silk, 0.2), transparentize(darken($silk, 10%), 0.4));
+}
+// Fix for color chose buttons, should be moved to upstream as it is variable
+// If the min-height is not set, it stretches compact headerbars
+button.color { min-height: $_headerbar_height / 2; }
+
+// Entries drown if drawn on widgets with $base_color
+// Fixing this at least for notebooks, since entries on tabs is a common pattern
+@if $variant=='dark' {
+ notebook entry { background-color: darken($base_color, 2%); }
+}
+
+// Make all :not:(.empty) level bars green - should be moved to upstream
+levelbar {
+ block {
+ &.high,
+ &:not(.empty) {
+ border-color: if($variant == 'light', darken($success_color, 20%), $success_color);
+ background-color: $success_color;
+ &:backdrop { border-color: $success_color; }
+ }
+ }
+}
+
+// Strengthen the menu shadows
+// And lighten up the dark shell menu/popover border to increase visibility
+$_dark_theme_outer_menu_border: lighten(desaturate($base_color, 100%), 14%);
+decoration {
+ .csd.popup & {
+ box-shadow: 0 1px 2px 1px transparentize(black, if($variant=='light', 0.7, 0.6)),
+ 0 0 0 1px if($variant=='light', transparentize(black, 0.77), $_dark_theme_outer_menu_border);
+ }
+}
+@if $variant=='dark' {
+ menu separator {
+ background-color: $_dark_theme_outer_menu_border;
+ }
+}
+popover.background {
+ .csd &, & {
+ border-color: if($variant=='light', transparentize(black, 0.77), $_dark_theme_outer_menu_border);
+ &:backdrop { border-color: $backdrop_borders_color; }
+ }
+ @if $variant=='dark' {
+ separator {
+ background-color: $_dark_theme_outer_menu_border;
+ }
+ }
+}
+// Adapt dark gtk3 scale and levelbar troughs to the shell
+@if $variant=='dark' {
+ scale, progressbar {
+ trough {
+ border-color: $_dark_theme_outer_menu_border;
+ background-color: $_dark_theme_outer_menu_border;
+ }
+ &:backdrop {
+ trough {
+ border-color: darken($_dark_theme_outer_menu_border, 5%);
+ background-color: darken($_dark_theme_outer_menu_border, 5%);
+ }
+ }
+ }
+ levelbar block.empty {
+ border-color: $_dark_theme_outer_menu_border;
+ background-color: $_dark_theme_outer_menu_border;
+ &:backdrop {
+ border-color: darken($_dark_theme_outer_menu_border, 5%);
+ background-color: darken($_dark_theme_outer_menu_border, 5%);
+ }
+ }
+}
+
+// Mimic GTK4 slider
+
+$_slider_color: darken(white, 1%);
+$_slider_hover_color: white;
+$_slider_disabled_color: if($variant == 'light', $_slider_color, darken($_slider_color, 20%));
+
+$_trough_color: if($variant == 'light', $silk, lighten($inkstone, 5%));
+$_trough_disabled_color: if($variant == 'light', lighten($_trough_color, 10%), $inkstone);
+
+switch {
+ $box-shadow: 0 2px 2px transparentize(black, .9);
+
+ transition: $button_transition;
+ transition-property: background, border;
+
+ &:not(:backdrop), :backdrop &:backdrop {
+ &, :selected & {
+ border-color: $_trough_color;
+ background: $_trough_color;
+ }
+
+ &:checked {
+ border-color: $checkradio_bg_color;
+ background: $checkradio_bg_color;
+
+ :selected & {
+ border-color: transparentize(black, $amount: .75);
+ }
+ }
+
+ &, :selected & {
+ &:disabled {
+ border-color: $_trough_disabled_color;
+ background: $_trough_disabled_color;
+ }
+ }
+ }
+
+ slider {
+ margin: 1px;
+
+ min-width: 20px;
+ min-height: 20px;
+
+ background-clip: border-box;
+ }
+
+ &:not(:backdrop) {
+ &, :selected & {
+ &, &:checked {
+ > slider {
+ border-color: $_slider_color;
+ background: $_slider_color;
+ box-shadow: $box-shadow;
+ }
+ }
+
+ &:hover {
+ &, &:checked {
+ > slider {
+ border-color: $_slider_hover_color;
+ background: $_slider_hover_color;
+ box-shadow: $box-shadow;
+ }
+ }
+ }
+ }
+ }
+
+ &:disabled, &:backdrop {
+ &, &:checked {
+ > slider {
+ &:disabled, &:backdrop {
+ border-color: $_slider_disabled_color;
+ background: $_slider_disabled_color;
+ }
+ }
+ }
+ }
+}
+
+scale:not(.marks-after):not(.marks-before) {
+ $box-shadow: 0 2px 2px transparentize(black, .9);
+ $box-shadow-border: inset 0 0 0 1px transparentize(black, if($variant == 'light', .8, 1));
+ $box-shadow-border-active: inset 0 0 0 1px $progress_border_color;
+
+ slider {
+ border: none;
+ min-height: 20px;
+ min-width: 20px;
+ }
+
+ &:not(:disabled) {
+ slider {
+ background: $_slider_color;
+ box-shadow: $box-shadow-border, $box-shadow;
+ }
+
+ &:hover {
+ slider {
+ background: $_slider_hover_color;
+ }
+ }
+
+ slider:active {
+ box-shadow: $box-shadow-border-active, $box-shadow;
+ }
+ }
+
+ &:disabled, &:backdrop {
+ &, &:hover {
+ slider {
+ background: $_slider_disabled_color;
+ box-shadow: $box-shadow-border;
+ }
+ }
+ }
+}
+
+// Fix for selected image
+// By default this use white, but as we use lighter bg_color
+// we need a darker selected background on light theme
+// and a lighter one on dark theme
+image:selected {
+ background: if($variant == 'light', darken($bg_color, 10%), lighten($bg_color, 10%));
+}
+
+// Fix invisible check and radio in selected row
+check,
+radio {
+ &:checked {
+ &:selected, row:selected & {
+ border-color: rgba(0,0,0,.2);
+ }
+ }
+}
+
+// Add dark theme soft border to libhandy windows
+@if $variant=='dark' {
+ // Same as Labadwaita
+ $window_outline_color: transparentize(white, .93);
+
+ window.csd.unified:not(.solid-csd):not(.fullscreen):not(.maximized) {
+ decoration-overlay {
+ box-shadow: inset 0 0 0 1px $window_outline_color;
+
+ // Remove default headerbar highlight
+ // Special selector to select all headerbars which has a parent which is near a decoration-overlay,
+ // so we only remove it in Libhandy apps
+ & ~ * headerbar {
+ box-shadow:none
+ }
+ }
+ }
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_brisk-menu.scss b/gtk/src/gtk-3.0/default/apps/_brisk-menu.scss
new file mode 100644
index 0000000000..eafdaa4847
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_brisk-menu.scss
@@ -0,0 +1,99 @@
+.brisk-menu {
+ .apps-list, .categories-list, entry {
+ margin: 4px;
+ }
+
+ .apps-list, .categories-list {
+ border-radius: $menu_radius;
+ row:selected { background-color: $selected_bg_color; color: $selected_fg_color; }
+ }
+
+ /* classic session button */
+ button.flat.session-button {
+ padding: 5px 6px;
+ min-width: 24px;
+ }
+
+ scrolledwindow {
+ border-width: 1px;
+ border-style: solid;
+ border-color: transparent;
+ margin: 4px;
+ }
+
+ scrollbar {
+ background-image: none;
+ background-color: transparent;
+ border-style: solid;
+ border-color: transparent;
+ }
+ }
+
+ // This should move into _tweaks.scss
+ // Or best would be adwaita, since there is no :hover for iconview there
+ iconview {
+ border-radius: $button_radius;
+ &:hover {
+ background-color: $popover_hover_color;
+ }
+ }
+
+ /* Brisk menu's panel button */
+ .mate-panel-menu-bar #PanelApplet button.flat.toggle.brisk-button {
+ &, &:hover {
+ image {
+ margin: 0px;
+ padding: 0px;
+ }
+ background-image: none;
+ background-color: transparent;
+ padding: 0px;
+ margin: 0px;
+ border-color: transparent;
+ border-radius: 0;
+ border-image: none;
+ text-shadow: none;
+ &:checked {
+ box-shadow: inset 0 -3px 0 0 $selected_bg_color;
+ }
+ }
+ }
+
+ /* mate-keyboard-layout-view, mate-keyboard-layout-chooser */
+ /* this way it styles only the border of the keys, the bg of the map itself
+ use the .view class */
+ matekbd-keyboard-drawing {
+ background-color: $_base_bg_color;
+ }
+
+ matekbd-keyboard-drawing:selected {
+ background-color: $selected_bg_color;
+ color: $selected_fg_color;
+ }
+
+ #xkb-layout-chooser > box.dialog-vbox > box.vertical > box.vertical > frame > border {
+ border-radius: 0px;
+ }
+
+ scrollbar {
+ background-image: none;
+ background-color: transparent;
+ }
+
+ // Axing the border-radii for classic (not csd) dialog buttons
+ // So we don't end up with rounded buttons in a squared dialog frame
+ messagedialog.background:not(.csd) {
+ .dialog-action-area button {
+ border-radius: $button_radius;
+ -gtk-outline-radius: $button_radius;
+ border: 1px solid $borders_color;
+ margin: 4px;
+ margin-bottom: 6px;
+ &:first-child {
+ margin-left: 6px;
+ }
+ &:last-child {
+ margin-right: 6px;
+ }
+ }
+ }
diff --git a/gtk/src/gtk-3.0/default/apps/_caja.scss b/gtk/src/gtk-3.0/default/apps/_caja.scss
new file mode 100644
index 0000000000..069b734b95
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_caja.scss
@@ -0,0 +1,63 @@
+window.background.caja-navigation-window #Toolbar:backdrop { background-color: $backdrop_bg_color; }
+
+.caja-pathbar button {
+ min-width: 24px;
+ border-radius: 0;
+ border-right-width: 0;
+ margin-right: -3px;
+}
+
+.caja-pathbar button.slider-button:nth-child(odd) {
+ border-radius: $button_radius 0px 0px $button_radius;
+}
+
+.caja-pathbar button.slider-button:nth-child(even) {
+ border-radius: 0 $button_radius $button_radius 0;
+ border-right-width: 1px;
+}
+
+// Removes roundness and highlight from
+// Headerbars that are not the last vertical top element
+// of the window
+.background:not(.csd) headerbar:not(.titlebar) {
+ border-radius: 0;
+ box-shadow: none;
+}
+
+// style mate control center
+#slab_section_style2.vertical:dir(ltr) {
+ background-color: $base_color;
+ &, label {
+ &, &:dir(ltr) {
+ color: $text_color;
+ &:backdrop { color: $backdrop_text_color; }
+ }
+ }
+}
+
+// Style mate panel pull down terminal search bar
+window#Main.background {
+ $_pull_down_terminal_border_color: if($variant=='light', $borders_color, lighten(desaturate($base_color, 100%), 14%));
+ #search {
+ background: $base_color;
+ color: $fg_color;
+ box-shadow: inset 100px 100px $base_color; // very dirty hack, otherwise we can't set the bg
+ border-bottom: 1px solid $_pull_down_terminal_border_color;
+ entry { border-color: $_pull_down_terminal_border_color; }
+ }
+}
+
+// Fix for invivible caret navigation in dark theme
+.caja-navigation-window,
+.caja-desktop-window {
+ widget.view widget.entry {
+ background: if($variant=="light", darken($bg_color, 5%), lighten($bg_color, 5%));
+ color: $fg_color;
+ border-color: $borders_color;
+
+ &:selected {
+ background: $selected_bg_color;
+ color: $selected_fg_color;
+ }
+ }
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_ding.scss b/gtk/src/gtk-3.0/default/apps/_ding.scss
new file mode 100644
index 0000000000..017146557e
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_ding.scss
@@ -0,0 +1,13 @@
+// Style DING (Desktop Icons NG) menus like GS ones
+
+menu.desktopmenu {
+ menuitem {
+ margin: 0 .25rem;
+ padding: .5rem;
+ border-radius: $menu_radius - 1px;
+ }
+
+ separator {
+ margin: .25rem 1rem;
+ }
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_evince.scss b/gtk/src/gtk-3.0/default/apps/_evince.scss
new file mode 100644
index 0000000000..0f3899406c
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_evince.scss
@@ -0,0 +1,6 @@
+@if $variant == 'light' {
+ evview {
+ background: darken($bg_color, 5%);
+ }
+}
+
\ No newline at end of file
diff --git a/gtk/src/gtk-3.0/default/apps/_evolution.scss b/gtk/src/gtk-3.0/default/apps/_evolution.scss
new file mode 100644
index 0000000000..e86346f449
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_evolution.scss
@@ -0,0 +1,5 @@
+// checkbox is clipped but this is undetectable till it gets keyboard focus
+// so we're pushing it to the right to have the focus ring be displayed properly
+assistant.background scrolledwindow .vertical checkbutton {
+ margin-left: 1px
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_firefox.scss b/gtk/src/gtk-3.0/default/apps/_firefox.scss
new file mode 100644
index 0000000000..9195803399
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_firefox.scss
@@ -0,0 +1,48 @@
+#MozillaGtkWidget.background {
+
+ // Adapt scrollbars a bit more to the GTK Scrollbar styling
+ scrollbar {
+ background-color: transparent;
+ border-color: transparent;
+
+ slider {
+ background-color: darken($scrollbar_slider_color, 10%);
+
+ &:hover {
+ background-color: darken($scrollbar_slider_hover_color, 10%);
+ }
+
+ &:hover:active {
+ background-color: $scrollbar_slider_active_color;
+ }
+
+ &:backdrop {
+ background-color: $backdrop_scrollbar_slider_color;
+ }
+
+ &:disabled {
+ background-color: transparent;
+ }
+ }
+
+ trough {
+ background-color: transparentize($bg_color, 0.8);
+ }
+ }
+}
+
+normal-button {
+ @include button(normal);
+
+ &:hover {
+ @include button(hover);
+ }
+
+ &:active {
+ @include button(active)
+ }
+
+ &:disabled {
+ @include button(insensitive);
+ }
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_geary.scss b/gtk/src/gtk-3.0/default/apps/_geary.scss
new file mode 100644
index 0000000000..806a595a5a
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_geary.scss
@@ -0,0 +1,3 @@
+.geary-expanded headerbar {
+ border: none;
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_gedit.scss b/gtk/src/gtk-3.0/default/apps/_gedit.scss
new file mode 100644
index 0000000000..0d9787493d
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_gedit.scss
@@ -0,0 +1,68 @@
+.gedit-bottom-panel-paned notebook>header {
+ background: if($variant==light, $porcelain, $bg_color);
+}
+
+.gedit-bottom-panel-paned~statusbar {
+ // give gedit's bottom panel a border
+ border-top: 1px solid $borders_color;
+
+ &:backdrop {
+ border-color: $backdrop_borders_color;
+ }
+}
+
+.gedit-search-slider {
+ // gives gedit search entry some padding and a border
+ // otherwise it's right under the headerbar
+ background: $bg_color;
+ border: 1px solid $borders_color;
+ border-top-style: none;
+ padding: 4px 8px;
+ border-radius: 0 0 5px 5px; // same radius as tooltips
+
+ &:backdrop {
+ background-color: $backdrop_bg_color;
+ border-color: $backdrop_borders_color;
+ }
+}
+
+.gedit-search-entry-occurrences-tag {
+ color: transparentize($fg_color, 0.65);
+ border: none; // Removed ugly tag border
+ box-shadow: none; // Removed button inset shadow
+ margin: 2px;
+ padding: 2px;
+}
+
+.gedit-document-panel {
+ // 'documents' pane
+
+ background-color: $bg_color;
+
+ row.activatable {
+ padding: 6px;
+ }
+
+ row button {
+ // 'close' button
+ min-width: 22px;
+ min-height: 22px;
+ padding: 0;
+ margin: 0;
+ border: none;
+ }
+
+ row:hover button {
+ &:hover {
+ background-color: rgba($fg_color, 0.15);
+ }
+
+ &:active {
+ background-color: rgba($fg_color, 0.25);
+ }
+ }
+
+ row:hover:selected button:hover {
+ color: $selected_fg_color;
+ }
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_gnome-disks.scss b/gtk/src/gtk-3.0/default/apps/_gnome-disks.scss
new file mode 100644
index 0000000000..635e272855
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_gnome-disks.scss
@@ -0,0 +1,5 @@
+// gnome disks headerbar menu seems to inherit the headerbar separator bg color
+// no unique class names or id used here so this rule is as specific as it can be
+headerbar button image~window decoration~menu separator {
+ background: $borders_color;
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_gnome-software.scss b/gtk/src/gtk-3.0/default/apps/_gnome-software.scss
new file mode 100644
index 0000000000..cf606939eb
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_gnome-software.scss
@@ -0,0 +1,10 @@
+
+//Used as update count in GNOME software
+.counter-label {
+ margin-top: 2px;
+ margin-bottom: 2px;
+ border-width: 0px;
+ padding-left: 2px;
+ padding-right: 2px;
+ box-shadow: inset 0 0 10px 10px $success_color;
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_gnome-terminal.scss b/gtk/src/gtk-3.0/default/apps/_gnome-terminal.scss
new file mode 100644
index 0000000000..354ab73998
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_gnome-terminal.scss
@@ -0,0 +1,51 @@
+$_terminal_bg_color: #300A24;
+$_terminal_fg_color: white;
+
+terminal-window {
+
+ // use unity 8 colors
+ // only colors, let everything else be inherited
+ .terminal-screen {
+ // inherits from .background
+ background-color: $_terminal_bg_color;
+ color: $_terminal_fg_color;
+
+ &:backdrop {
+ background-color: lighten($_terminal_bg_color, 2%);
+ color: $backdrop_selected_fg_color;
+ }
+ }
+
+ notebook {
+ scrollbar {
+ // inherits from scrollbar
+ background-color: transparent;
+ border-color: transparent;
+
+ &:backdrop {
+ background-color: transparent;
+ border-color: transparent
+ }
+
+ slider {
+ // avoids scrollbar protruding from the terminal window on wayland session
+ // workaround for https://bugs.launchpad.net/ubuntu/+source/gnome-terminal/+bug/1720651
+ margin: 0;
+ border-width: 3px;
+
+ &:backdrop {
+ background-color: gtkalpha(currentColor, 0.1);
+ }
+
+ &:disabled {
+ background-color: transparent;
+ }
+ }
+
+ &.dragging,
+ &.hovering {
+ background-color: transparent;
+ }
+ }
+ }
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_gnome-todo.scss b/gtk/src/gtk-3.0/default/apps/_gnome-todo.scss
new file mode 100644
index 0000000000..2ea4db849c
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_gnome-todo.scss
@@ -0,0 +1,19 @@
+.org-gnome-Todo {
+ taskrow.activatable.new-task-row button.popup.toggle {
+ border-radius: 0px;
+ border: none;
+ border-left: 1px solid $borders-color;
+ padding-left: 10px;
+ padding-right: 10px;
+ -gtk-outline-radius: 0px;
+ }
+
+ viewport.view,
+ listbox.transparent {
+ background-color: darken($base_color, 5%);
+
+ &:backdrop {
+ background-color: $backdrop_base_color
+ }
+ }
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_guake.scss b/gtk/src/gtk-3.0/default/apps/_guake.scss
new file mode 100644
index 0000000000..35246d2cfe
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_guake.scss
@@ -0,0 +1,4 @@
+// Fix bugged transparent headerbar background
+window#guake-terminal notebook header {
+ background: $bg-color;
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_mate-control-center.scss b/gtk/src/gtk-3.0/default/apps/_mate-control-center.scss
new file mode 100644
index 0000000000..1233a228e2
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_mate-control-center.scss
@@ -0,0 +1,8 @@
+// Workaround for https://github.com/mate-desktop/mate-control-center/issues/273
+foo-scroll-area:selected {
+ &,
+ &:focus,
+ &:backdrop {
+ background-color: $selected_bg_color;
+ }
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_mate-multimedia-osd.scss b/gtk/src/gtk-3.0/default/apps/_mate-multimedia-osd.scss
new file mode 100644
index 0000000000..0974784021
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_mate-multimedia-osd.scss
@@ -0,0 +1,30 @@
+MsdOsdWindow.background.osd {
+ border-radius: $window_radius;
+ border: 1px solid transparentize(white, 0.85);
+ background-color: $osd_bg_color;
+ color: $osd_fg_color;
+
+ .trough {
+ border-radius: $button_radius;
+ border: none;
+ background: darken($osd_fg_color, 70%);
+ }
+
+ .progressbar {
+ border-radius: $button_radius;
+ background-color: $osd_fg_color;
+ border: none;
+ }
+}
+
+.background.osd {
+ color: $osd_fg_color;
+ background-image: none;
+ background-color: $osd_bg_color;
+ border-radius: $window_radius;
+ border: 1px solid transparentize(white, 0.85);
+
+ :selected {
+ background-color: $selected_bg_color;
+ }
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_mate-terminal.scss b/gtk/src/gtk-3.0/default/apps/_mate-terminal.scss
new file mode 100644
index 0000000000..26ccfd7dff
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_mate-terminal.scss
@@ -0,0 +1,64 @@
+/* override for pavu-control */
+window.background.mate-terminal > box.vertical > notebook > header.top,
+window.background.mate-terminal > box.vertical > notebook > stack > box {
+ border-style: none;
+ border-width: 0px;
+}
+
+/* vte use hardcoded colors as upstream, ubuntu is patched */
+window.background.mate-terminal {
+
+ $_mate_terminal_bg_color: $bg_color;
+ $_mate_terminal_fg_color: $fg_color;
+
+ &, menubar, vte-terminal {
+ background-color: $_mate_terminal_bg_color;
+ color: $_mate_terminal_fg_color;
+ &:backdrop {
+ color: $_backdrop_base_fg_color;
+ }
+ }
+ scrollbar {
+ &, &.vertical {
+ &, &:backdrop {
+ background-color: transparent;
+ }
+ }
+
+ }
+
+ menubar,
+ .menubar {
+ > menuitem {
+ &:hover {
+ color: $_mate_terminal_fg_color;
+ }
+ }
+ }
+
+ notebook {
+ stack box.vertical box.horizontal scrollbar.vertical {
+ background-color: $_mate_terminal_bg_color;
+ }
+
+ tab {
+ color: $_mate_terminal_fg_color;
+ &:backdrop {
+ color: $_backdrop_base_fg_color;
+ }
+ button {
+ &:hover {
+ background-image: image($_mate_terminal_bg_color);
+ color: $_mate_terminal_fg_color;
+ border-color: $_base_border_color;
+ }
+ &:active {
+ background-image: image(darken($_backdrop_base_bg_color, 4%));
+ color: darken($_mate_terminal_fg_color, 4%);
+ border-color: darken($_base_border_color, 4%);
+ }
+
+ }
+ }
+ }
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_mate.scss b/gtk/src/gtk-3.0/default/apps/_mate.scss
new file mode 100644
index 0000000000..1d14c9d93d
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_mate.scss
@@ -0,0 +1,237 @@
+$_base_bg_color: $panel_bg_color;
+$_base_fg_color: $panel_fg_color;
+$_backdrop_base_bg_color: lighten($panel_bg_color, 3%);
+$_backdrop_base_fg_color: transparentize($panel_fg_color, 0.3);
+$_base_border_color: if($variant=='light', $borders_color, lighten(#323030, 8%));
+$_base_hover_color: if($variant=='light', darken($panel_bg_color, 4%), lighten($panel_bg_color, 4%));
+$_base_active_color: if($variant=='light', darken($panel_bg_color, 4%), darken($panel_bg_color, 4%));
+$_wm_border: if($variant=='light', transparentize(black, 0.77), transparentize($borders_color, 0.1));
+$_wm_border_backdrop: if($variant=='light', transparentize(black, 0.82), transparentize($borders_color, 0.1));
+$_wm_shadow: 0 3px 9px 1px transparentize(black, 0.5), 0 0 0 1px $_wm_border; //doing borders with box-shadow;
+
+/**************
+ * Mate-Panel *
+ **************/
+
+/* the panel bar itself */
+#PanelPlug,
+.mate-panel-menu-bar,
+PanelToplevel.background {
+ background-color: $_base_bg_color;
+ background-image: none;
+ color: $fg_color;
+ text-shadow: none;
+ menu {
+ border-radius: $menu_radius;
+ padding: 4px 0px;
+ .csd & {
+ border: none; // axes borders in a composited env
+ border-radius: $menu_radius;
+ }
+ }
+}
+// Axe the border under panel menubars
+#PanelPlug menubar { box-shadow: none; }
+
+/* workaround to avoid unwanted black frames behind menus if switching compositor on/off */
+.mate-panel-menu-bar .window-frame.csd.popup {
+ box-shadow: none;
+}
+
+// Force round menus for MATE, because they are populated from the top/bottom panels
+// And thus for MATE not just "legacy" menus used in "old" applications
+menubar,
+.menubar {
+
+ > menuitem {
+
+ menu {
+ &:dir(rtl), &:dir(ltr) { // specificity bump
+ border-radius: $menu_radius;
+ }
+ }
+ }
+
+ .csd.popup decoration { border-radius: $menu_radius; }
+}
+
+/* hide buttons */
+PanelToplevel > widget > button {
+ border-image: none;
+ background-image: none;
+ background: transparent;
+ border-style: none;
+ border-radius: 0px;
+ padding: 0px;
+ box-shadow: none;
+ color: $_base_fg_color;
+}
+
+#PanelApplet {
+ border-radius: $menu_radius;
+}
+
+PanelWidget > PanelSeparator {
+ border-width: 0;
+ background-color: transparent;
+ color: $_base_border_color;
+}
+
+/* the grid left from wnckpager and wncktasklist */
+MatePanelAppletFrameDBus > MatePanelAppletFrameDBus {
+ background-image: none;
+ background-color: transparent;
+ background-repeat: no-repeat;
+ background-position: left;
+}
+
+/* this makes text readable with all kind of wallpapers if using a transparent panel */
+#PanelApplet label,
+.mate-panel-menu-bar menubar > menuitem {
+ color: $_base_fg_color;
+ text-shadow: none;
+ &:hover {
+ color: $_base_fg_color;
+ box-shadow: inset 0 -3px 0 0 $selected_bg_color;
+ }
+}
+
+/* outlines */
+window.background, /* selector where outlines are writen on GtkTrayIcon */
+.mate-panel-menu-bar menubar,
+// .mate-panel-menu-bar button,
+.mate-panel-menu-bar PanelApplet {
+ outline-style: solid;
+ outline-offset: -2px;
+ outline-color: $focus_border_color;
+}
+
+// Hide focus outline on menu-bar buttons
+.mate-panel-menu-bar button {
+ outline-color: transparent;
+}
+
+PanelApplet.wnck-applet .wnck-pager {
+ outline-style: solid;
+ outline-offset: -1px;
+ outline-color: $focus_border_color;
+}
+
+/* main menu */
+/* set normal menubar menuitem */
+.mate-panel-menu-bar menubar > menuitem {
+ background-image: none;
+ box-shadow: none;
+}
+
+/* set selected menubar menuitem */
+.mate-panel-menu-bar menubar > menuitem:hover {
+ background-color: transparent;
+ background-clip: border-box;
+ background-image: image($_base_hover_color);
+}
+
+/* set normal menubar menu menuitem */
+.mate-panel-menu-bar menubar > menuitem > .popup.csd > menu > menuitem {
+ padding: 4px 5px 4px 5px;
+ border-width: 0px;
+}
+
+/* set Mate menu menuitem */
+.mate-panel-menu-bar menu menuitem {
+ padding: 4px 5px 4px 5px;
+ border-width: 0px;
+}
+
+/* all applets */
+.mate-panel-menu-bar #PanelApplet button {
+ &, &.flat {
+ &.toggle {
+ background-image: none;
+ background-color: transparent;
+ color: $_base_fg_color;
+ padding: 2px;
+ border-radius: 0;
+ border-image: none;
+ text-shadow: none;
+
+ &:hover, &:active:hover, &:checked:hover {
+ background-image: image(if($variant=='light', darken($_base_bg_color, 12%), lighten($_base_bg_color, 15%)));
+ }
+ &:checked {
+ background-image: image(if($variant=='light', darken($_base_bg_color, 5%), lighten($_base_bg_color, 8%)));
+ }
+ }
+ }
+}
+
+/* clock window */
+#MatePanelPopupWindow {
+ border-radius: $button_radius;
+}
+
+/* Weird, this sets the border color of the clockmap */
+#MatePanelPopupWindow > frame > box > box > box > widget {
+ color: $borders_color;
+}
+
+/* volume applet */
+.mate-panel-applet-slider,
+.mate-panel-applet-slider.background {
+ border-radius: $menu_radius;
+ border: 1px solid $_wm_border;
+ background: transparent;
+
+ frame {
+ background-color: $bg_color;
+ border-radius: $menu_radius;
+ padding: 1px;
+ margin: 1px;
+
+ border {
+ border-image: none;
+ border-style: none;
+ border-radius:2px;
+ }
+
+ frame {
+ background-color:transparent;
+ padding: 3px;
+ }
+
+ /* brightness applet */
+ button {
+ padding: 4px 5px 4px 0px;
+ background-image: none;
+ background-color: transparent;
+ border-style: none;
+ border-image: none;
+ color: $_base_fg_color;
+ margin: 0px;
+ &:checked {
+ box-shadow: inset 0 -3px 0 0 $selected_bg_color;
+ }
+ }
+ }
+}
+
+/* mate-indicator-applet */
+/* needed for a transparent panel */
+#fast-user-switch-applet > #fast-user-switch-menubar {
+ background-color: transparent;
+}
+
+/* Classic icon style */
+.mate-panel-menu-bar {
+ -PanelMenuBar-icon-visible: true;
+}
+
+/* system-monitor-applet, kill light frame border */
+.multiload-applet > box.horizontal > box.vertical > frame > border {
+ border-color: transparent;
+}
+
+.multiload-applet > box.horizontal > box.vertical > frame {
+ box-shadow: $_wm_shadow;
+}
+
diff --git a/gtk/src/gtk-3.0/default/apps/_nautilus.scss b/gtk/src/gtk-3.0/default/apps/_nautilus.scss
new file mode 100644
index 0000000000..0264e2746b
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_nautilus.scss
@@ -0,0 +1,391 @@
+.nautilus-window {
+
+ .nautilus-empty-state-icon {
+ opacity: 0.5;
+ }
+
+ // Yaru change: force focus state
+ .nautilus-canvas-item {
+ &, &:focus {
+ border-radius: 5px;
+
+ // Drop border-radius for the image preview
+ &:not(:dir(ltr)):not(:dir(rtl)) {
+ border-radius: 0;
+ }
+ }
+ }
+
+ @keyframes needs_attention_keyframes {
+ 0% {
+ background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
+ border-color: $borders_color;
+ }
+
+ 30% {
+ background-image: linear-gradient(to bottom, $base_color, $base_color, $base_color);
+ border-color: $fg_color;
+ }
+ 90% {
+ background-image: linear-gradient(to bottom, $base_color, $base_color, $base_color);
+ border-color: $fg_color;
+ }
+ 100% {
+ background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
+ border-color: $borders_color;
+ }
+ }
+
+ .nautilus-operations-button-needs-attention {
+ animation: needs_attention_keyframes 2s ease-in-out;
+ }
+ .nautilus-operations-button-needs-attention-multiple {
+ animation: needs_attention_keyframes 3s ease-in-out;
+ animation-iteration-count: 3;
+ }
+
+ /* Remove white background and highlight on hover which GTK adds by default
+ * to GtkListBox. TODO: Switch to GtkListView and drop this CSS hack. */
+ .operations-list,
+ .operations-list > :hover {
+ background: none;
+ }
+
+ .disclosure-button {
+ padding-left: 4px;
+ padding-right: 4px;
+ }
+
+ /* Path bar */
+
+ .nautilus-path-bar scrolledwindow {
+ border-radius: 5px 0px 0px 5px;
+ border: 1px $borders_color solid;
+ border-right-width: 0px;
+ background-color: $bg_color;
+ }
+ .nautilus-path-bar scrolledwindow undershoot.left {
+ border-radius: 5px 0px 0px 5px;
+ background: linear-gradient(to right, $bg_color 6px, transparentize($bg_color, 1) 24px);
+ }
+ .nautilus-path-bar scrolledwindow undershoot.right {
+ background: linear-gradient(to left, $bg_color 6px, transparentize($bg_color, 1) 24px);
+ }
+
+ .nautilus-path-bar > button,
+ .path-buttons-box button {
+ margin: 0px;
+ }
+
+ .path-buttons-box button {
+ background-image: none;
+ box-shadow: none;
+ border-radius: 5px;
+ border-width: 0px;
+ -gtk-icon-shadow: none;
+ }
+
+ .path-buttons-box button:not(.current-dir):not(:backdrop):hover {
+ background: transparentize($fg_color, 0.85);
+ box-shadow: inset 0 0 0 2px $bg_color;
+ }
+
+ .path-buttons-box button:not(.current-dir):not(:backdrop):hover * {
+ opacity: 1;
+ }
+
+ /* Make the tags fit into the box */
+ entry.search > * {
+ margin: 5px;
+ }
+
+ $disk_space_unknown: #888a85;
+ $disk_space_used: #cf7272;
+ $disk_space_free: #eeeeec;
+
+ .disk-space-display {
+ border-style: solid;
+ border-width: 2px;
+ }
+
+ .disk-space-display.unknown {
+ background-color: $disk_space_unknown;
+ border-color: shade($disk_space_unknown, 0.7);
+ color: $disk_space_unknown;
+ }
+ .disk-space-display.unknown.border {
+ color: shade($disk_space_unknown, 0.7);
+ }
+
+ .disk-space-display.used {
+ background-color: $disk_space_used;
+ border-color: shade($disk_space_used, 0.7);
+ color: $disk_space_used;
+ }
+ .disk-space-display.used.border {
+ color: shade($disk_space_used, 0.7);
+ }
+
+ .disk-space-display.free {
+ background-color: $disk_space_free;
+ border-color: shade($disk_space_free, 0.7);
+ color: $disk_space_free;
+ }
+ .disk-space-display.free.border {
+ color: shade($disk_space_free, 0.7);
+ }
+
+ /* As a workaround for GtkTreeView showing thick border above first row when
+ * horizontal grid lines are enabled, we add them using CSS instead. Exclude the
+ * drop targets to let through the default feedback style. */
+ .nautilus-list-view .view:not(:drop(active)) {
+ border-bottom: 1px solid $bg_color;
+ }
+
+ .nautilus-list-view.thumbnail {
+ -gtk-icon-shadow: 0px 1px 2px $borders_color, 1px 0px 0px transparentize($borders_color, 0.75),
+ -1px 0px 0px transparentize($borders_color, 0.75), 0px 2px 0px transparentize($borders_color, 0.5);
+ }
+
+ .search-information {
+ background-color: $selected_bg_color;
+ color: white;
+ padding: 2px;
+ }
+
+ $conflict_bg: #fef6b6;
+
+ .conflict-row {
+ background: $conflict_bg;
+ color: black;
+ }
+
+ .conflict-row:hover {
+ background-color: shade($conflict_bg, 0.9);
+ }
+
+ .conflict-row:selected {
+ background: $selected_bg_color;
+ color: $selected_fg_color;
+ }
+
+ /* Icon view */
+ flowbox {
+ padding: 18px;
+ }
+
+ flowboxchild {
+ padding: 0px;
+ }
+
+ flowboxchild:selected {
+ background-color: transparent;
+ outline-color: transparent;
+ }
+
+ flowboxchild .thumbnail {
+ margin: 4px;
+ box-shadow: 0px 1px 2px 0px transparentize($borders_color, 0.5), 0px 0px 0px 1px transparentize($borders_color, 0.5),
+ 0px 2px 0px 0px transparentize($borders_color, 0.5);
+ border-radius: 2px;
+ }
+
+ .icon-ui-labels-box {
+ padding: 2px 4px;
+ border-radius: 4px;
+ }
+
+ flowboxchild:selected .icon-ui-labels-box {
+ color: $selected_fg_color;
+ background-color: $selected_bg_color;
+ }
+
+ flowboxchild:selected image {
+ -gtk-icon-effect: dim; /* GTK 3 only */
+ /* GTK 4 TODO: Replace previous line with the following one:
+ -gtk-icon-filter: opacity(0.5);
+ */
+ -gtk-icon-shadow: 0px 0px $selected_bg_color;
+ }
+
+ // Due to the ubuntu orange being quiet bright
+ // we change the nautilus row selection from a full orange
+ // row to a soft gray selection
+ // until the nautilus gtk4 port lands in Ubuntu
+ $_row_hover_bg: if($variant=='light', transparentize(black, 0.96), transparentize(white, 0.96));
+ $_row_selection_bg: if($variant=='light', transparentize(black, 0.91), transparentize(white, 0.91));
+ $_backdrop_row_selection_bg: if($variant=='light', $_row_selection_bg, lighten($_row_selection_bg, 2%));
+
+ .sidebar-row {
+ &:hover:not(:backdrop):not(:selected) {
+ background: $_row_hover_bg;
+ }
+
+ &:selected {
+ &.activatable, & {
+ &:focus, &:hover, &:disabled, & {
+ background: $_row_selection_bg;
+ }
+
+ &:disabled {
+ &, button, button image { color: $insensitive_fg_color; }
+ }
+
+ &:focus, &:hover, & {
+ &, button, button image { color: $text_color; }
+ button.suggested-action, button.destructive-action { &:not(.image-button) { &, & image { color: white; } } }
+ }
+
+ &:backdrop {
+ &, button, button image { color: $backdrop_fg_color; }
+ button.suggested-action, button.destructive-action { &:not(.image-button) { &, & image { color: white; } } }
+ background: $_backdrop_row_selection_bg;
+ }
+
+ &:disabled {
+ &, &:backdrop {
+ &, button, button image { color: $insensitive_fg_color; }
+ }
+ }
+ }
+ }
+ }
+
+ .nautilus-canvas-item.dim-label,
+ .nautilus-list-dim-label {
+ color: mix($text_color, $base_color);
+ }
+
+ // keep details box visible
+ // details box looks ugly when many items are selected and it floats above the orange
+ background-image: none;
+ background-color: if($variant=='light', white, $bg_color);
+
+ &:backdrop {
+ background-color: if($variant=='light', $backdrop_base_color, $backdrop_bg_color);
+ }
+
+ placessidebar {
+ background-color: if($variant=='light', $bg_color, $base_color);
+
+ &:backdrop {
+ background-color: $backdrop_bg_color;
+ }
+ }
+
+ // Makes icons less bright in backdrop
+ @at-root %dim_icons_in_backdrop,
+ & *scrolledwindow:backdrop {
+ opacity: 0.9;
+ }
+
+ infobar {
+ background-color: transparentize($fg_color, if($variant == 'light', .93, .95));
+
+ &:backdrop {
+ background-color: transparentize($fg_color, if($variant == 'light', .96, .98));
+ }
+ }
+
+ paned box.floating-bar {
+ background-color: $bg_color;
+ border-style: solid;
+ border-color: if($variant=='light', lighten($borders_color, 8.3%), darken($borders_color, 1%));
+ border-width: 1px 0 0 1px;
+ border-radius: $button_radius 0 0 0;
+
+ button:dir(ltr).circular.flat.image-button {
+ background: radial-gradient(circle at 50%, white 35%, $bg_color 1%);
+ color: $destructive_color;
+ }
+
+ button:dir(ltr).circular.flat.image-button:hover {
+ border: 1px solid $borders_color;
+ background: radial-gradient(circle at 50%, white 30%, $base_hover_color 16%);
+ color: lighten($destructive_color, 5%);
+
+ }
+ }
+
+ treeview:drop(active):focus {
+ // drop target green bottom border was missing
+ border-bottom: 1px solid $drop_target_color;
+ }
+
+ treeview.view header button {
+ background-color: if($variant=='light', $base_color, $base_color);
+ background-image: none;
+ border-color: transparentize($borders_color, 0.6);
+ border-left: 1px;
+
+ &:hover {
+ background-color: $bg_color;
+ }
+
+ &:backdrop {
+ background-color: $backdrop_base_color;
+ }
+ }
+
+ .nautilus-list-view .view {
+ border-bottom: 1px solid transparentize($borders_color, 0.8);
+
+ // Hide superfluous treeview drop target indication
+ &.dnd {
+ border-style: none;
+ }
+
+ treeview {
+ &:selected {
+ &:backdrop {
+ color: $backdrop_fg_color;
+ background-color: if($variant=='light', darken($bg_color, 5%), lighten($base_color, 5%));
+ }
+ }
+ }
+ }
+
+ notebook>header {
+ background: $bg_color;
+ }
+
+ paned>separator {
+ // separator between sidebar and main window view
+ background-image: image(if($variant=='light', transparentize($borders_color, 0.6), darken($borders_color, 1%)));
+
+ &:backdrop {
+ background-image: image(transparentize($borders_color, 0.7));
+ }
+ }
+
+ /* dim the icon when not checked */
+
+ // This is the Icon + Text beneath - it's one widget
+ .nautilus-canvas-item {
+ outline-width: 0;
+ // First, remove the background
+ background-color: transparentize($fg_color, .95);
+
+ // Then bring it back for when it receives a direction
+ &:selected:not(:backdrop) {
+ &:dir(ltr),
+ &:dir(rtl) {
+ background-color: $selected_bg_color;
+ }
+
+ color: $selected_fg_color;
+ }
+
+ // Fix some broken image preview (was dark)
+ &:not(:focus) {
+ &:not(:dir(ltr)):not(:dir(rtl)) {
+ background: white;
+ }
+ }
+
+ &:backdrop:selected {
+ background-color: $selected_bg_color;
+ color: $backdrop_selected_fg_color;
+ }
+ }
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_nemo.scss b/gtk/src/gtk-3.0/default/apps/_nemo.scss
new file mode 100644
index 0000000000..06db9b49be
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_nemo.scss
@@ -0,0 +1,127 @@
+.nemo-properties-dialog {
+ .dialog-action-box .dialog-action-area {
+ // add margin to preferences buttons
+ margin: 2px 6px 4px;
+ }
+
+ toolbar stackswitcher.linked button {
+ margin-right: 0;
+
+ &:backdrop {
+ color: $backdrop_fg_color;
+ background-color: $backdrop_bg_color;
+ }
+ }
+}
+
+.nemo-window {
+ .sidebar {
+ scrolledwindow.frame.nemo-places-sidebar {
+ // get rid of double border in sidebar
+ border: none;
+ }
+
+ viewport.frame box.vertical treeview.view.places-treeview {
+ // use sidebar bg color
+ background-image: image($sidebar_bg_color);
+ border-radius: 0; // get rid of weird radius on selected rows
+
+ &:backdrop {
+ background-image: image($backdrop_sidebar_bg_color);
+ }
+
+ &:selected {
+ background: $selected_bg_color;
+ }
+
+ &:not(:selected) {
+ &:not(:backdrop):hover {
+ background-image: image($base_hover_color);
+ }
+ }
+ }
+
+ }
+
+ .nemo-inactive-pane .view,
+ .nemo-inactive-pane iconview {
+ // Shades the background of the inactive pane
+ background-color: $backdrop_bg_color;
+ }
+
+ .nemo-window-pane {
+ widget.entry {
+ // Add border around rename text entry
+ border: 1px solid;
+ border-radius: 3px;
+ color: $fg_color;
+ border-color: $selected_bg_color;
+ background-color: $bg_color;
+ }
+
+ widget.entry:selected {
+ // Add highlighting to selected text in rename text entry
+ border: 1px solid;
+ border-radius: 3px;
+ color: $selected_fg_color;
+ border-color: $selected_bg_color;
+ background-color: $selected_bg_color;
+ }
+ }
+
+ .view {
+
+ // imports nautilus tweaks
+ // dim icons in backdrop
+ &:backdrop {
+ @extend %dim_icons_in_backdrop;
+ }
+ }
+
+ toolbar.horizontal.primary-toolbar {
+ // add border under toolbar
+ border-bottom: 1px solid $borders_color;
+
+ widget.linked.raised button {
+
+ // use proper icons for next and left in stackswitcher-like pathbar
+ &:first-child widget {
+ -gtk-icon-source: -gtk-icontheme('go-previous-symbolic');
+ }
+
+ &:last-child widget {
+ -gtk-icon-source: -gtk-icontheme('go-next-symbolic');
+ }
+ }
+
+ toolitem box widget * {
+ // reset toolbar button dimensions
+ min-height: 0;
+ min-width: 0;
+ }
+
+ .linked button {
+ // link linked buttons
+ margin-right: 0;
+ }
+
+ button {
+
+ // return non-flat buttons
+ @each $state,
+ $t in ("", "normal"),
+ (":hover", "hover"),
+ (":active, &:checked", "active"),
+ (":disabled", "insensitive"),
+ (":disabled:active, &:disabled:checked", "insensitive-active"),
+ (":backdrop", "backdrop"),
+ (":backdrop:active, &:backdrop:checked", 'backdrop-active'),
+ (":backdrop:disabled", 'backdrop-insensitive'),
+ (":backdrop:disabled:active, &:backdrop:disabled:checked", 'backdrop-insensitive-active') {
+ &#{$state} {
+ @include button($t)
+ }
+ }
+ }
+ }
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_not-csd.scss b/gtk/src/gtk-3.0/default/apps/_not-csd.scss
new file mode 100644
index 0000000000..d9c173edb1
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_not-csd.scss
@@ -0,0 +1,25 @@
+// Axing the border-radii for classic (not csd) dialog buttons
+// So we don't end up with rounded buttons in a squared dialog frame
+messagedialog.background:not(.csd) {
+ .dialog-action-area button {
+ border-radius: $button_radius;
+ -gtk-outline-radius: $button_radius;
+ border: 1px solid $borders_color;
+ margin: 4px;
+ margin-bottom: 6px;
+ &:first-child {
+ margin-left: 6px;
+ }
+ &:last-child {
+ margin-right: 6px;
+ }
+ }
+}
+
+// Removes roundness and highlight from
+// Headerbars that are not the last vertical top element
+// of the window
+.background:not(.csd) headerbar:not(.titlebar) {
+ border-radius: 0;
+ box-shadow: none;
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_tweak-tool.scss b/gtk/src/gtk-3.0/default/apps/_tweak-tool.scss
new file mode 100644
index 0000000000..04f6017891
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_tweak-tool.scss
@@ -0,0 +1,5 @@
+// hide sidebar separators
+// make the sidebar look like a normal sidebar
+list.tweak-categories separator {
+ background: transparent;
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_ubiquity.scss b/gtk/src/gtk-3.0/default/apps/_ubiquity.scss
new file mode 100644
index 0000000000..c338ecf45d
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_ubiquity.scss
@@ -0,0 +1,37 @@
+#live_installer {
+ #title_eventbox {
+ background-color: $bg_color;
+ color: $fg_color;
+
+ &:backdrop {
+ background-color: $backdrop_bg_color;
+ color: $backdrop_fg_color;
+ }
+ }
+
+ #dot_grid progressbar {
+ border-radius: 100%;
+ padding: 1px;
+ padding-top: 2px;
+ background-color: white;
+ border: 1px solid $progress_bg_color;
+
+ .empty {
+ border-radius: 100%;
+ background-color: white;
+ padding: 0px;
+ }
+
+ .full progress {
+ border-radius: 100%;
+ padding: 1px;
+ padding-top: 2px;
+ margin-bottom: 2px;
+ }
+ }
+}
+
+#dialog-action_area1 {
+ padding-bottom: 5px;
+ padding-right: 5px
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_unity7.scss b/gtk/src/gtk-3.0/default/apps/_unity7.scss
new file mode 100644
index 0000000000..6a2ab9453e
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_unity7.scss
@@ -0,0 +1,89 @@
+$wm_border_unfocused: none;
+$wm_border_focused: if($variant=='light', transparentize(black, 0.9), transparentize($borders_color, 0.1));
+$titlebar_bg_color: if($variant=='light', darken($porcelain, 9%), lighten($jet, 4%));
+$titlebar_fg_color: if($variant=='light', $inkstone, $porcelain);
+
+UnityDecoration {
+ -UnityDecoration-extents: 32px 0px 0px 0px;
+ -UnityDecoration-input-extents: 10px;
+
+ -UnityDecoration-shadow-offset-x: 1px;
+ -UnityDecoration-shadow-offset-y: 1px;
+ -UnityDecoration-active-shadow-color: transparentize(black, 0.5);
+ -UnityDecoration-active-shadow-radius: 10px;
+ -UnityDecoration-inactive-shadow-color: transparentize(black, 0.999);
+ -UnityDecoration-inactive-shadow-radius: 0px;
+
+ -UnityDecoration-glow-size: 0px;
+ -UnityDecoration-glow-color: $selected_bg_color;
+
+ -UnityDecoration-title-indent: 0px;
+ -UnityDecoration-title-fade: 0px;
+ -UnityDecoration-title-alignment: 0.5;
+
+ // Unity "titlebars"
+ .top {
+ border: none;
+ border-radius: $window_radius $window_radius 0 0;
+ // padding used for the min/max/close titlebuttons
+ padding: 1px (4px + 3px) 0 (4px + 3px);
+ background-color: $titlebar_bg_color;
+ color: $titlebar_fg_color;
+ text-shadow: none;
+ box-shadow: inset 0 1px lighten($titlebar_bg_color, 8%);
+
+ &:hover {
+ // nothing changes here
+ }
+
+ &:backdrop {
+ border: none;
+ background-color: $backdrop_bg_color;
+ color: mix($titlebar_fg_color, lighten($titlebar_bg_color, 5%), 70%);
+ box-shadow: inset 0 1px transparentize(lighten($titlebar_bg_color, 8%), 0.4);
+
+ transition: $backdrop_transition;
+ }
+ }
+
+ // this is the window border outside of the titlebar!
+ .left,
+ .right,
+ .bottom {
+ border: none;
+ background-color: transparent;
+
+ &:backdrop {
+ background-color: transparent;
+ }
+ }
+}
+
+// unity 7 top panel - equivalent to the gnome panel
+UnityPanelWidget,
+.unity-panel {
+ background-color: $panel_bg_color;
+ color: $panel_fg_color;
+ border: 0;
+}
+
+.unity-panel {
+
+ &.menuitem,
+ .menuitem {
+ border-width: 0 1px;
+ color: $panel_fg_color;
+ background-color: transparent;
+
+ &:hover,
+ *:hover {
+ box-shadow: inset 0 -2px 0 0 $selected_bg_color;
+ background-color: transparent;
+ color: $panel_fg_color;
+ }
+ }
+}
+
+SheetStyleDialog.unity-force-quit {
+ background-color: $bg_color;
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_usb-creator-gtk.scss b/gtk/src/gtk-3.0/default/apps/_usb-creator-gtk.scss
new file mode 100644
index 0000000000..31e6c9c51e
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_usb-creator-gtk.scss
@@ -0,0 +1,3 @@
+#dialog-action_area3 {
+ margin: 5px;
+}
diff --git a/gtk/src/gtk-3.0/default/apps/_xfce.scss b/gtk/src/gtk-3.0/default/apps/_xfce.scss
new file mode 100644
index 0000000000..50bb964971
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/apps/_xfce.scss
@@ -0,0 +1,53 @@
+.xfce4-panel.background {
+ border: none;
+ background-color: $panel_bg_color;
+ color: $panel_fg_color;
+
+ button {
+ padding: 0;
+ min-height: 12px;
+ min-width: 12px;
+ border-radius: 0;
+ color: $panel_fg_color;
+ @include button(undecorated);
+
+ &:disabled {
+ background-color: transparent;
+ color: transparentize($panel_fg_color, 0.8);
+ }
+
+ &:hover:not(:active):not(:checked) {
+ color: $panel_fg_color;
+ background-color: lighten($panel_bg_color, 20%);
+ background-image: none;
+ box-shadow: none;
+ }
+
+ &:checked {
+ background-color: lighten($panel_bg_color, 30%);
+ color: $panel_fg_color;
+ box-shadow: inset 0 -2px $selected_bg_color;
+
+ &:disabled {
+ @include button(undecorated);
+ color: transparentize($panel_fg_color, 0.8);
+ }
+ }
+ entry { caret-color: $text_color; }
+ menu {
+ -gtk-icon-effect: none;
+
+ text-shadow: none;
+ // Theme pulseaudio-plugin's mpris buttons
+ .linked button {
+ @extend %linked;
+ @include button(normal, $menu_color, $text_color);
+ &:disabled {
+ @include button(insensitive);
+ border-color: transparentize($borders_color, 0.5);
+ }
+ }
+ }
+ }
+
+}
diff --git a/gtk/src/gtk-3.0/default/assets.svg b/gtk/src/gtk-3.0/default/assets.svg
new file mode 100644
index 0000000000..3ad6fa20ed
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/assets.svg
@@ -0,0 +1,1325 @@
+
+
diff --git a/gtk/src/gtk-3.0/default/assets.txt b/gtk/src/gtk-3.0/default/assets.txt
new file mode 100644
index 0000000000..3e280da8c2
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/assets.txt
@@ -0,0 +1,69 @@
+text-select-end
+text-select-end-hover
+text-select-end-active
+text-select-start
+text-select-start-hover
+text-select-start-active
+text-select-end-dark
+text-select-end-hover-dark
+text-select-end-active-dark
+text-select-start-dark
+text-select-start-hover-dark
+text-select-start-active-dark
+titlebutton-hover
+titlebutton-active
+titlebutton-selection-mode-hover
+titlebutton-selection-mode-active
+close-button
+close-button-hover
+close-button-active
+close-button-backdrop
+close-button-selection-mode
+slider-horz-scale-has-marks-below
+slider-horz-scale-has-marks-below-hover
+slider-horz-scale-has-marks-below-active
+slider-horz-scale-has-marks-below-insensitive
+slider-horz-scale-has-marks-below-backdrop
+slider-horz-scale-has-marks-below-backdrop-insensitive
+slider-vert-scale-has-marks-below
+slider-vert-scale-has-marks-below-hover
+slider-vert-scale-has-marks-below-active
+slider-vert-scale-has-marks-below-insensitive
+slider-vert-scale-has-marks-below-backdrop
+slider-vert-scale-has-marks-below-backdrop-insensitive
+slider-horz-scale-has-marks-above
+slider-horz-scale-has-marks-above-hover
+slider-horz-scale-has-marks-above-active
+slider-horz-scale-has-marks-above-insensitive
+slider-horz-scale-has-marks-above-backdrop
+slider-horz-scale-has-marks-above-backdrop-insensitive
+slider-vert-scale-has-marks-above
+slider-vert-scale-has-marks-above-hover
+slider-vert-scale-has-marks-above-active
+slider-vert-scale-has-marks-above-insensitive
+slider-vert-scale-has-marks-above-backdrop
+slider-vert-scale-has-marks-above-backdrop-insensitive
+slider-horz-scale-has-marks-below-dark
+slider-horz-scale-has-marks-below-hover-dark
+slider-horz-scale-has-marks-below-active-dark
+slider-horz-scale-has-marks-below-insensitive-dark
+slider-horz-scale-has-marks-below-backdrop-dark
+slider-horz-scale-has-marks-below-backdrop-insensitive-dark
+slider-vert-scale-has-marks-below-dark
+slider-vert-scale-has-marks-below-hover-dark
+slider-vert-scale-has-marks-below-active-dark
+slider-vert-scale-has-marks-below-insensitive-dark
+slider-vert-scale-has-marks-below-backdrop-dark
+slider-vert-scale-has-marks-below-backdrop-insensitive-dark
+slider-horz-scale-has-marks-above-dark
+slider-horz-scale-has-marks-above-hover-dark
+slider-horz-scale-has-marks-above-active-dark
+slider-horz-scale-has-marks-above-insensitive-dark
+slider-horz-scale-has-marks-above-backdrop-dark
+slider-horz-scale-has-marks-above-backdrop-insensitive-dark
+slider-vert-scale-has-marks-above-dark
+slider-vert-scale-has-marks-above-hover-dark
+slider-vert-scale-has-marks-above-active-dark
+slider-vert-scale-has-marks-above-insensitive-dark
+slider-vert-scale-has-marks-above-backdrop-dark
+slider-vert-scale-has-marks-above-backdrop-insensitive-dark
diff --git a/gtk/src/mate/gtk-3.0/assets/bullet-symbolic.svg b/gtk/src/gtk-3.0/default/assets/bullet-symbolic.svg
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/bullet-symbolic.svg
rename to gtk/src/gtk-3.0/default/assets/bullet-symbolic.svg
diff --git a/gtk/src/mate/gtk-3.0/assets/bullet-symbolic.symbolic.png b/gtk/src/gtk-3.0/default/assets/bullet-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/bullet-symbolic.symbolic.png
rename to gtk/src/gtk-3.0/default/assets/bullet-symbolic.symbolic.png
diff --git a/gtk/src/gtk-3.0/default/assets/check-symbolic.svg b/gtk/src/gtk-3.0/default/assets/check-symbolic.svg
new file mode 100644
index 0000000000..47dfbc215a
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/assets/check-symbolic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/gtk/src/gtk-3.0/default/assets/check-symbolic.symbolic.png b/gtk/src/gtk-3.0/default/assets/check-symbolic.symbolic.png
new file mode 100644
index 0000000000..f8bd50ce0e
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/check-symbolic.symbolic.png differ
diff --git a/gtk/src/mate/gtk-3.0/assets/dash-symbolic.svg b/gtk/src/gtk-3.0/default/assets/dash-symbolic.svg
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/dash-symbolic.svg
rename to gtk/src/gtk-3.0/default/assets/dash-symbolic.svg
diff --git a/gtk/src/mate/gtk-3.0/assets/dash-symbolic.symbolic.png b/gtk/src/gtk-3.0/default/assets/dash-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/dash-symbolic.symbolic.png
rename to gtk/src/gtk-3.0/default/assets/dash-symbolic.symbolic.png
diff --git a/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-active-dark.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-active-dark.png
new file mode 100644
index 0000000000..8aafccaaf3
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-active-dark.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-active-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-active-dark@2.png
new file mode 100644
index 0000000000..fe1250b8a7
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-active-dark@2.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-active.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-active.png
new file mode 100644
index 0000000000..4c74dc98df
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-active.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-active@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-active@2.png
new file mode 100644
index 0000000000..4ecbc8b509
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-active@2.png differ
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-dark.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-backdrop-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-backdrop-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-backdrop.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-backdrop.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-backdrop@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-backdrop@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-backdrop@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-dark.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-hover-dark.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-hover-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-hover-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-hover-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-hover-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-hover.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-hover.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-hover.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-hover.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-hover@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-hover@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-hover@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-hover@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-insensitive-dark.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-insensitive.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-insensitive.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-insensitive.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-insensitive.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-insensitive@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-insensitive@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-insensitive@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above-insensitive@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-above@2.png
diff --git a/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-active-dark.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-active-dark.png
new file mode 100644
index 0000000000..6cfd27076d
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-active-dark.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-active-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-active-dark@2.png
new file mode 100644
index 0000000000..47116df0dc
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-active-dark@2.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-active.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-active.png
new file mode 100644
index 0000000000..fb89e70ce1
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-active.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-active@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-active@2.png
new file mode 100644
index 0000000000..13c24ddec0
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-active@2.png differ
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-dark.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-backdrop-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-backdrop-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-backdrop.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-backdrop.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-backdrop@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-backdrop@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-backdrop@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-dark.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-hover-dark.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-hover-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-hover-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-hover-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-hover-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-hover.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-hover.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-hover.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-hover.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-hover@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-hover@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-hover@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-hover@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-insensitive-dark.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-insensitive.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-insensitive.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-insensitive.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-insensitive.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-insensitive@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-insensitive@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-insensitive@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below-insensitive@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below@2.png b/gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-horz-scale-has-marks-below@2.png
diff --git a/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-active-dark.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-active-dark.png
new file mode 100644
index 0000000000..166c4136cf
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-active-dark.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-active-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-active-dark@2.png
new file mode 100644
index 0000000000..6a6a77f20a
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-active-dark@2.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-active.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-active.png
new file mode 100644
index 0000000000..02951ee988
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-active.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-active@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-active@2.png
new file mode 100644
index 0000000000..ce0dac3299
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-active@2.png differ
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-dark.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-backdrop-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-backdrop-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-backdrop.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-backdrop.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-backdrop@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-backdrop@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-backdrop@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-dark.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-hover-dark.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-hover-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-hover-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-hover-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-hover-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-hover.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-hover.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-hover.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-hover.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-hover@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-hover@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-hover@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-hover@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-insensitive-dark.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-insensitive.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-insensitive.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-insensitive.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-insensitive.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-insensitive@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-insensitive@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-insensitive@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above-insensitive@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-above@2.png
diff --git a/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-active-dark.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-active-dark.png
new file mode 100644
index 0000000000..52cbd5deac
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-active-dark.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-active-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-active-dark@2.png
new file mode 100644
index 0000000000..bd90d92597
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-active-dark@2.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-active.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-active.png
new file mode 100644
index 0000000000..fe1ef3a4df
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-active.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-active@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-active@2.png
new file mode 100644
index 0000000000..b9c9233b7f
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-active@2.png differ
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-dark.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-backdrop-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-backdrop-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-backdrop.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-backdrop.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-backdrop@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-backdrop@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-backdrop@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-dark.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-hover-dark.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-hover-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-hover-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-hover-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-hover-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-hover.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-hover.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-hover.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-hover.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-hover@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-hover@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-hover@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-hover@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-insensitive-dark.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-insensitive.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-insensitive.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-insensitive.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-insensitive.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-insensitive@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-insensitive@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-insensitive@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below-insensitive@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below@2.png b/gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below@2.png
rename to gtk/src/gtk-3.0/default/assets/slider-vert-scale-has-marks-below@2.png
diff --git a/gtk/src/gtk-3.0/default/assets/text-select-end-active-dark.png b/gtk/src/gtk-3.0/default/assets/text-select-end-active-dark.png
new file mode 100644
index 0000000000..586910fc1d
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/text-select-end-active-dark.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/text-select-end-active-dark@2.png b/gtk/src/gtk-3.0/default/assets/text-select-end-active-dark@2.png
new file mode 100644
index 0000000000..d4e749d9f7
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/text-select-end-active-dark@2.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/text-select-end-active.png b/gtk/src/gtk-3.0/default/assets/text-select-end-active.png
new file mode 100644
index 0000000000..3aa1ca2c01
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/text-select-end-active.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/text-select-end-active@2.png b/gtk/src/gtk-3.0/default/assets/text-select-end-active@2.png
new file mode 100644
index 0000000000..4c96324c54
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/text-select-end-active@2.png differ
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-end-dark.png b/gtk/src/gtk-3.0/default/assets/text-select-end-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-end-dark.png
rename to gtk/src/gtk-3.0/default/assets/text-select-end-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-end-dark@2.png b/gtk/src/gtk-3.0/default/assets/text-select-end-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-end-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/text-select-end-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-end-hover-dark.png b/gtk/src/gtk-3.0/default/assets/text-select-end-hover-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-end-hover-dark.png
rename to gtk/src/gtk-3.0/default/assets/text-select-end-hover-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-end-hover-dark@2.png b/gtk/src/gtk-3.0/default/assets/text-select-end-hover-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-end-hover-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/text-select-end-hover-dark@2.png
diff --git a/gtk/src/gtk-3.0/default/assets/text-select-end-hover.png b/gtk/src/gtk-3.0/default/assets/text-select-end-hover.png
new file mode 100644
index 0000000000..0ad402bce6
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/text-select-end-hover.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/text-select-end-hover@2.png b/gtk/src/gtk-3.0/default/assets/text-select-end-hover@2.png
new file mode 100644
index 0000000000..7dd547682a
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/text-select-end-hover@2.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/text-select-end.png b/gtk/src/gtk-3.0/default/assets/text-select-end.png
new file mode 100644
index 0000000000..79be081939
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/text-select-end.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/text-select-end@2.png b/gtk/src/gtk-3.0/default/assets/text-select-end@2.png
new file mode 100644
index 0000000000..2fb308242f
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/text-select-end@2.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/text-select-start-active-dark.png b/gtk/src/gtk-3.0/default/assets/text-select-start-active-dark.png
new file mode 100644
index 0000000000..28b3390ff4
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/text-select-start-active-dark.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/text-select-start-active-dark@2.png b/gtk/src/gtk-3.0/default/assets/text-select-start-active-dark@2.png
new file mode 100644
index 0000000000..75a7be0c45
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/text-select-start-active-dark@2.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/text-select-start-active.png b/gtk/src/gtk-3.0/default/assets/text-select-start-active.png
new file mode 100644
index 0000000000..18f8996b42
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/text-select-start-active.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/text-select-start-active@2.png b/gtk/src/gtk-3.0/default/assets/text-select-start-active@2.png
new file mode 100644
index 0000000000..2825f8c2eb
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/text-select-start-active@2.png differ
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-start-dark.png b/gtk/src/gtk-3.0/default/assets/text-select-start-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-start-dark.png
rename to gtk/src/gtk-3.0/default/assets/text-select-start-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-start-dark@2.png b/gtk/src/gtk-3.0/default/assets/text-select-start-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-start-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/text-select-start-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-start-hover-dark.png b/gtk/src/gtk-3.0/default/assets/text-select-start-hover-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-start-hover-dark.png
rename to gtk/src/gtk-3.0/default/assets/text-select-start-hover-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-start-hover-dark@2.png b/gtk/src/gtk-3.0/default/assets/text-select-start-hover-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-start-hover-dark@2.png
rename to gtk/src/gtk-3.0/default/assets/text-select-start-hover-dark@2.png
diff --git a/gtk/src/gtk-3.0/default/assets/text-select-start-hover.png b/gtk/src/gtk-3.0/default/assets/text-select-start-hover.png
new file mode 100644
index 0000000000..f45c965fe5
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/text-select-start-hover.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/text-select-start-hover@2.png b/gtk/src/gtk-3.0/default/assets/text-select-start-hover@2.png
new file mode 100644
index 0000000000..d8832354ce
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/text-select-start-hover@2.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/text-select-start.png b/gtk/src/gtk-3.0/default/assets/text-select-start.png
new file mode 100644
index 0000000000..8aff54c8fe
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/text-select-start.png differ
diff --git a/gtk/src/gtk-3.0/default/assets/text-select-start@2.png b/gtk/src/gtk-3.0/default/assets/text-select-start@2.png
new file mode 100644
index 0000000000..160d576ada
Binary files /dev/null and b/gtk/src/gtk-3.0/default/assets/text-select-start@2.png differ
diff --git a/gtk/src/gtk-3.0/default/gtk-dark.scss b/gtk/src/gtk-3.0/default/gtk-dark.scss
new file mode 100644
index 0000000000..1b0f97a91f
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/gtk-dark.scss
@@ -0,0 +1,9 @@
+$variant: 'dark';
+
+@import 'colors';
+@import 'drawing';
+@import 'common';
+@import 'apps';
+@import 'tweaks';
+@import 'colors-public';
+@import 'libhandy/Adwaita-base';
diff --git a/gtk/src/gtk-3.0/default/gtk.scss b/gtk/src/gtk-3.0/default/gtk.scss
new file mode 100644
index 0000000000..d29314fcb9
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/gtk.scss
@@ -0,0 +1,9 @@
+$variant: 'light';
+
+@import 'colors';
+@import 'drawing';
+@import 'common';
+@import 'apps';
+@import 'tweaks';
+@import 'colors-public';
+@import 'libhandy/Adwaita-base';
diff --git a/gtk/src/gtk-3.0/default/libhandy/_Adwaita-base.scss b/gtk/src/gtk-3.0/default/libhandy/_Adwaita-base.scss
new file mode 100644
index 0000000000..7777725712
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/libhandy/_Adwaita-base.scss
@@ -0,0 +1,576 @@
+// Include base styling.
+@import 'fallback-base';
+@import 'shared-base';
+
+$tab_bg: darken($bg_color, if($variant == 'dark', 6%, 12%));
+$tab_bg_backdrop: darken($backdrop_bg_color, 6%);
+
+// HdyComboRow
+
+popover.combo {
+ padding: 0px;
+
+ list {
+ border-style: none;
+ background-color: transparent;
+
+ > row {
+ padding: 0px 12px 0px 12px;
+ min-height: 50px;
+
+ &:not(:last-child) {
+ border-bottom: 1px solid hdyalpha($borders_color, 0.5)
+ }
+
+ &:first-child {
+ @include rounded-border(top);
+ }
+
+ &:last-child {
+ @include rounded-border(bottom);
+ }
+ }
+ }
+
+ @each $border in top, bottom {
+ overshoot.#{$border} {
+ @include rounded-border($border);
+ }
+ }
+
+ scrollbar.vertical {
+ padding-top: 2px;
+ padding-bottom: 2px;
+
+ &:dir(ltr) {
+ @include rounded-border(right);
+ }
+
+ &:dir(rtl) {
+ @include rounded-border(left);
+ }
+ }
+}
+
+// HdyExpanderRow
+
+row.expander {
+ padding: 0px;
+
+ image.expander-row-arrow {
+ @include margin-start(6px);
+ }
+}
+
+// HdyKeypad
+
+keypad {
+ .digit {
+ font-size: 200%;
+ font-weight: bold;
+ }
+
+ .letters {
+ font-size: 70%;
+ }
+
+ .symbol {
+ font-size: 160%;
+ }
+}
+
+// HdyViewSwitcher
+
+viewswitcher {
+ &, & button {
+ margin: 0;
+ padding: 0;
+ }
+
+ button {
+ border-radius: 0;
+ border-top: 0;
+ border-bottom: 0;
+ box-shadow: none;
+ font-size: 1rem;
+ border-width: 0; // Yaru: remove headerbar buttons border
+
+ &:not(:checked):not(:hover) {
+ background: transparent;
+ }
+
+ &:not(:only-child):not(:last-child) {
+ border-right-width: 0px;
+ }
+
+ &:not(only-child):first-child:not(:checked):not(:hover),
+ &:not(:checked):not(:hover) + button:not(:checked):not(:hover) {
+ border-left-color: transparent;
+ }
+
+ &:not(only-child):last-child:not(:checked):not(:hover) {
+ border-right-color: transparent;
+ }
+
+ &:not(:checked):hover:not(:backdrop) {
+ background-image: image(lighter($bg_color));
+ }
+
+ &:not(only-child):first-child:not(:checked):hover,
+ &:not(:checked):hover + button:not(:checked):not(:hover),
+ &:not(:checked):not(:hover) + button:not(:checked):hover {
+ border-left-color: shade($borders_color, 1.15);
+ }
+
+ &:not(only-child):last-child:not(:checked):hover {
+ border-right-color: shade($borders_color, 1.15);
+ }
+
+ &:not(:checked):hover:backdrop {
+ background-image: image($bg_color);
+ }
+
+ // View switcher in a header bar
+ headerbar &:not(:checked) {
+ &:hover:not(:backdrop) {
+ // Reimplementation of $button_fill from Adwaita. The colors are made
+ // only 70% visible to avoid the highlight to be too strong.
+ $c: hdyalpha($bg_color, 0.7);
+ $button_fill: if($variant == 'light', linear-gradient(to top, shade($c, 0.96) 2px, $c),
+ linear-gradient(to top, shade($c, 0.99) 2px, $c)) !global;
+ background-image: $button_fill;
+ }
+
+ &:not(only-child):first-child:hover,
+ &:hover + button:not(:checked):not(:hover),
+ &:not(:hover) + button:not(:checked):hover {
+ border-left-color: $borders_color;
+ }
+
+ &:not(only-child):last-child:hover {
+ border-right-color: $borders_color;
+ }
+
+ &:hover:backdrop {
+ background-image: image($bg_color);
+ }
+ }
+
+ // View switcher button
+ > stack > box {
+ &.narrow {
+ font-size: 0.75rem;
+ padding-top: 7px;
+ padding-bottom: 5px;
+
+ image,
+ label {
+ padding-left: 8px;
+ padding-right: 8px;
+ }
+ }
+
+ &.wide {
+ padding: 8px 12px;
+
+ image {
+ &:dir(ltr) {
+ padding-left: 7px;
+ }
+
+ &:dir(rtl) {
+ padding-right: 7px;
+ }
+ }
+
+ label {
+ &:dir(ltr) {
+ padding-right: 7px;
+ }
+
+ &:dir(rtl) {
+ padding-left: 7px;
+ }
+ }
+ }
+
+ label.active {
+ font-weight: bold;
+ }
+ }
+
+ &.needs-attention {
+ &:active > stack > box label,
+ &:checked > stack > box label {
+ animation: none;
+ background-image: none;
+ }
+
+ @debug("gradient dot color is " + $accent_bg_color);
+ > stack > box label {
+ animation: needs_attention 150ms ease-in;
+ background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to($accent_bg_color), to(transparent)); // Yaru: use our own palette
+ background-size: 6px 6px, 6px 6px;
+ background-repeat: no-repeat;
+ background-position: right 0px, right 1px;
+
+ &:backdrop {
+ background-size: 6px 6px, 0 0;
+ }
+
+ &:dir(rtl) {
+ background-position: left 0px, left 1px;
+ }
+ }
+ }
+ }
+}
+
+// HdyViewSwitcherBar
+
+viewswitcherbar actionbar > revealer > box {
+ padding: 0;
+}
+
+// Content list
+
+list.content {
+ &,
+ list {
+ background-color: transparent;
+ }
+
+ // Nested rows background
+ list.nested > row:not(:active) {
+ &:not(:hover):not(:selected),
+ &:hover:not(.activatable):not(:selected) {
+ background-color: hdymix($bg_color, $base_color, 0.5);
+ }
+
+ &:hover.activatable:not(:selected) {
+ background-color: hdymix($fg_color, $base_color, 0.95);
+ }
+ }
+
+ > row {
+ // Regular rows and expander header rows background
+ &:not(.expander):not(:active):not(:hover):not(:selected),
+ &:not(.expander):hover:not(.activatable):not(:selected),
+ &.expander row.header:not(:active):not(:hover):not(:selected),
+ &.expander row.header:hover:not(.activatable):not(:selected) {
+ background-color: $base_color;
+ }
+
+ &:not(.expander):not(:active):hover.activatable:not(:selected),
+ &.expander row.header:not(:active):hover.activatable:not(:selected) {
+ background-color: hdymix($fg_color, $base_color, 0.95);
+ }
+
+ &,
+ list > row {
+ border-color: hdyalpha($borders_color, 0.7);
+ border-style: solid;
+ transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+ }
+
+ // Top border
+ &:not(:last-child) {
+ border-width: 1px 1px 0px 1px;
+ }
+
+ // Rounded top
+ &:first-child,
+ &.expander:first-child row.header,
+ &.expander:checked,
+ &.expander:checked row.header,
+ &.expander:checked + row,
+ &.expander:checked + row.expander row.header {
+ @include rounded-border(top);
+ }
+
+ // Bottom border
+ &:last-child,
+ &.checked-expander-row-previous-sibling,
+ &.expander:checked {
+ border-width: 1px;
+ }
+
+ // Rounded bottom
+ &:last-child,
+ &.checked-expander-row-previous-sibling,
+ &.expander:checked,
+ &.expander:not(:checked):last-child row.header,
+ &.expander:not(:checked).checked-expander-row-previous-sibling row.header,
+ &.expander.empty:checked row.header,
+ &.expander list.nested > row:last-child {
+ @include rounded-border(bottom);
+ }
+
+ // Add space around expanded rows
+ &.expander:checked:not(:first-child),
+ &.expander:checked + row {
+ margin-top: 6px;
+ }
+ }
+}
+
+// List button
+
+button.list-button:not(:active):not(:checked):not(:hover) {
+ background: none;
+ border: 1px solid hdyalpha($borders_color, 0.5);
+ box-shadow: none;
+}
+
+// Unified window
+
+window.csd.unified:not(.solid-csd):not(.fullscreen) {
+ // Remove the sheen on headerbar...
+ headerbar {
+ // box-shadow: inset 0 1px rgba(255, 255, 255, if($variant == 'light', 0.7, 0)); Yaru: drop headerbar box-shadow overwrite
+
+ &.selection-mode {
+ box-shadow: none;
+ }
+ }
+
+ // ...and add it on the window itself
+ > decoration-overlay {
+ // Use a white sheen instead of @borders, as it has to be neutral enough
+ // for any content and not just headerbar background
+ // box-shadow: inset 0 1px rgba(255, 255, 255, if($variant == 'light', 0.34, 0.065)); Yaru: drop headerbar box-shadow overwrite
+ }
+
+ &:not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized) {
+ &,
+ > decoration,
+ > decoration-overlay {
+ border-radius: $window_radius; // Yaru change: sync radius with Gtk4 (use Gtk3 vars instead of hardcode)
+ }
+ }
+}
+
+// HdyStatusPage
+
+statuspage > scrolledwindow > viewport > box > clamp > box > .icon {
+ color: transparentize($fg_color, 0.5);
+
+ &:backdrop {
+ color: transparentize($backdrop_fg_color, 0.5);
+ }
+}
+
+// Tabs
+
+@mixin undershoot-gradient($dir) {
+ @if $variant == 'dark' {
+ background: linear-gradient(to #{$dir},
+ transparentize(black, .6),
+ transparentize(black, 1) 20px);
+ }
+ @else {
+ background: linear-gradient(to #{$dir},
+ transparentize(black, .93),
+ transparentize(black, 1) 20px);
+ }
+}
+
+@mixin need-attention-gradient($dir) {
+ background: linear-gradient(to #{$dir},
+ transparentize($selected_bg_color, .3),
+ transparentize($selected_bg_color, .5) 1px,
+ transparentize($selected_bg_color, 1) 20px);
+}
+
+tabbar {
+ .box {
+ min-height: 38px;
+ background: darken($tab_bg, 3%);
+ border-bottom: 1px solid $alt_borders_color;
+
+ &:backdrop {
+ background-color: darken($tab_bg_backdrop, 3%);
+ border-color: $backdrop_borders_color;
+ }
+ }
+
+ scrolledwindow.pinned {
+ undershoot {
+ border: 0 solid $alt_borders_color;
+ }
+
+ &:dir(rtl) undershoot.left {
+ border-left-width: 1px;
+ }
+
+ &:dir(ltr) undershoot.right {
+ border-right-width: 1px;
+ }
+
+ &:backdrop undershoot {
+ border-color: $backdrop_borders_color;
+ }
+
+ tabbox {
+ &:dir(ltr) {
+ padding-right: 1px;
+ box-shadow: inset -1px 0 $alt_borders_color;
+
+ &:backdrop {
+ box-shadow: inset -1px 0 $backdrop_borders_color;
+ }
+ }
+
+ &:dir(rtl) {
+ padding-left: 1px;
+ box-shadow: inset 1px 0 $alt_borders_color;
+
+ &:backdrop {
+ box-shadow: inset 1px 0 $backdrop_borders_color;
+ }
+ }
+ }
+ }
+
+ undershoot {
+ transition: none;
+
+ &.left {
+ @include undershoot-gradient("right");
+ }
+
+ &.right {
+ @include undershoot-gradient("left");
+ }
+ }
+
+ .needs-attention-left undershoot.left {
+ @include need-attention-gradient("right");
+ }
+
+ .needs-attention-right undershoot.right {
+ @include need-attention-gradient("left");
+ }
+
+ tab {
+ border-style: solid;
+ border-color: $alt_borders_color;
+ border-width: 0 1px 0 1px;
+ transition: background 150ms ease-in-out;
+ background-color: $tab_bg;
+
+ &:checked {
+ background-color: lighten($tab_bg, 6%);
+
+ &:hover {
+ background-color: lighten($tab_bg, 9%);
+ }
+ }
+
+ &:hover {
+ background-color: lighten($tab_bg, 3%);
+ }
+
+ &:backdrop {
+ border-color: $backdrop_borders_color;
+ background-color: $tab_bg_backdrop;
+
+ &:checked {
+ background-color: $backdrop_bg_color;
+ }
+ }
+ }
+
+ .start-action,
+ .end-action {
+ background: $tab_bg;
+ border-color: $alt_borders_color;
+ border-style: solid;
+ transition: background 150ms ease-in-out;
+
+ &:backdrop {
+ border-color: $backdrop_borders_color;
+ background-color: $tab_bg_backdrop;
+ }
+
+ button {
+ border: none;
+ border-radius: 0;
+ }
+ }
+
+ .start-action:dir(ltr),
+ .end-action:dir(rtl) {
+ border-right-width: 1px;
+
+ > * {
+ margin-right: 1px;
+ }
+ }
+
+ .start-action:dir(rtl),
+ .end-action:dir(ltr) {
+ border-left-width: 1px;
+
+ > * {
+ margin-left: 1px;
+ }
+ }
+}
+
+.tab-drag-icon {
+ tab {
+ min-height: 26px;
+ background-color: lighten($tab_bg, 9%);
+
+ $_wm_border: if($variant=='light', transparentize(black, 0.77), transparentize($borders_color, 0.1));
+
+ box-shadow: 0 3px 9px 1px transparentize(black, 0.75),
+ 0 0 0 1px $_wm_border, //doing borders with box-shadow
+ inset 0 1px $top_hilight;
+
+ margin: 25px;
+ }
+}
+
+tabbar,
+.tab-drag-icon {
+ tab {
+ padding: 6px;
+
+ &.needs-attention {
+ background-image:
+ radial-gradient(ellipse at bottom,
+ transparentize(white, .2),
+ transparentize($selected_bg_color, .8) 15%,
+ transparentize($selected_bg_color, 1) 15%);
+ }
+
+ .tab-close-button,
+ .tab-indicator {
+ padding: 0;
+ margin: 0;
+ min-width: 24px;
+ min-height: 24px;
+ border-radius: 99px;
+
+ border: none;
+ box-shadow: none;
+ -gtk-icon-shadow: none;
+ text-shadow: none;
+ background: none;
+ }
+
+ .tab-close-button,
+ .tab-indicator.clickable {
+ &:hover {
+ background: hdyalpha($fg_color, .15);
+ }
+
+ &:active {
+ background: hdyalpha(black, .2);
+ }
+ }
+ }
+}
+
diff --git a/gtk/src/gtk-3.0/default/libhandy/_definitions.scss b/gtk/src/gtk-3.0/default/libhandy/_definitions.scss
new file mode 100644
index 0000000000..9225bffbd8
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/libhandy/_definitions.scss
@@ -0,0 +1,66 @@
+//@import 'drawing';
+
+@function hdyalpha($c, $a) {
+ @return unquote("alpha(#{$c}, #{$a})");
+}
+
+@function hdymix($c1, $c2, $r) {
+ @return unquote("mix(#{$c1}, #{$c2}, #{$r})");
+}
+
+$leaflet_dimming: rgba(0, 0, 0, if($variant == 'light', 0.12, 0.24));
+$leaflet_border: rgba(0, 0, 0, if($variant == 'light', 0.05, 0.2));
+$leaflet_outline: rgba(255, 255, 255, if($variant == 'light', 0.2, 0.05));
+
+//@if $high_contrast {
+// $leaflet_border: $borders_color;
+// $leaflet_outline: transparent;
+//}
+
+@mixin background-shadow($direction) {
+ background-image:
+ linear-gradient($direction,
+ rgba(0, 0, 0, if($variant == 'light', 0.05, 0.1)),
+ rgba(0, 0, 0, if($variant == 'light', 0.01, 0.02)) 40px,
+ rgba(0, 0, 0, 0) 56px),
+ linear-gradient($direction,
+ rgba(0, 0, 0, if($variant == 'light', 0.03, 0.06)),
+ rgba(0, 0, 0, if($variant == 'light', 0.01, 0.02)) 7px,
+ rgba(0, 0, 0, 0) 24px);
+}
+
+// Makes the corners of the given border rounded.
+// $border must be top, bottom, left, or right.
+@mixin rounded-border($border) {
+ // The floors (top, bottom) and walls (left, right) of the corners matching
+ // $border. This is needed to easily form floor-wall pairs regardless of
+ // whether $border is a floor or a wall.
+ $corners: (
+ 'top': (('top'), ('left', 'right')),
+ 'bottom': (('bottom'), ('left', 'right')),
+ 'left': (('top', 'bottom'), ('left')),
+ 'right': (('top', 'bottom'), ('right')),
+ );
+
+ @if not map-get($corners, $border) {
+ @error "Unknown border type: #{$border}";
+ }
+
+ // Loop through the floors and walls of the corners of $border.
+ @each $floor in nth(map-get($corners, $border), 1) {
+ @each $wall in nth(map-get($corners, $border), 2) {
+ border-#{$floor}-#{$wall}-radius: 8px;
+ -gtk-outline-#{$floor}-#{$wall}-radius: 7px;
+ }
+ }
+}
+
+@mixin margin-start($margin) {
+ &:dir(ltr) {
+ margin-left: $margin;
+ }
+
+ &:dir(rtl) {
+ margin-right: $margin;
+ }
+}
diff --git a/gtk/src/gtk-3.0/default/libhandy/_fallback-base.scss b/gtk/src/gtk-3.0/default/libhandy/_fallback-base.scss
new file mode 100644
index 0000000000..dbc2d10731
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/libhandy/_fallback-base.scss
@@ -0,0 +1,200 @@
+@import 'definitions';
+
+// HdyActionRow
+
+row {
+ label.subtitle {
+ font-size: smaller;
+ opacity: 0.55;
+ text-shadow: none;
+ }
+
+ > box.header {
+ margin-left: 12px;
+ margin-right: 12px;
+ min-height: 50px;
+
+ > box.title {
+ margin-top: 8px;
+ margin-bottom: 8px;
+ }
+ }
+}
+
+// HdyExpanderRow
+
+row.expander {
+ // Drop transparent background on expander rows to let nested rows handle it,
+ // avoiding double highlights.
+ background-color: transparent;
+
+ list.nested > row {
+ background-color: hdyalpha($bg_color, 0.5);
+ border-color: hdyalpha($borders_color, 0.7);
+ border-style: solid;
+ border-width: 1px 0px 0px 0px;
+ }
+
+ // HdyExpanderRow arrow rotation
+
+ image.expander-row-arrow {
+ transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+ }
+
+ &:checked image.expander-row-arrow {
+ -gtk-icon-transform: rotate(0turn);
+ }
+
+ &:not(:checked) image.expander-row-arrow {
+ opacity: 0.55;
+ text-shadow: none;
+
+ &:dir(ltr) {
+ -gtk-icon-transform: rotate(-0.25turn);
+ }
+
+ &:dir(rtl) {
+ -gtk-icon-transform: rotate(0.25turn);
+ }
+ }
+
+ &:checked image.expander-row-arrow:not(:disabled) {
+ color: $selected_bg_color;
+ }
+
+ & image.expander-row-arrow:disabled {
+ color: $insensitive_fg_color;
+ }
+}
+
+// Shadows
+
+flap,
+deck,
+leaflet {
+ > dimming {
+ background: $leaflet_dimming;
+ }
+
+ > border {
+ min-width: 1px;
+ min-height: 1px;
+ background: $leaflet_border;
+ }
+
+ > shadow {
+ min-width: 56px;
+ min-height: 56px;
+
+ &.left { @include background-shadow(to right); }
+ &.right { @include background-shadow(to left); }
+ &.up { @include background-shadow(to bottom); }
+ &.down { @include background-shadow(to top); }
+ }
+
+ > outline {
+ min-width: 1px;
+ min-height: 1px;
+ background: $leaflet_outline;
+ }
+}
+
+// Avatar
+
+avatar {
+ border-radius: 9999px;
+ -gtk-outline-radius: 9999px;
+ font-weight: bold;
+
+ // The list of colors to generate avatars.
+ // Each avatar color is represented by a font color, a gradient start color and a gradient stop color.
+ // There are 8 different colors for avtars in the list if you change the number of them you
+ // need to update the NUMBER_OF_COLORS in src/hdy-avatar.c.
+ // The 2D list has this form: ((font-color, gradient-top-color, gradient-bottom-color)).
+ $avatarcolorlist: (
+ (#cfe1f5, #83b6ec, #337fdc), // blue
+ (#caeaf2, #7ad9f1, #0f9ac8), // cyan
+ (#cef8d8, #8de6b1, #29ae74), // green
+ (#e6f9d7, #b5e98a, #6ab85b), // lime
+ (#f9f4e1, #f8e359, #d29d09), // yellow
+ (#ffead1, #ffcb62, #d68400), // gold
+ (#ffe5c5, #ffa95a, #ed5b00), // orange
+ (#f8d2ce, #f78773, #e62d42), // raspberry
+ (#fac7de, #e973ab, #e33b6a), // magenta
+ (#e7c2e8, #cb78d4, #9945b5), // purple
+ (#d5d2f5, #9e91e8, #7a59ca), // violet
+ (#f2eade, #e3cf9c, #b08952), // beige
+ (#e5d6ca, #be916d, #785336), // brown
+ (#d8d7d3, #c0bfbc, #6e6d71), // gray
+ );
+
+ @for $i from 1 through length($avatarcolorlist) {
+ &.color#{$i} {
+ $avatarcolor: nth($avatarcolorlist, $i);
+ background-image: linear-gradient(nth($avatarcolor, 2), nth($avatarcolor, 3));
+ color: nth($avatarcolor, 1);
+ }
+ }
+
+ &.contrasted { color: #fff; }
+
+ &.image { background: none; }
+}
+
+// HdyViewSwitcherTitle
+
+viewswitchertitle viewswitcher {
+ margin-left: 12px;
+ margin-right: 12px;
+}
+
+// HdyStatusPage
+
+statuspage > scrolledwindow > viewport > box {
+ margin: 36px 12px;
+
+ > clamp {
+ &:not(:last-child) > box {
+ margin-bottom: 36px;
+ }
+
+ > box {
+ > .icon:not(:last-child) {
+ margin-bottom: 36px;
+ }
+
+ > .title:not(:last-child) {
+ margin-bottom: 12px;
+ }
+ }
+ }
+}
+
+// Preferences
+
+window.preferences > deck > deck > box > stack > stack > scrolledwindow > viewport > clamp,
+preferencespage > scrolledwindow > viewport > clamp {
+ margin: 0 12px;
+
+ > list,
+ > box > preferencesgroup { margin-top: 24px; }
+}
+
+preferencesgroup > box {
+ // Add space between the description and the title.
+ > label:not(:first-child) {
+ margin-top: 6px;
+ }
+
+ // Add space between the box and the labels.
+ > box:not(:first-child) {
+ margin-top: 12px;
+ }
+}
+
+tabbar .tab-indicator:not(.clickable) {
+ background: none;
+ box-shadow: none;
+ border-color: transparent;
+}
+
diff --git a/gtk/src/gtk-3.0/default/libhandy/_shared-base.scss b/gtk/src/gtk-3.0/default/libhandy/_shared-base.scss
new file mode 100644
index 0000000000..6fec1a0ad4
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/libhandy/_shared-base.scss
@@ -0,0 +1,21 @@
+@import 'definitions';
+
+// HdyComboRow
+
+popover.combo list {
+ min-width: 200px;
+}
+
+window.csd.unified:not(.solid-csd) {
+ // Since corners are masked, there's no need for round corners anymore
+ headerbar {
+ border-radius: 0;
+ }
+}
+
+.windowhandle {
+ &, & * {
+ // This is the most reliable way to enable window dragging
+ -GtkWidget-window-dragging: true;
+ }
+}
diff --git a/gtk/src/gtk-3.0/default/render-assets.sh b/gtk/src/gtk-3.0/default/render-assets.sh
new file mode 120000
index 0000000000..966cb4d951
--- /dev/null
+++ b/gtk/src/gtk-3.0/default/render-assets.sh
@@ -0,0 +1 @@
+../gtk-4.0/render-assets.sh
\ No newline at end of file
diff --git a/gtk/src/gtk-3.0/default/thumbnail.png b/gtk/src/gtk-3.0/default/thumbnail.png
new file mode 100644
index 0000000000..472f2993c6
Binary files /dev/null and b/gtk/src/gtk-3.0/default/thumbnail.png differ
diff --git a/gtk/src/data/gtk-dark.css.in b/gtk/src/gtk-3.0/gtk-dark.css.in
similarity index 100%
rename from gtk/src/data/gtk-dark.css.in
rename to gtk/src/gtk-3.0/gtk-dark.css.in
diff --git a/gtk/src/data/gtk.css.in b/gtk/src/gtk-3.0/gtk.css.in
similarity index 100%
rename from gtk/src/data/gtk.css.in
rename to gtk/src/gtk-3.0/gtk.css.in
diff --git a/gtk/src/data/gtk.gresource.xml.in b/gtk/src/gtk-3.0/gtk.gresource.xml.in
similarity index 100%
rename from gtk/src/data/gtk.gresource.xml.in
rename to gtk/src/gtk-3.0/gtk.gresource.xml.in
diff --git a/gtk/src/gtk-3.0/mate-dark/_colors-public.scss b/gtk/src/gtk-3.0/mate-dark/_colors-public.scss
new file mode 120000
index 0000000000..6c8a4ea433
--- /dev/null
+++ b/gtk/src/gtk-3.0/mate-dark/_colors-public.scss
@@ -0,0 +1 @@
+../default/_colors-public.scss
\ No newline at end of file
diff --git a/gtk/src/gtk-3.0/mate-dark/_colors.scss b/gtk/src/gtk-3.0/mate-dark/_colors.scss
new file mode 120000
index 0000000000..573bb98917
--- /dev/null
+++ b/gtk/src/gtk-3.0/mate-dark/_colors.scss
@@ -0,0 +1 @@
+../default/_colors.scss
\ No newline at end of file
diff --git a/gtk/src/gtk-3.0/mate-dark/_common.scss b/gtk/src/gtk-3.0/mate-dark/_common.scss
new file mode 120000
index 0000000000..07883bef87
--- /dev/null
+++ b/gtk/src/gtk-3.0/mate-dark/_common.scss
@@ -0,0 +1 @@
+../default/_common.scss
\ No newline at end of file
diff --git a/gtk/src/gtk-3.0/mate-dark/_drawing.scss b/gtk/src/gtk-3.0/mate-dark/_drawing.scss
new file mode 120000
index 0000000000..4f76339967
--- /dev/null
+++ b/gtk/src/gtk-3.0/mate-dark/_drawing.scss
@@ -0,0 +1 @@
+../default/_drawing.scss
\ No newline at end of file
diff --git a/gtk/src/gtk-3.0/mate-dark/_tweaks.scss b/gtk/src/gtk-3.0/mate-dark/_tweaks.scss
new file mode 120000
index 0000000000..1bb17e2cd7
--- /dev/null
+++ b/gtk/src/gtk-3.0/mate-dark/_tweaks.scss
@@ -0,0 +1 @@
+../default/_tweaks.scss
\ No newline at end of file
diff --git a/gtk/src/gtk-3.0/mate-dark/assets.txt b/gtk/src/gtk-3.0/mate-dark/assets.txt
new file mode 120000
index 0000000000..9f996baa27
--- /dev/null
+++ b/gtk/src/gtk-3.0/mate-dark/assets.txt
@@ -0,0 +1 @@
+../default/assets.txt
\ No newline at end of file
diff --git a/gtk/src/gtk-3.0/mate-dark/gtk-dark.scss b/gtk/src/gtk-3.0/mate-dark/gtk-dark.scss
new file mode 120000
index 0000000000..85bfd8e484
--- /dev/null
+++ b/gtk/src/gtk-3.0/mate-dark/gtk-dark.scss
@@ -0,0 +1 @@
+../default/gtk-dark.scss
\ No newline at end of file
diff --git a/gtk/src/gtk-3.0/mate-dark/gtk.scss b/gtk/src/gtk-3.0/mate-dark/gtk.scss
new file mode 120000
index 0000000000..2d19d2415e
--- /dev/null
+++ b/gtk/src/gtk-3.0/mate-dark/gtk.scss
@@ -0,0 +1 @@
+../default/gtk.scss
\ No newline at end of file
diff --git a/gtk/src/gtk-3.0/mate-dark/render-assets.sh b/gtk/src/gtk-3.0/mate-dark/render-assets.sh
new file mode 120000
index 0000000000..349f5fa710
--- /dev/null
+++ b/gtk/src/gtk-3.0/mate-dark/render-assets.sh
@@ -0,0 +1 @@
+../render-assets.sh
\ No newline at end of file
diff --git a/gtk/src/gtk-3.0/mate/_colors.scss b/gtk/src/gtk-3.0/mate/_colors.scss
new file mode 120000
index 0000000000..573bb98917
--- /dev/null
+++ b/gtk/src/gtk-3.0/mate/_colors.scss
@@ -0,0 +1 @@
+../default/_colors.scss
\ No newline at end of file
diff --git a/gtk/src/mate/gtk-3.0/_palette.scss b/gtk/src/gtk-3.0/mate/_palette.scss
similarity index 100%
rename from gtk/src/mate/gtk-3.0/_palette.scss
rename to gtk/src/gtk-3.0/mate/_palette.scss
diff --git a/gtk/src/mate/gtk-3.0/assets.svg b/gtk/src/gtk-3.0/mate/assets.svg
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets.svg
rename to gtk/src/gtk-3.0/mate/assets.svg
diff --git a/gtk/src/gtk-3.0/mate/assets/bullet-symbolic.svg b/gtk/src/gtk-3.0/mate/assets/bullet-symbolic.svg
new file mode 100644
index 0000000000..1ecb76a3ab
--- /dev/null
+++ b/gtk/src/gtk-3.0/mate/assets/bullet-symbolic.svg
@@ -0,0 +1,155 @@
+
+
+
+
diff --git a/gtk/src/gtk-3.0/mate/assets/bullet-symbolic.symbolic.png b/gtk/src/gtk-3.0/mate/assets/bullet-symbolic.symbolic.png
new file mode 100644
index 0000000000..651cb6d93c
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/bullet-symbolic.symbolic.png differ
diff --git a/gtk/src/mate/gtk-3.0/assets/check-symbolic.svg b/gtk/src/gtk-3.0/mate/assets/check-symbolic.svg
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/check-symbolic.svg
rename to gtk/src/gtk-3.0/mate/assets/check-symbolic.svg
diff --git a/gtk/src/mate/gtk-3.0/assets/check-symbolic.symbolic.png b/gtk/src/gtk-3.0/mate/assets/check-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/check-symbolic.symbolic.png
rename to gtk/src/gtk-3.0/mate/assets/check-symbolic.symbolic.png
diff --git a/gtk/src/gtk-3.0/mate/assets/dash-symbolic.svg b/gtk/src/gtk-3.0/mate/assets/dash-symbolic.svg
new file mode 100644
index 0000000000..9062393228
--- /dev/null
+++ b/gtk/src/gtk-3.0/mate/assets/dash-symbolic.svg
@@ -0,0 +1,155 @@
+
+
diff --git a/gtk/src/gtk-3.0/mate/assets/dash-symbolic.symbolic.png b/gtk/src/gtk-3.0/mate/assets/dash-symbolic.symbolic.png
new file mode 100644
index 0000000000..5b5fb6b647
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/dash-symbolic.symbolic.png differ
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-active-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-active-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-active-dark.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-active-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-active-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-active-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-active-dark@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-active-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-active.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-active.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-active.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-active.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-active@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-active@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-above-active@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-active@2.png
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop-dark.png
new file mode 100644
index 0000000000..06523bbd0c
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop-dark.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png
new file mode 100644
index 0000000000..7a9c436264
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png
new file mode 100644
index 0000000000..06523bbd0c
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png
new file mode 100644
index 0000000000..7a9c436264
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-insensitive.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-insensitive.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png
new file mode 100644
index 0000000000..53f66ba556
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop.png
new file mode 100644
index 0000000000..def988d637
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop@2.png
new file mode 100644
index 0000000000..31d75e1da1
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-backdrop@2.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-dark.png
new file mode 100644
index 0000000000..5f921a2265
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-dark.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-dark@2.png
new file mode 100644
index 0000000000..6c2bc17b10
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-dark@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-hover-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-hover-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-hover-dark.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-hover-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-hover-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-hover.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-hover.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-hover.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-hover.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-hover@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-hover@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-hover@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-hover@2.png
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-insensitive-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
new file mode 100644
index 0000000000..06523bbd0c
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-insensitive-dark.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
new file mode 100644
index 0000000000..7a9c436264
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-insensitive.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-insensitive.png
new file mode 100644
index 0000000000..3b8f1e649e
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-insensitive.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-insensitive@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-insensitive@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-insensitive@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above-insensitive@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-above@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-active-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-active-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-active-dark.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-active-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-active-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-active-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-active-dark@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-active-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-active.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-active.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-active.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-active.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-active@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-active@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-horz-scale-has-marks-below-active@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-active@2.png
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop-dark.png
new file mode 100644
index 0000000000..640dfecea1
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop-dark.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png
new file mode 100644
index 0000000000..e140405583
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png
new file mode 100644
index 0000000000..640dfecea1
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png
new file mode 100644
index 0000000000..e140405583
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png
new file mode 100644
index 0000000000..e290aafe92
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png
new file mode 100644
index 0000000000..8e17a55d3b
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-insensitive.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-insensitive.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-insensitive@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-insensitive@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-backdrop@2.png
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-dark.png
new file mode 100644
index 0000000000..b7aa475948
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-dark.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-dark@2.png
new file mode 100644
index 0000000000..4be7820d91
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-dark@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-hover-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-hover-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-hover-dark.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-hover-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-hover-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-hover.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-hover.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-hover.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-hover.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-hover@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-hover@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-hover@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-hover@2.png
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-insensitive-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
new file mode 100644
index 0000000000..640dfecea1
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-insensitive-dark.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
new file mode 100644
index 0000000000..e140405583
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-insensitive.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-insensitive.png
new file mode 100644
index 0000000000..e49a835e37
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-insensitive.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-insensitive@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-insensitive@2.png
new file mode 100644
index 0000000000..cf5f21ecef
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below-insensitive@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below@2.png b/gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-horz-scale-has-marks-below@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-active-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-active-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-active-dark.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-active-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-active-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-active-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-active-dark@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-active-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-active.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-active.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-active.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-active.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-active@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-active@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-above-active@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-active@2.png
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop-dark.png
new file mode 100644
index 0000000000..cabc8312fe
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop-dark.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png
new file mode 100644
index 0000000000..1a47d6207f
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png
new file mode 100644
index 0000000000..cabc8312fe
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png
new file mode 100644
index 0000000000..1a47d6207f
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-insensitive.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-insensitive.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png
new file mode 100644
index 0000000000..252d798bd9
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop.png
new file mode 100644
index 0000000000..13e1b714dd
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop@2.png
new file mode 100644
index 0000000000..885084585f
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-backdrop@2.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-dark.png
new file mode 100644
index 0000000000..cfa6d1a35a
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-dark.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-dark@2.png
new file mode 100644
index 0000000000..5685075078
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-dark@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-hover-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-hover-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-hover-dark.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-hover-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-hover-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-hover.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-hover.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-hover.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-hover.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-hover@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-hover@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-hover@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-hover@2.png
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-insensitive-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
new file mode 100644
index 0000000000..cabc8312fe
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-insensitive-dark.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
new file mode 100644
index 0000000000..1a47d6207f
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-insensitive.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-insensitive.png
new file mode 100644
index 0000000000..32b43303d8
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-insensitive.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-insensitive@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-insensitive@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-insensitive@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above-insensitive@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-above@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-active-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-active-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-active-dark.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-active-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-active-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-active-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-active-dark@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-active-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-active.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-active.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-active.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-active.png
diff --git a/gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-active@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-active@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/slider-vert-scale-has-marks-below-active@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-active@2.png
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop-dark.png
new file mode 100644
index 0000000000..d3631d3830
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop-dark.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png
new file mode 100644
index 0000000000..5ba56ba077
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png
new file mode 100644
index 0000000000..d3631d3830
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png
new file mode 100644
index 0000000000..5ba56ba077
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-insensitive.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-insensitive.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png
new file mode 100644
index 0000000000..0628fdd48d
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop.png
new file mode 100644
index 0000000000..2d19aa70b0
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop@2.png
new file mode 100644
index 0000000000..0628fdd48d
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-backdrop@2.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-dark.png
new file mode 100644
index 0000000000..72248c0e5a
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-dark.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-dark@2.png
new file mode 100644
index 0000000000..d5815a1c7d
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-dark@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-hover-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-hover-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-hover-dark.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-hover-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-hover-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-hover.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-hover.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-hover.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-hover.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-hover@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-hover@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-hover@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-hover@2.png
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-insensitive-dark.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
new file mode 100644
index 0000000000..d3631d3830
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-insensitive-dark.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
new file mode 100644
index 0000000000..5ba56ba077
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-insensitive.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-insensitive.png
new file mode 100644
index 0000000000..2d19aa70b0
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-insensitive.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-insensitive@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-insensitive@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-insensitive@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below-insensitive@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below@2.png b/gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below@2.png
rename to gtk/src/gtk-3.0/mate/assets/slider-vert-scale-has-marks-below@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-end-active-dark.png b/gtk/src/gtk-3.0/mate/assets/text-select-end-active-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-end-active-dark.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-end-active-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-end-active-dark@2.png b/gtk/src/gtk-3.0/mate/assets/text-select-end-active-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-end-active-dark@2.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-end-active-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-end-active.png b/gtk/src/gtk-3.0/mate/assets/text-select-end-active.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-end-active.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-end-active.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-end-active@2.png b/gtk/src/gtk-3.0/mate/assets/text-select-end-active@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-end-active@2.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-end-active@2.png
diff --git a/gtk/src/gtk-3.0/mate/assets/text-select-end-dark.png b/gtk/src/gtk-3.0/mate/assets/text-select-end-dark.png
new file mode 100644
index 0000000000..8b1e392f91
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/text-select-end-dark.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/text-select-end-dark@2.png b/gtk/src/gtk-3.0/mate/assets/text-select-end-dark@2.png
new file mode 100644
index 0000000000..dc28e68e58
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/text-select-end-dark@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-end-hover-dark.png b/gtk/src/gtk-3.0/mate/assets/text-select-end-hover-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-end-hover-dark.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-end-hover-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-end-hover-dark@2.png b/gtk/src/gtk-3.0/mate/assets/text-select-end-hover-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-end-hover-dark@2.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-end-hover-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-end-hover.png b/gtk/src/gtk-3.0/mate/assets/text-select-end-hover.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-end-hover.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-end-hover.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-end-hover@2.png b/gtk/src/gtk-3.0/mate/assets/text-select-end-hover@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-end-hover@2.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-end-hover@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-end.png b/gtk/src/gtk-3.0/mate/assets/text-select-end.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-end.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-end.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-end@2.png b/gtk/src/gtk-3.0/mate/assets/text-select-end@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-end@2.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-end@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-start-active-dark.png b/gtk/src/gtk-3.0/mate/assets/text-select-start-active-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-start-active-dark.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-start-active-dark.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-start-active-dark@2.png b/gtk/src/gtk-3.0/mate/assets/text-select-start-active-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-start-active-dark@2.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-start-active-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-start-active.png b/gtk/src/gtk-3.0/mate/assets/text-select-start-active.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-start-active.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-start-active.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-start-active@2.png b/gtk/src/gtk-3.0/mate/assets/text-select-start-active@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-start-active@2.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-start-active@2.png
diff --git a/gtk/src/gtk-3.0/mate/assets/text-select-start-dark.png b/gtk/src/gtk-3.0/mate/assets/text-select-start-dark.png
new file mode 100644
index 0000000000..a7c95ffc1b
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/text-select-start-dark.png differ
diff --git a/gtk/src/gtk-3.0/mate/assets/text-select-start-dark@2.png b/gtk/src/gtk-3.0/mate/assets/text-select-start-dark@2.png
new file mode 100644
index 0000000000..216fe39188
Binary files /dev/null and b/gtk/src/gtk-3.0/mate/assets/text-select-start-dark@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-start-hover-dark.png b/gtk/src/gtk-3.0/mate/assets/text-select-start-hover-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-start-hover-dark.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-start-hover-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-start-hover-dark@2.png b/gtk/src/gtk-3.0/mate/assets/text-select-start-hover-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-start-hover-dark@2.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-start-hover-dark@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-start-hover.png b/gtk/src/gtk-3.0/mate/assets/text-select-start-hover.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-start-hover.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-start-hover.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-start-hover@2.png b/gtk/src/gtk-3.0/mate/assets/text-select-start-hover@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-start-hover@2.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-start-hover@2.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-start.png b/gtk/src/gtk-3.0/mate/assets/text-select-start.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-start.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-start.png
diff --git a/gtk/src/mate/gtk-3.0/assets/text-select-start@2.png b/gtk/src/gtk-3.0/mate/assets/text-select-start@2.png
similarity index 100%
rename from gtk/src/mate/gtk-3.0/assets/text-select-start@2.png
rename to gtk/src/gtk-3.0/mate/assets/text-select-start@2.png
diff --git a/gtk/src/gtk-3.0/mate/gtk-dark.scss b/gtk/src/gtk-3.0/mate/gtk-dark.scss
new file mode 120000
index 0000000000..85bfd8e484
--- /dev/null
+++ b/gtk/src/gtk-3.0/mate/gtk-dark.scss
@@ -0,0 +1 @@
+../default/gtk-dark.scss
\ No newline at end of file
diff --git a/gtk/src/gtk-3.0/mate/gtk.scss b/gtk/src/gtk-3.0/mate/gtk.scss
new file mode 120000
index 0000000000..2d19d2415e
--- /dev/null
+++ b/gtk/src/gtk-3.0/mate/gtk.scss
@@ -0,0 +1 @@
+../default/gtk.scss
\ No newline at end of file
diff --git a/gtk/src/gtk-3.0/mate/libhandy b/gtk/src/gtk-3.0/mate/libhandy
new file mode 120000
index 0000000000..1ae8daf0de
--- /dev/null
+++ b/gtk/src/gtk-3.0/mate/libhandy
@@ -0,0 +1 @@
+../default/libhandy
\ No newline at end of file
diff --git a/gtk/src/gtk-3.0/meson.build b/gtk/src/gtk-3.0/meson.build
new file mode 100644
index 0000000000..b0bcbfa738
--- /dev/null
+++ b/gtk/src/gtk-3.0/meson.build
@@ -0,0 +1,223 @@
+# GTK-3.0 Build Logic
+# Compiles SCSS to CSS and packages as gresource
+
+gtk_ver = '3.0'
+gtk_dir = 'gtk-@0@'.format(gtk_ver)
+
+variants = [
+ 'gtk',
+ 'gtk-dark'
+]
+
+foreach flavour: yaru_flavours
+ message('Configuring flavour ' + flavour + ' for GTK-3.0')
+ suffix = flavour == 'default' ? '' : '-@0@'.format(flavour)
+ theme_name = meson.project_name() + suffix
+ is_dark = flavour == 'dark' or flavour.endswith('-dark')
+ base_theme_name = is_dark ? flavour.split('-dark')[0] : flavour
+ is_accent = enabled_accent_colors.contains(base_theme_name)
+ theme_dir = join_paths(get_option('datadir'), 'themes', theme_name)
+ accent = is_accent ? base_theme_name : ''
+
+ if is_accent
+ accent_configuration = {
+ 'yaru_dark_variant': is_dark ? 'true' : 'false',
+ 'yaru_accent_color': accent,
+ }
+
+ accent_info_css = configure_file(
+ configuration: accent_configuration + {
+ 'yaru_theme_entry_point': '/dev/null',
+ },
+ input: accent_colors_definitions_scss,
+ output: '@0@-@1@-accent-color-info.scss'.format(theme_name, accent),
+ )
+
+ accent_parser = run_command(sassc,
+ yaru_sass_global_paths,
+ accent_info_css).stderr().strip()
+
+ accent_color_code = accent_parser.split(' Accent color is ')[1].split('\n')[0]
+ assert(accent_color_code.startswith('#'), 'No accent color code found')
+
+ accent_color_optimized_code = accent_parser.split(' Contrast optimized accent is ')[1].split('\n')[0]
+ assert(accent_color_optimized_code.startswith('#'), 'No accent color code found')
+ message('Accent color code is', accent_color_code)
+ message('Accent optimized color code is', accent_color_optimized_code)
+ endif
+
+ # Determine paths based on flavour
+ if flavour.startswith('mate')
+ base_path = flavour
+ dark_path = is_dark ? flavour : base_path
+ else
+ base_path = 'default'
+ dark_path = is_dark ? 'dark' : base_path
+ endif
+ default_path = 'default'
+ upstream_path = '../upstream' / gtk_dir / 'Default'
+ install_path = theme_dir / gtk_dir
+
+ # Sort by most relevant for the theme flavour
+ # All flavour GTK files are now in this directory
+ sources_priority = [
+ flavour,
+ dark_path,
+ base_path,
+ default_path,
+ upstream_path,
+ ]
+
+ generated_css = []
+ foreach variant : variants
+ message('Configuring @0@ variant for @1@-@2@'.format(
+ theme_name, variant, gtk_ver))
+ target_name = '@0@-@1@-@2@'.format(theme_name, variant, gtk_ver)
+ variant_file = is_dark ? variant.split('-dark')[0] + '-dark' : variant
+ gtk_scss_path = flavour / variant_file + '.scss'
+
+ if not fs.is_file(gtk_scss_path)
+ gtk_scss_path = base_path / variant_file + '.scss'
+ endif
+
+ # Look for scss files in the variant dir first, otherwise fallback to
+ # base, default or upstream paths, so using reversed order
+ scss_paths = yaru_sass_global_paths
+ gtk_scss_dependencies = []
+ foreach src: sources_priority
+ # upstream_path already contains '../', others don't
+ if src.startswith('../')
+ scss_paths += ['-I', meson.current_source_dir() / src ]
+ find_path = src
+ else
+ scss_paths += ['-I', meson.current_source_dir() / src ]
+ find_path = src
+ endif
+
+ scss_deps = run_command(
+ 'find', find_path, '-name', '_*.scss'
+ ).stdout().strip().split('\n')
+ if scss_deps.length() > 0 and scss_deps[0] != ''
+ gtk_scss_dependencies += scss_deps
+ endif
+ endforeach
+
+ if is_accent
+ gtk_accents_css = configure_file(
+ configuration: accent_configuration + {
+ 'yaru_theme_entry_point': meson.current_source_dir() / gtk_scss_path,
+ },
+ input: accent_colors_definitions_scss,
+ output: '@0@-accent-colors.scss'.format(target_name),
+ )
+
+ gtk_scss_path = gtk_accents_css
+
+ gtk_yaru_colors_defs_scss = configure_file(
+ configuration: accent_configuration + {
+ 'yaru_theme_entry_point': yaru_colors_defs_scss,
+ },
+ input: accent_colors_definitions_scss,
+ output: '@0@-yaru-colors-defs.scss'.format(target_name),
+ )
+
+ gtk_yaru_colors_defs += {
+ target_name: custom_target(
+ '@0@-yaru-colors-definitions'.format(target_name),
+ input: gtk_yaru_colors_defs_scss,
+ output: '@BASENAME@.css',
+ command: [
+ sassc, '-a',
+ scss_paths,
+ '@INPUT@', '@OUTPUT@',
+ ],
+ depend_files: [
+ yaru_colors_defs_scss,
+ gtk_scss_dependencies,
+ ]
+ )
+ }
+ endif
+
+ generated_css += custom_target(target_name,
+ input: gtk_scss_path,
+ output: '@0@-generated.css'.format(target_name),
+ depend_files: files(gtk_scss_dependencies),
+ command: [
+ sassc, '-a',
+ scss_paths,
+ '@INPUT@', '@OUTPUT@'],
+ )
+
+ conf_data = configuration_data()
+ conf_data.set('THEME_NAME', theme_name)
+ conf_data.set('GTK_VER', gtk_ver)
+ install_data(
+ configure_file(
+ input: '@0@.css.in'.format(variant),
+ output: '@0@.css'.format(target_name),
+ configuration: conf_data
+ ),
+ install_dir: install_path,
+ rename: '@0@.css'.format(variant),
+ )
+ endforeach
+
+ foreach src: sources_priority
+ # upstream_path already contains '../', others don't
+ if src.startswith('../')
+ assets_rel_dir = src / 'assets'
+ else
+ assets_rel_dir = src / 'assets'
+ endif
+ if fs.is_dir(assets_rel_dir)
+ break
+ endif
+ endforeach
+
+ assets = run_command(
+ 'ls', '-1', assets_rel_dir
+ ).stdout().strip().split('\n')
+
+ assets_xml = []
+ foreach asset: assets
+ assets_xml += ' @1@'.format(
+ asset,
+ join_paths(assets_rel_dir, asset)
+ )
+ endforeach
+
+ conf_data = configuration_data()
+ conf_data.set('THEME_NAME', theme_name)
+ conf_data.set('GTK_VER', gtk_ver)
+ conf_data.set('ASSETS', '\n'.join(assets_xml))
+ gresource_xml = configure_file(
+ input: 'gtk.gresource.xml.in',
+ output: '@0@-@1@-gtk.gresource.xml'.format(theme_name, gtk_ver),
+ configuration: conf_data)
+
+ gresource_name = '@0@-@1@'.format(theme_name, gtk_dir)
+ gnome.compile_resources(
+ gresource_name,
+ gresource_xml,
+ dependencies: generated_css,
+ gresource_bundle: true,
+ install: true,
+ install_dir: install_path,
+ )
+
+ # Rename gresource to gtk.gresource after install
+ meson.add_install_script('sh', '-c',
+ 'cd "$MESON_INSTALL_DESTDIR_PREFIX/@0@" && mv "@1@-gtk-@2@.gresource" "gtk.gresource" 2>/dev/null || true'.format(
+ install_path, theme_name, gtk_ver
+ )
+ )
+
+ if get_option('cinnamon-shell') and fs.is_file(dark_path / 'thumbnail.png')
+ # install thumbnail (cinnamon only)
+ install_data(
+ dark_path / 'thumbnail.png',
+ install_dir: install_path,
+ )
+ endif
+endforeach
diff --git a/gtk/src/dark/render-assets.sh b/gtk/src/gtk-3.0/render-assets.sh
similarity index 100%
rename from gtk/src/dark/render-assets.sh
rename to gtk/src/gtk-3.0/render-assets.sh
diff --git a/gtk/src/default/unity-to-metacity.sh b/gtk/src/gtk-3.0/unity-to-metacity.sh
similarity index 100%
rename from gtk/src/default/unity-to-metacity.sh
rename to gtk/src/gtk-3.0/unity-to-metacity.sh
diff --git a/gtk/src/default/gtk-4.0/README b/gtk/src/gtk-4.0/dark/README
similarity index 100%
rename from gtk/src/default/gtk-4.0/README
rename to gtk/src/gtk-4.0/dark/README
diff --git a/gtk/src/default/gtk-4.0/_colors-public.scss b/gtk/src/gtk-4.0/dark/_colors-public.scss
similarity index 100%
rename from gtk/src/default/gtk-4.0/_colors-public.scss
rename to gtk/src/gtk-4.0/dark/_colors-public.scss
diff --git a/gtk/src/default/gtk-4.0/_colors.scss b/gtk/src/gtk-4.0/dark/_colors.scss
similarity index 100%
rename from gtk/src/default/gtk-4.0/_colors.scss
rename to gtk/src/gtk-4.0/dark/_colors.scss
diff --git a/gtk/src/default/gtk-4.0/_common.scss b/gtk/src/gtk-4.0/dark/_common.scss
similarity index 100%
rename from gtk/src/default/gtk-4.0/_common.scss
rename to gtk/src/gtk-4.0/dark/_common.scss
diff --git a/gtk/src/default/gtk-4.0/_drawing.scss b/gtk/src/gtk-4.0/dark/_drawing.scss
similarity index 100%
rename from gtk/src/default/gtk-4.0/_drawing.scss
rename to gtk/src/gtk-4.0/dark/_drawing.scss
diff --git a/gtk/src/gtk-4.0/dark/_palette.scss b/gtk/src/gtk-4.0/dark/_palette.scss
new file mode 100644
index 0000000000..979b01569d
--- /dev/null
+++ b/gtk/src/gtk-4.0/dark/_palette.scss
@@ -0,0 +1,41 @@
+// Blacks
+$jet: #181818;
+$inkstone: #3D3D3D;
+$slate: #5D5D5D;
+$graphite: #666666;
+
+// Whites
+$white: #FFFFFF;
+$porcelain: #F7F7F7;
+$silk: #CCC;
+$warm_gray: #AEA79F;
+$ash: #878787;
+
+// Purples
+$aubergine: #924D8B;
+$purple: #762572;
+$light_aubergine: #77216F;
+$mid_aubergine: #5E2750;
+$dark_aubergine: #2C001E;
+
+// Reds
+$red: #c7162b;
+
+// Oranges
+$orange: #E95420;
+
+// Yellows
+$yellow: #f99b11;
+
+// Greens
+$green: #0e8420;
+
+// Blues
+$blue: #19B6EE;
+$linkblue: #007aa6;
+$darkblue: #335280;
+
+
+// Semantic colors
+$accent_bg_color: $orange !default;
+$accent_fg_color: $white !default;
diff --git a/gtk/src/default/gtk-4.0/_tweaks.scss b/gtk/src/gtk-4.0/dark/_tweaks.scss
similarity index 100%
rename from gtk/src/default/gtk-4.0/_tweaks.scss
rename to gtk/src/gtk-4.0/dark/_tweaks.scss
diff --git a/gtk/src/default/gtk-4.0/assets.svg b/gtk/src/gtk-4.0/dark/assets.svg
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets.svg
rename to gtk/src/gtk-4.0/dark/assets.svg
diff --git a/gtk/src/default/gtk-4.0/assets.txt b/gtk/src/gtk-4.0/dark/assets.txt
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets.txt
rename to gtk/src/gtk-4.0/dark/assets.txt
diff --git a/gtk/src/default/gtk-4.0/assets/bullet-symbolic.svg b/gtk/src/gtk-4.0/dark/assets/bullet-symbolic.svg
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/bullet-symbolic.svg
rename to gtk/src/gtk-4.0/dark/assets/bullet-symbolic.svg
diff --git a/gtk/src/default/gtk-4.0/assets/bullet-symbolic.symbolic.png b/gtk/src/gtk-4.0/dark/assets/bullet-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/bullet-symbolic.symbolic.png
rename to gtk/src/gtk-4.0/dark/assets/bullet-symbolic.symbolic.png
diff --git a/gtk/src/default/gtk-4.0/assets/bullet@2-symbolic.symbolic.png b/gtk/src/gtk-4.0/dark/assets/bullet@2-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/bullet@2-symbolic.symbolic.png
rename to gtk/src/gtk-4.0/dark/assets/bullet@2-symbolic.symbolic.png
diff --git a/gtk/src/default/gtk-4.0/assets/check-symbolic.svg b/gtk/src/gtk-4.0/dark/assets/check-symbolic.svg
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/check-symbolic.svg
rename to gtk/src/gtk-4.0/dark/assets/check-symbolic.svg
diff --git a/gtk/src/default/gtk-4.0/assets/check-symbolic.symbolic.png b/gtk/src/gtk-4.0/dark/assets/check-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/check-symbolic.symbolic.png
rename to gtk/src/gtk-4.0/dark/assets/check-symbolic.symbolic.png
diff --git a/gtk/src/default/gtk-4.0/assets/check@2-symbolic.symbolic.png b/gtk/src/gtk-4.0/dark/assets/check@2-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/check@2-symbolic.symbolic.png
rename to gtk/src/gtk-4.0/dark/assets/check@2-symbolic.symbolic.png
diff --git a/gtk/src/default/gtk-4.0/assets/dash-symbolic.svg b/gtk/src/gtk-4.0/dark/assets/dash-symbolic.svg
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/dash-symbolic.svg
rename to gtk/src/gtk-4.0/dark/assets/dash-symbolic.svg
diff --git a/gtk/src/default/gtk-4.0/assets/dash-symbolic.symbolic.png b/gtk/src/gtk-4.0/dark/assets/dash-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/dash-symbolic.symbolic.png
rename to gtk/src/gtk-4.0/dark/assets/dash-symbolic.symbolic.png
diff --git a/gtk/src/default/gtk-4.0/assets/dash@2-symbolic.symbolic.png b/gtk/src/gtk-4.0/dark/assets/dash@2-symbolic.symbolic.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/dash@2-symbolic.symbolic.png
rename to gtk/src/gtk-4.0/dark/assets/dash@2-symbolic.symbolic.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-active-dark.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-active-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-active-dark.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-active-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-active-dark@2.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-active-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-active-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-active-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-active.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-active.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-active.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-active.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-active@2.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-active@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-active@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-active@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-dark.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-dark.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-dark@2.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-hover-dark.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-hover-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-hover-dark.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-hover-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-hover-dark@2.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-hover.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-hover.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-hover.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-hover.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-hover@2.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-hover@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-hover@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-hover@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-insensitive-dark.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-insensitive.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-insensitive.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-insensitive.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-insensitive@2.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-insensitive@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above-insensitive@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above-insensitive@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above@2.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-above@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-above@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-active-dark.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-active-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-active-dark.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-active-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-active-dark@2.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-active-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-active-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-active-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-active.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-active.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-active.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-active.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-active@2.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-active@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-active@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-active@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-dark.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-dark.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-dark@2.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-hover-dark.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-hover-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-hover-dark.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-hover-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-hover-dark@2.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-hover.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-hover.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-hover.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-hover.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-hover@2.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-hover@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-hover@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-hover@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-insensitive-dark.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-insensitive.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-insensitive.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-insensitive.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-insensitive@2.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-insensitive@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below-insensitive@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below-insensitive@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below@2.png b/gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-horz-scale-has-marks-below@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-horz-scale-has-marks-below@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-active-dark.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-active-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-active-dark.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-active-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-active-dark@2.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-active-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-active-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-active-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-active.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-active.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-active.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-active.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-active@2.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-active@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-active@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-active@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-dark.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-dark.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-dark@2.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-hover-dark.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-hover-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-hover-dark.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-hover-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-hover-dark@2.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-hover.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-hover.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-hover.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-hover.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-hover@2.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-hover@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-hover@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-hover@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-insensitive-dark.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-insensitive.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-insensitive.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-insensitive.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-insensitive@2.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-insensitive@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above-insensitive@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above-insensitive@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above@2.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-above@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-above@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-active-dark.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-active-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-active-dark.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-active-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-active-dark@2.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-active-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-active-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-active-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-active.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-active.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-active.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-active.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-active@2.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-active@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-active@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-active@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-dark.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-dark.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-dark@2.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-hover-dark.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-hover-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-hover-dark.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-hover-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-hover-dark@2.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-hover.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-hover.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-hover.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-hover.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-hover@2.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-hover@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-hover@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-hover@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-insensitive-dark.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-insensitive.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-insensitive.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-insensitive.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-insensitive.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-insensitive@2.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-insensitive@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below-insensitive@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below-insensitive@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below.png
diff --git a/gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below@2.png b/gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/slider-vert-scale-has-marks-below@2.png
rename to gtk/src/gtk-4.0/dark/assets/slider-vert-scale-has-marks-below@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-end-active-dark.png b/gtk/src/gtk-4.0/dark/assets/text-select-end-active-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-end-active-dark.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-end-active-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-end-active-dark@2.png b/gtk/src/gtk-4.0/dark/assets/text-select-end-active-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-end-active-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-end-active-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-end-active.png b/gtk/src/gtk-4.0/dark/assets/text-select-end-active.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-end-active.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-end-active.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-end-active@2.png b/gtk/src/gtk-4.0/dark/assets/text-select-end-active@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-end-active@2.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-end-active@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-end-dark.png b/gtk/src/gtk-4.0/dark/assets/text-select-end-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-end-dark.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-end-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-end-dark@2.png b/gtk/src/gtk-4.0/dark/assets/text-select-end-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-end-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-end-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-end-hover-dark.png b/gtk/src/gtk-4.0/dark/assets/text-select-end-hover-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-end-hover-dark.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-end-hover-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-end-hover-dark@2.png b/gtk/src/gtk-4.0/dark/assets/text-select-end-hover-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-end-hover-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-end-hover-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-end-hover.png b/gtk/src/gtk-4.0/dark/assets/text-select-end-hover.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-end-hover.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-end-hover.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-end-hover@2.png b/gtk/src/gtk-4.0/dark/assets/text-select-end-hover@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-end-hover@2.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-end-hover@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-end.png b/gtk/src/gtk-4.0/dark/assets/text-select-end.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-end.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-end.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-end@2.png b/gtk/src/gtk-4.0/dark/assets/text-select-end@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-end@2.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-end@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-start-active-dark.png b/gtk/src/gtk-4.0/dark/assets/text-select-start-active-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-start-active-dark.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-start-active-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-start-active-dark@2.png b/gtk/src/gtk-4.0/dark/assets/text-select-start-active-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-start-active-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-start-active-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-start-active.png b/gtk/src/gtk-4.0/dark/assets/text-select-start-active.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-start-active.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-start-active.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-start-active@2.png b/gtk/src/gtk-4.0/dark/assets/text-select-start-active@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-start-active@2.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-start-active@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-start-dark.png b/gtk/src/gtk-4.0/dark/assets/text-select-start-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-start-dark.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-start-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-start-dark@2.png b/gtk/src/gtk-4.0/dark/assets/text-select-start-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-start-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-start-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-start-hover-dark.png b/gtk/src/gtk-4.0/dark/assets/text-select-start-hover-dark.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-start-hover-dark.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-start-hover-dark.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-start-hover-dark@2.png b/gtk/src/gtk-4.0/dark/assets/text-select-start-hover-dark@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-start-hover-dark@2.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-start-hover-dark@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-start-hover.png b/gtk/src/gtk-4.0/dark/assets/text-select-start-hover.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-start-hover.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-start-hover.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-start-hover@2.png b/gtk/src/gtk-4.0/dark/assets/text-select-start-hover@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-start-hover@2.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-start-hover@2.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-start.png b/gtk/src/gtk-4.0/dark/assets/text-select-start.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-start.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-start.png
diff --git a/gtk/src/default/gtk-4.0/assets/text-select-start@2.png b/gtk/src/gtk-4.0/dark/assets/text-select-start@2.png
similarity index 100%
rename from gtk/src/default/gtk-4.0/assets/text-select-start@2.png
rename to gtk/src/gtk-4.0/dark/assets/text-select-start@2.png
diff --git a/gtk/src/default/gtk-4.0/gtk-dark.scss b/gtk/src/gtk-4.0/dark/gtk-dark.scss
similarity index 100%
rename from gtk/src/default/gtk-4.0/gtk-dark.scss
rename to gtk/src/gtk-4.0/dark/gtk-dark.scss
diff --git a/gtk/src/default/gtk-4.0/gtk.scss b/gtk/src/gtk-4.0/dark/gtk.scss
similarity index 100%
rename from gtk/src/default/gtk-4.0/gtk.scss
rename to gtk/src/gtk-4.0/dark/gtk.scss
diff --git a/gtk/src/gtk-4.0/default/README b/gtk/src/gtk-4.0/default/README
new file mode 100644
index 0000000000..f2132f7fb7
--- /dev/null
+++ b/gtk/src/gtk-4.0/default/README
@@ -0,0 +1,45 @@
+Summary
+-------
+
+* To be able to use the latest/adequate version of sass, install sassc
+* meson will regenerate the CSS every time you modify the SCSS files.
+* Note that meson always builds out-of-tree, so the modified css files will
+ appear in your builddir.
+
+Theme variants
+--------------
+
+The Default theme comes in 4 variants: light, dark, hc (highcontrast) and
+hc-dark (highcontrast inverse). The generated CSS files for the variants
+are called Default-$variant.css. For technical reasons, GTK adds one level
+of include wrappers around these, which are called gtk-$variant.css.
+
+How to tweak the theme
+----------------------
+
+Default is a complex theme, so to keep it maintainable it's written and
+processed in SASS. The generated CSS is then transformed into a gresource file
+during gtk build and used at runtime in a non-legible or editable form.
+
+It is very likely your change will happen in the _common.scss file. That's where
+all the widget selectors are defined. Here's a rundown of the "supporting"
+stylesheets, that are unlikely to be the right place for a drive by stylesheet
+fix:
+
+_colors.scss - global color definitions. We keep the number of defined
+ colors to a necessary minimum, most colors are derived
+ from a handful of basics. It covers both the light variant
+ and the dark variant.
+
+_colors-public.scss - SCSS colors exported through gtk to allow for 3rd party
+ apps color mixing.
+
+_drawing.scss - drawing helper mixings/functions to allow easier
+ definition of widget drawing under specific context. This
+ is why Default isn't 15000 LOC.
+
+_common.scss - actual definitions of style for each widget. This is
+ where you are likely to add/remove your changes.
+
+You can read about SASS at http://sass-lang.com/documentation/. Once you make
+your changes to the _common.scss file, GTK will rebuild the CSS files.
diff --git a/gtk/src/gtk-4.0/default/_colors-public.scss b/gtk/src/gtk-4.0/default/_colors-public.scss
new file mode 100644
index 0000000000..2b2260caef
--- /dev/null
+++ b/gtk/src/gtk-4.0/default/_colors-public.scss
@@ -0,0 +1,119 @@
+//apps rely on some named colors to be exported
+/* GTK NAMED COLORS
+ ----------------
+ use responsibly! */
+
+// Sass thinks we're using the colors in the variables as strings and may shoot
+// warning, it's innocuous and can be defeated by using "" + $var
+/*
+widget text/foreground color */
+@define-color theme_fg_color #{"" +$fg_color};
+
+/*
+text color for entries, views and content in general */
+@define-color theme_text_color #{"" +$text_color};
+
+/*
+widget base background color */
+@define-color theme_bg_color #{"" +$bg_color};
+
+/*
+text widgets and the like base background color */
+@define-color theme_base_color #{"" +$base_color};
+
+/*
+base background color of selections */
+@define-color theme_selected_bg_color #{"" +$selected_bg_color};
+
+/*
+text/foreground color of selections */
+@define-color theme_selected_fg_color #{"" +$selected_fg_color};
+
+/*
+base background color of insensitive widgets */
+@define-color insensitive_bg_color #{"" +$insensitive_bg_color};
+
+/*
+text foreground color of insensitive widgets */
+@define-color insensitive_fg_color #{"" +$insensitive_fg_color};
+
+/*
+insensitive text widgets and the like base background color */
+@define-color insensitive_base_color #{"" +$base_color};
+
+/*
+widget text/foreground color on backdrop windows */
+@define-color theme_unfocused_fg_color #{"" +$backdrop_fg_color};
+
+/*
+text color for entries, views and content in general on backdrop windows */
+@define-color theme_unfocused_text_color #{"" +$text_color};
+
+/*
+widget base background color on backdrop windows */
+@define-color theme_unfocused_bg_color #{"" +$backdrop_bg_color};
+
+/*
+text widgets and the like base background color on backdrop windows */
+@define-color theme_unfocused_base_color #{"" +$backdrop_base_color};
+
+/*
+base background color of selections on backdrop windows */
+@define-color theme_unfocused_selected_bg_color #{"" +$selected_bg_color};
+
+/*
+text/foreground color of selections on backdrop windows */
+@define-color theme_unfocused_selected_fg_color #{"" + $selected_fg_color};
+
+/*
+insensitive color on backdrop windows*/
+@define-color unfocused_insensitive_color #{"" + $backdrop_insensitive_color};
+
+/*
+widgets main borders color */
+@define-color borders #{"" +$borders_color};
+
+/*
+widgets main borders color on backdrop windows */
+@define-color unfocused_borders #{"" +$backdrop_borders_color};
+
+/*
+these are pretty self explicative */
+@define-color warning_color #{"" +$warning_color};
+@define-color error_color #{"" +$error_color};
+@define-color success_color #{"" +$success_color};
+//@define-color destructive_color #{$destructive_color}
+
+//WM
+
+$_wm_highlight: if($variant=='light', $top_hilight, // Sass gets mad if this is
+ transparentize(black,1)); // done directly in the
+ // color definition
+
+/*
+these colors are exported for the window manager and shouldn't be used in applications,
+read if you used those and something break with a version upgrade you're on your own... */
+@define-color wm_title hsl(from #{$fg_color} h calc(s * 1.8) calc(l * 1.8));
+@define-color wm_unfocused_title #{$backdrop_fg_color};
+@define-color wm_highlight #{"" + $_wm_highlight};
+@define-color wm_borders_edge #{"" + $borders_edge};
+
+@define-color wm_bg_a hsl(from #{$bg_color} h calc(s * 1.2) calc(l * 1.2));
+@define-color wm_bg_b #{$bg_color};
+
+@define-color wm_shadow rgb(from black r g b / calc(alpha * 0.35));
+@define-color wm_border rgb(from black r g b / calc(alpha * 0.18));
+
+@define-color wm_button_hover_color_a hsl(from #{$bg_color} h calc(s * 1.3) calc(l * 1.3));
+@define-color wm_button_hover_color_b #{$bg_color};
+@define-color wm_button_active_color_a hsl(from #{$bg_color} h calc(s * 0.85) calc(l * 0.85));
+@define-color wm_button_active_color_b hsl(from #{$bg_color} h calc(s * 0.89) calc(l * 0.89));
+@define-color wm_button_active_color_c hsl(from #{$bg_color} h calc(s * 0.9) calc(l * 0.9));
+
+//FIXME this is really an API
+
+/* content view background such as thumbnails view in Photos or Boxes */
+@define-color content_view_bg #{"" + $base_color};
+
+/* Very contrasty background for text views (@theme_text_color foreground) */
+@define-color text_view_bg #{"" + if($variant == 'light', $base_color, darken($base_color,6%))};
diff --git a/gtk/src/gtk-4.0/default/_colors.scss b/gtk/src/gtk-4.0/default/_colors.scss
new file mode 100644
index 0000000000..499cad8afc
--- /dev/null
+++ b/gtk/src/gtk-4.0/default/_colors.scss
@@ -0,0 +1,85 @@
+// When color definition differs for dark and light variant
+// it gets @if ed depending on $variant
+
+@import 'palette';
+
+$base_color: if($variant == 'light', #ffffff, lighten($jet, 6%));
+$text_color: if($variant == 'light', black, white);
+$bg_color: if($variant == 'light', #FAFAFA, lighten($jet, 8%));
+$fg_color: if($variant == 'light', $inkstone, $porcelain);
+
+$selected_fg_color: $accent_fg_color;
+$selected_bg_color: $accent_bg_color;
+$selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 30%));
+$selected_text_bg_color: if($variant == 'light', transparentize($selected_bg_color, 0.7), transparentize($selected_bg_color, 0.2));
+$borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 10%));
+$alt_borders_color: if($variant == 'light', darken($bg_color, 24%), darken($bg_color, 18%));
+$borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
+$link_color: if($variant == 'light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 20%));
+$link_visited_color: if($variant == 'light', darken($selected_bg_color, 20%), lighten($selected_bg_color, 10%));
+$top_hilight: $borders_edge;
+$dark_fill: mix($borders_color, $bg_color, 50%);
+$headerbar_bg_color: if($variant == 'light', lighten($bg_color, 5%), darken($bg_color, 3%));
+$menu_color: if($variant == 'light', $bg_color, lighten($jet, 2%));
+$menu_selected_color: if($variant =='light', darken($bg_color, 6%), lighten($bg_color, 6%)); // Yaru change: use lighter color in dark theme (mimic Libadwaita)
+
+$scrollbar_bg_color: if($variant == 'light', mix($bg_color, $fg_color, 80%), mix($base_color, $bg_color, 50%));
+$scrollbar_slider_color: mix($fg_color, $bg_color, 60%);
+$scrollbar_slider_hover_color: mix($fg_color, $bg_color, 80%);
+$scrollbar_slider_active_color: if($variant=='light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 10%));
+
+$warning_color: $yellow;
+$error_color: $red;
+$success_color: lighten($green, 5%);
+$destructive_color: if($variant == 'light', $red, darken($red, 10%));
+
+$osd_fg_color: #eeeeec;
+$osd_text_color: white;
+$osd_bg_color: transparentize(lighten($jet, 2%),0.025);
+$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
+$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
+$osd_borders_color: transparentize(black, 0.3);
+
+$sidebar_bg_color: mix($bg_color, $base_color, 50%);
+
+$tooltip_borders_color: transparentize(white, 0.9);
+$shadow_color: transparentize(black, 0.9);
+
+$drop_target_color: $success_color;
+
+//insensitive state derived colors
+$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
+$insensitive_bg_color: mix($bg_color, $base_color, 60%);
+$insensitive_borders_color: $borders_color;
+
+//colors for the backdrop state, derived from the main colors.
+$backdrop_base_color: if($variant == 'light', darken($base_color, 1%), lighten($base_color, 3%));
+$backdrop_text_color: if($variant == 'light', transparentize($text_color, 0.31), transparentize(white, 0.45));
+$backdrop_bg_color: if($variant == 'light', $bg_color, lighten($bg_color, 3%));
+$backdrop_fg_color: if($variant == 'light', mix($fg_color, $backdrop_bg_color, 80%), transparentize(white, 0.35));
+$backdrop_insensitive_color: if($variant == 'light', darken($backdrop_bg_color, 15%), lighten($backdrop_bg_color, 15%));
+$backdrop_selected_fg_color: if($variant == 'light', $backdrop_base_color, $backdrop_text_color);
+$backdrop_selected_bg_color: transparentize(desaturate($selected_bg_color,100%),0.5);
+$backdrop_borders_color: mix($borders_color, $bg_color, 80%);
+$backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, 35%);
+
+//special cased widget colors
+$suggested_bg_color: if($accent_bg_color == $orange, if($variant == 'light', lighten($green, 5%), darken($green, 5%)), $accent_bg_color);
+$suggested_border_color: if($variant=='light', darken($suggested_bg_color, 5%), darken($suggested_bg_color, 10%));
+$progress_bg_color: if($variant== 'light', lighten($accent_bg_color, 10%), lighten($accent_bg_color, 5%));
+$progress_border_color: $progress_bg_color;
+$checkradio_bg_color: if($variant=='light', lighten($accent_bg_color, 5%), $accent_bg_color);
+$checkradio_fg_color: $accent_fg_color;
+$checkradio_borders_color: if($variant == 'light', darken($checkradio_bg_color, 10%), darken($checkradio_bg_color, 40%));
+$switch_bg_color: $selected_bg_color;
+$switch_borders_color: if($variant == 'light', darken($checkradio_bg_color, 10%), darken($checkradio_bg_color,40%));
+$focus_border_color: transparentize(lighten($accent_bg_color, 14%), 0.3);
+$alt_focus_border_color: if($variant == 'light', transparentize(white, 0.2), transparentize(white,0.7));
+$dim_label_opacity: 0.55;
+
+// Yaru: Optimize accent-color definition for default background colors
+@import 'sass-utils';
+$contrast_target: if($variant=='light', 6, 5.5);
+$link_color: optimize-contrast($bg_color, $accent_bg_color, $target: $contrast_target);
+$link_visited_color: if($variant=='light', darken($link_color, 10%),
+ optimize-contrast($bg_color, $accent_bg_color));
diff --git a/gtk/src/gtk-4.0/default/_common.scss b/gtk/src/gtk-4.0/default/_common.scss
new file mode 100644
index 0000000000..000e40e07a
--- /dev/null
+++ b/gtk/src/gtk-4.0/default/_common.scss
@@ -0,0 +1,4509 @@
+@function gtkalpha($c,$a) {
+ @return unquote("rgb(from #{$c} r g b / calc(alpha * #{$a}))");
+}
+
+$ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
+$asset_suffix: if($variant=='dark', '-dark', '');
+$assets: if($contrast=='normal', 'assets', 'assets-hc');
+$backdrop_transition: 200ms ease-out;
+$button_transition: all 200ms $ease-out-quad;
+$focus_transition: outline-width 200ms $ease-out-quad, outline-offset 200ms $ease-out-quad;
+$button_radius: 6px; // Yaru change: sync radius with Gtk4
+$menu_radius: 6px; // Yaru change: ↑↑↑
+$window_radius: $button_radius + 6; // Yaru change: ↑↑↑
+$popover_radius: $window_radius; // Yaru change: ↑↑↑
+$menu_margin: $menu_radius; //margin around menuitems & sidebar items
+
+/***************
+ * Base States *
+ ***************/
+.background {
+ color: $fg_color;
+ background-color: $bg_color;
+
+ &:backdrop {
+ text-shadow: none;
+ -gtk-icon-shadow: none;
+ }
+}
+
+dnd {
+ color: $fg-color;
+}
+
+.normal-icons {
+ -gtk-icon-size: 16px;
+}
+
+.large-icons {
+ -gtk-icon-size: 32px;
+}
+
+image:disabled {
+ -gtk-icon-filter: opacity(0.5);
+}
+
+picture:disabled {
+ opacity: 0.5;
+}
+
+.view,
+%view {
+ color: $text_color;
+ background-color: $base_color;
+
+ &:disabled {
+ color: $insensitive_fg_color;
+ background-color: $insensitive_bg_color;
+ }
+
+ &:selected {
+ &:focus, & {
+ @extend %selected_items;
+
+ border-radius: 3px;
+ }
+ }
+}
+
+textview {
+ > text {
+ @extend %view;
+
+ background-color: transparent;
+
+ > selection {
+ background-color: $backdrop_selected_bg_color;
+
+ &:focus-within {
+ background-color: $selected_text_bg_color;
+ }
+ }
+ }
+
+ &:drop(active) {
+ caret-color: $drop_target_color;
+ }
+}
+
+textview > border { background-color: mix($bg_color, $base_color, 50%); }
+
+iconview {
+ @extend .view;
+
+ @include focus-ring();
+
+ @if $contrast == 'high' {
+ &:selected {
+ box-shadow: inset 0 0 0 1px $borders_color;
+ }
+ }
+
+
+ &:drop(active) {
+ box-shadow: none;
+ }
+
+ > dndtarget:drop(active) {
+ border-style: solid;
+ border-width: 1px;
+ border-color: $selected_borders_color;
+ }
+}
+
+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;
+ transition: $focus_transition;
+
+ @include focus-ring();
+
+ &:selected {
+ outline-color: $alt_focus_border_color;
+
+ @extend %selected_items;
+ }
+ }
+}
+
+gridview {
+ > rubberband { @extend rubberband; }
+
+ > child {
+ padding: 3px;
+ transition: $focus_transition;
+
+ @include focus-ring();
+
+ &:selected {
+ outline-color: $alt_focus_border_color;
+
+ @extend %selected_items;
+
+ @if $contrast == 'high' {
+ box-shadow: inset 0 0 0 1px $borders_color;
+ }
+
+ }
+
+ box { //cells
+ border-spacing: 8px; //label separation
+ margin: 12px;
+ }
+ }
+}
+
+coverflow cover {
+ color: $text_color;
+ background-color: $base_color;
+ border: 1px solid black;
+}
+
+label {
+ @include focus-ring();
+
+ &.separator {
+ @extend .dim-label;
+ }
+
+ &:selected { @extend %nobg_selected_items; }
+
+ > selection {
+ background-color: $backdrop_selected_bg_color;
+ color: transparent;
+ &:focus-within {
+ background-color: $selected_text_bg_color;
+ }
+ }
+
+ &:disabled {
+ color: $insensitive_fg_color;
+
+ button & { color: inherit; }
+
+ > selection { @extend %selected_items_disabled; }
+ }
+
+ &.error {
+ color: $error_color;
+ &:disabled { color: transparentize($error_color,0.5); }
+ }
+}
+
+.dim-label {
+ opacity: $dim_label_opacity;
+ text-shadow: none;
+}
+
+window.assistant {
+ .sidebar {
+ padding: $menu-margin;
+ border-top: 1px solid $borders_color;
+ }
+
+ &.csd .sidebar { border-top-style: none; }
+
+ .sidebar > label { padding: 6px 12px; }
+
+ .sidebar > label.highlight {
+ background-color: $menu_selected_color;
+ border-radius: $menu-margin;
+ }
+}
+
+window.aboutdialog image.large-icons {
+ -gtk-icon-size: 128px;
+}
+
+%osd,
+.osd {
+ color: $osd_fg_color;
+ border: none;
+ background-color: $osd_bg_color;
+ background-clip: padding-box;
+ -gtk-icon-shadow: 0 1px black;
+
+}
+
+
+/*********************
+ * Spinner Animation *
+ *********************/
+@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: 240%;
+}
+.title-1 {
+ font-weight: 800;
+ font-size: 200%;
+}
+.title-2 {
+ font-weight: 800;
+ font-size: 150%;
+}
+.title-3 {
+ font-weight: 700;
+ font-size: 150%;
+}
+.title-4 {
+ font-weight: 700;
+ font-size: 130%;
+}
+.heading {
+ font-weight: 700;
+ font-size: 110%;
+}
+.body {
+ font-weight: 400;
+ font-size: 110%;
+}
+.caption-heading {
+ font-weight: 700;
+ font-size: 90%;
+}
+.caption {
+ font-weight: 400;
+ font-size: 90%;
+}
+
+/****************
+ * Text Entries *
+ ****************/
+
+%entry,
+entry {
+ %entry_basic, & {
+ min-height: 32px;
+ padding-left: 8px;
+ padding-right: 8px;
+ border: 1px solid;
+ border-radius: $button_radius;
+ border-spacing: 6px;
+ transition: all 200ms $ease-out-quad;
+
+ @include entry(normal);
+
+ @include focus-ring($focus-state: 'focus-within');
+
+ > image { // icons inside the entry
+ &.left { margin-right: 6px; }
+ &.right { margin-left: 6px; }
+ }
+
+ > text > placeholder {
+ @extend .dim-label;
+ @if $contrast == 'high' { font-style: italic; }
+ }
+
+ > text > block-cursor {
+ @include entry(block_cursor);
+ }
+
+ &.flat {
+ &:focus-within, &:backdrop, &:disabled, &:backdrop:disabled, & {
+ min-height: 0;
+ padding: 2px;
+ background-color: transparent;
+ border-color: transparent;
+ border-radius: 0;
+ }
+ }
+
+ &:focus-within {
+ @include entry(focus);
+ > placeholder {
+ opacity: 0; /* We hide placeholders on focus */
+ }
+ }
+
+ &:disabled { @include entry(insensitive); }
+
+ > text > selection {
+ background-color: $backdrop_selected_bg_color;
+ color: transparent;
+ &:focus-within {
+ background-color: $selected_text_bg_color;
+ color: $fg_color;
+ }
+ }
+
+ // entry error and warning style
+ @each $e_type, $e_color in (error, $error_color),
+ (warning, $warning_color) {
+ &.#{$e_type} {
+ color: $e_color;
+
+ @include focus-ring($focus-state: 'focus-within', $fc: transparentize($e_color, 0.5));
+
+ &:focus-within { @include entry(focus, $e_color); }
+
+ > selection { background-color: $e_color; }
+ }
+ }
+
+ > image { // entry icons colors
+ color: mix($fg_color, $base_color, 80%);
+
+ &:hover { color: $fg_color; }
+
+ &:active { color: $selected_bg_color; }
+
+ }
+
+ &.password image.caps-lock-indicator {
+ color: mix($backdrop_fg_color, $backdrop_base_color, 80%);
+ }
+
+ &:drop(active) {
+ &:focus-within, & {
+ border-color: $drop_target_color;
+ box-shadow: inset 0 0 0 1px $drop_target_color;
+ }
+ }
+
+ .osd & {
+ @include entry(osd);
+
+ &:focus-within { @include entry(osd-focus); }
+
+ &:disabled { @include entry(osd-insensitive); }
+ }
+ }
+
+ > progress {
+ margin-bottom: 2px;
+ }
+
+ > progress > trough {
+ min-height: 2px;
+ }
+
+ > progress > trough > progress {
+ background-color: transparent;
+ background-image: none;
+ border-radius: 0;
+ border-width: 0 0 2px;
+ border-color: $selected_bg_color;
+ border-style: solid;
+ box-shadow: none;
+ }
+
+ // linked entries
+ .linked:not(.vertical) > & { @extend %linked; }
+
+ .linked:not(.vertical) > &:drop(active) + &,
+ .linked:not(.vertical) > &:drop(active) + button,
+ .linked:not(.vertical) > &:drop(active) + menubutton > button,
+ .linked:not(.vertical) > &:drop(active) + dropdown > button,
+ .linked:not(.vertical) > &:drop(active) + colorbutton > button,
+ .linked:not(.vertical) > &:drop(active) + fontbutton > button,
+ .linked:not(.vertical) > &:drop(active) + filechooserbutton > button,
+ .linked:not(.vertical) > &:drop(active) + filechooserbutton > combobox > box > button.combo,
+ .linked:not(.vertical) > &:drop(active) + appchooserbutton > combobox > box > button.combo,
+ .linked:not(.vertical) > &:drop(active) + combobox > box > button.combo { border-left-color: $drop_target_color; }
+
+ // Vertically linked entries
+ // FIXME: take care of "colored" entries
+ .linked.vertical > & {
+ @extend %linked_vertical;
+
+ // brighter border between linked entries
+ &:not(:disabled) + entry:not(:disabled),
+ &:not(:disabled) + %entry:not(:disabled) {
+ border-top-color: mix($borders_color, $base_color, 30%);
+ }
+
+ // brighter border between linked insensitive entries
+ &:disabled + %entry:disabled,
+ &:disabled + entry:disabled { border-top-color: mix($borders_color, $base_color, 30%); }
+
+ + %entry:drop(active):not(:only-child),
+ + entry:drop(active):not(:only-child) { border-top-color: $drop_target_color; }
+
+ &:drop(active):not(:only-child) {
+ + %entry,
+ + entry,
+ + button,
+ + menubutton > button,
+ + dropdown > button,
+ + colorbutton > button,
+ + fontbutton > button,
+ + filechooserbutton > button,
+ + filechooserbutton > combobox > box > button.combo,
+ + appchooserbutton > combobox > box > button.combo,
+ + combobox > box > button.combo { border-top-color: $drop_target_color; }
+ }
+ }
+
+ &.error { color: $error_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);
+
+ > selection {
+ background-color: $backdrop_selected_bg_color;
+ color: transparent;
+ &:focus-within {
+ background-color: $selected_text_bg_color;
+ color: $fg_color;
+ }
+ }
+}
+
+/***********
+ * 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)); }
+}
+
+%button,
+button {
+ @at-root %button_basic, & {
+
+ min-height: 24px;
+ min-width: 16px;
+ padding: 4px 9px;
+ border: 1px solid;
+ border-radius: $button_radius;
+ transition: $button_transition;
+
+ @include button(normal);
+
+ @include focus-ring();
+
+ &:hover {
+ @include button(hover);
+ -gtk-icon-filter: brightness(1.2);
+ }
+
+ &.keyboard-activating,
+ &:active,
+ &:checked {
+ @include button(active);
+
+ transition-duration: 50ms;
+ }
+
+ &:checked:hover { @include button(checked-hover); }
+ &:checked:active { @include button(checked-active); }
+
+ &:backdrop {
+ &.flat, & {
+ @include button(backdrop);
+
+ transition: $backdrop_transition;
+
+ &:not(:disabled) { -gtk-icon-filter: none; }
+
+ &:active,
+ &:checked { @include button(backdrop-active); }
+
+ &:disabled {
+ @include button(backdrop-insensitive);
+
+ &:active,
+ &:checked { @include button(backdrop-insensitive-active); }
+ }
+ }
+ }
+
+ &:disabled {
+ @include button(insensitive);
+ -gtk-icon-filter: opacity(0.5);
+
+ &:active,
+ &:checked { @include button(insensitive-active); }
+ }
+
+ @at-root %button_basic_flat,
+ &.flat {
+ @include button(undecorated);
+ // to avoid adjacent buttons borders clashing when transitioning, the transition on the normal state is set
+ // to none, while it's added back in the hover state, so the button decoration will fade in on hover, but
+ // it won't fade out when the pointer leave the button allocation area. To make the transition more evident
+ // in this case the duration is increased.
+ transition: none;
+
+ &:hover {
+ @include button(undecorated-hover);
+ transition: $button_transition;
+ transition-duration: 500ms;
+ }
+ &.keyboard-activating,
+ &:active,
+ &:checked {
+ @include button(undecorated-active);
+ transition: $button_transition;
+ }
+ &:backdrop, &:disabled, &:backdrop:disabled { @include button(undecorated); }
+ }
+
+ &.image-button {
+ min-width: 24px;
+ padding-left: 5px;
+ padding-right: 5px;
+ }
+
+ &.text-button {
+ padding-left: 16px;
+ padding-right: 16px;
+ }
+
+ &.text-button.image-button {
+ padding-left: 8px;
+ padding-right: 8px;
+
+ label {
+ padding-left: 8px;
+ padding-right: 8px;
+ }
+ }
+
+ &.arrow-button {
+ padding-left: 10px;
+ padding-right: 10px;
+
+ > box {
+ border-spacing: 4px;
+ }
+ }
+
+ @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;
+ }
+ }
+
+ @at-root %button_selected, & {
+ row:selected & {
+ @if $variant == 'light' { border-color: $selected_borders_color; }
+ }
+
+ @at-root %button_selected_flat, &.flat {
+ row:selected & {
+ &:not(:active):not(:checked):not(:hover):not(disabled) {
+ color: $selected_fg_color;
+ border-color: transparent;
+
+ &:backdrop { color: if($variant=='light', $backdrop_base_color, $backdrop_fg_color); }
+ }
+ }
+ }
+ }
+
+
+ // big standalone buttons like in Documents pager
+ &.osd {
+ min-width: 26px;
+ min-height: 32px;
+
+ &.image-button {
+ min-width: 30px;
+ &:only-child {
+ margin: 4px;
+ border-radius: 50%; // completely round when it is a single button
+ box-shadow: 0 1px 2px transparentize(black, 0.8); // drop shadow for the only child
+ };
+ }
+
+ color: $osd_fg_color;
+ border-radius: 5px;
+
+ @include button(osd);
+
+ border: none;
+ box-shadow: none;
+
+ &:hover {
+ @include button(osd-hover);
+
+ border: none;
+ box-shadow: none;
+ }
+
+ &:active,
+ &:checked {
+ @include button(osd-active);
+
+ border: none;
+ box-shadow: none;
+ }
+ }
+
+ //overlay / OSD style
+ @at-root %osd_button,
+ .osd & {
+ @include button(osd);
+
+ &:hover { @include button(osd-hover); }
+
+ &:active,
+ &:checked { &:backdrop, & { @include button(osd-active); }}
+
+ &:disabled { &:backdrop, & { @include button(osd-insensitive); }}
+
+ &.flat {
+ @include button(undecorated);
+
+ box-shadow: none;
+ -gtk-icon-shadow: 0 1px black;
+
+ &:hover { @include button(osd-hover); }
+
+ &:disabled {
+ @include button(osd-insensitive);
+ background-image: none;
+ border-color: transparent;
+ box-shadow: none;
+ }
+
+ &:active,
+ &:checked { @include button(osd-active); }
+ }
+ }
+
+ // Suggested and Destructive Action buttons
+ @each $b_type, $b_color in (suggested-action, $suggested_bg_color), // Yaru change: use suggested bg color
+ (destructive-action, $destructive_color) {
+ &.#{$b_type} {
+ @include button(normal, $b_color, white);
+ @include focus-ring($fc: $alt_focus_border_color);
+
+ &.flat {
+ @include button(undecorated);
+
+ color: $b_color; //FIXME: does it work on the dark variant?
+ }
+
+ &:hover { @include button(hover, $b_color, white); }
+
+ &:active,
+ &:checked { @include button(active, $b_color, white); }
+
+ &.flat {
+ &:disabled {
+ @include button(undecorated);
+
+ color: transparentize($b_color, 0.2);
+ }
+ }
+
+ &:disabled {
+ @include button(insensitive);
+
+ &:active,
+ &:checked { @include button(insensitive-active, $b_color, white); }
+ }
+
+ .osd & {
+ @include button(osd, $b_color);
+
+ &:hover { @include button(osd-hover, $b_color); }
+
+ &:active,
+ &:checked { &:backdrop, & { @include button(osd-active, $b_color); }}
+
+ &:disabled { &:backdrop, & { @include button(osd-insensitive, $b_color); }}
+
+ }
+ }
+ }
+
+ stackswitcher > & {
+ // 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.
+
+ > label {
+ padding: 0 6px;
+ margin: 0 -6px;
+ }
+
+ > image {
+ padding: 3px 6px;
+ margin: -3px -6px;
+ }
+
+ &.needs-attention {
+ > label,
+ > image { @extend %needs_attention; }
+ }
+ }
+
+ // hide separators
+ &.font{
+ separator { background-color: transparent; }
+ > box { border-spacing: 6px; }
+ > box > box > label { font-weight: bold; }
+ }
+
+ .linked:not(.vertical) > & { @extend %linked; }
+
+ .linked.vertical > & { @extend %linked_vertical; }
+
+ menubutton.circular &,
+ &.circular { // force circular button shape
+ min-width: 32px;
+ min-height: 32px;
+ padding: 0;
+ border-radius: 9999px;
+
+ label { padding: 0; }
+ }
+}
+
+%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; }
+ }
+}
+
+
+%linked_not_left {
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0;
+}
+
+%linked_not_right {
+ border-right-style: none;
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+}
+
+// 1st/last child are at text start/end
+%linked {
+ &:dir(ltr) {
+ &:not(:first-child) { @extend %linked_not_left; }
+ &:not(:last-child) { @extend %linked_not_right; }
+ }
+
+ &:dir(rtl) {
+ &:not(:first-child) { @extend %linked_not_right; }
+ &:not(:last-child) { @extend %linked_not_left; }
+ }
+}
+
+%linked_not_top {
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+}
+
+%linked_not_bottom {
+ border-bottom-style: none;
+ border-bottom-left-radius: 0;
+ border-bottom-right-radius: 0;
+}
+
+%linked_vertical {
+ &:not(:first-child) { @extend %linked_not_top; }
+
+ &:not(:last-child) { @extend %linked_not_bottom; }
+}
+
+%undecorated_button {
+ background-color: transparent;
+ background-image: none;
+ border-color: transparent;
+ box-shadow: inset 0 1px transparentize(white, 1),
+ 0 1px transparentize(white, 1);
+ text-shadow: none;
+ -gtk-icon-shadow: none;
+}
+
+.linked:not(.vertical) > menubutton,
+.linked:not(.vertical) > dropdown,
+.linked:not(.vertical) > colorbutton,
+.linked:not(.vertical) > fontbutton,
+.linked:not(.vertical) > filechooserbutton {
+ &:dir(ltr) {
+ &:not(:first-child) > button { @extend %linked_not_left; }
+ &:not(:last-child) > button { @extend %linked_not_right; }
+ }
+
+ &:dir(rtl) {
+ &:not(:first-child) > button { @extend %linked_not_right; }
+ &:not(:last-child) > button { @extend %linked_not_left; }
+ }
+}
+
+.linked.vertical > menubutton,
+.linked.vertical > dropdown,
+.linked.vertical > colorbutton,
+.linked.vertical > fontbutton,
+.linked.vertical > filechooserbutton {
+ &:not(:first-child) > button { @extend %linked_not_top; }
+ &:not(:last-child) > button { @extend %linked_not_bottom; }
+}
+
+/* menu buttons */
+modelbutton.flat {
+ min-height: 26px;
+ padding-left: 5px;
+ padding-right: 5px;
+ border-radius: $button_radius;
+
+ @extend %undecorated_button;
+
+ &:hover { background-color: $menu_selected_color; }
+
+ &:disabled {
+ color: $insensitive_fg_color;
+
+
+ }
+
+ &:selected { @extend %selected_items; }
+}
+
+modelbutton.flat arrow {
+ background: none;
+ min-width: 16px;
+ min-height: 16px;
+ opacity: 0.3; //dim icon
+
+ &:hover { background: none; }
+
+ &.left { -gtk-icon-source: -gtk-icontheme("go-previous-symbolic"); }
+
+ &.right { -gtk-icon-source: -gtk-icontheme("go-next-symbolic"); }
+}
+
+/* oldstyle toolbar buttons */
+
+.toolbar > button,
+.toolbar > :not(.linked) > button,
+.toolbar :not(.linked) > menubutton > button,
+.toolbar :not(.linked) > scalebutton > button,
+.toolbar :not(.linked) > dropdown > button,
+.toolbar :not(.linked) > colorbutton > button,
+.toolbar :not(.linked) > fontbutton > button,
+.toolbar :not(.linked) > appchooserbutton > button,
+.toolbar :not(.linked) > combobox > box > button {
+ margin: 1px;
+
+ @extend %button_basic_flat;
+
+ &:hover { @include button(undecorated-hover, $c:darken($bg_color, 4%)); }
+ &:active,
+ &:checked { @include button(undecorated-active, $c:darken($bg_color, 4%)); }
+}
+
+button.color {
+ padding: 4px;
+
+ > colorswatch:only-child {
+ &, > overlay { border-radius: 0; }
+
+ @if $variant == 'light' {
+ box-shadow: 0 1px $shadow_color;
+
+ .osd & { box-shadow: none; }
+ }
+ }
+
+ @if $variant == 'light' {
+ .osd &, & {
+ &:disabled,
+ &:active,
+ &:checked { colorswatch:only-child { box-shadow: none; }}
+ }
+ }
+}
+
+/* list buttons */
+/* tone down as per new designs, see issue #1473 */
+%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(normal, $b_color, white);
+ @include focus-ring($fc: $alt_focus_border_color);
+ }
+ }
+}
+
+/*********
+ * Links *
+ *********/
+
+%link,
+link {
+ color: $link_color;
+ text-decoration: underline;
+
+ &:visited {
+ color: $link_visited_color;
+
+ *:selected & { color: mix($selected_fg_color, $link_visited_color, 60%); }
+ }
+
+ &:hover {
+ $_fg: lighten($link_color, 10%);
+ color: $_fg;
+
+ *:selected & { color: mix($selected_fg_color, $_fg, 90%); }
+ }
+
+ &:active {
+ color: $link_color;
+
+ *:selected & { color: mix($selected_fg_color, $link_color, 80%); }
+ }
+
+ &:disabled { color: transparentize(desaturate($link_color, 100%), 0.2); }
+
+ @at-root %link_selected,
+ &:selected,
+ *:selected & { color: mix($selected_fg_color, $link_color, 80%); }
+}
+
+link {
+ @include focus-ring();
+}
+
+button.link {
+ @extend %link;
+
+ &,
+ &:hover,
+ &:active,
+ &:checked {
+ @extend %undecorated_button;
+
+ text-shadow: none;
+ }
+
+ > label {
+ text-decoration: underline;
+ }
+}
+
+
+/*****************
+ * GtkSpinButton *
+ *****************/
+spinbutton {
+ &:not(.vertical) {
+ // in this horizontal configuration, the whole spinbutton
+ // behaves as the entry, so we extend the entry styling
+ // and nuke the style on the internal entry
+ @extend %entry;
+
+ padding: 0;
+ border-spacing: 0;
+
+ %spinbutton_horz_entry {
+ min-width: 28px;
+ // reset all the other props since the spinbutton node is styled here
+ margin: 0;
+ background: none;
+ background-color: transparent;
+ border: none;
+ border-radius: 0;
+ box-shadow: none;
+ padding: 6px;
+
+ &:backdrop:disabled { background-color: transparent; }
+ }
+
+ > text {
+ @extend %spinbutton_horz_entry;
+ }
+
+ /* :not here just to bump specificity above that of the list button styling */
+ > button.image-button.up:not(.flat),
+ > button.image-button.down:not(.flat) {
+ min-height: 16px;
+ margin: 0;
+ padding-bottom: 0;
+ padding-top: 0;
+ color: mix($fg_color, $base_color, 90%);
+ background-image: none;
+ border-style: none none none solid;
+ border-color: transparentize($borders_color, 0.7);
+ border-radius: 0;
+ box-shadow: none;
+
+ &:dir(rtl) { border-style: none solid none none; }
+
+ &:hover {
+ color: $fg_color;
+ background-color: darken($bg_color,5%);
+ }
+
+ &:disabled {
+ color: transparentize($insensitive_fg_color, 0.7);
+ background-color: transparent;
+ }
+
+ &:active {
+ background-color: transparentize(black, 0.9);
+ box-shadow: inset 0 2px 3px -1px transparentize(black, 0.8);
+ }
+
+ &:dir(ltr):last-child { border-radius: 0 $button_radius $button_radius 0; }
+
+ &:dir(rtl):first-child { border-radius: $button_radius 0 0 $button_radius; }
+ }
+ }
+
+ // OSD horizontal
+ .osd &:not(.vertical) {
+ > text {
+ @extend %spinbutton_horz_entry;
+ }
+
+ > button.image-button.up:not(.flat),
+ > button.image-button.down:not(.flat) {
+ @include button(undecorated);
+
+ color: $osd_fg_color;
+ border-style: none none none solid;
+ border-color: transparentize($osd_borders_color, 0.3);
+ border-radius: 0;
+ box-shadow: none;
+ -gtk-icon-shadow: 0 1px black;
+
+ &:dir(rtl) { border-style: none solid none none; }
+
+ &:hover {
+ @include button(undecorated);
+
+ color: $osd_fg_color;
+ border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
+ background-color: darken($osd_bg_color,10%);
+ -gtk-icon-shadow: 0 1px black;
+ box-shadow: none;
+ }
+
+ &:disabled {
+ @include button(undecorated);
+
+ color: $osd_insensitive_fg_color;
+ border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
+ -gtk-icon-shadow: none;
+ box-shadow: none;
+ }
+
+ &:dir(ltr):last-child { border-radius: 0 $button_radius $button_radius 0; }
+
+ &:dir(rtl):first-child { border-radius: $button_radius 0 0 $button_radius; }
+ }
+ }
+
+ // Vertical
+ &.vertical {
+ // in the vertical configuration, we treat the spinbutton
+ // as a box, and tweak the style of the entry in the middle
+ // so that it's linked
+
+ // FIXME: this should not be set at all, but otherwise it gets the wrong
+ // color
+ &:disabled { color: $insensitive_fg_color; }
+
+ &:drop(active) {
+ border-color: transparent;
+ box-shadow: none;
+ }
+
+ > text {
+ @extend %entry;
+
+ min-height: 32px;
+ min-width: 32px;
+ padding: 0;
+ border-radius: 0;
+
+ > selection {
+ background-color: $backdrop_selected_bg_color;
+ color: transparent;
+ &:focus-within {
+ background-color: $selected_text_bg_color;
+ color: $fg_color;
+ }
+ }
+ > block-cursor { @include entry(block_cursor); }
+ }
+
+ > button {
+ min-height: 32px;
+ min-width: 32px;
+ padding: 0;
+
+ &.up { @extend %top_button; }
+
+ &.down { @extend %bottom_button; }
+ }
+
+ %top_button {
+ border-bottom-style: none;
+ border-bottom-left-radius: 0;
+ border-bottom-right-radius: 0;
+ }
+
+ %bottom_button {
+ border-top-style: none;
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+ }
+ }
+
+ // OSD vertical
+ .osd &.vertical > button:first-child {
+ @include button(osd);
+
+ &:hover { @include button(osd-hover);}
+
+ &:active { @include button(osd-active); }
+
+ &:disabled { @include button(osd-insensitive); }
+ }
+
+ // Misc
+ treeview &:not(.vertical) {
+ min-height: 0;
+ border-style: none;
+ border-radius: 0;
+
+ > text {
+ min-height: 0;
+ padding: 1px 2px;
+ }
+ }
+
+ font-feature-settings: "tnum";
+}
+
+
+/**************
+ * ComboBoxes *
+ **************/
+dropdown > popover.menu.background > contents { padding: 0; } //allow search entries with no margin
+
+dropdown > button > box {
+ border-spacing: 6px;
+
+ > stack > row.activatable:hover {
+ background: none;
+ box-shadow: none;
+ }
+}
+
+dropdown,
+combobox {
+ arrow {
+ -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
+ min-height: 16px;
+ min-width: 16px;
+ }
+
+ // align menu labels with the button label
+ > popover.menu > contents modelbutton {
+ padding-left: 9px;
+ padding-right: 9px;
+ }
+
+ &.linked {
+ button:nth-child(2) {
+ &:dir(ltr) { @extend %linked_not_left; }
+ &:dir(rtl) { @extend %linked_not_right; }
+ }
+ }
+
+ &:drop(active) { // FIXME: untested
+ box-shadow: none;
+
+ button.combo { @extend %button_basic_drop_active; }
+ }
+
+ // newstyle
+ popover {
+ margin-top: 6px;
+ padding: 0;
+
+ listview {
+
+ margin: 8px;
+
+ > row.activatable {
+ padding: 8px;
+
+ &:selected {
+ &, &:hover {
+ outline-color: $alt_focus_border_color;
+ color: $text-color;
+ background-color: $menu_selected_color;
+ box-shadow: none;
+ border-radius: $button_radius;
+ }
+ }
+ }
+ }
+
+ // drodowns with searchboxes on top
+ .dropdown-searchbar {
+ padding: 6px;
+ border-bottom: 1px solid $borders_color;
+ }
+ }
+}
+
+
+// the combo is a composite widget so the way we do button linking doesn't
+// work, special case needed. See
+// https://bugzilla.gnome.org/show_bug.cgi?id=733979
+
+.linked:not(.vertical) > filechooserbutton > combobox,
+.linked:not(.vertical) > appchooserbutton > combobox,
+.linked:not(.vertical) > combobox {
+ &:dir(ltr) {
+ &:not(:first-child) > box > button.combo { @extend %linked_not_left; }
+ &:not(:last-child) > box > button.combo { @extend %linked_not_right; }
+ }
+
+ &:dir(rtl) {
+ &:not(:first-child) > box > button.combo { @extend %linked_not_right; }
+ &:not(:last-child) > box > button.combo { @extend %linked_not_left; }
+ }
+}
+
+.linked.vertical > filechooserbutton > combobox,
+.linked.vertical > appchooserbutton > combobox,
+.linked.vertical > combobox {
+ &:not(:first-child) > box > button.combo { @extend %linked_not_top; }
+ &:not(:last-child) > box > button.combo { @extend %linked_not_bottom; }
+}
+
+
+/************
+ * Toolbars *
+ ************/
+%toolbar {
+ padding: 4px;
+ border-spacing: 4px;
+ background-color: $bg_color;
+}
+
+.toolbar {
+ @extend %toolbar;
+
+ // on OSD
+ .osd & { background-color: transparent; }
+
+ // stand-alone OSD toolbars
+ &.osd {
+ padding: 13px;
+ border: none;
+ border-radius: 5px;
+ background-color: $osd_bg_color;
+
+ &.left,
+ &.right,
+ &.top,
+ &.bottom { border-radius: 0; } // positional classes for `attached` osd toolbars
+ }
+
+ // toolbar separators
+ &.horizontal > separator { margin: 4px 0; }
+ &.vertical > separator { margin: 0 4px; }
+}
+
+//searchbar & location-bar
+searchbar > revealer > box {
+ padding: 6px;
+ border-spacing: 6px;
+ @extend %toolbar;
+
+ @extend %darkbar;
+
+ border-width: 0 0 1px;
+}
+
+%darkbar {
+ border-style: solid;
+ border-color: $borders_color;
+ $_bg: mix($bg_color, $borders_color, 70%);
+ background-color: $_bg;
+
+ &:backdrop {
+ border-color: $backdrop_borders_color;
+ background-color: $backdrop_dark_fill;
+ box-shadow: none;
+ transition: $backdrop_transition;
+ }
+}
+
+/**************
+ * GtkInfoBar *
+ **************/
+infobar {
+ > revealer > box {
+ padding: 8px;
+ border-spacing: 12px;
+ }
+
+ &.action:hover > revealer > box {
+ background-color: if($variant == 'light', desaturate(lighten(invert($selected_bg_color), 47%), 30%),
+ desaturate(darken(invert($selected_bg_color), 42%), 70%));
+ }
+
+ &.info,
+ &.question,
+ &.warning,
+ &.error {
+ > revealer > box {
+ border-bottom: 1px solid lighten($borders_color, 5%);
+ background-color: if($variant == 'light', desaturate(lighten(invert($selected_bg_color), 45%), 30%),
+ desaturate(darken(invert($selected_bg_color), 40%), 70%));
+ }
+ }
+}
+
+ //close button for info and searchbar (#3215)
+
+ infobar .close,
+ searchbar .close {
+ @include button(undecorated);
+ min-width: 16px;
+ min-height: 16px;
+ padding: 4px;
+ border-radius: 50%;
+
+ &:hover { @include button(hover); }
+ }
+
+
+/*****************
+ * Title buttons *
+ *****************/
+
+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 {
+ @extend %button_basic_flat;
+
+ box-shadow: none;
+ border: none;
+ min-width: 34px;
+ padding: 0;
+
+ > image {
+ border-radius: 9999px;
+ min-height: 30px;
+ min-width: 30px;
+ }
+ &:hover > image {
+ //special case hover colors inside a headerbar
+ @include button(undecorated-hover,$c:darken($headerbar_bg_color,6%));
+ }
+ &:active > image,
+ &:checked > image { @include button(undecorated-active,$c:darken($headerbar_bg_color,10%)); }
+
+ &:hover,
+ &:active,
+ &:checked {
+ background: none;
+ }
+ }
+}
+
+
+/***************
+ * Header bars *
+ ***************/
+%titlebar,
+headerbar {
+ padding: 0 6px;
+ min-height: 46px;
+ border-width: 0 0 1px;
+ border-style: solid;
+ border-color: $alt_borders_color;
+ border-radius: 0;
+
+ @include headerbar_fill(if($variant == 'light', darken($bg_color, 6%), darken($bg_color, 10%))); // Yaru change: sync light headerbar bg color with Libadwaita (a bit lighten)
+
+ &:backdrop {
+ border-color: $backdrop_borders_color;
+ background-color: $bg_color;
+ background-image: none;
+
+ transition: $backdrop_transition;
+
+ .title { filter: opacity(.5); }
+ }
+
+ .title {
+ padding-left: 12px;
+ padding-right: 12px;
+ font-weight: bold;
+ }
+
+ .subtitle {
+ font-size: smaller;
+ padding-left: 12px;
+ padding-right: 12px;
+
+ @extend .dim-label;
+ }
+
+ /* Darken switchbuttons for headerbars. issue #1588 */
+ stackswitcher > button:checked,
+ button.toggle:checked {
+
+ background: if($variant == 'light', image(darken($bg_color, 17%)), image(darken($bg_color, 9%)));
+ border-color: darken($borders_color, 6%); // Yaru change: with our button styling we do not want a stronger bottom border
+ // border-top-color: darken($borders_color, 8%);
+ &:backdrop {
+ @include button(backdrop-active);
+ }
+ }
+
+ // squared corners when the window is maximized, tiled, or fullscreen
+ .tiled &,
+ .tiled-top &,
+ .tiled-left &,
+ .tiled-right &,
+ .tiled-bottom &,
+ .maximized &,
+ .fullscreen & {
+ &:backdrop, & {
+ border-radius: 0;
+ }
+ }
+
+ &.default-decoration {
+ min-height: 28px;
+ padding: 4px;
+
+ windowcontrols {
+ button,
+ menubutton {
+ min-height: 26px;
+ min-width: 26px;
+ margin: 0;
+ padding: 0;
+ }
+
+ menubutton button {
+ min-height: 20px;
+ min-width: 20px;
+ margin: 0;
+ padding: 4px;
+ }
+ }
+ }
+
+ .solid-csd & {
+ &:backdrop, & {
+ &:dir(rtl), &:dir(ltr) { // specificity bump
+ margin-left: -1px;
+ margin-right: -1px;
+ margin-top: -1px;
+ border-radius: 0;
+ box-shadow: none;
+ }
+ }
+ }
+}
+
+headerbar {
+ > windowhandle > box {
+ &,
+ > box.start,
+ > box.end {
+ border-spacing: 6px;
+ }
+ }
+
+ // add vertical margins to common widget on the headerbar to avoid them spanning the whole height
+ entry,
+ spinbutton,
+ separator:not(.sidebar),
+ button,
+ menubutton {
+ margin-top: 6px;
+ margin-bottom: 6px;
+ }
+
+ windowcontrols {
+ > button {
+ margin: 0;
+ }
+
+ &.start {
+ margin-left: -6px;
+
+ > button:first-child {
+ padding-left: 6px;
+ }
+ }
+ &.end {
+ margin-right: -6px;
+
+ > button:last-child {
+ padding-right: 6px;
+ }
+ }
+ }
+
+ // Reset margins for buttons inside menubutton
+ menubutton > button {
+ margin-top: 0px;
+ margin-bottom: 0px;
+ }
+
+ switch {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ }
+}
+
+
+.titlebar:not(headerbar) {
+ window.csd > & {
+ // in csd we assume every titlebar is a headerbar so reset anything, this is needed for split toolbars cases
+ padding: 0;
+ background-color: transparent;
+ background-image: none;
+ border-style: none;
+ border-color: transparent;
+ }
+
+ separator { background-color: $borders_color; } // FIXME: use darker border?
+
+ @extend %titlebar;
+}
+
+// Development versions of apps to use a differently styled headerbar
+
+window.devel {
+ headerbar.titlebar {
+ $c: darken($bg_color, 10%);
+ $gradient: cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat,
+ linear-gradient(to right, transparent 65%, transparentize($selected_bg_color, 0.8)),
+ linear-gradient(to top, darken($c, 3%), $c 3px, lighten($c, 6%));
+ @if $variant == 'dark' {
+ $gradient: cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat,
+ linear-gradient(to right, transparent 65%, transparentize($selected_bg_color, 0.9)),
+ linear-gradient(to top, lighten($c, 3%) 3px, lighten($c, 5%));
+ }
+
+ background: $bg_color $gradient;
+
+ &:backdrop {
+ background: $bg_color cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat,
+ image($bg_color); /* background-color would flash */
+ }
+ }
+}
+
+/************
+ * Pathbars *
+ ************/
+
+pathbar scrolledwindow undershoot.left {
+ border-left: solid 1px $borders_color;
+}
+
+pathbar scrolledwindow undershoot.right {
+ border-right: solid 1px $borders_color;
+}
+
+pathbar button {
+ &.text-button, &.image-button, & {
+ padding-left: 4px;
+ padding-right: 4px;
+ }
+
+ &.text-button.image-button label {
+ padding-left: 0;
+ padding-right: 0;
+ }
+
+ &.text-button.image-button, & {
+ label:last-child { padding-right: 8px; }
+ label:first-child { padding-left: 8px; }
+ }
+
+ image {
+ padding-left: 4px;
+ padding-right: 4px;
+ }
+
+ &.slider-button {
+ padding-left: 0;
+ padding-right: 0;
+ }
+}
+
+
+/**************
+ * Tree Views *
+ **************/
+
+$_treeview_borders_color: if($variant=='light',mix($borders_color, $base_color,80%),mix($fg_color, $base_color, 20%));
+$_treeview_backdrop_borders_color: if($variant=='light',mix($backdrop_borders_color, $base_color, 80%),mix($backdrop_fg_color, $base_color, 20%));
+columnview.view,
+treeview.view {
+ border-left-color: $_treeview_borders_color; // this is actually the tree lines color,
+ border-top-color: $_treeview_borders_color; // while this is the grid lines color, better then nothing
+
+ @include focus-ring();
+
+ > rubberband { @extend rubberband; } // to avoid borders being overridden by the previously set props
+
+ &:selected {
+ &:focus, & {
+ border-radius: 0;
+ outline-color: $alt_focus_border_color;
+
+ @extend %selected_items;
+ }
+ }
+
+ &:disabled {
+ color: $insensitive_fg_color;
+
+ &:selected {
+ color: mix($selected_fg_color, $selected_bg_color, 40%);
+ &:backdrop { color: mix($backdrop_selected_fg_color, $selected_bg_color, 30%); }
+ }
+ }
+
+ &.separator {
+ min-height: 2px;
+ color: $_treeview_borders_color;
+ }
+
+ &:backdrop {
+ border-left-color: $_treeview_backdrop_borders_color;
+ border-top: $_treeview_backdrop_borders_color;
+ }
+
+ &:drop(active) {
+ box-shadow: 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 {
+ // GtkTreeView uses the larger of the expander’s min-width and min-height
+ 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'); }
+
+ color: mix($text_color, $base_color, 70%);
+
+ &:hover { color: $text_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 { // progress bar in treeviews
+ @if $variant == light { color: $base_color; }
+
+ background-color: $selected_bg_color;
+ background-image: image($selected_bg_color);
+ box-shadow: none;
+
+ &:selected {
+ &:focus, & {
+
+ @if $variant == 'light' {
+ color: $selected_bg_color;
+
+ }
+
+ @else { box-shadow: inset 0 1px transparentize(white, 0.95); }
+
+ background-image: image($base_color);
+
+ &:backdrop {
+ @if $variant == 'light' {
+ color: $selected_bg_color;
+ }
+ background-color: $backdrop_base_color;
+ }
+ }
+ }
+ }
+
+ &.trough { // progress bar trough in treeviews
+ background-color: transparentize($fg_color,0.9);
+
+ &:selected {
+ &:focus, & {
+ background-color: if($variant == 'light',
+ transparentize($selected_fg_color, 0.7),
+ darken($selected_bg_color, 10%));
+
+ }
+ }
+ }
+
+ > header {
+ > button {
+ $_column_header_color: mix($fg_color, $base_color, 50%);
+
+ @extend %column_header_button;
+
+ color: $_column_header_color;
+ background-color: $base_color;
+ font-weight: bold;
+ text-shadow: none;
+ box-shadow: none;
+
+ &:hover {
+ @extend %column_header_button;
+
+ color: mix($_column_header_color, $fg_color, 50%);
+ box-shadow: none;
+ transition: none; //I shouldn't need this
+ }
+
+ &:active {
+ @extend %column_header_button;
+
+ color: $fg_color;
+ transition: none; //I shouldn't need this
+ }
+ sort-indicator {
+ &.ascending {
+ -gtk-icon-source: -gtk-icontheme('pan-up-symbolic');
+ }
+ &.descending {
+ -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
+ }
+
+ min-height: 16px;
+ min-width: 16px;
+ }
+ }
+ }
+
+ button.dnd,
+ header.button.dnd { // for treeview-like derive widgets
+ &:active, &:selected, &:hover, & {
+ padding: 0 6px;
+ color: $base_color;
+ background-image: none;
+ background-color: $selected_bg_color;
+ border-style: none;
+ border-radius: 0;
+ box-shadow: inset 0 0 0 1px $base_color;
+ text-shadow: none;
+ transition: none;
+ }
+ }
+
+ acceleditor > label { background-color: $selected_bg_color; } // see tests/testaccel to test
+}
+
+%column_header_button {
+ padding: 0 6px;
+ background-image: none;
+ border-style: none none solid solid;
+ border-color: $_treeview_borders_color;
+ border-radius: 0;
+ text-shadow: none;
+
+ &:disabled {
+ border-color: $bg_color;
+ background-image: none;
+ }
+
+ &:last-child { &:backdrop, & { border-right-style: none; }}
+}
+
+/***************
+ * Popovers *
+ ***************/
+
+popover.background {
+ background-color: transparent;
+ font: initial; // Decouple the font of popovers from their entry/textview
+
+ > arrow,
+ > contents {
+ $_popover_border: if($variant=='light', transparentize(black, 0.77), transparentize(black, 0.25));
+
+ background-color: $menu_color;
+ background-clip: padding-box;
+ border: 1px solid $_popover_border;
+ box-shadow: 0 1px 2px transparentize(black, 0.7);
+ }
+
+ &:backdrop {
+ background-color: transparent;
+ }
+
+ > contents {
+ padding: 8px;
+ border-radius: $popover_radius;
+
+ > list,
+ > .view,
+ > .toolbar {
+ border-style: none;
+ background-color: transparent;
+ }
+
+ separator {
+ background-color: mix($bg_color, $borders_color, 30%);
+ margin: 3px;
+ }
+
+ list separator { margin: 0; }
+ }
+
+ .osd &,
+ &.touch-selection,
+ &.magnifier {
+ background-color: transparent;
+
+ > arrow,
+ > contents {
+ @extend %osd;
+
+ border: 1px solid transparentize(white, 0.9);
+ box-shadow: none;
+ }
+ }
+
+ &.touch-selection,
+ &.magnifier {
+ button { @extend %osd_button; }
+ }
+}
+
+magnifier {
+ background-color: $base_color;
+}
+
+/**********************
+ * Popover Base Menus *
+ **********************/
+
+$_menu-padding: 12px; //inner menuitem padding
+//global $menu-margin for outside menuitems
+
+popover.menu {
+ padding: 0;
+
+ box.inline-buttons {
+ padding: 0 $_menu-padding;
+
+ button.image-button.model {
+ @include button(undecorated);
+
+ min-height: 30px;
+ min-width: 30px;
+ padding: 0;
+ border: none;
+ outline: none;
+ transition: none;
+
+ &:selected {
+ background: image($menu_selected_color);
+
+ @if $contrast == 'high' {
+ box-shadow: inset 0 0 0 1px $borders_color;
+ }
+ }
+ }
+ }
+
+ box.circular-buttons {
+ padding: $_menu-padding $_menu-padding 6px;
+
+ button.circular.image-button.model {
+ @extend %list_button;
+
+ padding: 11px;
+ &:focus {
+ background-color: $menu_selected_color;
+ border-color: $menu_selected_color;
+ }
+ }
+ }
+
+ & > arrow,
+ &.background > contents {
+ background-color: $menu_color;
+ padding: $menu-margin;
+ }
+
+ &.background separator {
+ margin: 6px 0;
+ }
+
+ accelerator {
+ color: gtkalpha(currentColor,0.55);
+
+ &:dir(ltr) { margin-left: $_menu-padding; }
+ &:dir(rtl) { margin-right: $_menu-padding; }
+ }
+
+ check,
+ radio {
+ @include check('menu', 'transparent', $text_color);
+
+ &:hover { @include check('menu-active', 'transparent', $text_color); }
+ &:active { @include check('menu-active', 'transparent', $text_color); }
+ }
+
+ //only menu radios have a border
+ radio { border-color: $borders_color;
+ &:active { border-color: transparentize($borders_color,0.5); }
+ }
+
+ 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: 30px;
+ min-width: 40px;
+ padding: 0 $_menu-padding;
+ border-radius: $menu-margin;
+
+ &:selected {
+ color: $text-color;
+ background-color: $menu_selected_color;
+ }
+ &:selected:active {
+ //@extend %selected_items;
+ //color: $selected_fg_color;
+ background-color: darken($bg_color,14%); // matching buttons
+ }
+ }
+
+ label.title {
+ font-weight: bold;
+ padding: 4px ($_menu-padding + 20px); //this will fall apart with font sizing
+ }
+}
+
+// initial styling for popover menu and bar
+menubar {
+ padding: 0px;
+ box-shadow: inset 0 -1px transparentize(black, 0.9);
+
+ > item {
+ min-height: 16px;
+ padding: 4px 8px;
+
+ &:selected { //Seems like it :hover even with keyboard focus
+ box-shadow: inset 0 -3px $selected_bg_color;
+ color: $link_color;
+ }
+
+ &:disabled {
+ color: $insensitive_fg_color;
+ box-shadow: none;
+ }
+ }
+
+ & > item popover.menu.background > contents {
+ padding: $menu-margin;
+ }
+ //nested submenus
+ & > item popover.menu popover.menu {
+ padding: 0 0 4px 0;
+ }
+ & > item popover.menu.background popover.menu.background > contents {
+ margin: 0;
+ border-radius: $popover_radius; //including top
+ }
+}
+
+
+/*************
+ * Notebooks *
+ *************/
+notebook {
+ @include focus-ring("> header > tabs > tab:checked", $offset: -2px, $focus-state: 'focus:focus-visible');
+
+ > header {
+ padding: 1px;
+ border-color: $borders_color;
+ border-width: 1px;
+ background-color: $dark_fill;
+
+ > tabs { margin: -1px; }
+
+ &.top {
+ border-bottom-style: solid;
+ > tabs {
+ margin-bottom: -2px;
+ > tab {
+ &:hover { box-shadow: inset 0 -3px $borders_color; } // Yaru change: 4px underlines are too much
+
+
+ &:checked { box-shadow: inset 0 -3px $selected_bg_color; } // Yaru change: 4px underlines are too much
+ }
+ }
+ }
+
+ &.bottom {
+ border-top-style: solid;
+ > tabs {
+ margin-top: -2px;
+ > tab {
+ &:hover { box-shadow: inset 0 3px $borders_color; } // Yaru change: 4px underlines are too much
+
+ &:checked { box-shadow: inset 0 3px $selected_bg_color; } // Yaru change: 4px underlines are too much
+ }
+ }
+ }
+
+ &.left {
+ border-right-style: solid;
+ > tabs {
+ margin-right: -2px;
+ > tab {
+ &:hover { box-shadow: inset -3px 0 $borders_color; } // Yaru change: 4px underlines are too much
+
+ &:checked { box-shadow: inset -3px 0 $selected_bg_color; } // Yaru change: 4px underlines are too much
+ }
+ }
+ }
+
+ &.right {
+ border-left-style: solid;
+ > tabs {
+ margin-left: -2px;
+ > tab {
+ &:hover { box-shadow: inset 3px 0 $borders_color; } // Yaru change: 4px underlines are too much
+
+ &:checked { box-shadow: inset 3px 0 $selected_bg_color; } // Yaru change: 4px underlines are too much
+ }
+ }
+ }
+
+ &.top > tabs > arrow {
+ @extend %notebook_vert_arrows;
+
+ border-top-style: none;
+ }
+
+ &.bottom > tabs > arrow {
+ @extend %notebook_vert_arrows;
+
+ border-bottom-style: none;
+ }
+
+ @at-root %notebook_vert_arrows {
+ margin-left: -5px;
+ margin-right: -5px;
+ padding-left: 4px;
+ padding-right: 4px;
+
+ &.down { -gtk-icon-source: -gtk-icontheme('pan-start-symbolic'); }
+
+ &.up { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); }
+ }
+
+ &.left > tabs > arrow {
+ @extend %notebook_horz_arrows;
+
+ border-left-style: none;
+ }
+
+ &.right > tabs > arrow {
+ @extend %notebook_horz_arrows;
+
+ border-right-style: none;
+ }
+
+ @at-root %notebook_horz_arrows {
+ margin-top: -5px;
+ margin-bottom: -5px;
+ padding-top: 4px;
+ padding-bottom: 4px;
+
+ &.down { -gtk-icon-source: -gtk-icontheme('pan-up-symbolic'); }
+
+ &.up { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); }
+ }
+
+ > tabs > arrow {
+ @extend %button_basic;
+
+ @extend %button_basic_flat;
+
+ min-height: 16px;
+ min-width: 16px;
+ border-radius: 0;
+
+ &:hover:not(:active):not(:backdrop) {
+ background-clip: padding-box;
+ background-image: none;
+ background-color: transparentize(white, 0.7);
+ border-color: transparent;
+ box-shadow: none;
+ }
+
+ &:disabled { @include button(undecorated); }
+ }
+
+ > tabs > tab {
+ transition: $focus_transition;
+ min-height: 30px;
+ min-width: 30px;
+ padding: 3px 12px;
+
+ color: $fg_color;
+ font-weight: normal;
+
+ border-width: 1px; // for reorderable tabs
+ border-color: transparent; //
+
+ &:hover {
+ color: $fg_color;
+ background-color: darken($dark_fill,4%);
+
+ &.reorderable-page {
+ border-color: transparentize($borders_color, 0.7);
+ background-color: transparentize($bg_color, 0.8);
+ }
+ }
+
+ &:not(:checked) {
+ outline-color: transparent;
+ }
+
+ &:checked {
+ color: $fg_color;
+ &.reorderable-page {
+ border-color: transparentize($borders_color, 0.5);
+ background-color: transparentize($bg_color, 0.5);
+
+ &:hover { background-color: transparentize($bg_color, 0.3); }
+ }
+ }
+
+ // colors the button like the label, overridden otherwise
+ button.flat {
+ color: gtkalpha(currentColor, 0.3);
+ &:hover { color: currentColor; }
+
+ padding: 0;
+ margin-top: 4px;
+ margin-bottom: 4px;
+ // FIXME: generalize .small-button?
+ min-width: 20px;
+ min-height: 20px;
+
+ &:last-child {
+ margin-left: 4px;
+ margin-right: -4px;
+ }
+
+ &:first-child {
+ margin-left: -4px;
+ margin-right: 4px;
+ }
+ }
+ }
+
+ &.top,
+ &.bottom {
+ > tabs {
+ padding-left: 4px;
+ padding-right: 4px;
+
+ &:not(:only-child) {
+ margin-left: 3px;
+ margin-right: 3px;
+
+ &:first-child { margin-left: -1px; }
+ &:last-child { margin-right: -1px; }
+ }
+
+ > tab {
+ margin-left: 4px;
+ margin-right: 4px;
+
+ &.reorderable-page { border-style: none solid; }
+ }
+ }
+ }
+
+ &.left,
+ &.right {
+ > tabs {
+ padding-top: 4px;
+ padding-bottom: 4px;
+
+ &:not(:only-child) {
+ margin-top: 3px;
+ margin-bottom: 3px;
+
+ &:first-child { margin-top: -1px; }
+ &:last-child { margin-bottom: -1px; }
+ }
+
+ > tab {
+ margin-top: 4px;
+ margin-bottom: 4px;
+
+ &.reorderable-page { border-style: solid none; }
+ }
+ }
+ }
+
+ &.top > tabs > tab { padding-bottom: 4px; }
+ &.bottom > tabs > tab { padding-top: 4px; }
+ }
+
+ > stack:not(:only-child) { // the :not(:only-child) is for "hidden" notebooks
+ background-color: $base_color;
+ }
+}
+
+
+/**************
+ * Scrollbars *
+ **************/
+
+scrollbar {
+ $_slider_min_length: 40px;
+ $_slider_width: 8px;
+ $_scrollbar_transition: all 300ms $ease-out-quad;
+ $_fine-tune_slider_border: $_slider_width - 3; //#3672
+
+ background-color: $scrollbar_bg_color;
+ transition: $_scrollbar_transition;
+
+ // 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; }
+
+ > range > trough > slider {
+ min-width: $_slider_width;
+ min-height: $_slider_width;
+ margin: -1px;
+ border: 4px solid transparent;
+ border-radius: 10px;
+ background-clip: padding-box;
+ background-color: $scrollbar_slider_color;
+ transition: $_scrollbar_transition;
+
+ &:hover { background-color: $scrollbar_slider_hover_color; }
+
+ &:hover:active { background-color: $scrollbar_slider_active_color; }
+
+ &:disabled { background-color: transparent; }
+ }
+
+ > range.fine-tune {
+ > trough > slider {
+ transition: none;
+ min-width: $_fine-tune_slider_border+1;
+ min-height: $_fine-tune_slider_border+1;
+ }
+
+ &.horizontal > trough > slider { border-width: $_fine-tune_slider_border 4px; }
+ &.vertical > trough > slider { border-width: 4px $_fine-tune_slider_border; }
+ }
+
+ &.overlay-indicator {
+ &:not(.dragging):not(.hovering) {
+ border-color: transparent;
+ background-color: transparent;
+
+ > range > trough > slider {
+ margin: 0;
+ min-width: 3px;
+ min-height: 3px;
+ background-color: gtkalpha($fg_color, 0.4);
+ border: 1px solid gtkalpha(if($variant == 'light', white, black), 0.4);
+ }
+
+ &.horizontal {
+ > range > trough > slider {
+ margin: 0 2px;
+ min-width: $_slider_min_length;
+ }
+ }
+
+ &.vertical {
+ > range > trough > slider {
+ margin: 2px 0;
+ min-height: $_slider_min_length;
+ }
+ }
+ }
+
+ &.dragging,
+ &.hovering {
+ background-color: gtkalpha($scrollbar_bg_color, 0.8);
+ border: 1px solid gtkalpha(if($variant == 'light', white, black), 0.8);
+ }
+ }
+
+ &.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;
+}
+
+/**********
+ * Switch *
+ **********/
+switch {
+ font-weight: bold;
+ font-size: smaller;
+
+ // similar to the .scale
+ border: 1px solid $borders_color;
+ border-radius: 14px;
+ color: $fg_color;
+ background-color: $dark_fill;
+ transition: $focus_transition;
+
+ @include focus-ring($offset: 0, $outer: true);
+
+ headerbar & { background-color: darken($dark_fill,8%); } //3504
+
+ &:checked {
+ color: $selected_fg_color;
+ border-color: $switch_borders_color;
+ background-color: $switch_bg_color;
+ }
+
+ &:disabled {
+ color: $insensitive_fg_color;
+ border-color: $borders_color;
+ background-color: $insensitive_bg_color;
+ text-shadow: none;
+ }
+
+ > slider {
+ @include button(normal);
+
+ margin: -1px;
+ min-width: 24px;
+ min-height: 24px;
+ border: 1px solid;
+ border-color: $borders_color;
+ border-radius: 50%;
+ transition: $button_transition;
+ }
+
+ &:hover > slider {
+ @include button(hover);
+ }
+
+ &:checked > slider { border: 1px solid $switch_borders_color; }
+
+ &:disabled > slider { @include button(insensitive); }
+
+
+ row:selected & {
+ outline-color: $alt_focus_border_color;
+
+ @if $variant == 'light' {
+ box-shadow: none;
+ border-color: $switch_borders_color;
+
+ > slider { &:checked, & { border-color: $switch_borders_color; } }
+ }
+ }
+}
+
+
+/*************************
+ * Check and Radio items *
+ *************************/
+// draw regular check and radio items using our PNG assets
+// all assets are rendered from assets.svg. never add pngs directly
+
+
+//selection-mode
+@each $check_state, $check_icon, $check_color, $check_background in
+ ('', 'none', 'transparent', $checkradio_bg_color),
+ (':hover', 'none', 'transparent', $checkradio_bg_color),
+ (':active', 'none', 'transparent', $checkradio_bg_color),
+ (':backdrop', 'none', 'transparent', '#{desaturate($checkradio_bg_color, 100%)}'),
+ (':checked', '-gtk-icontheme(\'object-select-symbolic\')', $osd_fg_color, $checkradio_bg_color),
+ (':checked:hover', '-gtk-icontheme(\'object-select-symbolic\')', $osd_fg_color, $checkradio_bg_color),
+ (':checked:active', '-gtk-icontheme(\'object-select-symbolic\')', $osd_fg_color, $checkradio_bg_color),
+ (':backdrop:checked', '-gtk-icontheme(\'object-select-symbolic\')', '#{transparentize($osd_fg_color, 0.2)}', '#{desaturate($checkradio_bg_color, 100%)}'), {
+
+ .view.content-view.check#{$check_state}:not(list),
+ .content-view .tile check#{$check_state}:not(list) {
+ margin: 4px;
+ min-width: 32px;
+ min-height: 32px;
+ color: #{$check_color};
+ background-color: #{$check_background};
+ border-radius: 5px;
+ background-image: none;
+ transition: 200ms;
+ box-shadow: none;
+ border-width: 0;
+ -gtk-icon-source: #{$check_icon};
+ -gtk-icon-shadow: none;
+ }
+}
+
+checkbutton {
+ border-spacing: 4px;
+ border-radius: $button_radius;
+ transition: $focus_transition;
+
+ @include focus-ring();
+
+ &.text-button {
+ // this is for a nice focus on check and radios text
+ padding: 4px;
+ }
+}
+
+check,
+radio {
+ min-height: 14px;
+ min-width: 14px;
+ border: 1px solid;
+ -gtk-icon-source: none;
+
+ & {
+ // for unchecked
+ $_c: if($variant=='light', white, $bg_color);
+
+ @each $state, $t in ("", "normal"),
+ (":hover", "hover"),
+ (":active", "active"),
+ (":disabled", "insensitive") {
+ &#{$state} {
+ @include check($t, $_c);
+ }
+ }
+ }
+
+ & {
+ // for checked
+ @each $t in (':checked'), (':indeterminate') {
+ &#{$t} {
+ @each $state, $t in ("", "normal"),
+ (":hover", "hover"),
+ (":active", "active"),
+ (":disabled", "insensitive") {
+ &#{$state} {
+ @include check($t, $checkradio_bg_color, $checkradio_fg_color, $checked: true);
+ }
+ }
+ }
+ }
+ }
+
+ @if $variant == 'light' {
+ // the borders of the light variant versions of checks and radios are too similar in luminosity to the selected background
+ // color, hence we need special casing.
+ row:selected & { border-color: $checkradio_borders_color; }
+ }
+
+ .osd & {
+ @include button(osd);
+
+ &:hover { @include button(osd); }
+ &:active { @include button(osd-active); }
+ &:disabled { @include button(osd-insensitive); }
+ }
+}
+
+%check,
+check {
+ border-radius: 3px;
+ -gtk-icon-size: 14px;
+
+ &:checked { -gtk-icon-source: -gtk-recolor(url("#{$assets}/check-symbolic.svg")); }
+
+ &:indeterminate { -gtk-icon-source: -gtk-recolor(url("#{$assets}/dash-symbolic.svg")); }
+}
+
+%radio,
+radio {
+ border-radius: 100%;
+ -gtk-icon-size: 14px;
+
+ &:checked { -gtk-icon-source: -gtk-recolor(url("#{$assets}/bullet-symbolic.svg")); }
+
+ &:indeterminate { -gtk-icon-source: -gtk-recolor(url("#{$assets}/dash-symbolic.svg")); }
+}
+
+treeview.view check,
+treeview.view radio {
+ &:selected {
+ &:focus, & {
+ color: $checkradio_fg_color;
+
+ @if $variant == 'light' { border-color: $selected_borders_color; }
+ }
+ }
+}
+
+treeview.view radio:selected { &:focus, & { @extend %radio; }} // This is a workaround
+
+
+/************
+ * GtkScale *
+ ************/
+%scale_trough {
+ border: 1px solid $dark_fill;
+ border-radius: 3px;
+ background-color: $dark_fill;
+
+ headerbar & { background-color: darken($dark_fill,8%); } //3504
+
+ &:disabled {
+ background-color: $insensitive_bg_color;
+ border-color: $insensitive_borders_color;
+ }
+
+ // ...on selected list rows
+ row:selected & {
+ &:disabled, & {
+ outline-color: $alt_focus_border_color;
+ border-color: $selected_borders_color;
+ }
+ }
+
+ // OSD
+ .osd & {
+ border-color: $osd_borders_color;
+ background-color: transparentize($osd_borders_color, 0.2);
+
+ &:disabled { background-color: $osd_insensitive_bg_color; }
+ }
+}
+
+%scale_highlight {
+ border: 1px solid $selected_bg_color;
+ border-radius: 3px;
+ background-color: $selected_bg_color;
+
+ &:disabled {
+ background-color: transparent;
+ border-color: transparent;
+ }
+
+ // ...on selected list rows
+ row:selected & { &:disabled, & { border-color: $selected_borders_color; }}
+
+ // OSD
+ .osd & {
+ border-color: $osd_borders_color;
+
+ &:disabled { border-color: transparent; }
+ }
+}
+
+scale {
+ // sizing
+ $_marks_length: 6px;
+ $_marks_distance: 6px;
+ $_marks_size: $_marks_length + $_marks_distance;
+
+ min-height: 10px;
+ min-width: 10px;
+ padding: 12px;
+
+ @include focus-ring("> trough", $offset: 10px);
+
+ // those are inside the trough node, I need them to show their own border over the trough one, so negative margin
+ > trough {
+ transition: $focus_transition;
+
+ > fill,
+ > highlight { margin: -1px; }
+
+ // the slider is inside the trough, so to have make it bigger there's a negative margin
+
+ > slider {
+ min-height: 18px;
+ min-width: 18px;
+ margin: -9px;
+ }
+ }
+
+ // click-and-hold the slider to activate
+ &.fine-tune {
+ // to make the trough grow in fine-tune mode
+ > trough { margin: -3px; }
+ > trough > slider { margin: -6px; }
+
+ > trough > fill,
+ > trough > highlight,
+ > trough {
+ border-radius: 5px;
+ }
+ }
+
+ // the backing bit
+ > trough {
+ @extend %scale_trough;
+ }
+
+ // the colored part of the backing bit
+ > trough > highlight { @extend %scale_highlight; }
+
+ // this is another differently styled part of the backing bit, the most relevant use case is for example
+ // in media player to indicate how much video stream as been cached
+ > trough > fill {
+ @extend %scale_trough;
+
+
+ &:disabled {
+ border-color: transparent;
+ background-color: transparent;
+ }
+
+ // OSD
+ .osd & {
+ background-color: mix($osd_fg_color, $osd_borders_color, 25%);
+
+ &:disabled {
+ border-color: transparent;
+ background-color: transparent;
+ }
+ }
+ }
+
+ > trough > slider {
+ @include button(normal);
+ border-width: 1px;
+ border-style: solid;
+ border-radius: 100%;
+ transition: $button_transition;
+ transition-property: background, border, box-shadow;
+
+ &:hover { @include button(hover); }
+
+ &:active { border-color: $selected_borders_color; }
+
+ &:disabled { @include button(insensitive); }
+
+ // ...on selected list rows
+ row:selected & { &:disabled, & { border-color: $selected_borders_color; } }
+
+ // OSD
+ .osd & {
+ @include button(osd);
+ border-color: darken($osd_borders_color, 3%);
+ background-color: opacify($osd_bg_color, 1); // solid background needed here
+
+ &:hover {
+ @include button(osd-hover);
+ background-color: opacify($osd_bg_color, 1); // solid background needed here
+ }
+
+ &:active {
+ @include button(osd-active);
+ background-color: opacify($osd_bg_color, 1); // solid background needed here
+ }
+
+ &:disabled {
+ @include button(osd-insensitive);
+ background-color: opacify($osd_bg_color, 1); // solid background needed here
+ }
+ }
+ }
+
+ > value {
+ color: gtkalpha(currentColor, 0.55);
+ font-feature-settings: "tnum";
+ }
+
+ &.horizontal {
+ > marks {
+ color: gtkalpha(currentColor, 0.55);
+ &.top { margin-bottom: $_marks_distance; }
+ &.bottom { margin-top: $_marks_distance; }
+
+ indicator {
+ background-color: currentColor;
+ min-height: $_marks_length;
+ min-width: 1px;
+ }
+ }
+
+ &:not(.marks-before) {
+ > value.top { margin-bottom: $_marks_size; }
+ }
+
+ &:not(.marks-after) {
+ > value.bottom { margin-top: $_marks_size; }
+ }
+
+ > value.left { margin-right: 9px; }
+ > value.right { margin-left: 9px; }
+
+ &.fine-tune >marks {
+ &.top { margin-top: 3px; }
+ &.bottom { margin-bottom: 3px; }
+
+ indicator { min-height: ($_marks_length - 3px); }
+ }
+ }
+
+ &.vertical {
+ > marks {
+ color: gtkalpha(currentColor, 0.55);
+ &.top { margin-right: $_marks_distance; }
+ &.bottom { margin-left: $_marks_distance; }
+
+ indicator {
+ background-color: currentColor;
+ min-height: 1px;
+ min-width: $_marks_length;
+ }
+ }
+
+ &:not(.marks-before) {
+ > value.left { margin-right: $_marks_size; }
+ }
+
+ &:not(.marks-after) {
+ > value.right { margin-left: $_marks_size; }
+ }
+
+ > value.top { margin-bottom: 9px; }
+ > value.bottom { margin-top: 9px; }
+
+ &.fine-tune >marks {
+ &.top { margin-left: 3px; }
+ &.bottom { margin-right: 3px; }
+
+ indicator { min-width: ($_marks_length - 3px); }
+ }
+ }
+
+ // *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} {
+
+ > trough > 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}#{$suffix}';
+ 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: 22px;
+
+ @if $marks_infix == 'scale-has-marks-above' {
+ margin-top: -14px;
+
+ $_scale_slider_bg_pos: top;
+ }
+
+ @else { margin-bottom: -14px; }
+ }
+
+ @else {
+ min-height: 22px;
+ 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 > trough > slider {
+ @if $dir_class == 'horizontal' {
+ // bigger negative margins to make the trough grow here as well
+ margin: -7px;
+
+ @if $marks_infix == 'scale-has-marks-above' { margin-top: -11px; }
+
+ @else { margin-bottom: -11px; }
+ }
+
+ @else {
+ margin: -7px;
+
+ @if $marks_infix == 'scale-has-marks-above' { margin-left: -11px; }
+
+ @else { margin-right: -11px; }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ &.color {
+ padding: 0;
+
+ > trough {
+ border: none;
+ background: none;
+ border-radius: 10px;
+ outline-offset: 1px;
+
+ > slider {
+ margin: 0;
+ opacity: .8;
+ }
+ }
+
+ &.fine-tune {
+ &.vertical {
+ padding-left: 2px;
+ padding-right: 2px;
+
+ > trough > slider {
+ margin-left: -2px;
+ margin-right: -2px;
+ }
+ }
+
+ &.horizontal {
+ padding-top: 2px;
+ padding-bottom: 2px;
+
+ > trough > slider {
+ margin-top: -2px;
+ margin-bottom: -2px;
+ }
+ }
+ }
+ }
+}
+
+
+/*****************
+ * Progress bars *
+ *****************/
+progressbar {
+ // sizing
+ &.horizontal {
+ > trough {
+ min-width: 150px;
+ &, > progress { min-height: 2px; }
+ }
+ }
+
+ &.vertical {
+ > trough {
+ min-height: 80px;
+ &, > progress { min-width: 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.
+
+
+ // FIXME: insensitive state missing and some other state should be set probably
+ font-size: smaller;
+ color: transparentize($fg_color, 0.6);
+ font-feature-settings: "tnum";
+
+ > trough { @extend %scale_trough; }
+
+ > trough > progress {
+ @extend %scale_highlight; /* share most of scales' */
+ /* override insensitive that is specific to progress */
+ &:disabled {
+ background-color: $insensitive_fg_color;
+ border-color: $insensitive_fg_color;
+ }
+
+ border-radius: 1.5px;
+ $_progress-radius: 5px;
+ &.left {
+ border-top-left-radius: $_progress-radius;
+ border-bottom-left-radius: $_progress-radius;
+ }
+
+ &.right {
+ border-top-right-radius: $_progress-radius;
+ border-bottom-right-radius: $_progress-radius;
+ }
+
+ &.top {
+ border-top-right-radius: $_progress-radius;
+ border-top-left-radius: $_progress-radius;
+ }
+
+ &.bottom {
+ border-bottom-right-radius: $_progress-radius;
+ border-bottom-left-radius: $_progress-radius;
+ }
+ }
+
+ &.osd { // progressbar.osd used for epiphany page loading progress
+ min-width: 3px;
+ min-height: 3px;
+ background-color: transparent;
+
+ > trough {
+ border-style: none;
+ border-radius: 0;
+ background-color: transparent;
+ box-shadow: none;
+
+ > progress {
+ border-style: none;
+ border-radius: 0;
+ }
+ }
+ }
+
+ > trough.empty > progress { all: unset; } // makes the progress indicator disappear, when the fraction is 0
+}
+
+/*************
+ * Level Bar *
+ *************/
+
+$_levelbar_size: 9px;
+$_levelbar_border_radius: 5px;
+
+levelbar {
+ &.horizontal {
+ trough > block {
+ min-height: $_levelbar_size;
+ border-radius: $_levelbar_border_radius;
+
+ &:dir(rtl) {
+ border-radius: 0 $_levelbar_border_radius $_levelbar_border_radius 0;
+ }
+
+ &:dir(ltr) {
+ border-radius: $_levelbar_border_radius 0 0 $_levelbar_border_radius;
+ }
+
+ &.empty,&.full {
+ border-radius: $_levelbar_border_radius;
+ }
+ }
+
+ // segmented level bar
+ &.discrete {
+ trough > block {
+ min-height: 2px;
+ margin: 1px;
+ min-width: 24px;
+ border-radius:0;
+ &:first-child {border-radius: 2px 0 0 2px;}
+ &:last-child {
+ border-radius: 0 2px 2px 0;
+ }
+ }
+ }
+ }
+
+ &.vertical {
+ trough > block {
+ min-width: $_levelbar_size;
+ border-radius: $_levelbar_border_radius;
+ }
+
+ &.discrete > trough > block {
+ min-width: $_levelbar_size - 7px;
+ margin: 1px 0;
+ min-height: 32px;
+ }
+ }
+
+ > trough {
+ padding: 0;
+ }
+
+ // level bar colours
+ > trough > block {
+ border: 1px solid;
+
+ &.low {
+ border-color: $warning_color;
+ background-color: $warning_color;
+ }
+
+ &.high,
+ &:not(.empty) {
+ border-color: $selected_bg_color;
+ background-color: $selected_bg_color;
+ }
+
+ &.full {
+ border-color: $success_color;
+ background-color: $success_color;
+ }
+
+ &.empty {
+ background-color: darken($bg_color, 5%);
+ border-color: darken($bg_color, 5%);
+ }
+ }
+}
+
+
+/****************
+ * Print dialog *
+*****************/
+window.dialog.print {
+ page-thumbnail {
+ background: white;
+ color: #2e3436;
+ border: 1px solid $borders_color;
+
+ label {
+ color: #2e3436;
+ }
+ }
+
+ .drawing {
+ color: $fg_color;
+ background: none;
+ border: none;
+ padding: 0;
+ }
+
+ .dialog-action-box { margin: 12px; }
+}
+
+
+/**********
+ * Frames *
+ **********/
+frame,
+.frame {
+ border: 1px solid $borders_color;
+}
+
+frame {
+ border-radius: $window_radius;
+
+ > label {
+ margin: 4px;
+ }
+}
+
+actionbar > revealer > box {
+ padding: 6px;
+ border-top: 1px solid $borders_color;
+
+ &, > box.start, > box.end {
+ border-spacing: 6px;
+ }
+}
+
+scrolledwindow {
+ // This is used when content is touch-dragged past boundaries.
+ // 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);
+ }
+ }
+
+ > junction { // the small square between two scrollbars
+ // Only color the top-left (or top right in RTL) pixel, to visually connect
+ // the borders of the two scrollbars.
+
+ background: $borders_color,
+ linear-gradient(to bottom, transparent 1px, $scrollbar_bg_color 1px),
+ linear-gradient(to right, transparent 1px, $scrollbar_bg_color 1px);
+
+ &:dir(rtl) {
+ background: $borders_color,
+ linear-gradient(to bottom, transparent 1px, $scrollbar_bg_color 1px),
+ linear-gradient(to left, transparent 1px, $scrollbar_bg_color 1px);
+ }
+ }
+}
+
+//vbox and hbox separators
+separator {
+ background: lighten($borders_color, 5%);
+ min-width: 1px;
+ min-height: 1px;
+}
+
+
+/*********
+ * Lists *
+ *********/
+listview,
+list {
+ color: $text_color;
+ background-color: $base_color;
+ border-color: $borders_color;
+
+ &:backdrop {
+ background-color: $backdrop_base_color;
+ border-color: $backdrop_borders_color;
+ }
+
+ > row { padding: 2px; }
+ > row.expander { padding: 0px; }
+ > row.expander .row-header { padding: 2px; }
+
+ &.horizontal row.separator,
+ &.separators.horizontal > row:not(.separator) {
+ border-left: 1px solid $_treeview_borders_color;
+ }
+ &:not(.horizontal) row.separator,
+ &.separators:not(.horizontal) > row:not(.separator) {
+ border-bottom: 1px solid $_treeview_borders_color;
+ }
+}
+
+row {
+ @include focus-ring();
+
+ &.activatable {
+ &.has-open-popup, // this is for indicathing which row generated a popover see https://bugzilla.gnome.org/show_bug.cgi?id=754411
+
+ &:hover { background-color: if(variant == light, transparentize($fg_color, 0.9), transparentize($fg_color, 0.95)); }
+
+ &:active { box-shadow: inset 0 2px 2px -2px transparentize(black, 0.8); }
+
+ &:selected {
+ &:active { box-shadow: inset 0 2px 3px -1px transparentize(black, 0.5); }
+
+ &.has-open-popup,
+ &:hover { background-color: mix($fg_color, $selected_bg_color, 10%); }
+ }
+ }
+
+ &:selected {
+ outline-color: $alt_focus_border_color;
+
+ @extend %selected_items;
+ }
+}
+
+listview:not(:focus-within) > row:selected {
+ background-color: $backdrop_selected_bg_color;
+}
+
+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: $_treeview_borders_color;
+ }
+
+ // shrink vertically for .data-table
+ &.data-table > listview > row > cell {
+ padding-top: 2px;
+ padding-bottom: 2px;
+ }
+}
+
+treeexpander {
+ border-spacing: 4px;
+ indent {
+ -gtk-icon-size: 8px;
+ }
+}
+
+/********************************************************
+ * Data Tables *
+ * treeview like tables with individual focusable cells *
+ * https://gitlab.gnome.org/GNOME/gtk/-/issues/2929 *
+ ********************************************************/
+
+columnview row:not(:selected) cell editablelabel:not(.editing):focus-within {
+ outline: 2px solid $focus_border_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 {
+ background-color: $backdrop_selected_bg_color;
+ color: transparent;
+ &:focus-within {
+ background-color: $selected_text_bg_color;
+ color: $fg_color;
+ }
+}
+
+/*******************************************************
+ * Rich Lists *
+ * Large list usually containing lots of widgets *
+ * https://gitlab.gnome.org/GNOME/gtk/-/issues/3073 *
+ *******************************************************/
+
+
+.rich-list { /* rich lists usually containing other widgets than just labels/text */
+ & > row, & > header {
+ padding: 8px 12px;
+ min-height: 32px; /* should be tall even when only containing a label */
+
+ & > box {
+ border-spacing: 12px;
+ }
+ }
+ & > header {
+ @extend %osd;
+ background-color: $osd_bg_color;
+
+ border-bottom: 1px solid $borders-color;
+ border-top: 1px solid $borders-color;
+ font-weight: bold;
+ }
+}
+
+/********************************************************
+ * Complex Lists *
+ * Put padding on the cell content so event controllers *
+ * can cover the whole area. *
+ ********************************************************/
+
+columnview.complex {
+ > listview > row > cell {
+ padding: 0;
+ > * {
+ padding: 8px 6px;
+ }
+ }
+
+ // shrink vertically for .data-table
+ &.data-table > listview > row > cell {
+ padding: 0;
+ > * {
+ padding-top: 2px;
+ padding-bottom: 2px;
+ }
+ }
+}
+
+/**********************************************************************
+ * Boxed Lists *
+ * Lists inside a rounded frame. Can be used together with .rich-list * *
+ **********************************************************************/
+
+.boxed-list {
+ border-radius: $window_radius;
+ border: 1px solid $borders_color;
+
+ > row {
+ @include focus-ring($offset: -1px);
+
+ border-bottom: 1px solid transparentize($borders_color, 0.5);
+
+ &:backdrop {
+ border-bottom-color: transparentize($backdrop_borders_color, 0.5);
+ }
+
+ &:first-child {
+ border-top-left-radius: $window_radius;
+ border-top-right-radius: $window_radius;
+ }
+
+ &:last-child {
+ border-bottom-left-radius: $window_radius;
+ border-bottom-right-radius: $window_radius;
+ border-bottom: none;
+ }
+ }
+}
+
+/*********************
+ * App Notifications *
+ *********************/
+.app-notification {
+ @extend %osd;
+
+ padding: 10px;
+ border-spacing: 10px;
+ border-radius: 0 0 5px 5px;
+ background-color: $osd_bg_color;
+ background-image: linear-gradient(to bottom, transparentize(black, 0.8),
+ transparent 2px);
+ background-clip: padding-box;
+
+ button { @extend %osd_button; }
+
+ border { border: none; }
+}
+
+
+/*************
+ * 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'); }
+
+ &:disabled { color: $insensitive_fg_color; }
+
+ &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); }
+}
+
+expander-widget {
+ @include focus-ring("> box > title");
+
+ > box > title {
+ transition: $focus_transition;
+ border-radius: $button_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 {
+ color: $text_color;
+ border: 1px solid $borders_color;
+ font-feature-settings: "tnum";
+
+ > header {
+ border-bottom: 1px solid $borders_color;
+
+ > button {
+ border: none;
+ box-shadow: none;
+ background: none;
+ border-radius: 0;
+ }
+ > button:backdrop {
+ background: none;
+ }
+ }
+
+ > grid {
+ > label.day-name {
+ }
+
+ > label.week-number {
+ }
+
+ > label.today {
+ box-shadow: inset 0px -2px $borders_color;
+
+ &:selected {
+ box-shadow: none;
+ }
+ }
+
+ > label:focus {
+ outline-color: $focus_border_color;
+ outline-offset: -2px;
+ outline-width: 2px;
+ outline-style: solid;
+ }
+
+ > label.day-number {
+ padding: 4px;
+
+ &:selected{
+ @extend %selected_items;
+ border-radius: 3px;
+ }
+
+ &:checked {
+ background-color: gtkalpha($selected_bg_color, 0.3);
+ }
+ }
+
+ > label.day-number.other-month {
+ color: gtkalpha(currentColor, 0.3);
+ }
+ }
+
+}
+
+
+/***********
+ * Dialogs *
+ ***********/
+window.dialog.message { // Message Dialog styling
+ .titlebar {
+ min-height: 20px;
+ background-image: none;
+ background-color: $bg_color;
+ border-style: none;
+ border-top-left-radius: $window_radius+1; // Yaru change: sync radii with Gtk4
+ border-top-right-radius: $window_radius+1; // Yaru change: sync radii with Gtk4
+ }
+
+ box.dialog-vbox.vertical {
+ border-spacing: 10px;
+ }
+
+ & label.title {
+ font-weight: 800;
+ font-size: 150%;
+ }
+
+ &.csd { // rounded bottom border styling for csd version
+ &.background {
+ // bigger radius for better antialiasing
+ border-bottom-left-radius: $window_radius+1;
+ border-bottom-right-radius: $window_radius+1;
+ }
+
+ .dialog-action-area button {
+ padding: 10px 14px; // labels are not vertically centered on message dialog, this is a workaround
+ border-radius: 0;
+ border-left-style: solid;
+ border-right-style: none;
+ border-bottom-style: none;
+
+ &:first-child{
+ border-left-style: none;
+ border-bottom-left-radius: $window_radius+1; // Yaru change: sync radii with Gtk4
+ }
+
+ &:last-child {
+ border-bottom-right-radius: $window_radius+1; // Yaru change: sync radii with Gtk4
+ }
+ }
+ }
+}
+
+filechooser {
+ .dialog-action-box {
+ border-top: 1px solid $borders_color;
+ }
+
+ #pathbarbox { border-bottom: 1px solid $bg_color; }
+
+ gridview child {
+ border-radius: 12px;
+ margin: 12px;
+
+ &:hover {
+ background-color: gtkalpha(currentColor, .04);
+ }
+
+ &:active {
+ background-color: gtkalpha(currentColor, .08);
+ }
+
+ &:selected {
+ background-color: gtkalpha($selected_bg_color, .15);
+ color: inherit;
+ }
+
+ &:selected:hover {
+ background-color: gtkalpha($selected_bg_color, .20);
+ }
+
+ &:selected:active {
+ background-color: gtkalpha($selected_bg_color, .25);
+ }
+
+ & filethumbnail image {
+ filter: drop-shadow(0px 1px 1px rgba(0,0,0,0.3));
+ }
+ }
+}
+
+
+filechooserbutton>button>box {
+ border-spacing: 6px;
+}
+filechooserbutton:drop(active) {
+ box-shadow: none;
+ border-color: transparent;
+}
+
+
+/***********
+ * Sidebar *
+ ***********/
+.sidebar {
+ background-color: mix($bg_color, $base_color, 50%);
+
+ &:not(separator) {
+ @at-root %sidebar_left,
+ &:dir(ltr),
+ &.left,
+ &.left:dir(rtl) {
+ border-right: 1px solid $borders_color;
+ border-left-style: none;
+ }
+
+ @at-root %sidebar_right,
+ &:dir(rtl),
+ &.right {
+ border-left: 1px solid $borders_color;
+ border-right-style: none;
+ }
+ }
+
+ listview.view,
+ list { background-color: transparent; }
+
+ paned & { &.left, &.right, &.left:dir(rtl), &:dir(rtl), &:dir(ltr), & { border-style: none; }}
+}
+
+stacksidebar {
+ //not a regular list
+ list.separators:not(.horizontal) > row:not(.separator) {
+ border-bottom: none;
+ }
+ row {
+ padding: 10px 4px;
+ @include focus-ring();
+
+ > label {
+ padding-left: 6px;
+ padding-right: 6px;
+ }
+
+ &.needs-attention > label {
+ @extend %needs_attention;
+ background-size: 6px 6px, 0 0;
+ }
+ &:selected {
+ background-color: $menu_selected_color;
+ border-radius: $menu_radius;
+ color: $fg_color;
+ }
+ &:selected:hover:dir(ltr), &:selected:hover:dir(rtl) {
+ background-color: if($variant == 'light', darken($menu_selected_color, 5%), lighten($menu_selected_color, 5%)); // Yaru change: use lighter color in dark theme (mimic Libadwaita)
+ }
+ &.activatable:active, &.activatable:selected:active {
+ box-shadow: none; // #3413
+ }
+ }
+}
+
+separator.sidebar {
+ background-color: $borders_color;
+}
+
+
+/**********************
+ * Navigation Sidebar *
+ **********************/
+
+.navigation-sidebar {
+ padding: $menu-margin 0; //only vertical padding. horizontal row size would clip
+
+ > separator {
+ margin: $menu-margin;
+ }
+
+ > row {
+ min-height: 36px;
+ padding: 0 8px;
+ border-radius: $menu-margin;
+ margin: 0 $menu-margin 2px;
+ @include focus-ring($focus-state: 'focus-visible:focus-within');
+ &:hover {
+ background-color: if($variant == 'light', darken($menu_selected_color, 5%), lighten($menu_selected_color, 5%)); // Yaru change: use lighter color in dark theme (mimic Libadwaita)
+ }
+
+ &:selected {
+ background-color: $menu_selected_color;
+ color: inherit;
+
+ @if $contrast == 'high' {
+ box-shadow: inset 0 0 0 1px $borders_color;
+ }
+
+
+ &:hover {
+ background-color: if($variant == 'light', darken($menu_selected_color, 5%), lighten($menu_selected_color, 5%)); // Yaru change: use lighter color in dark theme (mimic Libadwaita)
+ }
+
+ }
+
+ &:disabled { color: $insensitive_fg_color; }
+ }
+}
+
+
+/****************
+ * File chooser *
+ ****************/
+
+$_placesidebar_icons_opacity: 0.7;
+
+row image.sidebar-icon { opacity: $_placesidebar_icons_opacity; } // dim the sidebar icons
+ // see bug #786613 for details
+ // on this oddity
+
+/* this should be more generic, only using .navigation-sidebar
+ https://gitlab.gnome.org/GNOME/gtk/-/issues/2929
+*/
+
+placessidebar {
+ .navigation-sidebar > row {
+ // Needs overriding of the `.navigation-sidebar > row` padding
+ padding: 0;
+
+ // Using margins/padding directly in the SidebarRow
+ // will make the animation of the new bookmark row jump
+ > revealer { padding: 0 14px; }
+
+ image.sidebar-icon {
+ &:dir(ltr) { padding-right: 8px; }
+ &:dir(rtl) { padding-left: 8px; }
+ }
+
+ label.sidebar-label {
+ &:dir(ltr) { padding-right: 2px; }
+ &:dir(rtl) { padding-left: 2px; }
+ }
+
+ @at-root button.sidebar-button {
+ @extend %button_basic_flat;
+
+ @extend %button_selected_flat;
+ min-height: 26px;
+ min-width: 26px;
+ margin-top: 3px;
+ margin-bottom: 3px;
+ padding: 0;
+ border-radius: 100%;
+ }
+
+ // in the sidebar case it makes no sense to click the selected row
+ &:selected:active { box-shadow: none; }
+
+ &.sidebar-placeholder-row {
+ padding: 0 8px;
+ min-height: 2px;
+ background-image: image($drop_target_color);
+ background-clip: content-box;
+ }
+
+ &.sidebar-new-bookmark-row { color: $selected_bg_color; }
+
+ &:drop(active):not(:disabled) {
+ color: $drop_target_color;
+ box-shadow: inset 0 1px $drop_target_color,
+ inset 0 -1px $drop_target_color;
+
+ &:selected {
+ color: $selected_fg_color;
+ background-color: $drop_target_color;
+ }
+ }
+ }
+}
+
+placesview {
+ .server-list-button > image {
+ transition: 200ms $ease-out-quad;
+ -gtk-icon-transform: rotate(0turn);
+ }
+
+ .server-list-button:checked > image {
+ transition: 200ms $ease-out-quad;
+ -gtk-icon-transform: rotate(-0.5turn);
+ }
+
+ row.activatable:hover { }
+
+ > actionbar > revealer > box > box{
+ border-spacing: 6px;
+ }
+}
+
+
+/*********
+ * Paned *
+ *********/
+paned {
+ > separator {
+ min-width: 1px;
+ min-height: 1px;
+ -gtk-icon-source: none; // defeats the ugly default handle decoration
+ border-style: none; // just to be sure
+ background-color: transparent;
+ // workaround, using background instead of a border since the border will get rendered twice (?)
+ background-image: image($borders_color);
+ background-size: 1px 1px;
+
+ &:selected { background-image: image($selected_bg_color); } // FIXME is this needed?
+
+ &.wide {
+ min-width: 5px;
+ min-height: 5px;
+ background-color: $bg_color;
+ background-image: image($borders_color), image($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;
+ }
+}
+
+/************
+ * 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: transparentize(black, 0.2);
+ background-clip: padding-box;
+ border: 1px solid $tooltip_borders_color; // this subtle border is meant to
+ // not make the tooltip melt with
+ // very dark backgrounds
+ color: white;
+ }
+
+ padding: 6px 10px;
+ border-radius: $window_radius;
+ box-shadow: none; // otherwise it gets inherited by windowframe.csd
+
+ > box {
+ border-spacing: 6px;
+ }
+}
+
+
+/*****************
+ * Color Chooser *
+ *****************/
+colorswatch {
+ // This widget is made of two boxes one on top of the other, the lower box is colorswatch {} the other one
+ // is colorswatch overlay {}, colorswatch has the programmatically set background, so most of the style is
+ // applied to the overlay box.
+
+ transition: $focus_transition;
+
+ @include focus-ring($width: 4px, $offset: -2px);
+
+ &:drop(active), & { border-style: none; } // FIXME: implement a proper drop(active) state
+
+ $_colorswatch_radius: 5px;
+
+ // base color corners rounding
+ // to avoid the artifacts caused by rounded corner anti-aliasing the base color
+ // sports a bigger radius.
+ // nth-child is needed by the custom color strip.
+
+ &.top {
+ border-top-left-radius: $_colorswatch_radius + 0.5px;
+ border-top-right-radius: $_colorswatch_radius + 0.5px;
+
+ > 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.5px;
+
+ > 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: white;
+ }
+
+ &.activatable:hover > overlay {
+ border-color: if($variant == 'light', transparentize(black, 0.2), $borders_color);
+ }
+ }
+
+ &.light {
+ > overlay {
+ color: black;
+ }
+
+ &.activatable:hover > overlay {
+ border-color: if($variant == 'light', transparentize(black, 0.5), $borders_color);
+ }
+ }
+
+ &:drop(active) {
+ box-shadow: none;
+
+ &.light > overlay {
+ border-color: $drop_target_color;
+ box-shadow: inset 0 0 0 2px if($variant == 'light', darken($drop_target_color, 7%), $borders_color),
+ inset 0 0 0 1px $drop_target_color;
+ }
+
+ &.dark > overlay {
+ border-color: $drop_target_color;
+ box-shadow: inset 0 0 0 2px if($variant == 'light', transparentize(black, 0.7), $borders_color),
+ inset 0 0 0 1px $drop_target_color;
+ }
+ }
+
+ > overlay {
+ border: 1px solid if($variant == 'light', transparentize(black, 0.7), $borders_color);
+ }
+
+ &.activatable:hover > overlay {
+ box-shadow: inset 0 1px transparentize(white, 0.6),
+ inset 0 -1px transparentize(black, 0.8);
+ }
+
+ &#add-color-button {
+ border-radius: $_colorswatch_radius 0 0 $_colorswatch_radius;
+
+ &:only-child { border-radius: $_colorswatch_radius; }
+
+ > overlay {
+ @include button(normal);
+ }
+
+ &.activatable:hover > overlay {
+ @include button(hover);
+ }
+ }
+
+ &:disabled {
+ opacity: 0.5;
+
+ > overlay {
+ border-color: transparentize(black, 0.4);
+ box-shadow: none;
+ }
+ }
+
+ row:selected & { box-shadow: 0 0 0 2px $selected_fg_color; }
+
+ &#editor-color-sample {
+ border-radius: 4px;
+
+ > overlay { border-radius: 4.5px; }
+ }
+}
+
+plane {
+ transition: $focus_transition;
+
+ @include focus-ring($offset: 2px, $outer: true);
+}
+
+// colorscale popup
+colorchooser .popover.osd { border-radius: 5px; }
+
+/********
+ * Misc *
+ ********/
+.content-view {
+ background-color: darken($bg_color,7%);
+
+ &: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, $insensitive_bg_color); }
+}
+
+ > rubberband { @extend rubberband; }
+
+}
+
+.scale-popup {
+ .osd & { @extend %osd; }
+
+ .osd & button.flat { //FIXME: quick hack, redo properly
+ border-style: none;
+ border-radius: 5px;
+ }
+
+ button { // +/- buttons on GtkVolumeButton popup
+ &:hover {
+ @extend %undecorated_button;
+ background-color: transparentize($fg_color,0.9);
+ border-radius: 5px;
+ }
+ }
+}
+
+
+/**********************
+ * Window Decorations *
+ *********************/
+window {
+ // lamefun trick to get rounded borders regardless of CSD use
+ border-width: 0px;
+
+ // this needs to be transparent
+ // see bug #722563
+ $_wm_border: if($variant=='light', transparentize(black, 0.77), transparentize(black, 0.25));
+ $_wm_border_backdrop: if($variant=='light', transparentize(black, 0.82), transparentize(black, 0.25));
+
+ &.csd {
+ box-shadow: 0 3px 9px 1px transparentize(black, 0.5),
+ 0 0 0 1px $_wm_border; //doing borders with box-shadow
+ margin: 0px;
+ border-radius: $window_radius $window_radius 0 0;
+ &:backdrop {
+ // the transparent shadow here is to enforce that the shadow extents don't
+ // change when we go to backdrop, to prevent jumping windows.
+ // The biggest shadow should be in the same order then in the active state
+ // or the jumping will happen during the transition.
+ box-shadow: 0 3px 9px 1px transparent,
+ 0 2px 6px 2px transparentize(black, 0.8),
+ 0 0 0 1px $_wm_border_backdrop;
+ transition: $backdrop_transition;
+ }
+
+ &.popup {
+ border-radius: $menu_radius;
+ box-shadow: 0 1px 2px transparentize(black, 0.8),
+ 0 0 0 1px transparentize($_wm_border, 0.1);
+ }
+
+ &.dialog.message {
+ border-radius: $window_radius;
+ box-shadow: 0 1px 2px transparentize(black, 0.8),
+ 0 0 0 1px transparentize($_wm_border, 0.1);
+ }
+ }
+
+ &.solid-csd {
+ margin: 0;
+ padding: 4px;
+ border: solid 1px $borders_color;
+ border-radius: 0;
+ box-shadow: inset 0 0 0 4px $borders_color, inset 0 0 0 3px $headerbar_bg_color, inset 0 1px $top_hilight;
+
+ &:backdrop { box-shadow: inset 0 0 0 4px $borders_color, inset 0 0 0 3px $backdrop_bg_color, inset 0 1px $top_hilight; }
+ }
+
+ &.maximized,
+ &.fullscreen { border-radius: 0; box-shadow: none; }
+
+ &.tiled,
+ &.tiled-top,
+ &.tiled-left,
+ &.tiled-right,
+ &.tiled-bottom {
+ border-radius: 0;
+ box-shadow: 0 0 0 1px $_wm_border,
+ 0 0 0 20px transparent; //transparent control workaround -- #3670
+
+ &:backdrop { box-shadow: 0 0 0 1px $_wm_border_backdrop,
+ 0 0 0 20px transparent; // #3670
+ }
+ }
+
+ &.popup { box-shadow: none; }
+
+ // server-side decorations as used by mutter
+ &.ssd { box-shadow: 0 0 0 1px $_wm_border; } //just doing borders, wm draws actual shadows
+
+}
+
+tooltip.csd {
+ border-radius: 5px;
+ box-shadow: none;
+}
+
+// catch all extend :)
+
+%selected_items {
+ background-color: $selected_bg_color;
+
+ @at-root %nobg_selected_items, & {
+ color: $selected_fg_color;
+
+ @at-root %selected_items_disabled,
+ &:disabled { color: mix($selected_fg_color, $selected_bg_color, 50%); }
+
+ }
+}
+
+.monospace { font-family: monospace; }
+
+
+/**********************
+ * Touch Copy & Paste *
+ *********************/
+//touch selection handlebars for the Popover.osd above
+cursor-handle {
+ background-color: transparent;
+ background-image: none;
+ box-shadow: none;
+ border-style: none;
+ min-width: 20px;
+ min-height: 24px;
+ padding-left: 20px;
+ padding-right: 20px;
+ padding-top: 24px;
+ padding-bottom: 24px;
+
+ @each $s,$as in ('',''),
+ (':hover','-hover'),
+ (':active','-active') { //no need for insensitive and backdrop
+ &.top#{$s}:dir(ltr), &.bottom#{$s}:dir(rtl) {
+ $_url: '#{$assets}/text-select-start#{$as}#{$asset_suffix}';
+ -gtk-icon-source: -gtk-scaled(url('#{$_url}.png'),
+ url('#{$_url}@2.png'));
+ }
+
+ &.bottom#{$s}:dir(ltr), &.top#{$s}:dir(rtl) {
+ $_url: '#{$assets}/text-select-end#{$as}#{$asset_suffix}';
+ -gtk-icon-source: -gtk-scaled(url('#{$_url}.png'),
+ url('#{$_url}@2.png'));
+ }
+
+ &.insertion-cursor#{$s}:dir(ltr), &.insertion-cursor#{$s}:dir(rtl) {
+ $_url: '#{$assets}/slider-horz-scale-has-marks-above#{$as}#{$asset_suffix}';
+ -gtk-icon-source: -gtk-scaled(url('#{$_url}.png'),
+ url('#{$_url}@2.png'));
+ }
+ }
+}
+
+shortcuts-section {
+ margin: 20px;
+}
+
+.shortcuts-search-results {
+ margin: 20px;
+ border-spacing: 24px;
+}
+
+// shortcut window keys
+shortcut {
+ border-spacing: 6px;
+ border-radius: 5px;
+ @include focus-ring();
+}
+
+shortcut > .keycap {
+ min-width: 20px;
+ min-height: 25px;
+ margin-top: 2px;
+ padding-bottom: 3px;
+ padding-left: 6px;
+ padding-right: 6px;
+
+ color: $fg_color;
+ background-color: $base_color;
+ border: 1px solid;
+ border-color: if($variant == 'light', mix($borders_color, $bg_color, 50%), $borders_color);
+ border-radius: 5px;
+ box-shadow: if($variant == 'light', inset 0 -3px mix($base_color, $bg_color, 20%), inset 0 -3px mix($borders_color, $base_color, 60%));
+ font-size: smaller;
+
+}
+
+:not(decoration):not(window):drop(active):focus,
+:not(decoration):not(window):drop(active) { // FIXME needs to be done widget by widget, this wildcard should really die
+ border-color: $drop_target_color;
+ box-shadow: inset 0 0 0 1px $drop_target_color;
+ caret-color: $drop_target_color;
+}
+
+stackswitcher > button.text-button { min-width: 100px; } // FIXME aggregate with buttons
+
+stackswitcher.circular {
+ border-spacing: 12px;
+
+ // FIXME aggregate with buttons
+ > button.circular,
+ > button.text-button.circular {
+ min-width: 32px;
+ min-height: 32px;
+ padding: 0;
+ }
+}
+/*************
+ * App Icons *
+ *************/
+/* Outline for low res icons */
+.lowres-icon {
+ -gtk-icon-shadow: 0 -1px rgba(0,0,0,0.05),
+ 1px 0 rgba(0,0,0,0.1),
+ 0 1px rgba(0,0,0,0.3),
+ -1px 0 rgba(0,0,0,0.1);
+}
+
+/* Drapshadow for large icons */
+.icon-dropshadow {
+ -gtk-icon-shadow: 0 1px 12px rgba(0,0,0,0.05),
+ 0 -1px rgba(0,0,0,0.05),
+ 1px 0 rgba(0,0,0,0.1),
+ 0 1px rgba(0,0,0,0.3),
+ -1px 0 rgba(0,0,0,0.1);
+}
+
+/*********
+ * Emoji *
+ ********/
+
+popover.emoji-picker > 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;
+}
+
+button.emoji-section {
+ border-color: transparent;
+ border-width: 3px;
+ border-style: none none solid;
+ border-radius: 0;
+
+ padding: 3px 0 0;
+ min-width: 32px;
+ min-height: 28px;
+
+ /* reset props inherited from the button style */
+ background: none;
+ box-shadow: none;
+ text-shadow: none;
+
+ &:hover { border-color: if($variant == 'light', $borders_color, transparentize($fg_color, .9)); }
+ &:checked { border-color: $selected_bg_color; }
+}
+
+popover.emoji-picker emoji {
+ font-size: x-large;
+ padding: 6px;
+ border-radius: 6px;
+
+ &:focus,
+ &:hover {
+ background: $selected_bg_color;
+
+ @if $contrast == 'high' {
+ box-shadow: inset 0 0 0 1px $borders_color;
+ }
+ }
+}
+
+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: $menu_selected_color;
+}
+
+popover.entry-completion > contents {
+ padding: 0;
+}
+
+statusbar {
+ padding: 6px 10px 6px 10px;
+}
+
+menubutton {
+ > button > box {
+ border-spacing: 6px;
+ }
+
+ arrow {
+ min-height: 16px;
+ min-width: 16px;
+ &.none {
+ -gtk-icon-source: -gtk-icontheme('open-menu-symbolic');
+ }
+ &.down {
+ -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
+ }
+ &.up {
+ -gtk-icon-source: -gtk-icontheme('pan-up-symbolic');
+ }
+ &.left {
+ -gtk-icon-source: -gtk-icontheme('pan-start-symbolic');
+ }
+ &.right {
+ -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
+ }
+ }
+}
diff --git a/gtk/src/gtk-4.0/default/_drawing.scss b/gtk/src/gtk-4.0/default/_drawing.scss
new file mode 100644
index 0000000000..6d05609f27
--- /dev/null
+++ b/gtk/src/gtk-4.0/default/_drawing.scss
@@ -0,0 +1,514 @@
+// Drawing mixins
+
+// generic drawing of more complex things
+
+//
+// Helper mixin for drawing visible focus rings
+//
+// If $target is specified, the focus ring is applied to the specified child element.
+// If $outer is true, the focus ring extends outward. Otherwise, it extends inward.
+// If $within is true, use focus-within instead of focus:focus-visible
+//
+@mixin focus-ring($target: null, $width: 2px, $offset: -$width, $outer: false, $focus-state: 'focus:focus-visible', $fc: $focus_border_color) {
+ transition-property: outline, outline-width, outline-offset, outline-color;
+ transition-duration: 300ms;
+ animation-timing-function: ease-in-out;
+ & #{$target} {
+ outline: 0 solid transparent;
+ outline-offset: if($outer, $offset + 4px, $offset + $width + 4px);
+ }
+
+ &:#{$focus-state} #{$target} {
+ outline-color: $fc;
+ outline-width: $width;
+ outline-offset: $offset;
+ }
+}
+
+@mixin _shadows($list...) {
+//
+// Helper mixin to stack up to box-shadows;
+//
+ $shadows: null;
+
+ @each $shadow in $list {
+ @if $shadow!=none { $shadows: $shadows, $shadow; }
+ }
+
+ box-shadow: $shadows;
+}
+
+// entries
+
+@mixin entry($t, $fc:$focus_border_color) {
+//
+// Entries drawing function
+//
+// $t: entry type
+// $fc: focus color
+//
+// possible $t values:
+// normal, focus, insensitive, backdrop, backdrop-insensitive, osd, osd-focus, osd-backdrop, block_cursor;
+//
+
+ @if $t==normal {
+ color: $text_color;
+ border-color: $borders_color;
+ background-color: $base_color;
+ // for the transition to work the number of shadows in different states needs to match, hence the transparent shadow here.
+ }
+ @if $t==insensitive {
+ color: $insensitive_fg_color;
+ border-color: $borders_color;
+ background-color: $insensitive_bg_color;
+ }
+ @if $t==backdrop {
+ color: $backdrop_text_color;
+ border-color: $backdrop_borders_color;
+ background-color: $backdrop_base_color;
+ }
+ @if $t==backdrop-insensitive {
+ color: $backdrop_insensitive_color;
+ border-color: $backdrop_borders_color;
+ background-color: $insensitive_bg_color;
+ }
+ @if $t==osd {
+ color: $osd_text_color;
+ border-color: $osd_borders_color;
+ background-color: transparentize(opacify($osd_borders_color, 1), 0.5);
+ background-clip: padding-box;
+ box-shadow: none;
+ -gtk-icon-shadow: 0 1px black;
+ }
+ @if $t==osd-focus {
+ color: $osd_text_color;
+ border-color: $selected_bg_color;
+ background-color: transparentize(opacify($osd_borders_color, 1), 0.5);
+ background-clip: padding-box;
+ }
+ @if $t==osd-insensitive {
+ color: $osd_insensitive_fg_color;
+ border-color: $osd_borders_color;
+ background-color: $osd_insensitive_bg_color;
+ background-clip: padding-box;
+ }
+ @if $t==osd-backdrop {
+ color: $osd_text_color;
+ border-color: $osd_borders_color;
+ background-color: transparentize(opacify($osd_borders_color, 1), 0.5);
+ background-clip: padding-box;
+ }
+ @if $t==block_cursor {
+ color: $base_color;
+ background-color: $text_color;
+ }
+}
+
+// buttons
+
+@function _border_color($c, $darker: false) {
+ @if $darker == true { @return darken($c, 20%); }
+ @else { @return darken($c, 15%); }
+}
+
+$_default_button_c: lighten($bg_color,2%);
+@mixin button($t, $c:$_default_button_c, $tc:$fg_color) {
+//
+// Button drawing function
+//
+// $t: button type,
+// $c: base button color for colored* types
+// $tc: optional text color for colored* types
+//
+// possible $t values:
+// normal, hover, active, checked-hover, checked-active, insensitive, insensitive-active,
+// backdrop, backdrop-active, backdrop-insensitive, backdrop-insensitive-active,
+// osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated
+//
+ $_button_shadow: 0 1px 2px transparentize($shadow_color, 0.03);
+
+ @if $t==normal {
+ //
+ // normal button
+ //
+ color: $tc;
+ outline-color: if($c != $_default_button_c, $alt_focus_border_color, $focus_border_color);
+ border-color: if($c!=$_default_button_c, _border_color($c, true), $borders_color); //tint if not default button color
+ // Yaru change: we don't want to use gradients on buttons
+ background-image: if($variant == 'light', image(lighten($c, 2%)), image(lighten($c, 4%)));
+ @include _shadows(none); // Yaru change: drop shadow
+ }
+
+ @else if $t==hover {
+ //
+ // hovered button
+ //
+ color: $tc;
+ border-color: if($c != $_default_button_c, _border_color($c), $borders_color);
+ @if $variant == 'light' {
+ background-image: linear-gradient(to top, darken($c,16%), darken($c,8%) 1px);
+ @include _shadows($_button_shadow);
+ }
+ @else {
+ background-image: linear-gradient(to top, darken($c,4%) 20%, darken($c, 3%) 90%);
+ @include _shadows($_button_shadow);
+ }
+ box-shadow: none; // Yaru change: remove shadow
+ background-image: if($variant == 'light', image(darken($c, 2%)), image(lighten($c, 6%))); // Yaru change: darker bg on hover on light theme
+ }
+
+ @else if $t==active {
+ //
+ // pushed button
+ //
+ color: $tc;
+ border-color: if($c != $_default_button_c, _border_color($c), $borders_color);
+ background-image: if($variant == 'light', image(darken($c, 14%)), image(darken($c, 9%)));
+ box-shadow: none;
+ }
+
+ @else if $t==checked-hover {
+ //
+ // pushed togglebutton hover
+ //
+ color: $tc;
+ border-color: if($c != $_default_button_c, _border_color($c), $borders_color);
+ background-image: if($variant == 'light', image(darken($c, 18%)), image(darken($c, 12%)));
+ box-shadow: none;
+ }
+
+ @else if $t==checked-active {
+ //
+ // pushed togglebutton pushed further :)
+ //
+ color: $tc;
+ border-color: if($c != $_default_button_c, _border_color($c), $borders_color);
+ background-image: if($variant == 'light', image(darken($c, 22%)), image(darken($c, 14%)));
+ box-shadow: none;
+ }
+
+ @else if $t==insensitive {
+ //
+ // insensitive button
+ //
+ $_bg: if($c != $_default_button_c, mix($c, $base_color, 85%), $insensitive_bg_color);
+
+ color: if($tc != $fg_color, mix($tc, $_bg, 50%), $insensitive_fg_color);
+ border-color: if($c != $_default_button_c, _border_color($c), $insensitive_borders_color);
+ background-image: image($_bg);
+ }
+
+ @else if $t==insensitive-active {
+ //
+ // insensitive pushed button
+ //
+ $_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 6%));
+ $_bc: if($c != $_default_button_c, _border_color($c), $insensitive_borders_color);
+
+ color: if($c != $_default_button_c, mix($tc, $_bg, 60%), $insensitive_fg_color);
+ border-color: $_bc;
+ background-image: image($_bg);
+ box-shadow: none;
+ }
+
+ @else if $t==backdrop {
+ //
+ // backdrop button
+ //
+ $_bg: if($c != $_default_button_c, $c, $backdrop_bg_color);
+ $_bc: if($variant == 'light', $c, _border_color($c));
+
+ color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color);
+ border-color: if($c != $_default_button_c, $_bc, $backdrop_borders_color);
+ background-image: image($_bg);
+ box-shadow: none;
+ }
+
+ @else if $t==backdrop-active {
+ //
+ // backdrop pushed button
+ //
+ $_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 4%));
+ $_bc: if($variant == 'light', $_bg ,_border_color($c));
+
+ color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color);
+ border-color: if($c != $_default_button_c, $_bc, $backdrop_borders_color);
+ background-image: image($_bg);
+ box-shadow: none;
+ }
+
+ @else if $t==backdrop-insensitive {
+ //
+ // backdrop insensitive button
+ //
+
+ $_bg: if($c != $_default_button_c, mix($c, $base_color, 85%), if($variant=='light', $insensitive_bg_color, lighten($insensitive_bg_color, 3%))); // Yaru change: lighten bg color in light theme
+ $_bc: if($variant == 'light', $_bg,_border_color($c));
+
+ color: if($c != $_default_button_c, mix($tc, $_bg, 35%), $backdrop_insensitive_color);
+ border-color: if($c != $_default_button_c, $_bc, $backdrop_borders_color);
+ background-image: image($_bg);
+ box-shadow: none;
+ }
+
+ @else if $t==backdrop-insensitive-active {
+ //
+ // backdrop insensitive pushed button
+ //
+
+ $_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 4%));
+ $_bc: if($variant == 'light', $_bg, _border_color($c));
+
+ color: if($c != $_default_button_c, mix($tc, $_bg, 35%), $backdrop_insensitive_color);
+ border-color: if($c != $_default_button_c, $_bc, $backdrop_borders_color);
+ background-image: image($_bg);
+ box-shadow: none;
+ }
+
+ @else if $t==osd {
+ //
+ // normal osd button
+ //
+ $_bg: if($c != $_default_button_c, transparentize($c, 0.5), lighten($osd_bg_color, 9%)); // Yaru change: make osd buttons visible
+
+ color: $osd_fg_color;
+ outline-color: if($c != $_default_button_c, $alt_focus_border_color, $focus_border_color);
+ border-color: $osd_borders_color;
+ background-color: transparent;
+ background-image: image($_bg);
+ background-clip: padding-box;
+ }
+
+ @else if $t==osd-hover {
+ //
+ // active osd button
+ //
+ $_bg: if($c != $_default_button_c, transparentize($c, 0.3), lighten($osd_bg_color, 12%)); // Yaru change: make osd buttons visible
+
+ color: white;
+ border-color: $osd_borders_color;
+ background-color: transparent;
+ background-image: image($_bg);
+ background-clip: padding-box;
+ }
+
+ @else if $t==osd-active {
+ //
+ // active osd button
+ //
+ $_bg: if($c != $_default_button_c, $c, $osd_borders_color); // Yaru change: make osd buttons visible
+
+ color: white;
+ border-color: $osd_borders_color;
+ background-color: transparent;
+ background-image: image($_bg);
+ background-clip: padding-box;
+ box-shadow: none;
+ }
+
+ @else if $t==osd-insensitive {
+ //
+ // insensitive osd button
+ //
+ color: $osd_insensitive_fg_color;
+ border-color: $osd_borders_color;
+ background-color: transparent;
+ background-image: image($osd_insensitive_bg_color);
+ background-clip: padding-box;
+ }
+
+ @else if $t==osd-backdrop {
+ //
+ // backdrop osd button
+ //
+ $_bg: if($c != $_default_button_c, transparentize($c, 0.5), $osd_bg_color);
+
+ color: $osd_fg_color;
+ border-color: $osd_borders_color;
+ background-color: transparent;
+ background-image: image($_bg);
+ background-clip: padding-box;
+ }
+
+ @else if $t==undecorated {
+ //
+ // reset
+ //
+ border-color: transparent;
+ background-color: transparent;
+ background-image: none;
+ box-shadow: none;
+ }
+ @else if $t==undecorated-hover {
+ border-color: transparent;
+ background-image: none;
+ box-shadow: none;
+ @if $variant == 'light' {
+ background-color: darken($c,14%);
+ } @else {
+ background-color: darken($c,1%);
+ }
+ }
+ @else if $t==undecorated-active {
+ border-color: transparent;
+ background-image: none;
+ box-shadow: none;
+ @if $variant == 'light' {
+ background-color: darken($c,20%);
+ }
+ @else {
+ background-color: darken($c,5%);
+ }
+ }
+}
+
+@mixin headerbar_fill($c:$headerbar_bg_color, $ov: none) {
+//
+// headerbar fill
+//
+// $c: base color
+// $ov: a background layer for background shorthand (hence no commas!)
+//
+ $gradient: linear-gradient(to top, darken($c, 0%), lighten($c, 0%)); // Yaru change: no gradients
+
+ @if $variant == 'dark' { $gradient: linear-gradient(to top, lighten($c, 6%), lighten($c, 6%)); } // Yaru change: no gradients
+
+ @if $ov != none { background: $c $ov, $gradient; }
+ @else { background: $c $gradient; }
+
+}
+
+@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
+//
+
+ $_small_gradient_length: 3%;
+ $_big_gradient_length: 50%;
+
+ $_small_gradient_size: 100% $_small_gradient_length;
+ $_big_gradient_size: 100% $_big_gradient_length;
+
+ @if $p==right or $p==left {
+ $_small_gradient_size: $_small_gradient_length 100%;
+ $_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; }
+ }
+
+ $_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-repeat: no-repeat;
+ background-position: $p;
+
+ background-color: transparent; // reset some properties to be sure to not inherit them somehow
+ border: none; //
+ box-shadow: none; //
+}
+
+/***************************
+ * Check and Radio buttons *
+ ***************************/
+
+ @mixin check($t, $c:$checkradio_bg_color, $tc:$checkradio_fg_color, $checked: false) {
+ // Check/Radio drawing function
+ //
+ // $t: check/radio type,
+ // $c: base button color for colored* types
+ // $tc: optional text color for colored* types
+ // $checked: bool to chose between checked/unchecked
+ //
+ // possible $t values:
+ // normal, hover, active, insensitive, backdrop, backdrop-insensitive, menu
+
+ $_border_color: if($c==$checkradio_bg_color, $c, $alt_borders_color); // Yaru change: use background as border when checked
+ $_dim_border_color: transparentize($_border_color, if($variant == 'light', 0.3, 0.7));
+
+ @if $t==normal {
+ background-clip: if($checked, border-box, padding-box);
+ background-image: image(lighten($c, if($variant=='dark', if($c==$checkradio_bg_color, 0%, 5%), 0%))); // Yaru change: no gradients
+ border-color: $_border_color;
+ box-shadow: 0 1px transparentize(black, 0.95);
+ color: $tc;
+ }
+
+ @if $t==hover { // Yaru change: no gradients, better borders
+ background-image: image(if($c==$checkradio_bg_color, lighten($c, 7%), if($variant=='light', darken($c, 4%), lighten($c, 7%)))); // Yaru change: no gradients
+ border-color: if($c == $checkradio_bg_color, lighten($c, 7%), $alt_borders_color);
+ }
+
+ @if $t==active { // Yaru change: no gradients, no inset shadow
+ box-shadow: none;
+ background-image: image(if($c==white, $_border_color, darken($c, 7%)));
+ border-color: if($c==$checkradio_bg_color, darken($c, 7%), $_border_color);
+ }
+
+ @if $t==insensitive {
+ box-shadow: none;
+ color: $insensitive_fg_color; // Yaru change: use correct fg color
+ border-color: $insensitive_borders_color;
+ background-image: image($insensitive_bg_color);
+ }
+
+ @if $t==backdrop {
+ background-image: image($c);
+ box-shadow: none;
+ color: $tc;
+ }
+
+ @if $t==backdrop-insensitive {
+ box-shadow: none;
+ color: transparentize($tc, 0.3);
+ }
+
+ @if $t==menu {
+ transform: scale(0.8);
+ border-width: 1.2px;
+ border-color: transparent;
+ box-shadow: none;
+ background-image: image(transparent);
+ color: $tc;
+ }
+
+ @if $t==menu-active {
+ transform: scale(0.8);
+ border-width: 1.2px;
+ color: $tc;
+ box-shadow: none;
+ background-image: image(transparent);
+ }
+}
diff --git a/gtk/src/gtk-4.0/default/_palette.scss b/gtk/src/gtk-4.0/default/_palette.scss
new file mode 100644
index 0000000000..979b01569d
--- /dev/null
+++ b/gtk/src/gtk-4.0/default/_palette.scss
@@ -0,0 +1,41 @@
+// Blacks
+$jet: #181818;
+$inkstone: #3D3D3D;
+$slate: #5D5D5D;
+$graphite: #666666;
+
+// Whites
+$white: #FFFFFF;
+$porcelain: #F7F7F7;
+$silk: #CCC;
+$warm_gray: #AEA79F;
+$ash: #878787;
+
+// Purples
+$aubergine: #924D8B;
+$purple: #762572;
+$light_aubergine: #77216F;
+$mid_aubergine: #5E2750;
+$dark_aubergine: #2C001E;
+
+// Reds
+$red: #c7162b;
+
+// Oranges
+$orange: #E95420;
+
+// Yellows
+$yellow: #f99b11;
+
+// Greens
+$green: #0e8420;
+
+// Blues
+$blue: #19B6EE;
+$linkblue: #007aa6;
+$darkblue: #335280;
+
+
+// Semantic colors
+$accent_bg_color: $orange !default;
+$accent_fg_color: $white !default;
diff --git a/gtk/src/gtk-4.0/default/_tweaks.scss b/gtk/src/gtk-4.0/default/_tweaks.scss
new file mode 100644
index 0000000000..ee61606737
--- /dev/null
+++ b/gtk/src/gtk-4.0/default/_tweaks.scss
@@ -0,0 +1,254 @@
+// Reducing the amount of the palette's background colors to two
+.sidebar {
+ background-color: $bg_color;
+}
+
+// Entries drown if drawn on widgets with $base_color
+// Fixing this at least for notebooks, since entries on tabs is a common pattern
+// Remove this when upstream makes entries have a light border in the dark theme
+@if $variant== "dark" {
+ notebook entry {
+ background-color: darken($base_color, 2%);
+ }
+}
+
+// Add some transitions on widgets
+check,
+radio,
+switch,
+switch slider,
+scale > trough,
+scale > trough > slider,
+scale > trough > highlight {
+ transition: $button_transition;
+}
+%button,
+button {
+ &.suggested-action,
+ &.destructive-action {
+ transition: $button_transition;
+ }
+}
+
+// Fix popover wiggling effect (see #2903)
+popover.menu {
+ check,
+ radio {
+ transition: none;
+ }
+}
+
+// Check/radios in menus do not need a border
+popover.menu {
+ check,
+ radio {
+ &, &:checked, &:indeterminate {
+ &, &:hover, &:disabled {
+ border-color: transparent;
+ }
+ }
+ }
+}
+
+// Use our own palette for high and not empty levelbar
+levelbar {
+ > trough {
+ > block {
+ &.high,
+ &:not(.empty) {
+ background-color: $success_color;
+ border: 1px solid $success_color;
+ }
+ }
+ }
+}
+
+// Remove spinbutton active inset shadow
+spinbutton:not(.vertical) {
+ > button.image-button.up:not(.flat),
+ > button.image-button.down:not(.flat) {
+ &:active {
+ box-shadow: none;
+ }
+ }
+}
+
+// titlebutton
+windowcontrols {
+ button {
+ min-width: 24px;
+
+ $_base_button_color: transparentize($fg_color, 0.9);
+ $_base_hover_color: transparentize($fg_color, 0.85);
+ $_base_active_color: transparentize($fg_color, 0.75);
+
+ > image {
+ min-height: 20px;
+ min-width: 20px;
+ padding: 2px;
+ margin: 0 3px;
+
+ background: $_base_button_color;
+ }
+
+ &:hover > image {
+ //special case hover colors inside a headerbar
+ @include button(undecorated-hover,$c:$_base_hover_color);
+ }
+
+ &:active > image,
+ &:checked > image {
+ @include button(undecorated-active,$c:$_base_active_color);
+ }
+
+ &:hover,
+ &:active,
+ &:checked {
+ background: none;
+ }
+ }
+}
+
+%titlebar,
+headerbar {
+ &.default-decoration {
+ windowcontrols {
+ button,
+ menubutton button {
+ min-width: 24px;
+ }
+
+ button > image,
+ menubutton > image {
+ min-height: 20px;
+ min-width: 20px;
+ margin: 0 3px;
+ }
+
+ menubutton button > image {
+ min-height: 18px;
+ min-width: 18px;
+ }
+ }
+ }
+}
+
+
+// Mimic Libadwaita slider
+
+$_slider_color: darken(white, 1%);
+$_slider_hover_color: white;
+$_slider_disabled_color: if($variant == 'light', $_slider_color, darken($_slider_color, 20%));
+
+$_trough_color: if($variant == 'light', $silk, lighten($inkstone, 5%));
+$_trough_disabled_color: if($variant == 'light', lighten($_trough_color, 10%), $inkstone);
+
+switch {
+ $box-shadow: 0 2px 2px transparentize(black, .9);
+
+ transition: $button_transition;
+ transition-property: background, border;
+
+ &:not(:backdrop), :backdrop &:backdrop {
+ &, :selected & {
+ border-color: $_trough_color;
+ background: $_trough_color;
+ }
+
+ &:checked {
+ border-color: $checkradio_bg_color;
+ background: $checkradio_bg_color;
+
+ :selected & {
+ border-color: transparentize(black, $amount: .75);
+ }
+ }
+
+ &, :selected & {
+ &:disabled {
+ border-color: $_trough_disabled_color;
+ background: $_trough_disabled_color;
+ }
+ }
+ }
+
+ slider {
+ margin: 1px;
+
+ min-width: 20px;
+ min-height: 20px;
+
+ background-clip: border-box;
+ }
+
+ &:not(:backdrop) {
+ &, :selected & {
+ &, &:checked {
+ > slider {
+ border-color: $_slider_color;
+ background: $_slider_color;
+ box-shadow: $box-shadow;
+ }
+ }
+
+ &:hover {
+ &, &:checked {
+ > slider {
+ border-color: $_slider_hover_color;
+ background: $_slider_hover_color;
+ box-shadow: $box-shadow;
+ }
+ }
+ }
+ }
+ }
+
+ &:disabled, &:backdrop {
+ &, &:checked {
+ > slider {
+ &:disabled, &:backdrop {
+ border-color: $_slider_disabled_color;
+ background: $_slider_disabled_color;
+ }
+ }
+ }
+ }
+}
+
+scale:not(.marks-after):not(.marks-before) {
+ $box-shadow: 0 1px 0 transparentize(black, .9);
+ $box-shadow-border: inset 0 0 0 1px transparentize(black, if($variant == 'light', .8, 1));
+ $box-shadow-border-active: inset 0 0 0 1px $progress_border_color;
+
+ slider {
+ border: none;
+ min-height: 20px;
+ min-width: 20px;
+ }
+
+ &:not(:disabled) {
+ slider {
+ background: $_slider_color;
+ box-shadow: $box-shadow-border, $box-shadow;
+ }
+
+ &:hover {
+ slider {
+ background: $_slider_hover_color;
+ }
+ }
+
+ slider:active {
+ box-shadow: $box-shadow-border-active, $box-shadow;
+ }
+ }
+
+ &:disabled, &:backdrop {
+ &, &:hover {
+ slider {
+ background: $_slider_disabled_color;
+ box-shadow: $box-shadow-border;
+ }
+ }
+ }
+}
diff --git a/gtk/src/gtk-4.0/default/assets.svg b/gtk/src/gtk-4.0/default/assets.svg
new file mode 100644
index 0000000000..0b97dbbd3c
--- /dev/null
+++ b/gtk/src/gtk-4.0/default/assets.svg
@@ -0,0 +1,1066 @@
+
+
diff --git a/gtk/src/gtk-4.0/default/assets.txt b/gtk/src/gtk-4.0/default/assets.txt
new file mode 100644
index 0000000000..a380d1cce5
--- /dev/null
+++ b/gtk/src/gtk-4.0/default/assets.txt
@@ -0,0 +1,44 @@
+text-select-end
+text-select-end-hover
+text-select-end-active
+text-select-start
+text-select-start-hover
+text-select-start-active
+text-select-end-dark
+text-select-end-hover-dark
+text-select-end-active-dark
+text-select-start-dark
+text-select-start-hover-dark
+text-select-start-active-dark
+slider-horz-scale-has-marks-below
+slider-horz-scale-has-marks-below-hover
+slider-horz-scale-has-marks-below-active
+slider-horz-scale-has-marks-below-insensitive
+slider-vert-scale-has-marks-below
+slider-vert-scale-has-marks-below-hover
+slider-vert-scale-has-marks-below-active
+slider-vert-scale-has-marks-below-insensitive
+slider-horz-scale-has-marks-above
+slider-horz-scale-has-marks-above-hover
+slider-horz-scale-has-marks-above-active
+slider-horz-scale-has-marks-above-insensitive
+slider-vert-scale-has-marks-above
+slider-vert-scale-has-marks-above-hover
+slider-vert-scale-has-marks-above-active
+slider-vert-scale-has-marks-above-insensitive
+slider-horz-scale-has-marks-below-dark
+slider-horz-scale-has-marks-below-hover-dark
+slider-horz-scale-has-marks-below-active-dark
+slider-horz-scale-has-marks-below-insensitive-dark
+slider-vert-scale-has-marks-below-dark
+slider-vert-scale-has-marks-below-hover-dark
+slider-vert-scale-has-marks-below-active-dark
+slider-vert-scale-has-marks-below-insensitive-dark
+slider-horz-scale-has-marks-above-dark
+slider-horz-scale-has-marks-above-hover-dark
+slider-horz-scale-has-marks-above-active-dark
+slider-horz-scale-has-marks-above-insensitive-dark
+slider-vert-scale-has-marks-above-dark
+slider-vert-scale-has-marks-above-hover-dark
+slider-vert-scale-has-marks-above-active-dark
+slider-vert-scale-has-marks-above-insensitive-dark
diff --git a/gtk/src/gtk-4.0/default/assets/bullet-symbolic.svg b/gtk/src/gtk-4.0/default/assets/bullet-symbolic.svg
new file mode 100644
index 0000000000..fe4531881e
--- /dev/null
+++ b/gtk/src/gtk-4.0/default/assets/bullet-symbolic.svg
@@ -0,0 +1,48 @@
+
+
diff --git a/gtk/src/gtk-4.0/default/assets/bullet-symbolic.symbolic.png b/gtk/src/gtk-4.0/default/assets/bullet-symbolic.symbolic.png
new file mode 100644
index 0000000000..be2f5844df
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/bullet-symbolic.symbolic.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/bullet@2-symbolic.symbolic.png b/gtk/src/gtk-4.0/default/assets/bullet@2-symbolic.symbolic.png
new file mode 100644
index 0000000000..4c5fd28baf
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/bullet@2-symbolic.symbolic.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/check-symbolic.svg b/gtk/src/gtk-4.0/default/assets/check-symbolic.svg
new file mode 100644
index 0000000000..06e1edee37
--- /dev/null
+++ b/gtk/src/gtk-4.0/default/assets/check-symbolic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/default/assets/check-symbolic.symbolic.png b/gtk/src/gtk-4.0/default/assets/check-symbolic.symbolic.png
new file mode 100644
index 0000000000..cd217f5eb9
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/check-symbolic.symbolic.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/check@2-symbolic.symbolic.png b/gtk/src/gtk-4.0/default/assets/check@2-symbolic.symbolic.png
new file mode 100644
index 0000000000..6d6b01a9a7
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/check@2-symbolic.symbolic.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/dash-symbolic.svg b/gtk/src/gtk-4.0/default/assets/dash-symbolic.svg
new file mode 100644
index 0000000000..978f7dfdf3
--- /dev/null
+++ b/gtk/src/gtk-4.0/default/assets/dash-symbolic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/default/assets/dash-symbolic.symbolic.png b/gtk/src/gtk-4.0/default/assets/dash-symbolic.symbolic.png
new file mode 100644
index 0000000000..27be0ebdc6
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/dash-symbolic.symbolic.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/dash@2-symbolic.symbolic.png b/gtk/src/gtk-4.0/default/assets/dash@2-symbolic.symbolic.png
new file mode 100644
index 0000000000..66b0b8c798
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/dash@2-symbolic.symbolic.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-active-dark.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-active-dark.png
new file mode 100644
index 0000000000..52bba2c503
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-active-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-active-dark@2.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-active-dark@2.png
new file mode 100644
index 0000000000..0897bb1fc4
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-active-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-active.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-active.png
new file mode 100644
index 0000000000..917bcef1dd
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-active.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-active@2.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-active@2.png
new file mode 100644
index 0000000000..44befabfac
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-active@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-dark.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-dark.png
new file mode 100644
index 0000000000..7597df7c89
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-dark@2.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-dark@2.png
new file mode 100644
index 0000000000..f3070b2105
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-hover-dark.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-hover-dark.png
new file mode 100644
index 0000000000..d53e2c9bd3
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-hover-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-hover-dark@2.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
new file mode 100644
index 0000000000..6be6d8333f
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-hover-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-hover.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-hover.png
new file mode 100644
index 0000000000..4650ba62d0
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-hover.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-hover@2.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-hover@2.png
new file mode 100644
index 0000000000..3b5104a701
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-hover@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-insensitive-dark.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
new file mode 100644
index 0000000000..44f51e68a0
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-insensitive-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
new file mode 100644
index 0000000000..46776a2d7d
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-insensitive.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-insensitive.png
new file mode 100644
index 0000000000..f091e69b92
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-insensitive.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-insensitive@2.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-insensitive@2.png
new file mode 100644
index 0000000000..9cb60d0f78
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above-insensitive@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above.png
new file mode 100644
index 0000000000..014dd9914f
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above@2.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above@2.png
new file mode 100644
index 0000000000..0ffcc7b607
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-above@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-active-dark.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-active-dark.png
new file mode 100644
index 0000000000..e9435e9b9f
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-active-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-active-dark@2.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-active-dark@2.png
new file mode 100644
index 0000000000..c75791fe86
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-active-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-active.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-active.png
new file mode 100644
index 0000000000..17d8daa7d6
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-active.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-active@2.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-active@2.png
new file mode 100644
index 0000000000..e58a6dc74c
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-active@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-dark.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-dark.png
new file mode 100644
index 0000000000..f24b1570a6
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-dark@2.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-dark@2.png
new file mode 100644
index 0000000000..e19349eeff
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-hover-dark.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-hover-dark.png
new file mode 100644
index 0000000000..06d411e88c
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-hover-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-hover-dark@2.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
new file mode 100644
index 0000000000..a7121cc834
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-hover-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-hover.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-hover.png
new file mode 100644
index 0000000000..0775fb3591
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-hover.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-hover@2.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-hover@2.png
new file mode 100644
index 0000000000..1dc4086c3e
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-hover@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-insensitive-dark.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
new file mode 100644
index 0000000000..0e0b622b67
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-insensitive-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
new file mode 100644
index 0000000000..dbc71a72a8
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-insensitive.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-insensitive.png
new file mode 100644
index 0000000000..daeabd08db
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-insensitive.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-insensitive@2.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-insensitive@2.png
new file mode 100644
index 0000000000..4481bffdb7
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below-insensitive@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below.png
new file mode 100644
index 0000000000..8e8044a961
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below@2.png b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below@2.png
new file mode 100644
index 0000000000..8a1c4031a2
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-horz-scale-has-marks-below@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-active-dark.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-active-dark.png
new file mode 100644
index 0000000000..38a14995cb
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-active-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-active-dark@2.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-active-dark@2.png
new file mode 100644
index 0000000000..6d927825fb
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-active-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-active.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-active.png
new file mode 100644
index 0000000000..67b5826608
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-active.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-active@2.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-active@2.png
new file mode 100644
index 0000000000..f9f904a290
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-active@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-dark.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-dark.png
new file mode 100644
index 0000000000..b52bfc811e
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-dark@2.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-dark@2.png
new file mode 100644
index 0000000000..7299d8f5ca
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-hover-dark.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-hover-dark.png
new file mode 100644
index 0000000000..c4beb8e344
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-hover-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-hover-dark@2.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
new file mode 100644
index 0000000000..a91769f1a9
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-hover-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-hover.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-hover.png
new file mode 100644
index 0000000000..c0d353851e
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-hover.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-hover@2.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-hover@2.png
new file mode 100644
index 0000000000..6eb17b9154
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-hover@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-insensitive-dark.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
new file mode 100644
index 0000000000..007174a714
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-insensitive-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
new file mode 100644
index 0000000000..4ef89ce54f
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-insensitive.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-insensitive.png
new file mode 100644
index 0000000000..05541773e1
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-insensitive.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-insensitive@2.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-insensitive@2.png
new file mode 100644
index 0000000000..af3629b23d
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above-insensitive@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above.png
new file mode 100644
index 0000000000..1f6759f2ce
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above@2.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above@2.png
new file mode 100644
index 0000000000..66755eae42
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-above@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-active-dark.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-active-dark.png
new file mode 100644
index 0000000000..8b10decbb4
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-active-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-active-dark@2.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-active-dark@2.png
new file mode 100644
index 0000000000..38a1ada2e5
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-active-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-active.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-active.png
new file mode 100644
index 0000000000..3d04bad84f
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-active.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-active@2.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-active@2.png
new file mode 100644
index 0000000000..da786c83e9
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-active@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-dark.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-dark.png
new file mode 100644
index 0000000000..0a3febbeae
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-dark@2.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-dark@2.png
new file mode 100644
index 0000000000..c64433635f
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-hover-dark.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-hover-dark.png
new file mode 100644
index 0000000000..b2d42d5860
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-hover-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-hover-dark@2.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
new file mode 100644
index 0000000000..5fde1cf090
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-hover-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-hover.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-hover.png
new file mode 100644
index 0000000000..989b8a0a88
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-hover.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-hover@2.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-hover@2.png
new file mode 100644
index 0000000000..0cdb9030f0
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-hover@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-insensitive-dark.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
new file mode 100644
index 0000000000..c605a2f639
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-insensitive-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
new file mode 100644
index 0000000000..25f298ba0e
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-insensitive.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-insensitive.png
new file mode 100644
index 0000000000..7fb26d7292
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-insensitive.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-insensitive@2.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-insensitive@2.png
new file mode 100644
index 0000000000..f804b1f328
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below-insensitive@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below.png
new file mode 100644
index 0000000000..27fc5b792e
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below@2.png b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below@2.png
new file mode 100644
index 0000000000..345d3c32b9
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/slider-vert-scale-has-marks-below@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-end-active-dark.png b/gtk/src/gtk-4.0/default/assets/text-select-end-active-dark.png
new file mode 100644
index 0000000000..6e6d1cb336
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-end-active-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-end-active-dark@2.png b/gtk/src/gtk-4.0/default/assets/text-select-end-active-dark@2.png
new file mode 100644
index 0000000000..b961e445f8
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-end-active-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-end-active.png b/gtk/src/gtk-4.0/default/assets/text-select-end-active.png
new file mode 100644
index 0000000000..b68e7ea327
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-end-active.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-end-active@2.png b/gtk/src/gtk-4.0/default/assets/text-select-end-active@2.png
new file mode 100644
index 0000000000..17c7aa04c9
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-end-active@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-end-dark.png b/gtk/src/gtk-4.0/default/assets/text-select-end-dark.png
new file mode 100644
index 0000000000..a3285b3be7
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-end-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-end-dark@2.png b/gtk/src/gtk-4.0/default/assets/text-select-end-dark@2.png
new file mode 100644
index 0000000000..c39f8eeef8
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-end-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-end-hover-dark.png b/gtk/src/gtk-4.0/default/assets/text-select-end-hover-dark.png
new file mode 100644
index 0000000000..8b2a5f9b8b
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-end-hover-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-end-hover-dark@2.png b/gtk/src/gtk-4.0/default/assets/text-select-end-hover-dark@2.png
new file mode 100644
index 0000000000..175b967419
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-end-hover-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-end-hover.png b/gtk/src/gtk-4.0/default/assets/text-select-end-hover.png
new file mode 100644
index 0000000000..efb9a1a094
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-end-hover.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-end-hover@2.png b/gtk/src/gtk-4.0/default/assets/text-select-end-hover@2.png
new file mode 100644
index 0000000000..123357d56d
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-end-hover@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-end.png b/gtk/src/gtk-4.0/default/assets/text-select-end.png
new file mode 100644
index 0000000000..b8dfc888f3
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-end.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-end@2.png b/gtk/src/gtk-4.0/default/assets/text-select-end@2.png
new file mode 100644
index 0000000000..d1f272f12e
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-end@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-start-active-dark.png b/gtk/src/gtk-4.0/default/assets/text-select-start-active-dark.png
new file mode 100644
index 0000000000..7a7b67b9d4
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-start-active-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-start-active-dark@2.png b/gtk/src/gtk-4.0/default/assets/text-select-start-active-dark@2.png
new file mode 100644
index 0000000000..b57ff0bbe0
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-start-active-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-start-active.png b/gtk/src/gtk-4.0/default/assets/text-select-start-active.png
new file mode 100644
index 0000000000..f61ba09c0a
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-start-active.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-start-active@2.png b/gtk/src/gtk-4.0/default/assets/text-select-start-active@2.png
new file mode 100644
index 0000000000..786c7d6945
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-start-active@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-start-dark.png b/gtk/src/gtk-4.0/default/assets/text-select-start-dark.png
new file mode 100644
index 0000000000..14ec5b3790
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-start-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-start-dark@2.png b/gtk/src/gtk-4.0/default/assets/text-select-start-dark@2.png
new file mode 100644
index 0000000000..7389ce7ae9
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-start-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-start-hover-dark.png b/gtk/src/gtk-4.0/default/assets/text-select-start-hover-dark.png
new file mode 100644
index 0000000000..32d459fe84
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-start-hover-dark.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-start-hover-dark@2.png b/gtk/src/gtk-4.0/default/assets/text-select-start-hover-dark@2.png
new file mode 100644
index 0000000000..707edd28bc
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-start-hover-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-start-hover.png b/gtk/src/gtk-4.0/default/assets/text-select-start-hover.png
new file mode 100644
index 0000000000..92cf9cb5f8
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-start-hover.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-start-hover@2.png b/gtk/src/gtk-4.0/default/assets/text-select-start-hover@2.png
new file mode 100644
index 0000000000..8c4af98753
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-start-hover@2.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-start.png b/gtk/src/gtk-4.0/default/assets/text-select-start.png
new file mode 100644
index 0000000000..c41f64944a
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-start.png differ
diff --git a/gtk/src/gtk-4.0/default/assets/text-select-start@2.png b/gtk/src/gtk-4.0/default/assets/text-select-start@2.png
new file mode 100644
index 0000000000..1414d49d2b
Binary files /dev/null and b/gtk/src/gtk-4.0/default/assets/text-select-start@2.png differ
diff --git a/gtk/src/gtk-4.0/default/gtk-dark.scss b/gtk/src/gtk-4.0/default/gtk-dark.scss
new file mode 100644
index 0000000000..bc91afe2b6
--- /dev/null
+++ b/gtk/src/gtk-4.0/default/gtk-dark.scss
@@ -0,0 +1,8 @@
+$variant: 'dark';
+$contrast: 'normal';
+
+@import 'colors';
+@import 'drawing';
+@import 'common';
+@import 'tweaks';
+@import 'colors-public';
diff --git a/gtk/src/gtk-4.0/default/gtk.scss b/gtk/src/gtk-4.0/default/gtk.scss
new file mode 100644
index 0000000000..4c2ccb7820
--- /dev/null
+++ b/gtk/src/gtk-4.0/default/gtk.scss
@@ -0,0 +1,14 @@
+// General guidelines:
+// - very unlikely you want to edit something else than _common.scss
+// - keep the number of defined colors to a minimum, use the color blending functions if
+// you need a subtle shade
+// - if you need to inverse a color function use the @if directive to match for dark $variant
+
+$variant: 'light';
+$contrast: 'normal';
+
+@import 'colors';
+@import 'drawing';
+@import 'common';
+@import 'tweaks';
+@import 'colors-public';
diff --git a/gtk/src/gtk-4.0/gtk-dark.css.in b/gtk/src/gtk-4.0/gtk-dark.css.in
new file mode 100644
index 0000000000..3be2947ffe
--- /dev/null
+++ b/gtk/src/gtk-4.0/gtk-dark.css.in
@@ -0,0 +1 @@
+@import url("resource:///com/ubuntu/themes/@THEME_NAME@/@GTK_VER@/gtk-dark.css");
diff --git a/gtk/src/gtk-4.0/gtk.css.in b/gtk/src/gtk-4.0/gtk.css.in
new file mode 100644
index 0000000000..50cb59cde1
--- /dev/null
+++ b/gtk/src/gtk-4.0/gtk.css.in
@@ -0,0 +1 @@
+@import url("resource:///com/ubuntu/themes/@THEME_NAME@/@GTK_VER@/gtk.css");
diff --git a/gtk/src/gtk-4.0/gtk.gresource.xml.in b/gtk/src/gtk-4.0/gtk.gresource.xml.in
new file mode 100644
index 0000000000..4770383ebd
--- /dev/null
+++ b/gtk/src/gtk-4.0/gtk.gresource.xml.in
@@ -0,0 +1,7 @@
+
+
+ @THEME_NAME@-gtk-@GTK_VER@-generated.css
+ @THEME_NAME@-gtk-dark-@GTK_VER@-generated.css
+ @ASSETS@
+
+
diff --git a/gtk/src/gtk-4.0/mate-dark/_colors.scss b/gtk/src/gtk-4.0/mate-dark/_colors.scss
new file mode 120000
index 0000000000..f713699e87
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate-dark/_colors.scss
@@ -0,0 +1 @@
+../mate/_colors.scss
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/mate-dark/gtk-dark.scss b/gtk/src/gtk-4.0/mate-dark/gtk-dark.scss
new file mode 120000
index 0000000000..85bfd8e484
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate-dark/gtk-dark.scss
@@ -0,0 +1 @@
+../default/gtk-dark.scss
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/mate/_colors-public.scss b/gtk/src/gtk-4.0/mate/_colors-public.scss
new file mode 120000
index 0000000000..6c8a4ea433
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate/_colors-public.scss
@@ -0,0 +1 @@
+../default/_colors-public.scss
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/mate/_colors.scss b/gtk/src/gtk-4.0/mate/_colors.scss
new file mode 120000
index 0000000000..573bb98917
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate/_colors.scss
@@ -0,0 +1 @@
+../default/_colors.scss
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/mate/_common.scss b/gtk/src/gtk-4.0/mate/_common.scss
new file mode 120000
index 0000000000..07883bef87
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate/_common.scss
@@ -0,0 +1 @@
+../default/_common.scss
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/mate/_drawing.scss b/gtk/src/gtk-4.0/mate/_drawing.scss
new file mode 120000
index 0000000000..4f76339967
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate/_drawing.scss
@@ -0,0 +1 @@
+../default/_drawing.scss
\ No newline at end of file
diff --git a/gtk/src/mate/gtk-4.0/_palette.scss b/gtk/src/gtk-4.0/mate/_palette.scss
similarity index 100%
rename from gtk/src/mate/gtk-4.0/_palette.scss
rename to gtk/src/gtk-4.0/mate/_palette.scss
diff --git a/gtk/src/gtk-4.0/mate/_tweaks.scss b/gtk/src/gtk-4.0/mate/_tweaks.scss
new file mode 120000
index 0000000000..1bb17e2cd7
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate/_tweaks.scss
@@ -0,0 +1 @@
+../default/_tweaks.scss
\ No newline at end of file
diff --git a/gtk/src/mate/gtk-4.0/assets.svg b/gtk/src/gtk-4.0/mate/assets.svg
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets.svg
rename to gtk/src/gtk-4.0/mate/assets.svg
diff --git a/gtk/src/gtk-4.0/mate/assets.txt b/gtk/src/gtk-4.0/mate/assets.txt
new file mode 120000
index 0000000000..9f996baa27
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate/assets.txt
@@ -0,0 +1 @@
+../default/assets.txt
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/mate/assets/bullet-symbolic.svg b/gtk/src/gtk-4.0/mate/assets/bullet-symbolic.svg
new file mode 120000
index 0000000000..961b93569f
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate/assets/bullet-symbolic.svg
@@ -0,0 +1 @@
+../../default/assets/bullet-symbolic.svg
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/mate/assets/bullet-symbolic.symbolic.png b/gtk/src/gtk-4.0/mate/assets/bullet-symbolic.symbolic.png
new file mode 120000
index 0000000000..d4457f8e13
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate/assets/bullet-symbolic.symbolic.png
@@ -0,0 +1 @@
+../../default/assets/bullet-symbolic.symbolic.png
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/mate/assets/bullet@2-symbolic.symbolic.png b/gtk/src/gtk-4.0/mate/assets/bullet@2-symbolic.symbolic.png
new file mode 120000
index 0000000000..4c52e10435
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate/assets/bullet@2-symbolic.symbolic.png
@@ -0,0 +1 @@
+../../default/assets/bullet@2-symbolic.symbolic.png
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/mate/assets/check-symbolic.svg b/gtk/src/gtk-4.0/mate/assets/check-symbolic.svg
new file mode 120000
index 0000000000..4ffdc1c594
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate/assets/check-symbolic.svg
@@ -0,0 +1 @@
+../../default/assets/check-symbolic.svg
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/mate/assets/check-symbolic.symbolic.png b/gtk/src/gtk-4.0/mate/assets/check-symbolic.symbolic.png
new file mode 120000
index 0000000000..c39df60ee8
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate/assets/check-symbolic.symbolic.png
@@ -0,0 +1 @@
+../../default/assets/check-symbolic.symbolic.png
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/mate/assets/check@2-symbolic.symbolic.png b/gtk/src/gtk-4.0/mate/assets/check@2-symbolic.symbolic.png
new file mode 120000
index 0000000000..6939c9bc21
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate/assets/check@2-symbolic.symbolic.png
@@ -0,0 +1 @@
+../../default/assets/check@2-symbolic.symbolic.png
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/mate/assets/dash-symbolic.svg b/gtk/src/gtk-4.0/mate/assets/dash-symbolic.svg
new file mode 120000
index 0000000000..c9500ec138
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate/assets/dash-symbolic.svg
@@ -0,0 +1 @@
+../../default/assets/dash-symbolic.svg
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/mate/assets/dash-symbolic.symbolic.png b/gtk/src/gtk-4.0/mate/assets/dash-symbolic.symbolic.png
new file mode 120000
index 0000000000..4603bae6de
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate/assets/dash-symbolic.symbolic.png
@@ -0,0 +1 @@
+../../default/assets/dash-symbolic.symbolic.png
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/mate/assets/dash@2-symbolic.symbolic.png b/gtk/src/gtk-4.0/mate/assets/dash@2-symbolic.symbolic.png
new file mode 120000
index 0000000000..9840b6d5c0
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate/assets/dash@2-symbolic.symbolic.png
@@ -0,0 +1 @@
+../../default/assets/dash@2-symbolic.symbolic.png
\ No newline at end of file
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-active-dark.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-active-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-active-dark.png
rename to gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-active-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-active-dark@2.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-active-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-active-dark@2.png
rename to gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-active-dark@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-active.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-active.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-active.png
rename to gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-active.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-active@2.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-active@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-active@2.png
rename to gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-active@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-dark.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-dark.png
rename to gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-dark@2.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-dark@2.png
rename to gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-dark@2.png
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-hover-dark.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-hover-dark.png
new file mode 100644
index 0000000000..8f8365943b
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-hover-dark.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-hover-dark@2.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
new file mode 100644
index 0000000000..5403fe43dc
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-hover-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-hover.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-hover.png
new file mode 100644
index 0000000000..ba951c0594
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-hover.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-hover@2.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-hover@2.png
new file mode 100644
index 0000000000..eab0599c46
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-hover@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-insensitive-dark.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
rename to gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
rename to gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-insensitive.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-insensitive.png
new file mode 100644
index 0000000000..3b8f1e649e
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-insensitive.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-insensitive@2.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-insensitive@2.png
new file mode 100644
index 0000000000..c4a397f266
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above-insensitive@2.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above.png
new file mode 100644
index 0000000000..20837877ee
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above@2.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above@2.png
new file mode 100644
index 0000000000..076aba5dc2
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-above@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-active-dark.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-active-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-active-dark.png
rename to gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-active-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-active-dark@2.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-active-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-active-dark@2.png
rename to gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-active-dark@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-active.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-active.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-active.png
rename to gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-active.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-active@2.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-active@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-active@2.png
rename to gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-active@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-dark.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-dark.png
rename to gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-dark@2.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-dark@2.png
rename to gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-dark@2.png
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-hover-dark.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-hover-dark.png
new file mode 100644
index 0000000000..719ea68928
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-hover-dark.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-hover-dark@2.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
new file mode 100644
index 0000000000..644f0cf511
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-hover-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-hover.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-hover.png
new file mode 100644
index 0000000000..df66b4e56d
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-hover.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-hover@2.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-hover@2.png
new file mode 100644
index 0000000000..30a3a75648
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-hover@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-insensitive-dark.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
rename to gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
rename to gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-insensitive.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-insensitive.png
new file mode 100644
index 0000000000..e49a835e37
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-insensitive.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-insensitive@2.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-insensitive@2.png
new file mode 100644
index 0000000000..cf5f21ecef
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below-insensitive@2.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below.png
new file mode 100644
index 0000000000..e939cd93f7
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below@2.png b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below@2.png
new file mode 100644
index 0000000000..a1b5002bbf
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-horz-scale-has-marks-below@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-active-dark.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-active-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-active-dark.png
rename to gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-active-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-active-dark@2.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-active-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-active-dark@2.png
rename to gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-active-dark@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-active.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-active.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-active.png
rename to gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-active.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-active@2.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-active@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-active@2.png
rename to gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-active@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-dark.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-dark.png
rename to gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-dark@2.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-dark@2.png
rename to gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-dark@2.png
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-hover-dark.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-hover-dark.png
new file mode 100644
index 0000000000..aa3f1620ce
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-hover-dark.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-hover-dark@2.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
new file mode 100644
index 0000000000..89a802792b
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-hover-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-hover.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-hover.png
new file mode 100644
index 0000000000..5b271dbe76
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-hover.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-hover@2.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-hover@2.png
new file mode 100644
index 0000000000..51847fdab0
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-hover@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-insensitive-dark.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
rename to gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
rename to gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-insensitive.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-insensitive.png
new file mode 100644
index 0000000000..32b43303d8
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-insensitive.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-insensitive@2.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-insensitive@2.png
new file mode 100644
index 0000000000..d57d8a96f4
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above-insensitive@2.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above.png
new file mode 100644
index 0000000000..dabe8a0372
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above@2.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above@2.png
new file mode 100644
index 0000000000..9acaae8632
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-above@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-active-dark.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-active-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-active-dark.png
rename to gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-active-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-active-dark@2.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-active-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-active-dark@2.png
rename to gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-active-dark@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-active.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-active.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-active.png
rename to gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-active.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-active@2.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-active@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-active@2.png
rename to gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-active@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-dark.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-dark.png
rename to gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-dark@2.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-dark@2.png
rename to gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-dark@2.png
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-hover-dark.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-hover-dark.png
new file mode 100644
index 0000000000..a93756d255
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-hover-dark.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-hover-dark@2.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
new file mode 100644
index 0000000000..1ac2297062
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-hover-dark@2.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-hover.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-hover.png
new file mode 100644
index 0000000000..4eba555ee6
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-hover.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-hover@2.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-hover@2.png
new file mode 100644
index 0000000000..982f068831
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-hover@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-insensitive-dark.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
rename to gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
rename to gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-insensitive.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-insensitive.png
new file mode 100644
index 0000000000..2d19aa70b0
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-insensitive.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-insensitive@2.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-insensitive@2.png
new file mode 100644
index 0000000000..056cf5c293
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below-insensitive@2.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below.png
new file mode 100644
index 0000000000..d8ae7e4e33
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below@2.png b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below@2.png
new file mode 100644
index 0000000000..21e22da645
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/slider-vert-scale-has-marks-below@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-end-active-dark.png b/gtk/src/gtk-4.0/mate/assets/text-select-end-active-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-end-active-dark.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-end-active-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-end-active-dark@2.png b/gtk/src/gtk-4.0/mate/assets/text-select-end-active-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-end-active-dark@2.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-end-active-dark@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-end-active.png b/gtk/src/gtk-4.0/mate/assets/text-select-end-active.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-end-active.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-end-active.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-end-active@2.png b/gtk/src/gtk-4.0/mate/assets/text-select-end-active@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-end-active@2.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-end-active@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-end-dark.png b/gtk/src/gtk-4.0/mate/assets/text-select-end-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-end-dark.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-end-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-end-dark@2.png b/gtk/src/gtk-4.0/mate/assets/text-select-end-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-end-dark@2.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-end-dark@2.png
diff --git a/gtk/src/gtk-4.0/mate/assets/text-select-end-hover-dark.png b/gtk/src/gtk-4.0/mate/assets/text-select-end-hover-dark.png
new file mode 100644
index 0000000000..e91709d052
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/text-select-end-hover-dark.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/text-select-end-hover-dark@2.png b/gtk/src/gtk-4.0/mate/assets/text-select-end-hover-dark@2.png
new file mode 100644
index 0000000000..486b767181
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/text-select-end-hover-dark@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-end-hover.png b/gtk/src/gtk-4.0/mate/assets/text-select-end-hover.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-end-hover.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-end-hover.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-end-hover@2.png b/gtk/src/gtk-4.0/mate/assets/text-select-end-hover@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-end-hover@2.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-end-hover@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-end.png b/gtk/src/gtk-4.0/mate/assets/text-select-end.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-end.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-end.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-end@2.png b/gtk/src/gtk-4.0/mate/assets/text-select-end@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-end@2.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-end@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-start-active-dark.png b/gtk/src/gtk-4.0/mate/assets/text-select-start-active-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-start-active-dark.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-start-active-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-start-active-dark@2.png b/gtk/src/gtk-4.0/mate/assets/text-select-start-active-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-start-active-dark@2.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-start-active-dark@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-start-active.png b/gtk/src/gtk-4.0/mate/assets/text-select-start-active.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-start-active.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-start-active.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-start-active@2.png b/gtk/src/gtk-4.0/mate/assets/text-select-start-active@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-start-active@2.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-start-active@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-start-dark.png b/gtk/src/gtk-4.0/mate/assets/text-select-start-dark.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-start-dark.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-start-dark.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-start-dark@2.png b/gtk/src/gtk-4.0/mate/assets/text-select-start-dark@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-start-dark@2.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-start-dark@2.png
diff --git a/gtk/src/gtk-4.0/mate/assets/text-select-start-hover-dark.png b/gtk/src/gtk-4.0/mate/assets/text-select-start-hover-dark.png
new file mode 100644
index 0000000000..32936d8dd1
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/text-select-start-hover-dark.png differ
diff --git a/gtk/src/gtk-4.0/mate/assets/text-select-start-hover-dark@2.png b/gtk/src/gtk-4.0/mate/assets/text-select-start-hover-dark@2.png
new file mode 100644
index 0000000000..63d087cc5d
Binary files /dev/null and b/gtk/src/gtk-4.0/mate/assets/text-select-start-hover-dark@2.png differ
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-start-hover.png b/gtk/src/gtk-4.0/mate/assets/text-select-start-hover.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-start-hover.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-start-hover.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-start-hover@2.png b/gtk/src/gtk-4.0/mate/assets/text-select-start-hover@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-start-hover@2.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-start-hover@2.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-start.png b/gtk/src/gtk-4.0/mate/assets/text-select-start.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-start.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-start.png
diff --git a/gtk/src/mate/gtk-4.0/assets/text-select-start@2.png b/gtk/src/gtk-4.0/mate/assets/text-select-start@2.png
similarity index 100%
rename from gtk/src/mate/gtk-4.0/assets/text-select-start@2.png
rename to gtk/src/gtk-4.0/mate/assets/text-select-start@2.png
diff --git a/gtk/src/gtk-4.0/mate/gtk-dark.scss b/gtk/src/gtk-4.0/mate/gtk-dark.scss
new file mode 120000
index 0000000000..85bfd8e484
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate/gtk-dark.scss
@@ -0,0 +1 @@
+../default/gtk-dark.scss
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/mate/gtk.scss b/gtk/src/gtk-4.0/mate/gtk.scss
new file mode 120000
index 0000000000..2d19d2415e
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate/gtk.scss
@@ -0,0 +1 @@
+../default/gtk.scss
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/mate/render-assets.sh b/gtk/src/gtk-4.0/mate/render-assets.sh
new file mode 120000
index 0000000000..349f5fa710
--- /dev/null
+++ b/gtk/src/gtk-4.0/mate/render-assets.sh
@@ -0,0 +1 @@
+../render-assets.sh
\ No newline at end of file
diff --git a/gtk/src/gtk-4.0/meson.build b/gtk/src/gtk-4.0/meson.build
new file mode 100644
index 0000000000..521d6864ac
--- /dev/null
+++ b/gtk/src/gtk-4.0/meson.build
@@ -0,0 +1,223 @@
+# GTK-4.0 Build Logic
+# Compiles SCSS to CSS and packages as gresource
+
+gtk_ver = '4.0'
+gtk_dir = 'gtk-@0@'.format(gtk_ver)
+
+variants = [
+ 'gtk',
+ 'gtk-dark'
+]
+
+foreach flavour: yaru_flavours
+ message('Configuring flavour ' + flavour + ' for GTK-4.0')
+ suffix = flavour == 'default' ? '' : '-@0@'.format(flavour)
+ theme_name = meson.project_name() + suffix
+ is_dark = flavour == 'dark' or flavour.endswith('-dark')
+ base_theme_name = is_dark ? flavour.split('-dark')[0] : flavour
+ is_accent = enabled_accent_colors.contains(base_theme_name)
+ theme_dir = join_paths(get_option('datadir'), 'themes', theme_name)
+ accent = is_accent ? base_theme_name : ''
+
+ if is_accent
+ accent_configuration = {
+ 'yaru_dark_variant': is_dark ? 'true' : 'false',
+ 'yaru_accent_color': accent,
+ }
+
+ accent_info_css = configure_file(
+ configuration: accent_configuration + {
+ 'yaru_theme_entry_point': '/dev/null',
+ },
+ input: accent_colors_definitions_scss,
+ output: '@0@-@1@-accent-color-info.scss'.format(theme_name, accent),
+ )
+
+ accent_parser = run_command(sassc,
+ yaru_sass_global_paths,
+ accent_info_css).stderr().strip()
+
+ accent_color_code = accent_parser.split(' Accent color is ')[1].split('\n')[0]
+ assert(accent_color_code.startswith('#'), 'No accent color code found')
+
+ accent_color_optimized_code = accent_parser.split(' Contrast optimized accent is ')[1].split('\n')[0]
+ assert(accent_color_optimized_code.startswith('#'), 'No accent color code found')
+ message('Accent color code is', accent_color_code)
+ message('Accent optimized color code is', accent_color_optimized_code)
+ endif
+
+ # Determine paths based on flavour
+ if flavour.startswith('mate')
+ base_path = flavour
+ dark_path = is_dark ? flavour : base_path
+ else
+ base_path = 'default'
+ dark_path = is_dark ? 'dark' : base_path
+ endif
+ default_path = 'default'
+ upstream_path = '../upstream' / gtk_dir / 'Default'
+ install_path = theme_dir / gtk_dir
+
+ # Sort by most relevant for the theme flavour
+ # All flavour GTK files are now in this directory
+ sources_priority = [
+ flavour,
+ dark_path,
+ base_path,
+ default_path,
+ upstream_path,
+ ]
+
+ generated_css = []
+ foreach variant : variants
+ message('Configuring @0@ variant for @1@-@2@'.format(
+ theme_name, variant, gtk_ver))
+ target_name = '@0@-@1@-@2@'.format(theme_name, variant, gtk_ver)
+ variant_file = is_dark ? variant.split('-dark')[0] + '-dark' : variant
+ gtk_scss_path = flavour / variant_file + '.scss'
+
+ if not fs.is_file(gtk_scss_path)
+ gtk_scss_path = base_path / variant_file + '.scss'
+ endif
+
+ # Look for scss files in the variant dir first, otherwise fallback to
+ # base, default or upstream paths, so using reversed order
+ scss_paths = yaru_sass_global_paths
+ gtk_scss_dependencies = []
+ foreach src: sources_priority
+ # upstream_path already contains '../', others don't
+ if src.startswith('../')
+ scss_paths += ['-I', meson.current_source_dir() / src ]
+ find_path = src
+ else
+ scss_paths += ['-I', meson.current_source_dir() / src ]
+ find_path = src
+ endif
+
+ scss_deps = run_command(
+ 'find', find_path, '-name', '_*.scss'
+ ).stdout().strip().split('\n')
+ if scss_deps.length() > 0 and scss_deps[0] != ''
+ gtk_scss_dependencies += scss_deps
+ endif
+ endforeach
+
+ if is_accent
+ gtk_accents_css = configure_file(
+ configuration: accent_configuration + {
+ 'yaru_theme_entry_point': meson.current_source_dir() / gtk_scss_path,
+ },
+ input: accent_colors_definitions_scss,
+ output: '@0@-accent-colors.scss'.format(target_name),
+ )
+
+ gtk_scss_path = gtk_accents_css
+
+ gtk_yaru_colors_defs_scss = configure_file(
+ configuration: accent_configuration + {
+ 'yaru_theme_entry_point': yaru_colors_defs_scss,
+ },
+ input: accent_colors_definitions_scss,
+ output: '@0@-yaru-colors-defs.scss'.format(target_name),
+ )
+
+ gtk_yaru_colors_defs += {
+ target_name: custom_target(
+ '@0@-yaru-colors-definitions'.format(target_name),
+ input: gtk_yaru_colors_defs_scss,
+ output: '@BASENAME@.css',
+ command: [
+ sassc, '-a',
+ scss_paths,
+ '@INPUT@', '@OUTPUT@',
+ ],
+ depend_files: [
+ yaru_colors_defs_scss,
+ gtk_scss_dependencies,
+ ]
+ )
+ }
+ endif
+
+ generated_css += custom_target(target_name,
+ input: gtk_scss_path,
+ output: '@0@-generated.css'.format(target_name),
+ depend_files: files(gtk_scss_dependencies),
+ command: [
+ sassc, '-a',
+ scss_paths,
+ '@INPUT@', '@OUTPUT@'],
+ )
+
+ conf_data = configuration_data()
+ conf_data.set('THEME_NAME', theme_name)
+ conf_data.set('GTK_VER', gtk_ver)
+ install_data(
+ configure_file(
+ input: '@0@.css.in'.format(variant),
+ output: '@0@.css'.format(target_name),
+ configuration: conf_data
+ ),
+ install_dir: install_path,
+ rename: '@0@.css'.format(variant),
+ )
+ endforeach
+
+ foreach src: sources_priority
+ # upstream_path already contains '../', others don't
+ if src.startswith('../')
+ assets_rel_dir = src / 'assets'
+ else
+ assets_rel_dir = src / 'assets'
+ endif
+ if fs.is_dir(assets_rel_dir)
+ break
+ endif
+ endforeach
+
+ assets = run_command(
+ 'ls', '-1', assets_rel_dir
+ ).stdout().strip().split('\n')
+
+ assets_xml = []
+ foreach asset: assets
+ assets_xml += ' @1@'.format(
+ asset,
+ join_paths(assets_rel_dir, asset)
+ )
+ endforeach
+
+ conf_data = configuration_data()
+ conf_data.set('THEME_NAME', theme_name)
+ conf_data.set('GTK_VER', gtk_ver)
+ conf_data.set('ASSETS', '\n'.join(assets_xml))
+ gresource_xml = configure_file(
+ input: 'gtk.gresource.xml.in',
+ output: '@0@-@1@-gtk.gresource.xml'.format(theme_name, gtk_ver),
+ configuration: conf_data)
+
+ gresource_name = '@0@-@1@'.format(theme_name, gtk_dir)
+ gnome.compile_resources(
+ gresource_name,
+ gresource_xml,
+ dependencies: generated_css,
+ gresource_bundle: true,
+ install: true,
+ install_dir: install_path,
+ )
+
+ # Rename gresource to gtk.gresource after install
+ meson.add_install_script('sh', '-c',
+ 'cd "$MESON_INSTALL_DESTDIR_PREFIX/@0@" && mv "@1@-gtk-@2@.gresource" "gtk.gresource" 2>/dev/null || true'.format(
+ install_path, theme_name, gtk_ver
+ )
+ )
+
+ if get_option('cinnamon-shell') and fs.is_file(dark_path / 'thumbnail.png')
+ # install thumbnail (cinnamon only)
+ install_data(
+ dark_path / 'thumbnail.png',
+ install_dir: install_path,
+ )
+ endif
+endforeach
diff --git a/gtk/src/default/render-assets.sh b/gtk/src/gtk-4.0/render-assets.sh
similarity index 100%
rename from gtk/src/default/render-assets.sh
rename to gtk/src/gtk-4.0/render-assets.sh
diff --git a/gtk/src/magenta-dark/gtk-2.0/apps.rc b/gtk/src/magenta-dark/gtk-2.0/apps.rc
deleted file mode 100644
index 916acfdaec..0000000000
--- a/gtk/src/magenta-dark/gtk-2.0/apps.rc
+++ /dev/null
@@ -1,99 +0,0 @@
-# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
-#
-# This file, unlike hacks.rc, contains legitimate cases we need to handle, e.g.
-# custom widgets, programs giving us a chance to alter their UI to fit more with
-# the theme or stuff that is supposed to look different, like panels.
-
-# TODO: This could really look nicer
-style "gimp_spin_scale" {
-
- # Spin background
- bg[NORMAL] = @base_color
-
- engine "pixmap" {
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_up"
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_up"
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_up"
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_up"
- overlay_file = "assets/spin-up-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_down"
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_down"
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_down"
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_down"
- overlay_file = "assets/spin-down-insensitive.png"
- overlay_stretch = FALSE
- }
-
- }
-
-}
-
-style "chrome_gtk_frame" {
-
- ChromeGtkFrame::frame-color = @window_color
- ChromeGtkFrame::frame-gradient-color = @window_color
- ChromeGtkFrame::inactive-frame-color = @bg_color
-
- ChromeGtkFrame::incognito-frame-color = "#cbd2d9"
- ChromeGtkFrame::incognito-frame-gradient-color = "#cbd2d9"
- ChromeGtkFrame::incognito-inactive-frame-color = mix (0.5, @bg_color, "#cbd2d9")
-
-}
-
-# Disable spin button assets for GimpSpinScale
-class "GimpSpinScale" style "gimp_spin_scale"
-
-# Chromium lets us define some colours and settings for better integration
-class "ChromeGtkFrame" style "chrome_gtk_frame"
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets-external.svg b/gtk/src/magenta-dark/gtk-2.0/assets-external.svg
deleted file mode 100644
index 061e7bfde6..0000000000
--- a/gtk/src/magenta-dark/gtk-2.0/assets-external.svg
+++ /dev/null
@@ -1,6840 +0,0 @@
-
-
-
-
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets-external.txt b/gtk/src/magenta-dark/gtk-2.0/assets-external.txt
deleted file mode 100644
index 9abba2aaf4..0000000000
--- a/gtk/src/magenta-dark/gtk-2.0/assets-external.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-checkbox-checked
-checkbox-checked-active
-checkbox-checked-insensitive
-checkbox-unchecked
-checkbox-unchecked-hover
-checkbox-unchecked-active
-checkbox-unchecked-insensitive
-checkbox-mixed
-checkbox-mixed-active
-checkbox-mixed-insensitive
-radio-checked
-radio-checked-active
-radio-checked-insensitive
-radio-unchecked
-radio-unchecked-hover
-radio-unchecked-active
-radio-unchecked-insensitive
-radio-mixed
-radio-mixed-active
-radio-mixed-insensitive
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets.svg b/gtk/src/magenta-dark/gtk-2.0/assets.svg
deleted file mode 100644
index 9bcb3ad770..0000000000
--- a/gtk/src/magenta-dark/gtk-2.0/assets.svg
+++ /dev/null
@@ -1,5836 +0,0 @@
-
-
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets.txt b/gtk/src/magenta-dark/gtk-2.0/assets.txt
deleted file mode 100644
index 425651383b..0000000000
--- a/gtk/src/magenta-dark/gtk-2.0/assets.txt
+++ /dev/null
@@ -1,141 +0,0 @@
-menu-checkbox
-menu-checkbox-hover
-menu-checkbox-insensitive
-menu-checkbox-checked
-menu-checkbox-checked-insensitive
-menu-checkbox-mixed
-menu-checkbox-mixed-insensitive
-menu-radio
-menu-radio-hover
-menu-radio-insensitive
-menu-radio-checked
-menu-radio-checked-insensitive
-menu-radio-mixed
-menu-radio-mixed-insensitive
-menu-pan-left
-menu-pan-left-hover
-menu-pan-left-insensitive
-menu-pan-right
-menu-pan-right-hover
-menu-pan-right-insensitive
-menu-pan-up
-menu-pan-up-insensitive
-menu-pan-down
-menu-pan-down-insensitive
-button
-button-hover
-button-active
-button-insensitive
-combo-entry-ltr-entry
-combo-entry-ltr-entry-active
-combo-entry-ltr-entry-insensitive
-combo-entry-ltr-button
-combo-entry-ltr-button-hover
-combo-entry-ltr-button-active
-combo-entry-ltr-button-insensitive
-combo-entry-rtl-entry
-combo-entry-rtl-entry-active
-combo-entry-rtl-entry-insensitive
-combo-entry-rtl-button
-combo-entry-rtl-button-hover
-combo-entry-rtl-button-active
-combo-entry-rtl-button-insensitive
-entry
-entry-active
-entry-insensitive
-entry-background
-entry-background-insensitive
-border
-frame
-frame-inline
-frame-notebook
-line
-focus
-handle
-handle-horz
-handle-vert
-menu-border
-menubar-item-active
-notebook-entry
-notebook-entry-active
-notebook-entry-insensitive
-notebook-combo-entry-ltr-entry
-notebook-combo-entry-ltr-entry-active
-notebook-combo-entry-ltr-entry-insensitive
-notebook-combo-entry-rtl-entry
-notebook-combo-entry-rtl-entry-active
-notebook-combo-entry-rtl-entry-insensitive
-pan-left
-pan-left-semi
-pan-left-insensitive
-pan-right
-pan-right-semi
-pan-right-insensitive
-pan-up
-pan-up-insensitive
-pan-down
-pan-down-insensitive
-progressbar-horz
-progressbar-horz-trough
-progressbar-vert
-progressbar-vert-trough
-scrollbar-horz-slider
-scrollbar-horz-slider-hover
-scrollbar-horz-slider-active
-scrollbar-horz-trough
-scrollbar-vert-slider
-scrollbar-vert-slider-hover
-scrollbar-vert-slider-active
-scrollbar-vert-trough
-scrollbar-vert-slider-rtl
-scrollbar-vert-slider-hover-rtl
-scrollbar-vert-slider-active-rtl
-scrollbar-vert-trough-rtl
-spin-ltr-down
-spin-ltr-down-hover
-spin-ltr-down-active
-spin-ltr-down-insensitive
-spin-ltr-up
-spin-ltr-up-hover
-spin-ltr-up-active
-spin-ltr-up-insensitive
-spin-rtl-down
-spin-rtl-down-hover
-spin-rtl-down-active
-spin-rtl-down-insensitive
-spin-rtl-up
-spin-rtl-up-hover
-spin-rtl-up-active
-spin-rtl-up-insensitive
-spin-up
-spin-down
-spin-up-insensitive
-spin-down-insensitive
-scale-slider
-scale-slider-hover
-scale-slider-active
-scale-slider-insensitive
-scale-horz-focus
-scale-horz-trough
-scale-horz-trough-active
-scale-vert-trough
-scale-vert-trough-active
-tab-left
-tab-left-active
-tab-right
-tab-right-active
-tab-up
-tab-up-active
-tab-down
-tab-down-active
-tab-horz-gap
-tab-vert-gap
-treeview-header-button
-treeview-pan-up
-treeview-pan-up-hover
-treeview-pan-up-active
-treeview-pan-down
-treeview-pan-down-hover
-treeview-pan-down-active
-treeview-separator-ltr
-treeview-separator-rtl
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/border.png b/gtk/src/magenta-dark/gtk-2.0/assets/border.png
deleted file mode 100644
index 9f6d1a06bb..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/border.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/button-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/button-active.png
deleted file mode 100644
index a81736fc26..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/button-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/button-hover.png b/gtk/src/magenta-dark/gtk-2.0/assets/button-hover.png
deleted file mode 100644
index 5e6a3e4f4f..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/button-hover.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/button-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/button-insensitive.png
deleted file mode 100644
index 6f21fd83ce..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/button-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/button.png b/gtk/src/magenta-dark/gtk-2.0/assets/button.png
deleted file mode 100644
index c841d1f7bb..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/button.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-checked-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-checked-active.png
deleted file mode 100644
index db208d13e0..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-checked-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-checked-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-checked-insensitive.png
deleted file mode 100644
index bfe89a6d1d..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-checked.png b/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-checked.png
deleted file mode 100644
index ada71625a7..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-checked.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-mixed-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-mixed-active.png
deleted file mode 100644
index 6df5aeb83f..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-mixed-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-mixed-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-mixed-insensitive.png
deleted file mode 100644
index af95826e16..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-mixed.png b/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-mixed.png
deleted file mode 100644
index 26c9b42d25..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-mixed.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-unchecked-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-unchecked-active.png
deleted file mode 100644
index 6dd362192d..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-unchecked-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-unchecked-hover.png b/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-unchecked-hover.png
deleted file mode 100644
index 1d53f96eb0..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-unchecked-hover.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-unchecked-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-unchecked-insensitive.png
deleted file mode 100644
index 2282847f50..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-unchecked-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-unchecked.png b/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-unchecked.png
deleted file mode 100644
index e2964791ca..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/checkbox-unchecked.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-button-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-button-active.png
deleted file mode 100644
index a45d33ea66..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-button-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-button-hover.png b/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-button-hover.png
deleted file mode 100644
index 10703ad816..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-button-hover.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png
deleted file mode 100644
index bdbae85a01..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-button.png b/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-button.png
deleted file mode 100644
index 78e2354af1..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-button.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-entry-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-entry-active.png
deleted file mode 100644
index b10f1f4fe0..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-entry-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png
deleted file mode 100644
index ab286b3694..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-entry.png b/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-entry.png
deleted file mode 100644
index d6703ca3b9..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-ltr-entry.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-button-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-button-active.png
deleted file mode 100644
index 41176ab320..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-button-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-button-hover.png b/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-button-hover.png
deleted file mode 100644
index 182dcea8c6..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-button-hover.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png
deleted file mode 100644
index 56ea02790a..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-button.png b/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-button.png
deleted file mode 100644
index f5c3259bab..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-button.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-entry-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-entry-active.png
deleted file mode 100644
index c66e74c473..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-entry-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png
deleted file mode 100644
index b45560d05e..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-entry.png b/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-entry.png
deleted file mode 100644
index 5fca5f2a7b..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/combo-entry-rtl-entry.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/entry-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/entry-active.png
deleted file mode 100644
index 9f98bed66f..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/entry-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/entry-background-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/entry-background-insensitive.png
deleted file mode 100644
index e702aee22a..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/entry-background-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/entry-background.png b/gtk/src/magenta-dark/gtk-2.0/assets/entry-background.png
deleted file mode 100644
index 95e7c8173c..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/entry-background.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/entry-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/entry-insensitive.png
deleted file mode 100644
index 1225573ebc..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/entry.png b/gtk/src/magenta-dark/gtk-2.0/assets/entry.png
deleted file mode 100644
index 7b4f4390f0..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/entry.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/focus.png b/gtk/src/magenta-dark/gtk-2.0/assets/focus.png
deleted file mode 100644
index 0f6332227f..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/focus.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/frame-inline.png b/gtk/src/magenta-dark/gtk-2.0/assets/frame-inline.png
deleted file mode 100644
index 6bac7b96c6..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/frame-inline.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/frame-notebook.png b/gtk/src/magenta-dark/gtk-2.0/assets/frame-notebook.png
deleted file mode 100644
index 8b3f329538..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/frame-notebook.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/frame.png b/gtk/src/magenta-dark/gtk-2.0/assets/frame.png
deleted file mode 100644
index 56a2d8dad6..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/frame.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/handle-horz.png b/gtk/src/magenta-dark/gtk-2.0/assets/handle-horz.png
deleted file mode 100644
index 7e53b2e31d..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/handle-horz.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/handle-vert.png b/gtk/src/magenta-dark/gtk-2.0/assets/handle-vert.png
deleted file mode 100644
index fd6890c81d..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/handle-vert.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/handle.png b/gtk/src/magenta-dark/gtk-2.0/assets/handle.png
deleted file mode 100644
index c7b9825591..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/handle.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/line.png b/gtk/src/magenta-dark/gtk-2.0/assets/line.png
deleted file mode 100644
index 1fad628ee0..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/line.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-border.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-border.png
deleted file mode 100644
index 728f243d1d..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-border.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox-checked-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox-checked-insensitive.png
deleted file mode 100644
index 49038d3625..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox-checked.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox-checked.png
deleted file mode 100644
index 25c34e7275..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox-checked.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox-hover.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox-hover.png
deleted file mode 100644
index 83ef341ff3..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox-hover.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox-insensitive.png
deleted file mode 100644
index b82efc4afc..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png
deleted file mode 100644
index 861685a014..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox-mixed.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox-mixed.png
deleted file mode 100644
index fc85684cd2..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox-mixed.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox.png
deleted file mode 100644
index b82efc4afc..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-checkbox.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-down-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-down-insensitive.png
deleted file mode 100644
index 535de1c059..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-down.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-down.png
deleted file mode 100644
index 31ef6a353b..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-down.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-left-hover.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-left-hover.png
deleted file mode 100644
index a2cac3ef38..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-left-hover.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-left-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-left-insensitive.png
deleted file mode 100644
index 29323a7b8d..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-left-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-left.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-left.png
deleted file mode 100644
index 6dce59eacc..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-left.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-right-hover.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-right-hover.png
deleted file mode 100644
index 80da318c6e..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-right-hover.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-right-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-right-insensitive.png
deleted file mode 100644
index 9de489b728..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-right-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-right.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-right.png
deleted file mode 100644
index fcf6cd8579..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-right.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-up-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-up-insensitive.png
deleted file mode 100644
index 76af286613..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-up.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-up.png
deleted file mode 100644
index e42cce9df9..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-pan-up.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio-checked-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio-checked-insensitive.png
deleted file mode 100644
index 66d5a9183a..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio-checked.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio-checked.png
deleted file mode 100644
index 2fb650ed9c..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio-checked.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio-hover.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio-hover.png
deleted file mode 100644
index 0a49b1bc06..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio-hover.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio-insensitive.png
deleted file mode 100644
index b82efc4afc..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio-mixed-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio-mixed-insensitive.png
deleted file mode 100644
index 861685a014..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio-mixed.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio-mixed.png
deleted file mode 100644
index fc85684cd2..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio-mixed.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio.png b/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio.png
deleted file mode 100644
index b82efc4afc..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menu-radio.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/menubar-item-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/menubar-item-active.png
deleted file mode 100644
index e260f96300..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/menubar-item-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png
deleted file mode 100644
index fb9562a578..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png
deleted file mode 100644
index 35419c49c0..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png b/gtk/src/magenta-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png
deleted file mode 100644
index 9ec4987140..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png
deleted file mode 100644
index 9abc7f0cf5..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png
deleted file mode 100644
index ea235aa9c4..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png b/gtk/src/magenta-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png
deleted file mode 100644
index 9564a57b31..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/notebook-entry-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/notebook-entry-active.png
deleted file mode 100644
index 97d7f1c452..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/notebook-entry-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/notebook-entry-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/notebook-entry-insensitive.png
deleted file mode 100644
index 81631c711d..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/notebook-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/notebook-entry.png b/gtk/src/magenta-dark/gtk-2.0/assets/notebook-entry.png
deleted file mode 100644
index e29fd1e78c..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/notebook-entry.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/pan-down-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/pan-down-insensitive.png
deleted file mode 100644
index e898198d34..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/pan-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/pan-down.png b/gtk/src/magenta-dark/gtk-2.0/assets/pan-down.png
deleted file mode 100644
index 31ef6a353b..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/pan-down.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/pan-left-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/pan-left-insensitive.png
deleted file mode 100644
index e765c2d3aa..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/pan-left-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/pan-left-semi.png b/gtk/src/magenta-dark/gtk-2.0/assets/pan-left-semi.png
deleted file mode 100644
index 936672edb6..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/pan-left-semi.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/pan-left.png b/gtk/src/magenta-dark/gtk-2.0/assets/pan-left.png
deleted file mode 100644
index 5280692827..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/pan-left.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/pan-right-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/pan-right-insensitive.png
deleted file mode 100644
index 70f578f138..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/pan-right-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/pan-right-semi.png b/gtk/src/magenta-dark/gtk-2.0/assets/pan-right-semi.png
deleted file mode 100644
index 6f0796eeea..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/pan-right-semi.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/pan-right.png b/gtk/src/magenta-dark/gtk-2.0/assets/pan-right.png
deleted file mode 100644
index 936c2be433..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/pan-right.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/pan-up-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/pan-up-insensitive.png
deleted file mode 100644
index 4dda1cd33a..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/pan-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/pan-up.png b/gtk/src/magenta-dark/gtk-2.0/assets/pan-up.png
deleted file mode 100644
index e42cce9df9..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/pan-up.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/progressbar-horz-trough.png b/gtk/src/magenta-dark/gtk-2.0/assets/progressbar-horz-trough.png
deleted file mode 100644
index 5589ac52d5..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/progressbar-horz-trough.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/progressbar-horz.png b/gtk/src/magenta-dark/gtk-2.0/assets/progressbar-horz.png
deleted file mode 100644
index df21a3f476..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/progressbar-horz.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/progressbar-vert-trough.png b/gtk/src/magenta-dark/gtk-2.0/assets/progressbar-vert-trough.png
deleted file mode 100644
index d4152dab2b..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/progressbar-vert-trough.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/progressbar-vert.png b/gtk/src/magenta-dark/gtk-2.0/assets/progressbar-vert.png
deleted file mode 100644
index 6535c6b9c6..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/progressbar-vert.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/radio-checked-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/radio-checked-active.png
deleted file mode 100644
index 166d41376d..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/radio-checked-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/radio-checked-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/radio-checked-insensitive.png
deleted file mode 100644
index 7866d2b6a0..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/radio-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/radio-checked.png b/gtk/src/magenta-dark/gtk-2.0/assets/radio-checked.png
deleted file mode 100644
index 66f1210e12..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/radio-checked.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/radio-mixed-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/radio-mixed-active.png
deleted file mode 100644
index a019b23243..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/radio-mixed-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/radio-mixed-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/radio-mixed-insensitive.png
deleted file mode 100644
index 4f10ac0734..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/radio-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/radio-mixed.png b/gtk/src/magenta-dark/gtk-2.0/assets/radio-mixed.png
deleted file mode 100644
index 4bf9c09f2e..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/radio-mixed.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/radio-unchecked-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/radio-unchecked-active.png
deleted file mode 100644
index 3b551f2b5a..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/radio-unchecked-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/radio-unchecked-hover.png b/gtk/src/magenta-dark/gtk-2.0/assets/radio-unchecked-hover.png
deleted file mode 100644
index cecf227dae..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/radio-unchecked-hover.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/radio-unchecked-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/radio-unchecked-insensitive.png
deleted file mode 100644
index e8a5fdbaca..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/radio-unchecked-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/radio-unchecked.png b/gtk/src/magenta-dark/gtk-2.0/assets/radio-unchecked.png
deleted file mode 100644
index 78f114f35e..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/radio-unchecked.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scale-horz-focus.png b/gtk/src/magenta-dark/gtk-2.0/assets/scale-horz-focus.png
deleted file mode 100644
index e6688bde53..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scale-horz-focus.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scale-horz-trough-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/scale-horz-trough-active.png
deleted file mode 100644
index f1095a2df7..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scale-horz-trough-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scale-horz-trough.png b/gtk/src/magenta-dark/gtk-2.0/assets/scale-horz-trough.png
deleted file mode 100644
index 8e2f291272..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scale-horz-trough.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scale-slider-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/scale-slider-active.png
deleted file mode 100644
index caee8411d8..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scale-slider-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scale-slider-hover.png b/gtk/src/magenta-dark/gtk-2.0/assets/scale-slider-hover.png
deleted file mode 100644
index 93f1a71deb..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scale-slider-hover.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scale-slider-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/scale-slider-insensitive.png
deleted file mode 100644
index a417de4354..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scale-slider-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scale-slider.png b/gtk/src/magenta-dark/gtk-2.0/assets/scale-slider.png
deleted file mode 100644
index 2432f87ab5..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scale-slider.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scale-vert-trough-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/scale-vert-trough-active.png
deleted file mode 100644
index 053948e89b..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scale-vert-trough-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scale-vert-trough.png b/gtk/src/magenta-dark/gtk-2.0/assets/scale-vert-trough.png
deleted file mode 100644
index b2f04217c7..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scale-vert-trough.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-horz-slider-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-horz-slider-active.png
deleted file mode 100644
index 986e4f2aea..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-horz-slider-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-horz-slider-hover.png b/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-horz-slider-hover.png
deleted file mode 100644
index 9d936cb932..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-horz-slider-hover.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-horz-slider.png b/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-horz-slider.png
deleted file mode 100644
index e56537d30b..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-horz-slider.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-horz-trough.png b/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-horz-trough.png
deleted file mode 100644
index 2d5d36b271..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-horz-trough.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png b/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png
deleted file mode 100644
index 4d753bd111..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-slider-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-slider-active.png
deleted file mode 100644
index 7e1d165519..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-slider-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png b/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png
deleted file mode 100644
index 525a929bca..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-slider-hover.png b/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-slider-hover.png
deleted file mode 100644
index dc1c0bd7f4..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-slider-hover.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-slider-rtl.png b/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-slider-rtl.png
deleted file mode 100644
index 8b535f98f1..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-slider-rtl.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-slider.png b/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-slider.png
deleted file mode 100644
index 68a3b5cf5b..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-slider.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-trough-rtl.png b/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-trough-rtl.png
deleted file mode 100644
index 694e334145..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-trough-rtl.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-trough.png b/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-trough.png
deleted file mode 100644
index 694e334145..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/scrollbar-vert-trough.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-down-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-down-insensitive.png
deleted file mode 100644
index 2a77729339..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-down.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-down.png
deleted file mode 100644
index 9ba7e8c646..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-down.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-down-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-down-active.png
deleted file mode 100644
index 215721f9b2..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-down-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-down-hover.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-down-hover.png
deleted file mode 100644
index d1ff4fca9b..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-down-hover.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-down-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-down-insensitive.png
deleted file mode 100644
index bd9508a3ca..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-down.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-down.png
deleted file mode 100644
index 4f366b45f5..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-down.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-up-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-up-active.png
deleted file mode 100644
index 57a84eba51..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-up-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-up-hover.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-up-hover.png
deleted file mode 100644
index 286c4cad59..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-up-hover.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-up-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-up-insensitive.png
deleted file mode 100644
index 01d6287666..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-up.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-up.png
deleted file mode 100644
index a3aaab0be1..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-ltr-up.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-down-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-down-active.png
deleted file mode 100644
index 18d48adc63..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-down-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-down-hover.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-down-hover.png
deleted file mode 100644
index 96e40b47f8..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-down-hover.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-down-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-down-insensitive.png
deleted file mode 100644
index 03b99934f2..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-down.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-down.png
deleted file mode 100644
index 7d0ec869e9..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-down.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-up-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-up-active.png
deleted file mode 100644
index ebaa3ff4eb..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-up-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-up-hover.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-up-hover.png
deleted file mode 100644
index 4b6b7b67ea..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-up-hover.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-up-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-up-insensitive.png
deleted file mode 100644
index 05cd2a3698..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-up.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-up.png
deleted file mode 100644
index f334c25a7a..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-rtl-up.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-up-insensitive.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-up-insensitive.png
deleted file mode 100644
index c9dcc0aefe..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/spin-up.png b/gtk/src/magenta-dark/gtk-2.0/assets/spin-up.png
deleted file mode 100644
index 69d276646a..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/spin-up.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/tab-down-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/tab-down-active.png
deleted file mode 100644
index e6c3b8c2f0..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/tab-down-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/tab-down.png b/gtk/src/magenta-dark/gtk-2.0/assets/tab-down.png
deleted file mode 100644
index eecbdf3a92..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/tab-down.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/tab-horz-gap.png b/gtk/src/magenta-dark/gtk-2.0/assets/tab-horz-gap.png
deleted file mode 100644
index 5a24cc142e..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/tab-horz-gap.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/tab-left-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/tab-left-active.png
deleted file mode 100644
index 63a7e3b739..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/tab-left-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/tab-left.png b/gtk/src/magenta-dark/gtk-2.0/assets/tab-left.png
deleted file mode 100644
index 4973e1fcbe..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/tab-left.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/tab-right-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/tab-right-active.png
deleted file mode 100644
index a85784c9f4..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/tab-right-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/tab-right.png b/gtk/src/magenta-dark/gtk-2.0/assets/tab-right.png
deleted file mode 100644
index 4973e1fcbe..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/tab-right.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/tab-up-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/tab-up-active.png
deleted file mode 100644
index 3007d886db..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/tab-up-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/tab-up.png b/gtk/src/magenta-dark/gtk-2.0/assets/tab-up.png
deleted file mode 100644
index eecbdf3a92..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/tab-up.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/tab-vert-gap.png b/gtk/src/magenta-dark/gtk-2.0/assets/tab-vert-gap.png
deleted file mode 100644
index 6670b113e6..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/tab-vert-gap.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/treeview-header-button.png b/gtk/src/magenta-dark/gtk-2.0/assets/treeview-header-button.png
deleted file mode 100644
index 86da7ad21e..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/treeview-header-button.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/treeview-pan-down-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/treeview-pan-down-active.png
deleted file mode 100644
index 31ef6a353b..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/treeview-pan-down-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/treeview-pan-down-hover.png b/gtk/src/magenta-dark/gtk-2.0/assets/treeview-pan-down-hover.png
deleted file mode 100644
index 2f28e41e15..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/treeview-pan-down-hover.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/treeview-pan-down.png b/gtk/src/magenta-dark/gtk-2.0/assets/treeview-pan-down.png
deleted file mode 100644
index e898198d34..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/treeview-pan-down.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/treeview-pan-up-active.png b/gtk/src/magenta-dark/gtk-2.0/assets/treeview-pan-up-active.png
deleted file mode 100644
index e42cce9df9..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/treeview-pan-up-active.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/treeview-pan-up-hover.png b/gtk/src/magenta-dark/gtk-2.0/assets/treeview-pan-up-hover.png
deleted file mode 100644
index a99f7cf08a..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/treeview-pan-up-hover.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/treeview-pan-up.png b/gtk/src/magenta-dark/gtk-2.0/assets/treeview-pan-up.png
deleted file mode 100644
index 4dda1cd33a..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/treeview-pan-up.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/treeview-separator-ltr.png b/gtk/src/magenta-dark/gtk-2.0/assets/treeview-separator-ltr.png
deleted file mode 100644
index 109c32b9ca..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/treeview-separator-ltr.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/assets/treeview-separator-rtl.png b/gtk/src/magenta-dark/gtk-2.0/assets/treeview-separator-rtl.png
deleted file mode 100644
index dec2110da9..0000000000
Binary files a/gtk/src/magenta-dark/gtk-2.0/assets/treeview-separator-rtl.png and /dev/null differ
diff --git a/gtk/src/magenta-dark/gtk-2.0/gtkrc b/gtk/src/magenta-dark/gtk-2.0/gtkrc
deleted file mode 100644
index a575c44f5f..0000000000
--- a/gtk/src/magenta-dark/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,49 +0,0 @@
-# Based on Bridge by ScionicSpectre
-# vim:set ts=2 sw=2 sts=2 ai et:
-#
-# This is the GTK+ 2 version of Adwaita. It's whole purpose is to look as the
-# GTK+ 3 version as much as possible until GTK+ 2 dies completely.
-#
-# Note: comments for explaining styles are on the bottom of each file beside the
-# widget matches.
-
-# Declare the colours used throughout the theme.
-# There shouldn't be any fiddling with them in the theme files themselves in
-# order to not mess up the dark theme.
-
-# Text/base
-gtk-color-scheme = "text_color:#F7F7F7\nbase_color:#3d3d3d"
-# Foreground/background
-gtk-color-scheme = "fg_color:#F7F7F7\nbg_color:#353535"
-# Selected foreground/background
-gtk-color-scheme = "selected_fg_color:#FFFFFF\nselected_bg_color:#B34CB3"
-# Insensitive foreground/background
-gtk-color-scheme = "insensitive_fg_color:#969696\ninsensitive_bg_color:#383838"
-# Menus
-gtk-color-scheme = "menu_color:#424242\nmenubar_bg:#3A3A3A"
-gtk-color-scheme = "menubar_fg:#F7F7F7\nmenubar_insensitive_fg:#CCCCCC"
-# Links
-gtk-color-scheme = "link_color:#B34CB3\nvisited_link_color:#B34CA2"
-# Treeview headers
-gtk-color-scheme = "column_header_color:#353535\nhover_column_header_color:#636769"
-# Window decoration
-gtk-color-scheme = "menu_hover_color:#616161\nwindow_color:#f4f4f4"
-# Tooltips
-gtk-color-scheme = "tooltip_fg_color:#f7f7f7\ntooltip_bg_color:#353535"
-
-# Set GTK settings
-gtk-auto-mnemonics = 1
-gtk-primary-button-warps-slider = 1
-gtk-icon-sizes="gtk-menu=16,16:\
- gtk-button=16,16:\
- gtk-small-toolbar=16,16:\
- gtk-dnd=16,16:\
- gtk-dialog=16,16"
-gtk-toolbar-style = GTK_TOOLBAR_ICONS
-gtk-menu-images = 0
-gtk-menu-popup-delay = 0
-
-# And hand over the control to the theme files
-include "main.rc"
-include "apps.rc"
-include "hacks.rc"
diff --git a/gtk/src/magenta-dark/gtk-2.0/hacks.rc b/gtk/src/magenta-dark/gtk-2.0/hacks.rc
deleted file mode 100644
index 1bdbee9a41..0000000000
--- a/gtk/src/magenta-dark/gtk-2.0/hacks.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
-#
-# This file contains horrible hacks to make this theme work with some programs
-# This is mostly due to the limitations of gtk2 but sometimes its the fault of
-# the programs themselves. Not going to point fingers.
-#
-# Either way, it's a WONTFIX for both, hence this horrible file.
-
-style "toplevel_hack" {
- engine "adwaita" {}
-}
-
-style "chrome_entry" {
- base[NORMAL] = @base_color
- base[INSENSITIVE] = @base_color
-}
-
-style "vim_notebook" {
- bg[NORMAL] = @base_color
- bg[ACTIVE] = @insensitive_bg_color
-}
-
-# Vim puts an eventbox between the tab and the label and colours it,
-# we need to handle that
-widget "vim-main-window*GtkNotebook.GtkEventBox" style "vim_notebook"
-
-# (he)xchat input box
-class "SexySpellEntry" style:highest "normal_entry"
-
-# Chromium uses base as the fill colour of its own entries
-# This would be fine but Gtk+ uses it to fill the surrounding space, so its set to bg
-# That results in Chromium using it for the fill, so we need to handle that
-widget_class "*Chrom*" style "chrome_entry"
-
-# Hack to be able to match widgets in LibreOffice
-class "GtkWindow" style "toplevel_hack"
diff --git a/gtk/src/magenta-dark/gtk-2.0/main.rc b/gtk/src/magenta-dark/gtk-2.0/main.rc
deleted file mode 100644
index 8b2997fb09..0000000000
--- a/gtk/src/magenta-dark/gtk-2.0/main.rc
+++ /dev/null
@@ -1,2630 +0,0 @@
-# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
-#
-# This is the main theme file, handling all the default widgets and theme
-# properties. Since GTK+ 2 is old, we need to overcome some of its limitations,
-# which is also mostly done in this file. Sadly not all of them can be overcome
-# so there will always be a visible difference between the GTK+ 2 and 3 theme.
-
-style "default" {
-
- xthickness = 1
- ythickness = 1
-
- ####################
- # Style Properties #
- ####################
-
- GtkWidget::focus-line-width = 1
- GtkWidget::focus-line-pattern = "\2\1"
-
- GtkToolbar::internal-padding = 4
- GtkToolButton::icon-spacing = 4
-
- GtkWidget::tooltip-radius = 3
- GtkWidget::tooltip-alpha = 235
- GtkWidget::new-tooltip-style = 1 #for compatibility
-
- GtkWidget::link-color = @link_color
- GtkWidget::visited-link-color = @visited_link_color
- GnomeHRef::link_color = @link_color
- GtkHTML::link-color = @link_color
- GtkHTML::vlink-color = @visited_link_color
- GtkIMHtml::hyperlink-color = @link_color
- GtkIMHtml::hyperlink-visited-color = @visited_link_color
-
- GtkSeparatorMenuItem::horizontal-padding = 0
- GtkSeparatorMenuItem::wide-separators = 1
- GtkSeparatorMenuItem::separator-height = 1
-
- GtkButton::child-displacement-y = 0
-
- GtkButton::default-border = {0, 0, 0, 0}
- GtkButton::default-outside-border = {0, 0, 0, 0}
- GtkButton::inner-border = {4, 4, 4, 4}
-
- GtkEntry::state-hint = 1
- GtkEntry::inner-border = {7, 7, 4, 5}
-
- GtkPaned::handle-size = 8
- GtkHPaned::handle-size = 8
- GtkVPaned::handle-size = 8
-
- GtkScrollbar::trough-border = 0
- GtkRange::trough-border = 0
- GtkRange::slider-width = 13
- GtkRange::stepper-size = 0
- GtkRange::activate-slider = 1
-
- GtkScrollbar::activate-slider = 1
- GtkScrollbar::stepper-size = 0
- GtkScrollbar::has-backward-stepper = 0
- GtkScrollbar::has-forward-stepper = 0
- GtkScrollbar::min-slider-length = 48 # 42 + 2*3 (margins)
- GtkScrolledWindow::scrollbar-spacing = 0
- GtkScrolledWindow::scrollbars-within-bevel = 1
-
- GtkScale::slider_length = 26
- GtkScale::slider_width = 26
- GtkScale::trough-side-details = 1
-
- GtkProgressBar::min-horizontal-bar-height = 6
- GtkProgressBar::min-vertical-bar-width = 6
- # Making this bigger than the min[height,width]-2*[y,x]spacing makes the
- # whole progressbar thicker, so by setting it to the exact above value
- # we get the maximum spacing between the text and the edges without
- # doing so.
- GtkProgressBar::xspacing = 4
- GtkProgressBar::yspacing = 4
-
- GtkStatusbar::shadow_type = GTK_SHADOW_NONE
- GtkSpinButton::shadow_type = GTK_SHADOW_NONE
- GtkMenuBar::shadow-type = GTK_SHADOW_NONE
- GtkToolbar::shadow-type = GTK_SHADOW_NONE
- # TODO: find out what this comment means:
- # ( every window is misaligned for the sake of menus ):
- GtkMenuBar::internal-padding = 0
- GtkMenu::horizontal-padding = 0
- GtkMenu::vertical-padding = 2
- GtkMenu::double-arrows = 0
- GtkMenuItem::arrow-scaling = 1
- GtkMenuItem::toggle-spacing = 10
-
- GtkCheckButton::indicator_spacing = 3
- GtkOptionMenu::indicator_spacing = {13, 13, 5, 8}
-
- GtkTreeView::expander-size = 16
- GtkTreeView::vertical-separator = 0
- GtkTreeView::horizontal-separator = 4
- GtkTreeView::allow-rules = 0
- # Set this because some apps read it
- GtkTreeView::odd-row-color = @base_color
- GtkTreeView::even-row-color = @base_color
-
- GtkExpander::expander-size = 16
-
- GtkNotebook::tab-overlap = 4
-
- ##########
- # Colors #
- ##########
-
- bg[NORMAL] = @bg_color
- bg[PRELIGHT] = @bg_color
- bg[SELECTED] = @selected_bg_color
- bg[INSENSITIVE] = @insensitive_bg_color
- bg[ACTIVE] = @bg_color
-
- fg[NORMAL] = @fg_color
- fg[PRELIGHT] = @fg_color
- fg[SELECTED] = @selected_fg_color
- fg[INSENSITIVE] = @insensitive_fg_color
- fg[ACTIVE] = @fg_color
-
- text[NORMAL] = @text_color
- text[PRELIGHT] = @text_color
- text[SELECTED] = @selected_fg_color
- text[INSENSITIVE] = @insensitive_fg_color
- text[ACTIVE] = @selected_fg_color
-
- base[NORMAL] = @base_color
- base[PRELIGHT] = shade (0.95, @bg_color)
- base[SELECTED] = @selected_bg_color
- base[INSENSITIVE] = @insensitive_bg_color
- base[ACTIVE] = @selected_bg_color
-
- # For succinctness, all reasonable pixmap options remain here
-
- # Draw frame around menu in a non-compositied environment
- # This needs to go before pixmap because we need to override some stuff
- engine "adwaita" {}
-
- engine "pixmap" {
-
- #################
- # Check Buttons #
- #################
-
- image {
- function = CHECK
- state = NORMAL
- shadow = OUT
- overlay_file = "assets/checkbox-unchecked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = OUT
- overlay_file = "assets/checkbox-unchecked-hover.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = OUT
- overlay_file = "assets/checkbox-unchecked-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = SELECTED
- shadow = OUT
- overlay_file = "assets/checkbox-unchecked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = OUT
- overlay_file = "assets/checkbox-unchecked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = NORMAL
- shadow = IN
- overlay_file = "assets/checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = IN
- overlay_file = "assets/checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = IN
- overlay_file = "assets/checkbox-checked-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = SELECTED
- shadow = IN
- overlay_file = "assets/checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = IN
- overlay_file = "assets/checkbox-checked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = NORMAL
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = SELECTED
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed-insensitive.png"
- overlay_stretch = FALSE
- }
-
- #################
- # Radio Buttons #
- #################
-
- image {
- function = OPTION
- state = NORMAL
- shadow = OUT
- overlay_file = "assets/radio-unchecked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = OUT
- overlay_file = "assets/radio-unchecked-hover.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = OUT
- overlay_file = "assets/radio-unchecked-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = SELECTED
- shadow = OUT
- overlay_file = "assets/radio-unchecked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = OUT
- overlay_file = "assets/radio-unchecked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = NORMAL
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = SELECTED
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = IN
- overlay_file = "assets/menu-radio-checked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = NORMAL
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = SELECTED
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed-insensitive.png"
- overlay_stretch = FALSE
- }
-
- ##########
- # Arrows #
- ##########
-
- # Overrides
-
- # Disable arrows in spinbuttons
- image {
- function = ARROW
- detail = "spinbutton"
- }
-
- # QGtkStyle (used for Qt apps) *always* assumes scrollbars have
- # arrows, so configure these here. Gtk2 apps will atually ignore
- # this.
-
- image {
- function = ARROW
- overlay_file = "assets/scrollbar-arrow-up.png"
- detail = "vscrollbar"
- overlay_border = { 0, 0, 0, 0 }
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- overlay_file = "assets/scrollbar-arrow-down.png"
- detail = "vscrollbar"
- overlay_border = { 0, 0, 0, 0 }
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- overlay_file = "assets/scrollbar-arrow-left.png"
- detail = "hscrollbar"
- overlay_border = { 0, 0, 0, 0 }
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- overlay_file = "assets/scrollbar-arrow-right.png"
- detail = "hscrollbar"
- overlay_border = { 0, 0, 0, 0 }
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = BOX
- detail = "hscrollbar"
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "vscrollbar"
- orientation = VERTICAL
- }
-
- # Menu arrows
-
- image {
- function = ARROW
- state = NORMAL
- detail = "menuitem"
- overlay_file = "assets/menu-pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- detail = "menuitem"
- overlay_file = "assets/menu-pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- detail = "menuitem"
- overlay_file = "assets/menu-pan-left-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = NORMAL
- detail = "menuitem"
- overlay_file = "assets/menu-pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- detail = "menuitem"
- overlay_file = "assets/menu-pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- detail = "menuitem"
- overlay_file = "assets/menu-pan-right-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- detail = "menu_scroll_arrow_up"
- overlay_file = "assets/menu-pan-up-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = ARROW
- detail = "menu_scroll_arrow_up"
- overlay_file = "assets/menu-pan-up.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- detail = "menu_scroll_arrow_down"
- overlay_file = "assets/menu-pan-down-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = ARROW
- detail = "menu_scroll_arrow_down"
- overlay_file = "assets/menu-pan-down.png"
- overlay_stretch = FALSE
- }
-
- # Regular arrows
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/pan-up.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/pan-up.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/pan-up.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- overlay_file = "assets/pan-up-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- overlay_file = "assets/pan-down-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- overlay_file = "assets/pan-left-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- overlay_file = "assets/pan-right-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- ######################
- # Option Menu Arrows #
- ######################
-
- image {
- function = TAB
- state = NORMAL
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = TAB
- state = PRELIGHT
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = TAB
- state = ACTIVE
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = TAB
- state = INSENSITIVE
- overlay_file = "assets/pan-down-insensitive.png"
- overlay_stretch = FALSE
- }
-
- #########
- # Lines #
- #########
-
- image {
- function = VLINE
- file = "assets/line.png"
- border = {1, 0, 0, 0}
- }
-
- image {
- function = HLINE
- file = "assets/line.png"
- border = {0, 0, 1, 0}
- }
-
- #########
- # Focus #
- #########
-
- image {
- function = FOCUS
- file = "assets/focus.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- }
-
- ###########
- # Handles #
- ###########
-
- image {
- function = HANDLE
- detail = "handlebox"
- overlay_file = "assets/handle.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = HANDLE
- file = "assets/handle-horz.png"
- border = {0, 0, 4, 4}
- orientation = HORIZONTAL
- }
-
- image {
- function = HANDLE
- file = "assets/handle-vert.png"
- border = {4, 4, 0, 0}
- orientation = VERTICAL
- }
-
- image {
- function = RESIZE_GRIP
- }
-
- #############
- # Expanders #
- #############
-
- image {
- function = EXPANDER
- expander_style = EXPANDED
- file = "assets/pan-down.png"
- }
-
- # LTR
-
- image {
- function = EXPANDER
- expander_style = COLLAPSED
- file = "assets/pan-right.png"
- direction = LTR
- }
-
- image {
- function = EXPANDER
- expander_style = SEMI_COLLAPSED
- file = "assets/pan-right-semi.png"
- direction = LTR
- }
-
- image {
- function = EXPANDER
- expander_style = SEMI_EXPANDED
- file = "assets/pan-right-semi.png"
- direction = LTR
- }
-
- # RTL
-
- image {
- function = EXPANDER
- expander_style = COLLAPSED
- file = "assets/pan-left.png"
- direction = RTL
- }
-
- image {
- function = EXPANDER
- expander_style = SEMI_COLLAPSED
- file = "assets/pan-left-semi.png"
- direction = RTL
- }
-
- image {
- function = EXPANDER
- expander_style = SEMI_EXPANDED
- file = "assets/pan-left-semi.png"
- direction = RTL
- }
-
- #############
- # Notebooks #
- #############
-
- # Left
-
- image {
- function = EXTENSION
- state = NORMAL
- file = "assets/tab-left-active.png"
- border = {3, 0, 3, 3}
- stretch = TRUE
- gap_side = RIGHT
- }
-
- image {
- function = EXTENSION
- file = "assets/tab-left.png"
- border = {3, 0, 3, 3}
- stretch = TRUE
- gap_side = RIGHT
- }
-
- # Right
-
- image {
- function = EXTENSION
- state = NORMAL
- file = "assets/tab-right-active.png"
- border = {0, 3, 3, 3}
- stretch = TRUE
- gap_side = LEFT
- }
-
- image {
- function = EXTENSION
- file = "assets/tab-right.png"
- border = {0, 3, 3, 3}
- stretch = TRUE
- gap_side = LEFT
- }
-
- # Up
-
- image {
- function = EXTENSION
- state = NORMAL
- file = "assets/tab-up-active.png"
- border = {3, 3, 3, 0}
- stretch = TRUE
- gap_side = BOTTOM
- }
-
- image {
- function = EXTENSION
- file = "assets/tab-up.png"
- border = {3, 3, 3, 0}
- stretch = TRUE
- gap_side = BOTTOM
- }
-
- # Down
-
- image {
- function = EXTENSION
- state = NORMAL
- file = "assets/tab-down-active.png"
- border = {3, 3, 0, 3}
- stretch = TRUE
- gap_side = TOP
- }
-
- image {
- function = EXTENSION
- file = "assets/tab-down.png"
- border = {3, 3, 0, 3}
- stretch = TRUE
- gap_side = TOP
- }
-
- # Inner frame
-
- image {
- function = BOX_GAP
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_file = "assets/tab-vert-gap.png"
- gap_border = {1, 0, 1, 1}
- gap_side = LEFT
- }
-
- image {
- function = BOX_GAP
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_file = "assets/tab-vert-gap.png"
- gap_border = {0, 1, 1, 1}
- gap_side = RIGHT
- }
-
- image {
- function = BOX_GAP
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_file = "assets/tab-horz-gap.png"
- gap_border = {1, 1, 1, 0}
- gap_side = TOP
- }
-
- image {
- function = BOX_GAP
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_file = "assets/tab-horz-gap.png"
- gap_border = {1, 1, 0, 1}
- gap_side = BOTTOM
- }
-
- # Standalone frame
- image {
- function = BOX
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- }
-
- ##############
- # Scrollbars #
- ##############
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/scrollbar-horz-trough.png"
- border = {0, 0, 1, 0}
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/scrollbar-vert-trough.png"
- border = {1, 0, 0, 0}
- orientation = VERTICAL
- direction = LTR
- }
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/scrollbar-vert-trough-rtl.png"
- border = {0, 1, 0, 0}
- orientation = VERTICAL
- direction = RTL
- }
-
-
- # Disable insensitive sliders
-
- image {
- function = SLIDER
- state = INSENSITIVE
- detail = "slider"
- }
-
- # Horizontal sliders
-
- image {
- function = SLIDER
- state = NORMAL
- detail = "slider"
- file = "assets/scrollbar-horz-slider.png"
- border = {6, 6, 7, 6 }
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "slider"
- file = "assets/scrollbar-horz-slider-hover.png"
- border = {6, 6, 7, 6 }
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "slider"
- file = "assets/scrollbar-horz-slider-active.png"
- border = {6, 6, 7, 6 }
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- # Vertical sliders
-
- image {
- function = SLIDER
- state = NORMAL
- detail = "slider"
- file = "assets/scrollbar-vert-slider.png"
- border = {7, 6, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = LTR
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "slider"
- file = "assets/scrollbar-vert-slider-hover.png"
- border = {7, 6, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = LTR
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "slider"
- file = "assets/scrollbar-vert-slider-active.png"
- border = {7, 6, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = LTR
- }
-
- # RTL
-
- image {
- function = SLIDER
- state = NORMAL
- detail = "slider"
- file = "assets/scrollbar-vert-slider-rtl.png"
- border = {6, 7, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = RTL
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "slider"
- file = "assets/scrollbar-vert-slider-hover-rtl.png"
- border = {6, 7, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = RTL
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "slider"
- file = "assets/scrollbar-vert-slider-active-rtl.png"
- border = {6, 7, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = RTL
- }
-
- ##########
- # Scales #
- ##########
-
- # Troughs, overrided later on. We set them here too because some widgets
- # don't specify their orientation.
-
- image {
- function = BOX
- detail = "trough-upper"
- file = "assets/scale-horz-trough.png"
- border = {10, 10, 0, 0}
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "trough-lower"
- file = "assets/scale-horz-trough-active.png"
- border = {10, 10, 0, 0}
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "trough-upper"
- file = "assets/scale-vert-trough.png"
- border = {0, 0, 10, 10}
- stretch = TRUE
- orientation = VERTICAL
- }
-
- image {
- function = BOX
- detail = "trough-lower"
- file = "assets/scale-vert-trough-active.png"
- border = {0, 0, 10, 10}
- stretch = TRUE
- orientation = VERTICAL
- }
-
- # Sliders
-
- image {
- function = SLIDER
- state = NORMAL
- detail = "hscale"
- file = "assets/scale-slider.png"
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "hscale"
- file = "assets/scale-slider-hover.png"
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "hscale"
- file = "assets/scale-slider-active.png"
- }
-
- image {
- function = SLIDER
- state = INSENSITIVE
- detail = "hscale"
- file = "assets/scale-slider-insensitive.png"
- }
- image {
- function = SLIDER
- state = NORMAL
- detail = "vscale"
- file = "assets/scale-slider.png"
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "vscale"
- file = "assets/scale-slider-hover.png"
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "vscale"
- file = "assets/scale-slider-active.png"
- }
-
- image {
- function = SLIDER
- state = INSENSITIVE
- detail = "vscale"
- file = "assets/scale-slider-insensitive.png"
- }
-
- ###########
- # Menubar #
- ###########
-
- image {
- function = BOX
- detail = "menubar"
- file = "assets/line.png"
- border = {0, 0, 0, 1}
- }
-
- #########
- # Menus #
- #########
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "menu_scroll_arrow_up"
- file = "assets/line.png"
- }
-
- image {
- function = BOX
- detail = "menu_scroll_arrow_up"
- file = "assets/line.png"
- border = {0, 0, 0, 1}
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "menu_scroll_arrow_down"
- file = "assets/line.png"
- }
-
- image {
- function = BOX
- detail = "menu_scroll_arrow_down"
- file = "assets/line.png"
- border = {0, 0, 1, 0}
- }
-
- ###########
- # Entries #
- ###########
-
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- detail = "entry"
- file = "assets/entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = FLAT_BOX
- state = ACTIVE
- detail = "entry_bg"
- file = "assets/entry-background.png"
- }
-
- image {
- function = FLAT_BOX
- state = INSENSITIVE
- detail = "entry_bg"
- file = "assets/entry-background-insensitive.png"
- }
-
- image {
- function = FLAT_BOX
- detail = "entry_bg"
- file = "assets/entry-background.png"
- }
- #########
- # Spins #
- #########
-
- # Spin-Up LTR
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_up"
- file = "assets/spin-ltr-up.png"
- border = {1, 4, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_up"
- file = "assets/spin-ltr-up-hover.png"
- border = {1, 4, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_up"
- file = "assets/spin-ltr-up-active.png"
- border = {1, 4, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_up"
- file = "assets/spin-ltr-up-insensitive.png"
- border = {1, 4, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up-insensitive.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- # Spin-Up RTL
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_up"
- file = "assets/spin-rtl-up.png"
- border = {4, 1, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_up"
- file = "assets/spin-rtl-up-hover.png"
- border = {4, 1, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_up"
- file = "assets/spin-rtl-up-hover.png"
- border = {4, 1, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_up"
- file = "assets/spin-rtl-up-insensitive.png"
- border = {4, 1, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up-insensitive.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- # Spin-Down LTR
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_down"
- file = "assets/spin-ltr-down.png"
- border = {1, 4, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_down"
- file = "assets/spin-ltr-down-hover.png"
- border = {1, 4, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_down"
- file = "assets/spin-ltr-down-active.png"
- border = {1, 4, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_down"
- file = "assets/spin-ltr-down-insensitive.png"
- border = {1, 4, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down-insensitive.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- # Spin-Down RTL
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_down"
- file = "assets/spin-rtl-down.png"
- border = {4, 1, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_down"
- file = "assets/spin-rtl-down-hover.png"
- border = {4, 1, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_down"
- file = "assets/spin-rtl-down-active.png"
- border = {4, 1, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_down"
- file = "assets/spin-rtl-down-insensitive.png"
- border = {4, 1, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down-insensitive.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- ##############
- # Scrollbars #
- ##############
-
- image {
- function = BOX
- detail = "bar"
- file = "assets/progressbar-horz.png"
- stretch = TRUE
- border = {2, 2, 1, 1}
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "bar"
- file = "assets/progressbar-vert.png"
- stretch = TRUE
- border = {1, 1, 2, 2}
- orientation = VERTICAL
- }
-
- #############
- # Treeviews #
- #############
-
- # Disable active the column highlight
- # We need to match specific cells or we break stuff
- # Looking at you deadbeef
-
- image {
- function = FLAT_BOX
- detail = "cell_even_sorted"
- state = NORMAL
- }
-
- image {
- function = FLAT_BOX
- detail = "cell_odd_sorted"
- state = NORMAL
- }
-
- # Disable all the other shadows
- # This prevents the Raleigh effect
- image {
- function = SHADOW
- }
-
- }
-
-}
-
-style "menubar" {
-
- # Needed to fix Firefox's menubar text
- bg[NORMAL] = @menubar_bg
- bg[SELECTED] = @selected_fg_color
- fg[SELECTED] = @link_color
-}
-
-style "menubar_item" {
-
- xthickness = 3
- ythickness = 4
-
- fg[NORMAL] = @menubar_insensitive_fg
- fg[PRELIGHT] = @menubar_fg
-
- engine "pixmap" {
- image {
- function = BOX
- state = PRELIGHT
- file = "assets/menubar-item-active.png"
- border = {0, 0, 0, 3}
- }
- }
-
-}
-
-style "menu" {
-
- xthickness = 0
- ythickness = 0
-
- bg[NORMAL] = @menu_color
- bg[INSENSITIVE] = @menu_color
- bg[PRELIGHT] = @menu_color
- bg[SELECTED] = @selected_bg_color
-
-}
-
-style "menu_item" {
-
- xthickness = 3
- ythickness = 4
-
- bg[PRELIGHT] = @menu_hover_color
- # Chromium uses this setting
- bg[SELECTED] = @menu_hover_color
-
- fg[PRELIGHT] = @fg_color
- fg[SELECTED] = @fg_color
- text[NORMAL] = @fg_color
- text[PRELIGHT] = @fg_color
- text[ACTIVE] = @fg_color
- text[SELECTED] = @fg_color
-
- # Some widgets use text, we need to handle that
- # Don't know what this comment is about but maybe we've nulled it
-
- # Unfortunately we can't tell regular and menu checks/radios apart
- # Without the heirarchy
- engine "pixmap" {
-
- #################
- # Check Buttons #
- #################
-
- image {
- function = CHECK
- state = NORMAL
- shadow = OUT
- overlay_file = "assets/menu-checkbox.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = OUT
- overlay_file = "assets/menu-checkbox.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = OUT
- overlay_file = "assets/menu-checkbox.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = OUT
- overlay_file = "assets/menu-checkbox-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = NORMAL
- shadow = IN
- overlay_file = "assets/menu-checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = IN
- overlay_file = "assets/menu-checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = IN
- overlay_file = "assets/menu-checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = IN
- overlay_file = "assets/menu-checkbox-checked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = NORMAL
- shadow = ETCHED_IN
- overlay_file = "assets/menu-checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = ETCHED_IN
- overlay_file = "assets/menu-checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = ETCHED_IN
- overlay_file = "assets/menu-checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = ETCHED_IN
- overlay_file = "assets/menu-checkbox-mixed-insensitive.png"
- overlay_stretch = FALSE
- }
-
- #################
- # Radio Buttons #
- #################
-
- image {
- function = OPTION
- state = NORMAL
- shadow = OUT
- overlay_file = "assets/menu-radio.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = OUT
- overlay_file = "assets/menu-radio.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = OUT
- overlay_file = "assets/menu-radio.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = OUT
- overlay_file = "assets/menu-radio-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = NORMAL
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = IN
- overlay_file = "assets/menu-radio-checked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = NORMAL
- shadow = ETCHED_IN
- overlay_file = "assets/menu-radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = ETCHED_IN
- overlay_file = "assets/menu-radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = ETCHED_IN
- overlay_file = "assets/menu-radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = ETCHED_IN
- overlay_file = "assets/menu-radio-mixed-insensitive.png"
- overlay_stretch = FALSE
- }
-
-
-
- }
-
-}
-
-style "separator_menu_item" {
-
- xthickness = 0
- ythickness = 0
-
- engine "pixmap" {
- image {
- function = BOX
- file = "assets/line.png"
- }
- }
-
-}
-
-style "button" {
-
- xthickness = 2
- ythickness = 2
-
- # For the sake of sanity style buttons this way
- engine "pixmap" {
-
- ###########
- # Buttons #
- ###########
-
- image {
- function = BOX
- state = NORMAL
- file = "assets/button.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = BOX
- state = PRELIGHT
- shadow = OUT
- file = "assets/button-hover.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- # Don't add hover effect on pressed buttons
- image {
- function = BOX
- state = PRELIGHT
- shadow = IN
- file = "assets/button-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = BOX
- state = ACTIVE
- file = "assets/button-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- file = "assets/button-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
- }
-}
-
-style "link_button" {
-
- # Disable the button effect, leave just the link
- engine "pixmap" {
- image {
- function = BOX
- }
- }
-
-}
-
-style "entry" {
-
- # We set this same as the border of the border of the entry
- # This way there's no overlap
- xthickness = 4
- ythickness = 4
-
-}
-
-style "combobox" {
-
- xthickness = 6
- ythickness = 4
-
- # This affects only the button beside an entry
- GtkButton::inner-border = {0, 0, 0, 0}
-
-}
-
-style "combobox_cellview" {
- text[NORMAL] = @fg_color
- text[PRELIGHT] = @fg_color
-}
-
-style "combobox_entry" {
-
- # Since one side of the button is missing, we need to shift the arrow a little to the right
- GtkButton::inner-border = {0, 1, 0, 0}
-
- engine "pixmap" {
-
- #############
- # LTR entry #
- #############
-
- image {
- function = SHADOW
- state = NORMAL
- detail = "entry"
- file = "assets/combo-entry-ltr-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/combo-entry-ltr-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/combo-entry-ltr-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- #############
- # RTL entry #
- #############
-
- image {
- function = SHADOW
- state = NORMAL
- detail = "entry"
- file = "assets/combo-entry-rtl-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/combo-entry-rtl-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/combo-entry-rtl-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- ##############
- # LTR button #
- ##############
-
- image {
- function = BOX
- state = NORMAL
- detail = "button"
- file = "assets/combo-entry-ltr-button.png"
- border = {0, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "button"
- file = "assets/combo-entry-ltr-button-hover.png"
- border = {0, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "button"
- file = "assets/combo-entry-ltr-button-active.png"
- border = {0, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "button"
- file = "assets/combo-entry-ltr-button-insensitive.png"
- border = {0, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- ##############
- # RTL button #
- ##############
-
- image {
- function = BOX
- state = NORMAL
- detail = "button"
- file = "assets/combo-entry-rtl-button.png"
- border = {4, 0, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "button"
- file = "assets/combo-entry-rtl-button-hover.png"
- border = {4, 0, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "button"
- file = "assets/combo-entry-rtl-button-active.png"
- border = {4, 0, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "button"
- file = "assets/combo-entry-rtl-button-insensitive.png"
- border = {4, 0, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- }
-
-}
-
-style "combo_button_padding" {
-
- # Since one side of the button is missing, we need to shift the arrow a
- # little to the right.
- # This is the same thing we've done above but the combo, unlike the combobox,
- # uses padding the same way as a button.
- GtkButton::inner-border = {6, 8, 4, 4}
-
-}
-
-style "notebook" {
-
- xthickness = 5
- ythickness = 2
-
-}
-
-style "notebook_viewport" {
- bg[NORMAL] = @base_color
-}
-
-style "notebook_bg" {
- bg[NORMAL] = @base_color
- bg[PRELIGHT] = @base_color
- bg[INSENSITIVE] = @base_color
-}
-
-style "notebook_entry" {
-
- engine "pixmap" {
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/notebook-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/notebook-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- detail = "entry"
- file = "assets/notebook-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
- }
-}
-
-style "normal_bg" {
- bg[NORMAL] = @bg_color
- bg[PRELIGHT] = @bg_color
- bg[INSENSITIVE] = @insensitive_bg_color
-}
-
-style "normal_entry" {
-
- engine "pixmap" {
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- detail = "entry"
- file = "assets/entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
- }
-}
-
-style "notebook_combo" {
-
- engine "pixmap" {
-
- #############
- # LTR entry #
- #############
-
- image {
- function = SHADOW
- state = NORMAL
- detail = "entry"
- file = "assets/notebook-combo-entry-ltr-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/notebook-combo-entry-ltr-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/notebook-combo-entry-ltr-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- #############
- # RTL entry #
- #############
-
- image {
- function = SHADOW
- state = NORMAL
- detail = "entry"
- file = "assets/notebook-combo-entry-rtl-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/notebook-combo-entry-rtl-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/notebook-combo-entry-rtl-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- }
-
-}
-
-style "textview" {
- bg[NORMAL] = @base_color
-}
-
-style "scale_horz" {
-
- engine "pixmap" {
-
- image {
- function = BOX
- detail = "trough-upper"
- file = "assets/scale-horz-trough.png"
- border = {10, 10, 0, 0}
- stretch = TRUE
- }
-
- image {
- function = BOX
- detail = "trough-lower"
- file = "assets/scale-horz-trough-active.png"
- border = {10, 10, 0, 0}
- stretch = TRUE
- }
-
- }
-
-}
-
-style "scale_vert" {
-
- engine "pixmap" {
-
- image {
- function = BOX
- detail = "trough-upper"
- file = "assets/scale-vert-trough.png"
- border = {0, 0, 10, 10}
- stretch = TRUE
- }
-
- image {
- function = BOX
- detail = "trough-lower"
- file = "assets/scale-vert-trough-active.png"
- border = {0, 0, 10, 10}
- stretch = TRUE
- }
-
- }
-
-}
-
-style "progressbar" {
-
- xthickness = 1
- ythickness = 1
-
- fg[PRELIGHT] = @selected_fg_color
-
- engine "pixmap" {
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/progressbar-horz-trough.png"
- border = {3, 3, 2, 2}
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/progressbar-vert-trough.png"
- border = {2, 2, 3, 3}
- stretch = TRUE
- orientation = VERTICAL
- }
-
- }
-
-}
-
-style "treeview_header_button" {
-
- engine "pixmap" {
- image {
- function = SHADOW
- state = NORMAL
- file = "assets/treeview-header-button.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
- }
-
-}
-
-style "treeview_header_label" {
-
- xthickness = 1
- ythickness = 0
-
- font_name = "Bold"
-
- GtkButton::inner-border = {5, 5, 0, 1}
-
- engine "pixmap" {
-
- image {
- function = BOX
- file = "assets/treeview-separator-ltr.png"
- border = {0, 1, 0, 1}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = BOX
- file = "assets/treeview-separator-rtl.png"
- border = {1, 0, 0, 1}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/treeview-pan-up.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/treeview-pan-up-hover.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/treeview-pan-up-active.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/treeview-pan-down.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/treeview-pan-down-hover.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/treeview-pan-down-active.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- }
-
-}
-
-style "scrolled_window" {
-
- engine "pixmap" {
- image {
- function = SHADOW
- file = "assets/frame.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- }
- }
-
-}
-
-style "frame" {
-
- engine "pixmap" {
-
- image {
- function = SHADOW
- shadow = NONE
- }
-
- image {
- function = SHADOW
- file = "assets/frame.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- }
-
- image {
- function = SHADOW_GAP
- file = "assets/frame.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_start_file = "assets/border.png"
- gap_end_file = "assets/border.png"
- }
-
- }
-
-}
-
-style "toolbar_button" {
-
- xthickness = 2
- ythickness = 2
-
- GtkButton::inner-border = {2, 2, 2, 2}
-
-}
-
-style "toolbar_separator" {
-
- GtkWidget::wide-separators = 1
- GtkWidget::separator-width = 1
- GtkWidget::separator-height = 1
-
- engine "pixmap" {
- image {
- function = BOX
- file = "assets/line.png"
- }
- }
-
-}
-
-style "inline_toolbar" {
-
- GtkToolbar::button-relief = GTK_RELIEF_NORMAL
-
- engine "pixmap" {
- image {
- function = SHADOW
- file = "assets/frame-inline.png"
- border = {1, 1, 0, 1}
- stretch = TRUE
- }
- }
-
-}
-
-style "tooltip" {
-
- xthickness = 13
- ythickness = 13
-
- bg[NORMAL] = @tooltip_bg_color
- fg[NORMAL] = @tooltip_fg_color
- bg[SELECTED] = @tooltip_bg_color
-
-}
-
-style "text" = "default" {
- engine "murrine" { textstyle = 0 }
-}
-
-style "menu_text" = "menu_item" {
- engine "murrine" { textstyle = 0 }
-}
-
-style "disable_separator" {
-
- xthickness = 0
- ythickness = 0
-
- GtkWidget::wide-separators = 1
-
-}
-
-# Default style, containing theme properties and trying to match every widget as
-# much as possible, which is not only faster than trying to match every widget
-# by its own but also less bug-prune and more consistent. However there is some
-# widget specific stuff that needs to be taken care of, which is the point of
-# every other style below.
-class "GtkWidget" style "default"
-
- ######################################
- # Override padding, style and colour #
- ######################################
-
-class "GtkButton" style "button"
-class "GtkLinkButton" style "link_button"
-class "GtkEntry" style "entry"
-class "GtkOldEditable" style "entry"
-class "GtkNotebook" style "notebook"
-class "GtkHScale" style "scale_horz"
-class "GtkVScale" style "scale_vert"
-class "GtkProgressBar" style "progressbar"
-class "GtkScrolledWindow" style "scrolled_window"
-class "GtkFrame" style "frame"
-class "GtkSeparatorToolItem" style "toolbar_separator"
-class "GtkMenuBar" style "menubar"
-class "GtkMenu" style "menu"
-class "GtkTextView" style "textview"
-
-# Menu and menubar items
-widget_class "**" style "menu_item"
-widget_class "*.*" style "menubar_item"
-widget_class "**" style "menubar_item"
-widget_class "**" style "separator_menu_item"
-
-# Treeview buttons
-widget_class "***" style "treeview_header_label"
-widget_class "**" style "treeview_header_button"
-
-# Give the file chooser toolbar a border
-widget_class "**" style "inline_toolbar"
-
-# Fix padding on regular comboboxes
-widget_class "*." style "combobox"
-# And disable separators on them
-widget_class "*.*" style "disable_separator"
-
-# Join together the ComboBoxEntry entry and button
-widget_class "**" style "combobox_entry"
-
-# Join the Combo entry and button
-widget_class "**" style "combobox_entry"
-# Tweak the padding on the button a little bit because it
-# uses it a bit differently
-widget_class "*." style "combo_button_padding"
-
-# Alas we cannot do the same for ComboBoxText because there
-# isn't a way to apply the style to only the comboboxes that
-# have an entry inside
-
-# Toolbar buttons have different paddings
-widget_class "**" style "toolbar_button"
-
-# Notebooks are white, act accordingly
-widget_class "**" style "notebook_entry"
-widget_class "**" style "notebook_bg"
-widget_class "**" style "notebook_bg"
-widget_class "***" style "notebook_bg"
-widget_class "**" style "notebook_bg"
-widget_class "*.*" style "notebook_bg"
-widget_class "***" style "notebook_combo"
-widget_class "***" style "notebook_combo"
-
-# However, stuff inside eventboxes inside notebooks is grey
-# again, react
-widget_class "***" style "normal_entry"
-widget_class "***" style "normal_bg"
-widget_class "***" style "normal_bg"
-widget_class "****" style "combobox_entry"
-widget_class "****" style "combobox_entry"
-widget_class "***." style "combo_button_padding"
-
-# ComboBoxes tend to draw the button label with text[]
-# instead of fg[], we need to fix that
-widget_class "**" style "combobox_cellview"
-
-# GTK tooltips
-widget "gtk-tooltip*" style "tooltip"
-
-# Fixes ugly text shadows for insensitive text
-widget_class "*" style "text"
-widget_class "**" style "menu_text"
-widget_class "**" style "text"
-widget_class "**" style "text"
-widget_class "**" style "text"
\ No newline at end of file
diff --git a/gtk/src/magenta-dark/gtk-2.0/render-all-assets.sh b/gtk/src/magenta-dark/gtk-2.0/render-all-assets.sh
deleted file mode 100755
index 82b9a4280e..0000000000
--- a/gtk/src/magenta-dark/gtk-2.0/render-all-assets.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="inkscape"
-OPTIPNG="optipng"
-
-SRC_FILE="assets.svg"
-ASSETS_DIR="assets"
-INDEX="assets.txt"
-
-rm assets/*.png
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
- echo $ASSETS_DIR/$i.png exists.
-else
- echo
- echo Rendering $ASSETS_DIR/$i.png
- $INKSCAPE --export-id=$i \
- --export-id-only \
- -o $ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
- && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png
-fi
-done
-exit 0
diff --git a/gtk/src/magenta-dark/gtk-2.0/render-assets-external.sh b/gtk/src/magenta-dark/gtk-2.0/render-assets-external.sh
deleted file mode 100755
index 5f5c2c2e7b..0000000000
--- a/gtk/src/magenta-dark/gtk-2.0/render-assets-external.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="inkscape"
-OPTIPNG="optipng"
-
-SRC_FILE="assets-external.svg"
-ASSETS_DIR="assets"
-INDEX="assets-external.txt"
-
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
- echo $ASSETS_DIR/$i.png exists.
-else
- echo
- echo Rendering $ASSETS_DIR/$i.png
- $INKSCAPE --export-id=$i \
- --export-id-only \
- --export-background-opacity=0 \
- --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
- && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png
-fi
-done
-exit 0
diff --git a/gtk/src/magenta/gtk-2.0/apps.rc b/gtk/src/magenta/gtk-2.0/apps.rc
deleted file mode 100644
index 916acfdaec..0000000000
--- a/gtk/src/magenta/gtk-2.0/apps.rc
+++ /dev/null
@@ -1,99 +0,0 @@
-# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
-#
-# This file, unlike hacks.rc, contains legitimate cases we need to handle, e.g.
-# custom widgets, programs giving us a chance to alter their UI to fit more with
-# the theme or stuff that is supposed to look different, like panels.
-
-# TODO: This could really look nicer
-style "gimp_spin_scale" {
-
- # Spin background
- bg[NORMAL] = @base_color
-
- engine "pixmap" {
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_up"
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_up"
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_up"
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_up"
- overlay_file = "assets/spin-up-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_down"
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_down"
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_down"
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_down"
- overlay_file = "assets/spin-down-insensitive.png"
- overlay_stretch = FALSE
- }
-
- }
-
-}
-
-style "chrome_gtk_frame" {
-
- ChromeGtkFrame::frame-color = @window_color
- ChromeGtkFrame::frame-gradient-color = @window_color
- ChromeGtkFrame::inactive-frame-color = @bg_color
-
- ChromeGtkFrame::incognito-frame-color = "#cbd2d9"
- ChromeGtkFrame::incognito-frame-gradient-color = "#cbd2d9"
- ChromeGtkFrame::incognito-inactive-frame-color = mix (0.5, @bg_color, "#cbd2d9")
-
-}
-
-# Disable spin button assets for GimpSpinScale
-class "GimpSpinScale" style "gimp_spin_scale"
-
-# Chromium lets us define some colours and settings for better integration
-class "ChromeGtkFrame" style "chrome_gtk_frame"
diff --git a/gtk/src/magenta/gtk-2.0/assets-external.svg b/gtk/src/magenta/gtk-2.0/assets-external.svg
deleted file mode 100644
index d4b80e672c..0000000000
--- a/gtk/src/magenta/gtk-2.0/assets-external.svg
+++ /dev/null
@@ -1,6840 +0,0 @@
-
-
-
-
diff --git a/gtk/src/magenta/gtk-2.0/assets-external.txt b/gtk/src/magenta/gtk-2.0/assets-external.txt
deleted file mode 100644
index 9abba2aaf4..0000000000
--- a/gtk/src/magenta/gtk-2.0/assets-external.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-checkbox-checked
-checkbox-checked-active
-checkbox-checked-insensitive
-checkbox-unchecked
-checkbox-unchecked-hover
-checkbox-unchecked-active
-checkbox-unchecked-insensitive
-checkbox-mixed
-checkbox-mixed-active
-checkbox-mixed-insensitive
-radio-checked
-radio-checked-active
-radio-checked-insensitive
-radio-unchecked
-radio-unchecked-hover
-radio-unchecked-active
-radio-unchecked-insensitive
-radio-mixed
-radio-mixed-active
-radio-mixed-insensitive
diff --git a/gtk/src/magenta/gtk-2.0/assets.svg b/gtk/src/magenta/gtk-2.0/assets.svg
deleted file mode 100644
index f758b81a01..0000000000
--- a/gtk/src/magenta/gtk-2.0/assets.svg
+++ /dev/null
@@ -1,5751 +0,0 @@
-
-
diff --git a/gtk/src/magenta/gtk-2.0/assets.txt b/gtk/src/magenta/gtk-2.0/assets.txt
deleted file mode 100644
index 425651383b..0000000000
--- a/gtk/src/magenta/gtk-2.0/assets.txt
+++ /dev/null
@@ -1,141 +0,0 @@
-menu-checkbox
-menu-checkbox-hover
-menu-checkbox-insensitive
-menu-checkbox-checked
-menu-checkbox-checked-insensitive
-menu-checkbox-mixed
-menu-checkbox-mixed-insensitive
-menu-radio
-menu-radio-hover
-menu-radio-insensitive
-menu-radio-checked
-menu-radio-checked-insensitive
-menu-radio-mixed
-menu-radio-mixed-insensitive
-menu-pan-left
-menu-pan-left-hover
-menu-pan-left-insensitive
-menu-pan-right
-menu-pan-right-hover
-menu-pan-right-insensitive
-menu-pan-up
-menu-pan-up-insensitive
-menu-pan-down
-menu-pan-down-insensitive
-button
-button-hover
-button-active
-button-insensitive
-combo-entry-ltr-entry
-combo-entry-ltr-entry-active
-combo-entry-ltr-entry-insensitive
-combo-entry-ltr-button
-combo-entry-ltr-button-hover
-combo-entry-ltr-button-active
-combo-entry-ltr-button-insensitive
-combo-entry-rtl-entry
-combo-entry-rtl-entry-active
-combo-entry-rtl-entry-insensitive
-combo-entry-rtl-button
-combo-entry-rtl-button-hover
-combo-entry-rtl-button-active
-combo-entry-rtl-button-insensitive
-entry
-entry-active
-entry-insensitive
-entry-background
-entry-background-insensitive
-border
-frame
-frame-inline
-frame-notebook
-line
-focus
-handle
-handle-horz
-handle-vert
-menu-border
-menubar-item-active
-notebook-entry
-notebook-entry-active
-notebook-entry-insensitive
-notebook-combo-entry-ltr-entry
-notebook-combo-entry-ltr-entry-active
-notebook-combo-entry-ltr-entry-insensitive
-notebook-combo-entry-rtl-entry
-notebook-combo-entry-rtl-entry-active
-notebook-combo-entry-rtl-entry-insensitive
-pan-left
-pan-left-semi
-pan-left-insensitive
-pan-right
-pan-right-semi
-pan-right-insensitive
-pan-up
-pan-up-insensitive
-pan-down
-pan-down-insensitive
-progressbar-horz
-progressbar-horz-trough
-progressbar-vert
-progressbar-vert-trough
-scrollbar-horz-slider
-scrollbar-horz-slider-hover
-scrollbar-horz-slider-active
-scrollbar-horz-trough
-scrollbar-vert-slider
-scrollbar-vert-slider-hover
-scrollbar-vert-slider-active
-scrollbar-vert-trough
-scrollbar-vert-slider-rtl
-scrollbar-vert-slider-hover-rtl
-scrollbar-vert-slider-active-rtl
-scrollbar-vert-trough-rtl
-spin-ltr-down
-spin-ltr-down-hover
-spin-ltr-down-active
-spin-ltr-down-insensitive
-spin-ltr-up
-spin-ltr-up-hover
-spin-ltr-up-active
-spin-ltr-up-insensitive
-spin-rtl-down
-spin-rtl-down-hover
-spin-rtl-down-active
-spin-rtl-down-insensitive
-spin-rtl-up
-spin-rtl-up-hover
-spin-rtl-up-active
-spin-rtl-up-insensitive
-spin-up
-spin-down
-spin-up-insensitive
-spin-down-insensitive
-scale-slider
-scale-slider-hover
-scale-slider-active
-scale-slider-insensitive
-scale-horz-focus
-scale-horz-trough
-scale-horz-trough-active
-scale-vert-trough
-scale-vert-trough-active
-tab-left
-tab-left-active
-tab-right
-tab-right-active
-tab-up
-tab-up-active
-tab-down
-tab-down-active
-tab-horz-gap
-tab-vert-gap
-treeview-header-button
-treeview-pan-up
-treeview-pan-up-hover
-treeview-pan-up-active
-treeview-pan-down
-treeview-pan-down-hover
-treeview-pan-down-active
-treeview-separator-ltr
-treeview-separator-rtl
diff --git a/gtk/src/magenta/gtk-2.0/assets/border.png b/gtk/src/magenta/gtk-2.0/assets/border.png
deleted file mode 100644
index 9f6d1a06bb..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/border.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/button-active.png b/gtk/src/magenta/gtk-2.0/assets/button-active.png
deleted file mode 100644
index 23cbe83af5..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/button-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/button-hover.png b/gtk/src/magenta/gtk-2.0/assets/button-hover.png
deleted file mode 100644
index 7d41d4d81a..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/button-hover.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/button-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/button-insensitive.png
deleted file mode 100644
index d508ab1a13..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/button-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/button.png b/gtk/src/magenta/gtk-2.0/assets/button.png
deleted file mode 100644
index 9b50dcb53b..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/button.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/checkbox-checked-active.png b/gtk/src/magenta/gtk-2.0/assets/checkbox-checked-active.png
deleted file mode 100644
index db208d13e0..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/checkbox-checked-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/checkbox-checked-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/checkbox-checked-insensitive.png
deleted file mode 100644
index eea94bc378..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/checkbox-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/checkbox-checked.png b/gtk/src/magenta/gtk-2.0/assets/checkbox-checked.png
deleted file mode 100644
index ada71625a7..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/checkbox-checked.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/checkbox-mixed-active.png b/gtk/src/magenta/gtk-2.0/assets/checkbox-mixed-active.png
deleted file mode 100644
index 6df5aeb83f..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/checkbox-mixed-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/checkbox-mixed-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/checkbox-mixed-insensitive.png
deleted file mode 100644
index d57838e0a5..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/checkbox-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/checkbox-mixed.png b/gtk/src/magenta/gtk-2.0/assets/checkbox-mixed.png
deleted file mode 100644
index 26c9b42d25..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/checkbox-mixed.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/checkbox-unchecked-active.png b/gtk/src/magenta/gtk-2.0/assets/checkbox-unchecked-active.png
deleted file mode 100644
index ff8a8d7a6d..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/checkbox-unchecked-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/checkbox-unchecked-hover.png b/gtk/src/magenta/gtk-2.0/assets/checkbox-unchecked-hover.png
deleted file mode 100644
index 74ad8ee1f0..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/checkbox-unchecked-hover.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/checkbox-unchecked-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/checkbox-unchecked-insensitive.png
deleted file mode 100644
index 4a1e2ddd23..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/checkbox-unchecked-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/checkbox-unchecked.png b/gtk/src/magenta/gtk-2.0/assets/checkbox-unchecked.png
deleted file mode 100644
index 7b8310961d..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/checkbox-unchecked.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-button-active.png b/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-button-active.png
deleted file mode 100644
index 1f4e0f2011..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-button-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-button-hover.png b/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-button-hover.png
deleted file mode 100644
index 9778366fd8..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-button-hover.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png
deleted file mode 100644
index 46edd08609..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-button-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-button.png b/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-button.png
deleted file mode 100644
index eb6a2a1515..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-button.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-entry-active.png b/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-entry-active.png
deleted file mode 100644
index 85121607ad..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-entry-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png
deleted file mode 100644
index c40592fd4a..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-entry.png b/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-entry.png
deleted file mode 100644
index c8a93d946e..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/combo-entry-ltr-entry.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-button-active.png b/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-button-active.png
deleted file mode 100644
index 47beb2786e..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-button-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-button-hover.png b/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-button-hover.png
deleted file mode 100644
index 11b32794c6..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-button-hover.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png
deleted file mode 100644
index e700669382..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-button-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-button.png b/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-button.png
deleted file mode 100644
index 1b1356ea12..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-button.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-entry-active.png b/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-entry-active.png
deleted file mode 100644
index f0c2019b4f..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-entry-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png
deleted file mode 100644
index a086d68a3b..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-entry.png b/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-entry.png
deleted file mode 100644
index 603c5e2f06..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/combo-entry-rtl-entry.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/entry-active.png b/gtk/src/magenta/gtk-2.0/assets/entry-active.png
deleted file mode 100644
index 1a0fd91ea8..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/entry-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/entry-background-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/entry-background-insensitive.png
deleted file mode 100644
index fde31319ec..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/entry-background-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/entry-background.png b/gtk/src/magenta/gtk-2.0/assets/entry-background.png
deleted file mode 100644
index 732aed0fb8..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/entry-background.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/entry-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/entry-insensitive.png
deleted file mode 100644
index 4d760fb0f5..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/entry.png b/gtk/src/magenta/gtk-2.0/assets/entry.png
deleted file mode 100644
index 27fc031cf5..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/entry.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/focus.png b/gtk/src/magenta/gtk-2.0/assets/focus.png
deleted file mode 100644
index 0f6332227f..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/focus.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/frame-inline.png b/gtk/src/magenta/gtk-2.0/assets/frame-inline.png
deleted file mode 100644
index e6996dfff6..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/frame-inline.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/frame-notebook.png b/gtk/src/magenta/gtk-2.0/assets/frame-notebook.png
deleted file mode 100644
index 42c8bb2983..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/frame-notebook.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/frame.png b/gtk/src/magenta/gtk-2.0/assets/frame.png
deleted file mode 100644
index 6d1c66a2d7..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/frame.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/handle-horz.png b/gtk/src/magenta/gtk-2.0/assets/handle-horz.png
deleted file mode 100644
index 8d94db2674..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/handle-horz.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/handle-vert.png b/gtk/src/magenta/gtk-2.0/assets/handle-vert.png
deleted file mode 100644
index 376dac1e23..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/handle-vert.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/handle.png b/gtk/src/magenta/gtk-2.0/assets/handle.png
deleted file mode 100644
index c7b9825591..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/handle.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/line.png b/gtk/src/magenta/gtk-2.0/assets/line.png
deleted file mode 100644
index db1c69730b..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/line.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-border.png b/gtk/src/magenta/gtk-2.0/assets/menu-border.png
deleted file mode 100644
index 728f243d1d..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-border.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-checkbox-checked-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/menu-checkbox-checked-insensitive.png
deleted file mode 100644
index eb0627e6ca..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-checkbox-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-checkbox-checked.png b/gtk/src/magenta/gtk-2.0/assets/menu-checkbox-checked.png
deleted file mode 100644
index c2fce5e76c..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-checkbox-checked.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-checkbox-hover.png b/gtk/src/magenta/gtk-2.0/assets/menu-checkbox-hover.png
deleted file mode 100644
index 1529b3495e..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-checkbox-hover.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-checkbox-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/menu-checkbox-insensitive.png
deleted file mode 100644
index b82efc4afc..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-checkbox-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png
deleted file mode 100644
index 120e5478fc..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-checkbox-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-checkbox-mixed.png b/gtk/src/magenta/gtk-2.0/assets/menu-checkbox-mixed.png
deleted file mode 100644
index 190488e5f5..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-checkbox-mixed.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-checkbox.png b/gtk/src/magenta/gtk-2.0/assets/menu-checkbox.png
deleted file mode 100644
index b82efc4afc..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-checkbox.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-pan-down-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/menu-pan-down-insensitive.png
deleted file mode 100644
index 535de1c059..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-pan-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-pan-down.png b/gtk/src/magenta/gtk-2.0/assets/menu-pan-down.png
deleted file mode 100644
index 5dece0922a..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-pan-down.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-pan-left-hover.png b/gtk/src/magenta/gtk-2.0/assets/menu-pan-left-hover.png
deleted file mode 100644
index a2cac3ef38..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-pan-left-hover.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-pan-left-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/menu-pan-left-insensitive.png
deleted file mode 100644
index 29323a7b8d..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-pan-left-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-pan-left.png b/gtk/src/magenta/gtk-2.0/assets/menu-pan-left.png
deleted file mode 100644
index f71a3cc3fd..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-pan-left.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-pan-right-hover.png b/gtk/src/magenta/gtk-2.0/assets/menu-pan-right-hover.png
deleted file mode 100644
index 80da318c6e..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-pan-right-hover.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-pan-right-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/menu-pan-right-insensitive.png
deleted file mode 100644
index 9de489b728..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-pan-right-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-pan-right.png b/gtk/src/magenta/gtk-2.0/assets/menu-pan-right.png
deleted file mode 100644
index 6af4726e55..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-pan-right.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-pan-up-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/menu-pan-up-insensitive.png
deleted file mode 100644
index 76af286613..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-pan-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-pan-up.png b/gtk/src/magenta/gtk-2.0/assets/menu-pan-up.png
deleted file mode 100644
index c77245b37e..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-pan-up.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-radio-checked-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/menu-radio-checked-insensitive.png
deleted file mode 100644
index 9cee0c3f4e..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-radio-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-radio-checked.png b/gtk/src/magenta/gtk-2.0/assets/menu-radio-checked.png
deleted file mode 100644
index 23c56e54ae..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-radio-checked.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-radio-hover.png b/gtk/src/magenta/gtk-2.0/assets/menu-radio-hover.png
deleted file mode 100644
index 1529b3495e..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-radio-hover.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-radio-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/menu-radio-insensitive.png
deleted file mode 100644
index b82efc4afc..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-radio-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-radio-mixed-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/menu-radio-mixed-insensitive.png
deleted file mode 100644
index 120e5478fc..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-radio-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-radio-mixed.png b/gtk/src/magenta/gtk-2.0/assets/menu-radio-mixed.png
deleted file mode 100644
index 190488e5f5..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-radio-mixed.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menu-radio.png b/gtk/src/magenta/gtk-2.0/assets/menu-radio.png
deleted file mode 100644
index b82efc4afc..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menu-radio.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/menubar-item-active.png b/gtk/src/magenta/gtk-2.0/assets/menubar-item-active.png
deleted file mode 100644
index e260f96300..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/menubar-item-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png b/gtk/src/magenta/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png
deleted file mode 100644
index 6e8c6cf944..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/notebook-combo-entry-ltr-entry-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png
deleted file mode 100644
index 5c052204cc..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/notebook-combo-entry-ltr-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png b/gtk/src/magenta/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png
deleted file mode 100644
index fa2a59985a..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/notebook-combo-entry-ltr-entry.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png b/gtk/src/magenta/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png
deleted file mode 100644
index 2c2e4c2a33..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/notebook-combo-entry-rtl-entry-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png
deleted file mode 100644
index ec573914cf..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/notebook-combo-entry-rtl-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png b/gtk/src/magenta/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png
deleted file mode 100644
index 66346adbfd..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/notebook-combo-entry-rtl-entry.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/notebook-entry-active.png b/gtk/src/magenta/gtk-2.0/assets/notebook-entry-active.png
deleted file mode 100644
index 85a05d638b..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/notebook-entry-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/notebook-entry-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/notebook-entry-insensitive.png
deleted file mode 100644
index 3ea7d03f97..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/notebook-entry-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/notebook-entry.png b/gtk/src/magenta/gtk-2.0/assets/notebook-entry.png
deleted file mode 100644
index 9b65c2454f..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/notebook-entry.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/pan-down-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/pan-down-insensitive.png
deleted file mode 100644
index 535de1c059..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/pan-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/pan-down.png b/gtk/src/magenta/gtk-2.0/assets/pan-down.png
deleted file mode 100644
index 5dece0922a..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/pan-down.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/pan-left-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/pan-left-insensitive.png
deleted file mode 100644
index a72d8a1c91..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/pan-left-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/pan-left-semi.png b/gtk/src/magenta/gtk-2.0/assets/pan-left-semi.png
deleted file mode 100644
index 26bd19bec9..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/pan-left-semi.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/pan-left.png b/gtk/src/magenta/gtk-2.0/assets/pan-left.png
deleted file mode 100644
index 21bdf9b0ff..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/pan-left.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/pan-right-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/pan-right-insensitive.png
deleted file mode 100644
index 4629e52af5..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/pan-right-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/pan-right-semi.png b/gtk/src/magenta/gtk-2.0/assets/pan-right-semi.png
deleted file mode 100644
index 5eb9db9227..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/pan-right-semi.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/pan-right.png b/gtk/src/magenta/gtk-2.0/assets/pan-right.png
deleted file mode 100644
index cbfb2acd2e..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/pan-right.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/pan-up-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/pan-up-insensitive.png
deleted file mode 100644
index 76af286613..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/pan-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/pan-up.png b/gtk/src/magenta/gtk-2.0/assets/pan-up.png
deleted file mode 100644
index c77245b37e..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/pan-up.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/progressbar-horz-trough.png b/gtk/src/magenta/gtk-2.0/assets/progressbar-horz-trough.png
deleted file mode 100644
index 5589ac52d5..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/progressbar-horz-trough.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/progressbar-horz.png b/gtk/src/magenta/gtk-2.0/assets/progressbar-horz.png
deleted file mode 100644
index 07d1ea1385..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/progressbar-horz.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/progressbar-vert-trough.png b/gtk/src/magenta/gtk-2.0/assets/progressbar-vert-trough.png
deleted file mode 100644
index d4152dab2b..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/progressbar-vert-trough.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/progressbar-vert.png b/gtk/src/magenta/gtk-2.0/assets/progressbar-vert.png
deleted file mode 100644
index cf3b91f6ee..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/progressbar-vert.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/radio-checked-active.png b/gtk/src/magenta/gtk-2.0/assets/radio-checked-active.png
deleted file mode 100644
index 166d41376d..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/radio-checked-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/radio-checked-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/radio-checked-insensitive.png
deleted file mode 100644
index 6e488f7927..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/radio-checked-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/radio-checked.png b/gtk/src/magenta/gtk-2.0/assets/radio-checked.png
deleted file mode 100644
index 66f1210e12..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/radio-checked.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/radio-mixed-active.png b/gtk/src/magenta/gtk-2.0/assets/radio-mixed-active.png
deleted file mode 100644
index a019b23243..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/radio-mixed-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/radio-mixed-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/radio-mixed-insensitive.png
deleted file mode 100644
index 18cc9a7d69..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/radio-mixed-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/radio-mixed.png b/gtk/src/magenta/gtk-2.0/assets/radio-mixed.png
deleted file mode 100644
index 4bf9c09f2e..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/radio-mixed.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/radio-unchecked-active.png b/gtk/src/magenta/gtk-2.0/assets/radio-unchecked-active.png
deleted file mode 100644
index e330e89eeb..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/radio-unchecked-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/radio-unchecked-hover.png b/gtk/src/magenta/gtk-2.0/assets/radio-unchecked-hover.png
deleted file mode 100644
index 72d22a641f..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/radio-unchecked-hover.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/radio-unchecked-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/radio-unchecked-insensitive.png
deleted file mode 100644
index 201fbf5469..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/radio-unchecked-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/radio-unchecked.png b/gtk/src/magenta/gtk-2.0/assets/radio-unchecked.png
deleted file mode 100644
index eab330c60f..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/radio-unchecked.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scale-horz-focus.png b/gtk/src/magenta/gtk-2.0/assets/scale-horz-focus.png
deleted file mode 100644
index e6688bde53..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scale-horz-focus.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scale-horz-trough-active.png b/gtk/src/magenta/gtk-2.0/assets/scale-horz-trough-active.png
deleted file mode 100644
index 4cd51cf21e..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scale-horz-trough-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scale-horz-trough.png b/gtk/src/magenta/gtk-2.0/assets/scale-horz-trough.png
deleted file mode 100644
index 8e2f291272..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scale-horz-trough.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scale-slider-active.png b/gtk/src/magenta/gtk-2.0/assets/scale-slider-active.png
deleted file mode 100644
index caee8411d8..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scale-slider-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scale-slider-hover.png b/gtk/src/magenta/gtk-2.0/assets/scale-slider-hover.png
deleted file mode 100644
index 113d53ccc8..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scale-slider-hover.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scale-slider-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/scale-slider-insensitive.png
deleted file mode 100644
index 625ed26eb3..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scale-slider-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scale-slider.png b/gtk/src/magenta/gtk-2.0/assets/scale-slider.png
deleted file mode 100644
index 2ed5a3aa1f..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scale-slider.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scale-vert-trough-active.png b/gtk/src/magenta/gtk-2.0/assets/scale-vert-trough-active.png
deleted file mode 100644
index b8b6f086bd..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scale-vert-trough-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scale-vert-trough.png b/gtk/src/magenta/gtk-2.0/assets/scale-vert-trough.png
deleted file mode 100644
index b2f04217c7..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scale-vert-trough.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scrollbar-horz-slider-active.png b/gtk/src/magenta/gtk-2.0/assets/scrollbar-horz-slider-active.png
deleted file mode 100644
index 986e4f2aea..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scrollbar-horz-slider-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scrollbar-horz-slider-hover.png b/gtk/src/magenta/gtk-2.0/assets/scrollbar-horz-slider-hover.png
deleted file mode 100644
index 24c275b8a6..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scrollbar-horz-slider-hover.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scrollbar-horz-slider.png b/gtk/src/magenta/gtk-2.0/assets/scrollbar-horz-slider.png
deleted file mode 100644
index e56537d30b..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scrollbar-horz-slider.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scrollbar-horz-trough.png b/gtk/src/magenta/gtk-2.0/assets/scrollbar-horz-trough.png
deleted file mode 100644
index f60ebabef7..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scrollbar-horz-trough.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png b/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png
deleted file mode 100644
index 4d753bd111..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-slider-active-rtl.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-slider-active.png b/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-slider-active.png
deleted file mode 100644
index 7e1d165519..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-slider-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png b/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png
deleted file mode 100644
index 4139d0b5f4..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-slider-hover-rtl.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-slider-hover.png b/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-slider-hover.png
deleted file mode 100644
index 8e64438aad..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-slider-hover.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-slider-rtl.png b/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-slider-rtl.png
deleted file mode 100644
index 8b535f98f1..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-slider-rtl.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-slider.png b/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-slider.png
deleted file mode 100644
index 68a3b5cf5b..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-slider.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-trough-rtl.png b/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-trough-rtl.png
deleted file mode 100644
index 37b0ae6c4f..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-trough-rtl.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-trough.png b/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-trough.png
deleted file mode 100644
index f59757eebc..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/scrollbar-vert-trough.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-down-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/spin-down-insensitive.png
deleted file mode 100644
index a0ab64e09f..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-down.png b/gtk/src/magenta/gtk-2.0/assets/spin-down.png
deleted file mode 100644
index 2f5915c9ea..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-down.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-ltr-down-active.png b/gtk/src/magenta/gtk-2.0/assets/spin-ltr-down-active.png
deleted file mode 100644
index 4c932e3fc8..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-ltr-down-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-ltr-down-hover.png b/gtk/src/magenta/gtk-2.0/assets/spin-ltr-down-hover.png
deleted file mode 100644
index 57758a2d8d..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-ltr-down-hover.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-ltr-down-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/spin-ltr-down-insensitive.png
deleted file mode 100644
index 36e72e335b..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-ltr-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-ltr-down.png b/gtk/src/magenta/gtk-2.0/assets/spin-ltr-down.png
deleted file mode 100644
index 05e677a34d..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-ltr-down.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-ltr-up-active.png b/gtk/src/magenta/gtk-2.0/assets/spin-ltr-up-active.png
deleted file mode 100644
index ccf5821c30..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-ltr-up-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-ltr-up-hover.png b/gtk/src/magenta/gtk-2.0/assets/spin-ltr-up-hover.png
deleted file mode 100644
index 82a2f324bc..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-ltr-up-hover.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-ltr-up-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/spin-ltr-up-insensitive.png
deleted file mode 100644
index 58270a58dd..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-ltr-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-ltr-up.png b/gtk/src/magenta/gtk-2.0/assets/spin-ltr-up.png
deleted file mode 100644
index d56931cbf0..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-ltr-up.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-rtl-down-active.png b/gtk/src/magenta/gtk-2.0/assets/spin-rtl-down-active.png
deleted file mode 100644
index 5c2067d2dd..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-rtl-down-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-rtl-down-hover.png b/gtk/src/magenta/gtk-2.0/assets/spin-rtl-down-hover.png
deleted file mode 100644
index 76eb9616b7..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-rtl-down-hover.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-rtl-down-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/spin-rtl-down-insensitive.png
deleted file mode 100644
index 536c454b66..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-rtl-down-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-rtl-down.png b/gtk/src/magenta/gtk-2.0/assets/spin-rtl-down.png
deleted file mode 100644
index bdf027ca5b..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-rtl-down.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-rtl-up-active.png b/gtk/src/magenta/gtk-2.0/assets/spin-rtl-up-active.png
deleted file mode 100644
index 5ebd0c585b..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-rtl-up-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-rtl-up-hover.png b/gtk/src/magenta/gtk-2.0/assets/spin-rtl-up-hover.png
deleted file mode 100644
index 819cabeb55..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-rtl-up-hover.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-rtl-up-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/spin-rtl-up-insensitive.png
deleted file mode 100644
index 0f4bd3418c..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-rtl-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-rtl-up.png b/gtk/src/magenta/gtk-2.0/assets/spin-rtl-up.png
deleted file mode 100644
index 7753ea907c..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-rtl-up.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-up-insensitive.png b/gtk/src/magenta/gtk-2.0/assets/spin-up-insensitive.png
deleted file mode 100644
index 334933958a..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-up-insensitive.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/spin-up.png b/gtk/src/magenta/gtk-2.0/assets/spin-up.png
deleted file mode 100644
index b59cc3f1fe..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/spin-up.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/tab-down-active.png b/gtk/src/magenta/gtk-2.0/assets/tab-down-active.png
deleted file mode 100644
index c877eb774a..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/tab-down-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/tab-down.png b/gtk/src/magenta/gtk-2.0/assets/tab-down.png
deleted file mode 100644
index eecbdf3a92..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/tab-down.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/tab-horz-gap.png b/gtk/src/magenta/gtk-2.0/assets/tab-horz-gap.png
deleted file mode 100644
index be9c50b24b..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/tab-horz-gap.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/tab-left-active.png b/gtk/src/magenta/gtk-2.0/assets/tab-left-active.png
deleted file mode 100644
index a3a1552730..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/tab-left-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/tab-left.png b/gtk/src/magenta/gtk-2.0/assets/tab-left.png
deleted file mode 100644
index 4973e1fcbe..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/tab-left.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/tab-right-active.png b/gtk/src/magenta/gtk-2.0/assets/tab-right-active.png
deleted file mode 100644
index e6634759bb..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/tab-right-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/tab-right.png b/gtk/src/magenta/gtk-2.0/assets/tab-right.png
deleted file mode 100644
index 4973e1fcbe..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/tab-right.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/tab-up-active.png b/gtk/src/magenta/gtk-2.0/assets/tab-up-active.png
deleted file mode 100644
index ecf8d5cef6..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/tab-up-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/tab-up.png b/gtk/src/magenta/gtk-2.0/assets/tab-up.png
deleted file mode 100644
index eecbdf3a92..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/tab-up.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/tab-vert-gap.png b/gtk/src/magenta/gtk-2.0/assets/tab-vert-gap.png
deleted file mode 100644
index 57a7619fcb..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/tab-vert-gap.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/treeview-header-button.png b/gtk/src/magenta/gtk-2.0/assets/treeview-header-button.png
deleted file mode 100644
index 6614cf84c8..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/treeview-header-button.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/treeview-pan-down-active.png b/gtk/src/magenta/gtk-2.0/assets/treeview-pan-down-active.png
deleted file mode 100644
index 5dece0922a..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/treeview-pan-down-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/treeview-pan-down-hover.png b/gtk/src/magenta/gtk-2.0/assets/treeview-pan-down-hover.png
deleted file mode 100644
index 2df6772a99..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/treeview-pan-down-hover.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/treeview-pan-down.png b/gtk/src/magenta/gtk-2.0/assets/treeview-pan-down.png
deleted file mode 100644
index f6db2bf0a3..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/treeview-pan-down.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/treeview-pan-up-active.png b/gtk/src/magenta/gtk-2.0/assets/treeview-pan-up-active.png
deleted file mode 100644
index c77245b37e..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/treeview-pan-up-active.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/treeview-pan-up-hover.png b/gtk/src/magenta/gtk-2.0/assets/treeview-pan-up-hover.png
deleted file mode 100644
index b50d8c7b4a..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/treeview-pan-up-hover.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/treeview-pan-up.png b/gtk/src/magenta/gtk-2.0/assets/treeview-pan-up.png
deleted file mode 100644
index d80b65d024..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/treeview-pan-up.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/treeview-separator-ltr.png b/gtk/src/magenta/gtk-2.0/assets/treeview-separator-ltr.png
deleted file mode 100644
index 01fc4e236d..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/treeview-separator-ltr.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/assets/treeview-separator-rtl.png b/gtk/src/magenta/gtk-2.0/assets/treeview-separator-rtl.png
deleted file mode 100644
index 31242a15b3..0000000000
Binary files a/gtk/src/magenta/gtk-2.0/assets/treeview-separator-rtl.png and /dev/null differ
diff --git a/gtk/src/magenta/gtk-2.0/gtkrc b/gtk/src/magenta/gtk-2.0/gtkrc
deleted file mode 100644
index 7fa4331765..0000000000
--- a/gtk/src/magenta/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,50 +0,0 @@
-# Based on Bridge by ScionicSpectre
-# vim:set ts=2 sw=2 sts=2 ai et:
-#
-# This is the GTK+ 2 version of Adwaita. It's whole purpose is to look as the
-# GTK+ 3 version as much as possible until GTK+ 2 dies completely.
-#
-# Note: comments for explaining styles are on the bottom of each file beside the
-# widget matches.
-
-# Declare the colours used throughout the theme.
-# There shouldn't be any fiddling with them in the theme files themselves in
-# order to not mess up the dark theme.
-
-# Text/base
-gtk-color-scheme = "text_color:#5D5D5D\nbase_color:#FFFFFF"
-# Foreground/background
-gtk-color-scheme = "fg_color:#3D3D3D\nbg_color:#F5F6F7"
-# Selected foreground/background
-gtk-color-scheme = "selected_fg_color:#ffffff\nselected_bg_color:#B34CB3"
-# Insensitive foreground/background
-gtk-color-scheme = "insensitive_fg_color:#8b8e8f\ninsensitive_bg_color:#f1f1f1"
-# Menus
-gtk-color-scheme = "menu_color:#fafafa\nmenubar_bg:#f5f6f7"
-gtk-color-scheme = "menubar_fg:#3d3d3d\nmenubar_insensitive_fg:#3d3d3d"
-# Links
-gtk-color-scheme = "link_color:#B34CB3\nvisited_link_color:#B34CA2"
-# Treeview headers
-gtk-color-scheme = "column_header_color:#979a9b\nhover_column_header_color:#636769"
-# Window decoration
-gtk-color-scheme = "menu_hover_color:#e2e2e2\nwindow_color:#f4f4f4"
-# Tooltips
-gtk-color-scheme = "tooltip_fg_color:#ffffff\ntooltip_bg_color:#343434"
-
-# Set GTK settings
-gtk-auto-mnemonics = 1
-gtk-primary-button-warps-slider = 1
-gtk-icon-sizes="gtk-menu=16,16:
-gtk-button=16,16:
-gtk-small-toolbar=16,16:
-
-gtk-dnd=16,16:
-gtk-dialog=16,16"
-gtk-toolbar-style = GTK_TOOLBAR_ICONS
-gtk-menu-images = 0
-gtk-menu-popup-delay = 0
-
-# And hand over the control to the theme files
-include "main.rc"
-include "apps.rc"
-include "hacks.rc"
diff --git a/gtk/src/magenta/gtk-2.0/hacks.rc b/gtk/src/magenta/gtk-2.0/hacks.rc
deleted file mode 100644
index 1bdbee9a41..0000000000
--- a/gtk/src/magenta/gtk-2.0/hacks.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
-#
-# This file contains horrible hacks to make this theme work with some programs
-# This is mostly due to the limitations of gtk2 but sometimes its the fault of
-# the programs themselves. Not going to point fingers.
-#
-# Either way, it's a WONTFIX for both, hence this horrible file.
-
-style "toplevel_hack" {
- engine "adwaita" {}
-}
-
-style "chrome_entry" {
- base[NORMAL] = @base_color
- base[INSENSITIVE] = @base_color
-}
-
-style "vim_notebook" {
- bg[NORMAL] = @base_color
- bg[ACTIVE] = @insensitive_bg_color
-}
-
-# Vim puts an eventbox between the tab and the label and colours it,
-# we need to handle that
-widget "vim-main-window*GtkNotebook.GtkEventBox" style "vim_notebook"
-
-# (he)xchat input box
-class "SexySpellEntry" style:highest "normal_entry"
-
-# Chromium uses base as the fill colour of its own entries
-# This would be fine but Gtk+ uses it to fill the surrounding space, so its set to bg
-# That results in Chromium using it for the fill, so we need to handle that
-widget_class "*Chrom*" style "chrome_entry"
-
-# Hack to be able to match widgets in LibreOffice
-class "GtkWindow" style "toplevel_hack"
diff --git a/gtk/src/magenta/gtk-2.0/main.rc b/gtk/src/magenta/gtk-2.0/main.rc
deleted file mode 100644
index f1ad8dc74c..0000000000
--- a/gtk/src/magenta/gtk-2.0/main.rc
+++ /dev/null
@@ -1,2615 +0,0 @@
-# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
-#
-# This is the main theme file, handling all the default widgets and theme
-# properties. Since GTK+ 2 is old, we need to overcome some of its limitations,
-# which is also mostly done in this file. Sadly not all of them can be overcome
-# so there will always be a visible difference between the GTK+ 2 and 3 theme.
-
-style "default" {
-
- xthickness = 1
- ythickness = 1
-
- ####################
- # Style Properties #
- ####################
-
- GtkWidget::focus-line-width = 1
- GtkWidget::focus-line-pattern = "\2\1"
-
- GtkToolbar::internal-padding = 4
- GtkToolButton::icon-spacing = 4
-
- GtkWidget::tooltip-radius = 3
- GtkWidget::tooltip-alpha = 235
- GtkWidget::new-tooltip-style = 1 #for compatibility
-
- GtkWidget::link-color = @link_color
- GtkWidget::visited-link-color = @visited_link_color
- GnomeHRef::link_color = @link_color
- GtkHTML::link-color = @link_color
- GtkHTML::vlink-color = @visited_link_color
- GtkIMHtml::hyperlink-color = @link_color
- GtkIMHtml::hyperlink-visited-color = @visited_link_color
-
- GtkSeparatorMenuItem::horizontal-padding = 0
- GtkSeparatorMenuItem::wide-separators = 1
- GtkSeparatorMenuItem::separator-height = 1
-
- GtkButton::child-displacement-y = 0
-
- GtkButton::default-border = {0, 0, 0, 0}
- GtkButton::default-outside-border = {0, 0, 0, 0}
- GtkButton::inner-border = {4, 4, 4, 4}
-
- GtkEntry::state-hint = 1
- GtkEntry::inner-border = {7, 7, 4, 5}
-
- GtkPaned::handle-size = 8
- GtkHPaned::handle-size = 8
- GtkVPaned::handle-size = 8
-
- GtkScrollbar::trough-border = 0
- GtkRange::trough-border = 0
- GtkRange::slider-width = 13
- GtkRange::stepper-size = 0
- GtkRange::activate-slider = 1
-
- GtkScrollbar::activate-slider = 1
- GtkScrollbar::stepper-size = 0
- GtkScrollbar::has-backward-stepper = 0
- GtkScrollbar::has-forward-stepper = 0
- GtkScrollbar::min-slider-length = 48 # 42 + 2*3 (margins)
- GtkScrolledWindow::scrollbar-spacing = 0
- GtkScrolledWindow::scrollbars-within-bevel = 1
-
- GtkScale::slider_length = 26
- GtkScale::slider_width = 26
- GtkScale::trough-side-details = 1
-
- GtkProgressBar::min-horizontal-bar-height = 6
- GtkProgressBar::min-vertical-bar-width = 6
- # Making this bigger than the min[height,width]-2*[y,x]spacing makes the
- # whole progressbar thicker, so by setting it to the exact above value
- # we get the maximum spacing between the text and the edges without
- # doing so.
- GtkProgressBar::xspacing = 4
- GtkProgressBar::yspacing = 4
-
- GtkStatusbar::shadow_type = GTK_SHADOW_NONE
- GtkSpinButton::shadow_type = GTK_SHADOW_NONE
- GtkMenuBar::shadow-type = GTK_SHADOW_NONE
- GtkToolbar::shadow-type = GTK_SHADOW_NONE
- # TODO: find out what this comment means:
- # ( every window is misaligned for the sake of menus ):
- GtkMenuBar::internal-padding = 0
- GtkMenu::horizontal-padding = 0
- GtkMenu::vertical-padding = 2
- GtkMenu::double-arrows = 0
- GtkMenuItem::arrow-scaling = 1
- GtkMenuItem::toggle-spacing = 10
-
- GtkCheckButton::indicator_spacing = 3
- GtkOptionMenu::indicator_spacing = {13, 13, 5, 8}
-
- GtkTreeView::expander-size = 16
- GtkTreeView::vertical-separator = 0
- GtkTreeView::horizontal-separator = 4
- GtkTreeView::allow-rules = 0
- # Set this because some apps read it
- GtkTreeView::odd-row-color = @base_color
- GtkTreeView::even-row-color = @base_color
-
- GtkExpander::expander-size = 16
-
- GtkNotebook::tab-overlap = 4
-
- ##########
- # Colors #
- ##########
-
- bg[NORMAL] = @bg_color
- bg[PRELIGHT] = @bg_color
- bg[SELECTED] = @selected_bg_color
- bg[INSENSITIVE] = @insensitive_bg_color
- bg[ACTIVE] = @bg_color
-
- fg[NORMAL] = @fg_color
- fg[PRELIGHT] = @fg_color
- fg[SELECTED] = @selected_fg_color
- fg[INSENSITIVE] = @insensitive_fg_color
- fg[ACTIVE] = @fg_color
-
- text[NORMAL] = @text_color
- text[PRELIGHT] = @text_color
- text[SELECTED] = @selected_fg_color
- text[INSENSITIVE] = @insensitive_fg_color
- text[ACTIVE] = @selected_fg_color
-
- base[NORMAL] = @base_color
- base[PRELIGHT] = shade (0.95, @bg_color)
- base[SELECTED] = @selected_bg_color
- base[INSENSITIVE] = @insensitive_bg_color
- base[ACTIVE] = @selected_bg_color
-
- # For succinctness, all reasonable pixmap options remain here
-
- # Draw frame around menu in a non-compositied environment
- # This needs to go before pixmap because we need to override some stuff
- engine "adwaita" {}
-
- engine "pixmap" {
-
- #################
- # Check Buttons #
- #################
-
- image {
- function = CHECK
- state = NORMAL
- shadow = OUT
- overlay_file = "assets/checkbox-unchecked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = OUT
- overlay_file = "assets/checkbox-unchecked-hover.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = OUT
- overlay_file = "assets/checkbox-unchecked-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = SELECTED
- shadow = OUT
- overlay_file = "assets/checkbox-unchecked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = OUT
- overlay_file = "assets/menu-checkbox-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = NORMAL
- shadow = IN
- overlay_file = "assets/checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = IN
- overlay_file = "assets/checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = IN
- overlay_file = "assets/checkbox-checked-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = SELECTED
- shadow = IN
- overlay_file = "assets/checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = IN
- overlay_file = "assets/menu-checkbox-checked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = NORMAL
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = SELECTED
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = ETCHED_IN
- overlay_file = "assets/checkbox-mixed-insensitive.png"
- overlay_stretch = FALSE
- }
-
- #################
- # Radio Buttons #
- #################
-
- image {
- function = OPTION
- state = NORMAL
- shadow = OUT
- overlay_file = "assets/radio-unchecked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = OUT
- overlay_file = "assets/radio-unchecked-hover.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = OUT
- overlay_file = "assets/radio-unchecked-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = SELECTED
- shadow = OUT
- overlay_file = "assets/radio-unchecked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = OUT
- overlay_file = "assets/menu-radio-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = NORMAL
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = SELECTED
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = IN
- overlay_file = "assets/menu-radio-checked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = NORMAL
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed-active.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = SELECTED
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = ETCHED_IN
- overlay_file = "assets/radio-mixed-insensitive.png"
- overlay_stretch = FALSE
- }
-
- ##########
- # Arrows #
- ##########
-
- # Overrides
-
- # Disable arrows in spinbuttons
- image {
- function = ARROW
- detail = "spinbutton"
- }
-
- # QGtkStyle (used for Qt apps) *always* assumes scrollbars have
- # arrows, so configure these here. Gtk2 apps will atually ignore
- # this.
-
- image {
- function = ARROW
- overlay_file = "assets/scrollbar-arrow-up.png"
- detail = "vscrollbar"
- overlay_border = { 0, 0, 0, 0 }
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- overlay_file = "assets/scrollbar-arrow-down.png"
- detail = "vscrollbar"
- overlay_border = { 0, 0, 0, 0 }
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- overlay_file = "assets/scrollbar-arrow-left.png"
- detail = "hscrollbar"
- overlay_border = { 0, 0, 0, 0 }
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- overlay_file = "assets/scrollbar-arrow-right.png"
- detail = "hscrollbar"
- overlay_border = { 0, 0, 0, 0 }
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = BOX
- detail = "hscrollbar"
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "vscrollbar"
- orientation = VERTICAL
- }
-
- # Menu arrows
-
- image {
- function = ARROW
- state = NORMAL
- detail = "menuitem"
- overlay_file = "assets/menu-pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- detail = "menuitem"
- overlay_file = "assets/menu-pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- detail = "menuitem"
- overlay_file = "assets/menu-pan-left-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = NORMAL
- detail = "menuitem"
- overlay_file = "assets/menu-pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- detail = "menuitem"
- overlay_file = "assets/menu-pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- detail = "menuitem"
- overlay_file = "assets/menu-pan-right-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- detail = "menu_scroll_arrow_up"
- overlay_file = "assets/menu-pan-up-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = ARROW
- detail = "menu_scroll_arrow_up"
- overlay_file = "assets/menu-pan-up.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- detail = "menu_scroll_arrow_down"
- overlay_file = "assets/menu-pan-down-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = ARROW
- detail = "menu_scroll_arrow_down"
- overlay_file = "assets/menu-pan-down.png"
- overlay_stretch = FALSE
- }
-
- # Regular arrows
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/pan-up.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/pan-up.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/pan-up.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- overlay_file = "assets/pan-up-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- overlay_file = "assets/pan-down-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/pan-left.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- overlay_file = "assets/pan-left-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = LEFT
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/pan-right.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- image {
- function = ARROW
- state = INSENSITIVE
- overlay_file = "assets/pan-right-insensitive.png"
- overlay_stretch = FALSE
- arrow_direction = RIGHT
- }
-
- ######################
- # Option Menu Arrows #
- ######################
-
- image {
- function = TAB
- state = NORMAL
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = TAB
- state = PRELIGHT
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = TAB
- state = ACTIVE
- overlay_file = "assets/pan-down.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = TAB
- state = INSENSITIVE
- overlay_file = "assets/pan-down-insensitive.png"
- overlay_stretch = FALSE
- }
-
- #########
- # Lines #
- #########
-
- image {
- function = VLINE
- file = "assets/line.png"
- border = {1, 0, 0, 0}
- }
-
- image {
- function = HLINE
- file = "assets/line.png"
- border = {0, 0, 1, 0}
- }
-
- #########
- # Focus #
- #########
-
- image {
- function = FOCUS
- file = "assets/focus.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- }
-
- ###########
- # Handles #
- ###########
-
- image {
- function = HANDLE
- detail = "handlebox"
- overlay_file = "assets/handle.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = HANDLE
- file = "assets/handle-horz.png"
- border = {0, 0, 4, 4}
- orientation = HORIZONTAL
- }
-
- image {
- function = HANDLE
- file = "assets/handle-vert.png"
- border = {4, 4, 0, 0}
- orientation = VERTICAL
- }
-
- image {
- function = RESIZE_GRIP
- }
-
- #############
- # Expanders #
- #############
-
- image {
- function = EXPANDER
- expander_style = EXPANDED
- file = "assets/pan-down.png"
- }
-
- # LTR
-
- image {
- function = EXPANDER
- expander_style = COLLAPSED
- file = "assets/pan-right.png"
- direction = LTR
- }
-
- image {
- function = EXPANDER
- expander_style = SEMI_COLLAPSED
- file = "assets/pan-right-semi.png"
- direction = LTR
- }
-
- image {
- function = EXPANDER
- expander_style = SEMI_EXPANDED
- file = "assets/pan-right-semi.png"
- direction = LTR
- }
-
- # RTL
-
- image {
- function = EXPANDER
- expander_style = COLLAPSED
- file = "assets/pan-left.png"
- direction = RTL
- }
-
- image {
- function = EXPANDER
- expander_style = SEMI_COLLAPSED
- file = "assets/pan-left-semi.png"
- direction = RTL
- }
-
- image {
- function = EXPANDER
- expander_style = SEMI_EXPANDED
- file = "assets/pan-left-semi.png"
- direction = RTL
- }
-
- #############
- # Notebooks #
- #############
-
- # Left
-
- image {
- function = EXTENSION
- state = NORMAL
- file = "assets/tab-left-active.png"
- border = {3, 0, 3, 3}
- stretch = TRUE
- gap_side = RIGHT
- }
-
- image {
- function = EXTENSION
- file = "assets/tab-left.png"
- border = {3, 0, 3, 3}
- stretch = TRUE
- gap_side = RIGHT
- }
-
- # Right
-
- image {
- function = EXTENSION
- state = NORMAL
- file = "assets/tab-right-active.png"
- border = {0, 3, 3, 3}
- stretch = TRUE
- gap_side = LEFT
- }
-
- image {
- function = EXTENSION
- file = "assets/tab-right.png"
- border = {0, 3, 3, 3}
- stretch = TRUE
- gap_side = LEFT
- }
-
- # Up
-
- image {
- function = EXTENSION
- state = NORMAL
- file = "assets/tab-up-active.png"
- border = {3, 3, 3, 0}
- stretch = TRUE
- gap_side = BOTTOM
- }
-
- image {
- function = EXTENSION
- file = "assets/tab-up.png"
- border = {3, 3, 3, 0}
- stretch = TRUE
- gap_side = BOTTOM
- }
-
- # Down
-
- image {
- function = EXTENSION
- state = NORMAL
- file = "assets/tab-down-active.png"
- border = {3, 3, 0, 3}
- stretch = TRUE
- gap_side = TOP
- }
-
- image {
- function = EXTENSION
- file = "assets/tab-down.png"
- border = {3, 3, 0, 3}
- stretch = TRUE
- gap_side = TOP
- }
-
- # Inner frame
-
- image {
- function = BOX_GAP
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_file = "assets/tab-vert-gap.png"
- gap_border = {1, 0, 1, 1}
- gap_side = LEFT
- }
-
- image {
- function = BOX_GAP
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_file = "assets/tab-vert-gap.png"
- gap_border = {0, 1, 1, 1}
- gap_side = RIGHT
- }
-
- image {
- function = BOX_GAP
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_file = "assets/tab-horz-gap.png"
- gap_border = {1, 1, 1, 0}
- gap_side = TOP
- }
-
- image {
- function = BOX_GAP
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_file = "assets/tab-horz-gap.png"
- gap_border = {1, 1, 0, 1}
- gap_side = BOTTOM
- }
-
- # Standalone frame
- image {
- function = BOX
- detail = "notebook"
- file = "assets/frame-notebook.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- }
-
- ##############
- # Scrollbars #
- ##############
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/scrollbar-horz-trough.png"
- border = {0, 0, 1, 0}
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/scrollbar-vert-trough.png"
- border = {1, 0, 0, 0}
- orientation = VERTICAL
- direction = LTR
- }
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/scrollbar-vert-trough-rtl.png"
- border = {0, 1, 0, 0}
- orientation = VERTICAL
- direction = RTL
- }
-
-
- # Disable insensitive sliders
-
- image {
- function = SLIDER
- state = INSENSITIVE
- detail = "slider"
- }
-
- # Horizontal sliders
-
- image {
- function = SLIDER
- state = NORMAL
- detail = "slider"
- file = "assets/scrollbar-horz-slider.png"
- border = {6, 6, 7, 6 }
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "slider"
- file = "assets/scrollbar-horz-slider-hover.png"
- border = {6, 6, 7, 6 }
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "slider"
- file = "assets/scrollbar-horz-slider-active.png"
- border = {6, 6, 7, 6 }
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- # Vertical sliders
-
- image {
- function = SLIDER
- state = NORMAL
- detail = "slider"
- file = "assets/scrollbar-vert-slider.png"
- border = {7, 6, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = LTR
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "slider"
- file = "assets/scrollbar-vert-slider-hover.png"
- border = {7, 6, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = LTR
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "slider"
- file = "assets/scrollbar-vert-slider-active.png"
- border = {7, 6, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = LTR
- }
-
- # RTL
-
- image {
- function = SLIDER
- state = NORMAL
- detail = "slider"
- file = "assets/scrollbar-vert-slider-rtl.png"
- border = {6, 7, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = RTL
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "slider"
- file = "assets/scrollbar-vert-slider-hover-rtl.png"
- border = {6, 7, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = RTL
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "slider"
- file = "assets/scrollbar-vert-slider-active-rtl.png"
- border = {6, 7, 6, 6}
- stretch = TRUE
- orientation = VERTICAL
- direction = RTL
- }
-
- ##########
- # Scales #
- ##########
-
- # Troughs, overrided later on. We set them here too because some widgets
- # don't specify their orientation.
-
- image {
- function = BOX
- detail = "trough-upper"
- file = "assets/scale-horz-trough.png"
- border = {10, 10, 0, 0}
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "trough-lower"
- file = "assets/scale-horz-trough-active.png"
- border = {10, 10, 0, 0}
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "trough-upper"
- file = "assets/scale-vert-trough.png"
- border = {0, 0, 10, 10}
- stretch = TRUE
- orientation = VERTICAL
- }
-
- image {
- function = BOX
- detail = "trough-lower"
- file = "assets/scale-vert-trough-active.png"
- border = {0, 0, 10, 10}
- stretch = TRUE
- orientation = VERTICAL
- }
-
- # Sliders
-
- image {
- function = SLIDER
- state = NORMAL
- detail = "hscale"
- file = "assets/scale-slider.png"
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "hscale"
- file = "assets/scale-slider-hover.png"
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "hscale"
- file = "assets/scale-slider-active.png"
- }
-
- image {
- function = SLIDER
- state = INSENSITIVE
- detail = "hscale"
- file = "assets/scale-slider-insensitive.png"
- }
- image {
- function = SLIDER
- state = NORMAL
- detail = "vscale"
- file = "assets/scale-slider.png"
- }
-
- image {
- function = SLIDER
- state = PRELIGHT
- detail = "vscale"
- file = "assets/scale-slider-hover.png"
- }
-
- image {
- function = SLIDER
- state = ACTIVE
- detail = "vscale"
- file = "assets/scale-slider-active.png"
- }
-
- image {
- function = SLIDER
- state = INSENSITIVE
- detail = "vscale"
- file = "assets/scale-slider-insensitive.png"
- }
-
- ###########
- # Menubar #
- ###########
-
- image {
- function = BOX
- detail = "menubar"
- file = "assets/line.png"
- border = {0, 0, 0, 1}
- }
-
- #########
- # Menus #
- #########
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "menu_scroll_arrow_up"
- file = "assets/line.png"
- }
-
- image {
- function = BOX
- detail = "menu_scroll_arrow_up"
- file = "assets/line.png"
- border = {0, 0, 0, 1}
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "menu_scroll_arrow_down"
- file = "assets/line.png"
- }
-
- image {
- function = BOX
- detail = "menu_scroll_arrow_down"
- file = "assets/line.png"
- border = {0, 0, 1, 0}
- }
-
- ###########
- # Entries #
- ###########
-
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- detail = "entry"
- file = "assets/entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = FLAT_BOX
- state = ACTIVE
- detail = "entry_bg"
- file = "assets/entry-background.png"
- }
-
- image {
- function = FLAT_BOX
- state = INSENSITIVE
- detail = "entry_bg"
- file = "assets/entry-background-insensitive.png"
- }
-
- image {
- function = FLAT_BOX
- detail = "entry_bg"
- file = "assets/entry-background.png"
- }
- #########
- # Spins #
- #########
-
- # Spin-Up LTR
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_up"
- file = "assets/spin-ltr-up.png"
- border = {1, 4, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_up"
- file = "assets/spin-ltr-up-hover.png"
- border = {1, 4, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_up"
- file = "assets/spin-ltr-up-active.png"
- border = {1, 4, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_up"
- file = "assets/spin-ltr-up-insensitive.png"
- border = {1, 4, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up-insensitive.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- # Spin-Up RTL
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_up"
- file = "assets/spin-rtl-up.png"
- border = {4, 1, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_up"
- file = "assets/spin-rtl-up-hover.png"
- border = {4, 1, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_up"
- file = "assets/spin-rtl-up-hover.png"
- border = {4, 1, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_up"
- file = "assets/spin-rtl-up-insensitive.png"
- border = {4, 1, 4, 0}
- stretch = TRUE
- overlay_file = "assets/spin-up-insensitive.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- # Spin-Down LTR
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_down"
- file = "assets/spin-ltr-down.png"
- border = {1, 4, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_down"
- file = "assets/spin-ltr-down-hover.png"
- border = {1, 4, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_down"
- file = "assets/spin-ltr-down-active.png"
- border = {1, 4, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_down"
- file = "assets/spin-ltr-down-insensitive.png"
- border = {1, 4, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down-insensitive.png"
- overlay_stretch = FALSE
- direction = LTR
- }
-
- # Spin-Down RTL
-
- image {
- function = BOX
- state = NORMAL
- detail = "spinbutton_down"
- file = "assets/spin-rtl-down.png"
- border = {4, 1, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "spinbutton_down"
- file = "assets/spin-rtl-down-hover.png"
- border = {4, 1, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "spinbutton_down"
- file = "assets/spin-rtl-down-active.png"
- border = {4, 1, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "spinbutton_down"
- file = "assets/spin-rtl-down-insensitive.png"
- border = {4, 1, 1, 4}
- stretch = TRUE
- overlay_file = "assets/spin-down-insensitive.png"
- overlay_stretch = FALSE
- direction = RTL
- }
-
- ##############
- # Scrollbars #
- ##############
-
- image {
- function = BOX
- detail = "bar"
- file = "assets/progressbar-horz.png"
- stretch = TRUE
- border = {2, 2, 1, 1}
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "bar"
- file = "assets/progressbar-vert.png"
- stretch = TRUE
- border = {1, 1, 2, 2}
- orientation = VERTICAL
- }
-
- #############
- # Treeviews #
- #############
-
- # Disable active the column highlight
- # We need to match specific cells or we break stuff
- # Looking at you deadbeef
-
- image {
- function = FLAT_BOX
- detail = "cell_even_sorted"
- state = NORMAL
- }
-
- image {
- function = FLAT_BOX
- detail = "cell_odd_sorted"
- state = NORMAL
- }
-
- # Disable all the other shadows
- # This prevents the Raleigh effect
- image {
- function = SHADOW
- }
-
- }
-
-}
-
-style "menubar" {
-
- # Needed to fix Firefox's menubar text
- bg[NORMAL] = @menubar_bg
- bg[SELECTED] = @selected_fg_color
- fg[SELECTED] = @link_color
-}
-
-style "menubar_item" {
-
- xthickness = 3
- ythickness = 4
-
- fg[NORMAL] = @menubar_insensitive_fg
- fg[PRELIGHT] = @menubar_fg
-
- engine "pixmap" {
- image {
- function = BOX
- state = PRELIGHT
- file = "assets/menubar-item-active.png"
- border = {0, 0, 0, 3}
- }
- }
-
-}
-
-style "menu" {
-
- xthickness = 0
- ythickness = 0
-
- bg[NORMAL] = @menu_color
- bg[INSENSITIVE] = @menu_color
- bg[PRELIGHT] = @menu_color
- bg[SELECTED] = @selected_bg_color
-
-}
-
-style "menu_item" {
-
- xthickness = 3
- ythickness = 4
-
- bg[PRELIGHT] = @menu_hover_color
- # Chromium uses this setting
- bg[SELECTED] = @menu_hover_color
-
- fg[PRELIGHT] = @fg_color
- fg[SELECTED] = @fg_color
- text[NORMAL] = @fg_color
- text[PRELIGHT] = @fg_color
- text[ACTIVE] = @fg_color
- text[SELECTED] = @fg_color
-
- # Some widgets use text, we need to handle that
- # Don't know what this comment is about but maybe we've nulled it
-
- # Unfortunately we can't tell regular and menu checks/radios apart
- # Without the heirarchy
- engine "pixmap" {
-
- #################
- # Check Buttons #
- #################
-
- image {
- function = CHECK
- state = NORMAL
- shadow = OUT
- overlay_file = "assets/menu-checkbox.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = OUT
- overlay_file = "assets/menu-checkbox.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = OUT
- overlay_file = "assets/menu-checkbox.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = OUT
- overlay_file = "assets/menu-checkbox-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = NORMAL
- shadow = IN
- overlay_file = "assets/menu-checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = IN
- overlay_file = "assets/menu-checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = IN
- overlay_file = "assets/menu-checkbox-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = IN
- overlay_file = "assets/menu-checkbox-checked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = NORMAL
- shadow = ETCHED_IN
- overlay_file = "assets/menu-checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = PRELIGHT
- shadow = ETCHED_IN
- overlay_file = "assets/menu-checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = ACTIVE
- shadow = ETCHED_IN
- overlay_file = "assets/menu-checkbox-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = CHECK
- state = INSENSITIVE
- shadow = ETCHED_IN
- overlay_file = "assets/menu-checkbox-mixed-insensitive.png"
- overlay_stretch = FALSE
- }
-
- #################
- # Radio Buttons #
- #################
-
- image {
- function = OPTION
- state = NORMAL
- shadow = OUT
- overlay_file = "assets/menu-radio.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = OUT
- overlay_file = "assets/menu-radio.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = OUT
- overlay_file = "assets/menu-radio.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = OUT
- overlay_file = "assets/menu-radio-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = NORMAL
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = IN
- overlay_file = "assets/menu-radio-checked.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = IN
- overlay_file = "assets/menu-radio-checked-insensitive.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = NORMAL
- shadow = ETCHED_IN
- overlay_file = "assets/menu-radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = PRELIGHT
- shadow = ETCHED_IN
- overlay_file = "assets/menu-radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = ACTIVE
- shadow = ETCHED_IN
- overlay_file = "assets/menu-radio-mixed.png"
- overlay_stretch = FALSE
- }
-
- image {
- function = OPTION
- state = INSENSITIVE
- shadow = ETCHED_IN
- overlay_file = "assets/menu-radio-mixed-insensitive.png"
- overlay_stretch = FALSE
- }
-
-
-
- }
-
-}
-
-style "separator_menu_item" {
-
- xthickness = 0
- ythickness = 0
-
- engine "pixmap" {
- image {
- function = BOX
- file = "assets/line.png"
- }
- }
-
-}
-
-style "button" {
-
- xthickness = 2
- ythickness = 2
-
- # For the sake of sanity style buttons this way
- engine "pixmap" {
-
- ###########
- # Buttons #
- ###########
-
- image {
- function = BOX
- state = NORMAL
- file = "assets/button.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = BOX
- state = PRELIGHT
- shadow = OUT
- file = "assets/button-hover.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- # Don't add hover effect on pressed buttons
- image {
- function = BOX
- state = PRELIGHT
- shadow = IN
- file = "assets/button-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = BOX
- state = ACTIVE
- file = "assets/button-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- file = "assets/button-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
- }
-}
-
-style "link_button" {
-
- # Disable the button effect, leave just the link
- engine "pixmap" {
- image {
- function = BOX
- }
- }
-
-}
-
-style "entry" {
-
- # We set this same as the border of the border of the entry
- # This way there's no overlap
- xthickness = 4
- ythickness = 4
-
-}
-
-style "combobox" {
-
- xthickness = 6
- ythickness = 4
-
- # This affects only the button beside an entry
- GtkButton::inner-border = {0, 0, 0, 0}
-
-}
-
-style "combobox_cellview" {
- text[NORMAL] = @fg_color
- text[PRELIGHT] = @fg_color
-}
-
-style "combobox_entry" {
-
- # Since one side of the button is missing, we need to shift the arrow a little to the right
- GtkButton::inner-border = {0, 1, 0, 0}
-
- engine "pixmap" {
-
- #############
- # LTR entry #
- #############
-
- image {
- function = SHADOW
- state = NORMAL
- detail = "entry"
- file = "assets/combo-entry-ltr-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/combo-entry-ltr-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/combo-entry-ltr-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- #############
- # RTL entry #
- #############
-
- image {
- function = SHADOW
- state = NORMAL
- detail = "entry"
- file = "assets/combo-entry-rtl-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/combo-entry-rtl-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/combo-entry-rtl-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- ##############
- # LTR button #
- ##############
-
- image {
- function = BOX
- state = NORMAL
- detail = "button"
- file = "assets/combo-entry-ltr-button.png"
- border = {0, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "button"
- file = "assets/combo-entry-ltr-button-hover.png"
- border = {0, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "button"
- file = "assets/combo-entry-ltr-button-active.png"
- border = {0, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "button"
- file = "assets/combo-entry-ltr-button-insensitive.png"
- border = {0, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- ##############
- # RTL button #
- ##############
-
- image {
- function = BOX
- state = NORMAL
- detail = "button"
- file = "assets/combo-entry-rtl-button.png"
- border = {4, 0, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = BOX
- state = PRELIGHT
- detail = "button"
- file = "assets/combo-entry-rtl-button-hover.png"
- border = {4, 0, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = BOX
- state = ACTIVE
- detail = "button"
- file = "assets/combo-entry-rtl-button-active.png"
- border = {4, 0, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = BOX
- state = INSENSITIVE
- detail = "button"
- file = "assets/combo-entry-rtl-button-insensitive.png"
- border = {4, 0, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- }
-
-}
-
-style "combo_button_padding" {
-
- # Since one side of the button is missing, we need to shift the arrow a
- # little to the right.
- # This is the same thing we've done above but the combo, unlike the combobox,
- # uses padding the same way as a button.
- GtkButton::inner-border = {6, 8, 4, 4}
-
-}
-
-style "notebook" {
-
- xthickness = 5
- ythickness = 2
-
-}
-
-style "notebook_viewport" {
- bg[NORMAL] = @base_color
-}
-
-style "notebook_bg" {
- bg[NORMAL] = @base_color
- bg[PRELIGHT] = @base_color
- bg[INSENSITIVE] = @base_color
-}
-
-style "notebook_entry" {
-
- engine "pixmap" {
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/notebook-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/notebook-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- detail = "entry"
- file = "assets/notebook-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
- }
-}
-
-style "normal_bg" {
- bg[NORMAL] = @bg_color
- bg[PRELIGHT] = @bg_color
- bg[INSENSITIVE] = @insensitive_bg_color
-}
-
-style "normal_entry" {
-
- engine "pixmap" {
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
-
- image {
- function = SHADOW
- detail = "entry"
- file = "assets/entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
- }
-}
-
-style "notebook_combo" {
-
- engine "pixmap" {
-
- #############
- # LTR entry #
- #############
-
- image {
- function = SHADOW
- state = NORMAL
- detail = "entry"
- file = "assets/notebook-combo-entry-ltr-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/notebook-combo-entry-ltr-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/notebook-combo-entry-ltr-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = LTR
- }
-
- #############
- # RTL entry #
- #############
-
- image {
- function = SHADOW
- state = NORMAL
- detail = "entry"
- file = "assets/notebook-combo-entry-rtl-entry.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = SHADOW
- state = ACTIVE
- detail = "entry"
- file = "assets/notebook-combo-entry-rtl-entry-active.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = SHADOW
- state = INSENSITIVE
- detail = "entry"
- file = "assets/notebook-combo-entry-rtl-entry-insensitive.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- direction = RTL
- }
-
- }
-
-}
-
-style "textview" {
- bg[NORMAL] = @base_color
-}
-
-style "scale_horz" {
-
- engine "pixmap" {
-
- image {
- function = BOX
- detail = "trough-upper"
- file = "assets/scale-horz-trough.png"
- border = {10, 10, 0, 0}
- stretch = TRUE
- }
-
- image {
- function = BOX
- detail = "trough-lower"
- file = "assets/scale-horz-trough-active.png"
- border = {10, 10, 0, 0}
- stretch = TRUE
- }
-
- }
-
-}
-
-style "scale_vert" {
-
- engine "pixmap" {
-
- image {
- function = BOX
- detail = "trough-upper"
- file = "assets/scale-vert-trough.png"
- border = {0, 0, 10, 10}
- stretch = TRUE
- }
-
- image {
- function = BOX
- detail = "trough-lower"
- file = "assets/scale-vert-trough-active.png"
- border = {0, 0, 10, 10}
- stretch = TRUE
- }
-
- }
-
-}
-
-style "progressbar" {
-
- xthickness = 1
- ythickness = 1
-
- fg[PRELIGHT] = @selected_fg_color
-
- engine "pixmap" {
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/progressbar-horz-trough.png"
- border = {3, 3, 2, 2}
- stretch = TRUE
- orientation = HORIZONTAL
- }
-
- image {
- function = BOX
- detail = "trough"
- file = "assets/progressbar-vert-trough.png"
- border = {2, 2, 3, 3}
- stretch = TRUE
- orientation = VERTICAL
- }
-
- }
-
-}
-
-style "treeview_header_button" {
-
- engine "pixmap" {
- image {
- function = SHADOW
- state = NORMAL
- file = "assets/treeview-header-button.png"
- border = {4, 4, 4, 4}
- stretch = TRUE
- }
- }
-
-}
-
-style "treeview_header_label" {
-
- xthickness = 1
- ythickness = 0
-
- font_name = "Bold"
-
- GtkButton::inner-border = {5, 5, 0, 1}
-
- engine "pixmap" {
-
- image {
- function = BOX
- file = "assets/treeview-separator-ltr.png"
- border = {0, 1, 0, 1}
- stretch = TRUE
- direction = LTR
- }
-
- image {
- function = BOX
- file = "assets/treeview-separator-rtl.png"
- border = {1, 0, 0, 1}
- stretch = TRUE
- direction = RTL
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/treeview-pan-up.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/treeview-pan-up-hover.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/treeview-pan-up-active.png"
- overlay_stretch = FALSE
- arrow_direction = UP
- }
-
- image {
- function = ARROW
- state = NORMAL
- overlay_file = "assets/treeview-pan-down.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = PRELIGHT
- overlay_file = "assets/treeview-pan-down-hover.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- image {
- function = ARROW
- state = ACTIVE
- overlay_file = "assets/treeview-pan-down-active.png"
- overlay_stretch = FALSE
- arrow_direction = DOWN
- }
-
- }
-
-}
-
-style "scrolled_window" {
-
- engine "pixmap" {
- image {
- function = SHADOW
- file = "assets/frame.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- }
- }
-
-}
-
-style "frame" {
-
- engine "pixmap" {
-
- image {
- function = SHADOW
- shadow = NONE
- }
-
- image {
- function = SHADOW
- file = "assets/frame.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- }
-
- image {
- function = SHADOW_GAP
- file = "assets/frame.png"
- border = {1, 1, 1, 1}
- stretch = TRUE
- gap_start_file = "assets/border.png"
- gap_end_file = "assets/border.png"
- }
-
- }
-
-}
-
-style "toolbar_button" {
-
- xthickness = 2
- ythickness = 2
-
- GtkButton::inner-border = {2, 2, 2, 2}
-
-}
-
-style "toolbar_separator" {
-
- GtkWidget::wide-separators = 1
- GtkWidget::separator-width = 1
- GtkWidget::separator-height = 1
-
- engine "pixmap" {
- image {
- function = BOX
- file = "assets/line.png"
- }
- }
-
-}
-
-style "inline_toolbar" {
-
- GtkToolbar::button-relief = GTK_RELIEF_NORMAL
-
- engine "pixmap" {
- image {
- function = SHADOW
- file = "assets/frame-inline.png"
- border = {1, 1, 0, 1}
- stretch = TRUE
- }
- }
-
-}
-
-style "tooltip" {
-
- xthickness = 13
- ythickness = 13
-
- bg[NORMAL] = @tooltip_bg_color
- fg[NORMAL] = @tooltip_fg_color
- bg[SELECTED] = @tooltip_bg_color
-
-}
-
-style "disable_separator" {
-
- xthickness = 0
- ythickness = 0
-
- GtkWidget::wide-separators = 1
-
-}
-
-# Default style, containing theme properties and trying to match every widget as
-# much as possible, which is not only faster than trying to match every widget
-# by its own but also less bug-prune and more consistent. However there is some
-# widget specific stuff that needs to be taken care of, which is the point of
-# every other style below.
-class "GtkWidget" style "default"
-
- ######################################
- # Override padding, style and colour #
- ######################################
-
-class "GtkButton" style "button"
-class "GtkLinkButton" style "link_button"
-class "GtkEntry" style "entry"
-class "GtkOldEditable" style "entry"
-class "GtkNotebook" style "notebook"
-class "GtkHScale" style "scale_horz"
-class "GtkVScale" style "scale_vert"
-class "GtkProgressBar" style "progressbar"
-class "GtkScrolledWindow" style "scrolled_window"
-class "GtkFrame" style "frame"
-class "GtkSeparatorToolItem" style "toolbar_separator"
-class "GtkMenuBar" style "menubar"
-class "GtkMenu" style "menu"
-class "GtkTextView" style "textview"
-
-# Menu and menubar items
-widget_class "**" style "menu_item"
-widget_class "*.*" style "menubar_item"
-widget_class "**" style "menubar_item"
-widget_class "**" style "separator_menu_item"
-
-# Treeview buttons
-widget_class "***" style "treeview_header_label"
-widget_class "**" style "treeview_header_button"
-
-# Give the file chooser toolbar a border
-widget_class "**" style "inline_toolbar"
-
-# Fix padding on regular comboboxes
-widget_class "*." style "combobox"
-# And disable separators on them
-widget_class "*.*" style "disable_separator"
-
-# Join together the ComboBoxEntry entry and button
-widget_class "**" style "combobox_entry"
-
-# Join the Combo entry and button
-widget_class "**" style "combobox_entry"
-# Tweak the padding on the button a little bit because it
-# uses it a bit differently
-widget_class "*." style "combo_button_padding"
-
-# Alas we cannot do the same for ComboBoxText because there
-# isn't a way to apply the style to only the comboboxes that
-# have an entry inside
-
-# Toolbar buttons have different paddings
-widget_class "**" style "toolbar_button"
-
-# Notebooks are white, act accordingly
-widget_class "**" style "notebook_entry"
-widget_class "**" style "notebook_bg"
-widget_class "**" style "notebook_bg"
-widget_class "***" style "notebook_bg"
-widget_class "**" style "notebook_bg"
-widget_class "*.*" style "notebook_bg"
-widget_class "***" style "notebook_combo"
-widget_class "***" style "notebook_combo"
-
-# However, stuff inside eventboxes inside notebooks is grey
-# again, react
-widget_class "***" style "normal_entry"
-widget_class "***" style "normal_bg"
-widget_class "***