Reorganize our themes

Rename the included theme to Default, with 4 variants:
light, dark, hc, hc-dark. This replaces Adwaita,
Adwaita:dark, HighContrast and HighContrastInverse.
We still make the themes available under these names,
and we still set up Adwaita-dark and HighContrastInverse
as the dark variants of Adwaita and HighContrast.

The unification of the theme variants under Default
is not quite perfect; it would be nice to merge
the assets/ and assets-hc/ subdirectories and render
all assets from a single svg file.

227 files changed, 162 insertions, 270 deletions

diff --git a/gtk/gen-gtk-gresources-xml.py b/gtk/gen-gtk-gresources-xml.py
index 0404bef758..38a928388d 100644
--- a/gtk/gen-gtk-gresources-xml.py
+++ b/gtk/gen-gtk-gresources-xml.py
@@ -32,36 +32,38 @@ def get_files(subdir,extension):
 
 xml += '''
     <file>theme/Empty/gtk.css</file>
-    <file>theme/Adwaita/gtk.css</file>
-    <file>theme/Adwaita/gtk-dark.css</file>
-    <file alias='theme/Adwaita-dark/gtk.css'>theme/Adwaita/gtk-dark.css</file>
-    <file>theme/Adwaita/Adwaita.css</file>
-    <file>theme/Adwaita/Adwaita-dark.css</file>
+    <file>theme/Default/gtk.css</file>
+    <file>theme/Default/gtk-light.css</file>
+    <file>theme/Default/gtk-dark.css</file>
+    <file>theme/Default/gtk-hc.css</file>
+    <file>theme/Default/gtk-hc-dark.css</file>
+    <file>theme/Default/Default-light.css</file>
+    <file>theme/Default/Default-dark.css</file>
+    <file>theme/Default/Default-hc.css</file>
+    <file>theme/Default/Default-hc-dark.css</file>
+    <file alias='theme/Adwaita/gtk.css'>theme/Default/gtk.css</file>
+    <file alias='theme/Adwaita/gtk-dark.css'>theme/Default/gtk-dark.css</file>
+    <file alias='theme/Adwaita-dark/gtk.css'>theme/Default/gtk-dark.css</file>
+    <file alias='theme/HighContrast/gtk.css'>theme/Default/gtk-hc.css</file>
+    <file alias='theme/HighContrast/gtk-dark.css'>theme/Default/gtk-hc-dark.css</file>
+    <file alias='theme/HighContrastInverse/gtk.css'>theme/Default/gtk-hc-dark.css</file>
 '''
 
-for f in get_files('theme/Adwaita/assets', '.png'):
-  xml += '    <file>theme/Adwaita/assets/{0}</file>\n'.format(f)
+for f in get_files('theme/Default/assets', '.png'):
+  xml += '    <file>theme/Default/assets/{0}</file>\n'.format(f)
 
 xml += '\n'
 
-for f in get_files('theme/Adwaita/assets', '.svg'):
-  xml += '    <file>theme/Adwaita/assets/{0}</file>\n'.format(f)
+for f in get_files('theme/Default/assets', '.svg'):
+  xml += '    <file>theme/Default/assets/{0}</file>\n'.format(f)
 
-xml += '''
-    <file>theme/HighContrast/gtk.css</file>
-    <file>theme/HighContrast/gtk-dark.css</file>
-    <file alias='theme/HighContrastInverse/gtk.css'>theme/HighContrast/gtk-dark.css</file>
-    <file>theme/HighContrast/HighContrast.css</file>
-    <file>theme/HighContrast/HighContrast-dark.css</file>
-'''
-
-for f in get_files('theme/HighContrast/assets', '.png'):
-  xml += '    <file>theme/HighContrast/assets/{0}</file>\n'.format(f)
+for f in get_files('theme/Default/assets-hc', '.png'):
+  xml += '    <file>theme/Default/assets-hc/{0}</file>\n'.format(f)
 
 xml += '\n'
 
-for f in get_files('theme/HighContrast/assets', '.svg'):
-  xml += '    <file>theme/HighContrast/assets/{0}</file>\n'.format(f)
+for f in get_files('theme/Default/assets-hc', '.svg'):
+  xml += '    <file>theme/Default/assets-hc/{0}</file>\n'.format(f)
 
 for f in get_files('ui', '.ui'):
   xml += '    <file preprocess=\'xml-stripblanks\'>ui/{0}</file>\n'.format(f)
diff --git a/gtk/meson.build b/gtk/meson.build
index fe0ec456d9..ed6c97617b 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -848,12 +848,10 @@ endif
 if sassc.found()
   sassc_opts = [ '-a', '-M', '-t', 'compact' ]
 
-  subdir('theme/Adwaita')
-  subdir('theme/HighContrast')
+  subdir('theme/Default')
 
   theme_deps = [
-    adwaita_theme_deps,
-    hc_theme_deps,
+    default_theme_deps,
   ]
 else
   theme_deps = []
diff --git a/gtk/theme/Adwaita/gtk-dark.css b/gtk/theme/Adwaita/gtk-dark.css
deleted file mode 100644
index d6711af387..0000000000
--- a/gtk/theme/Adwaita/gtk-dark.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita-dark.css");
diff --git a/gtk/theme/Adwaita/gtk.css b/gtk/theme/Adwaita/gtk.css
deleted file mode 100644
index d99e088ea0..0000000000
--- a/gtk/theme/Adwaita/gtk.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita.css");
diff --git a/gtk/theme/Adwaita/meson.build b/gtk/theme/Adwaita/meson.build
deleted file mode 100644
index c829c9126a..0000000000
--- a/gtk/theme/Adwaita/meson.build
+++ /dev/null
@@ -1,32 +0,0 @@
-adwaita_scss_files = files([
-  '_colors-public.scss',
-  '_colors.scss',
-  '_common.scss',
-  '_drawing.scss',
-])
-
-adwaita_theme_variants = [
-  'dark',
-]
-
-adwaita_theme_deps = [
-  custom_target('Adwaita theme',
-    input: 'Adwaita.scss',
-    output: 'Adwaita.css',
-    command: [
-      sassc, sassc_opts, '@INPUT@', '@OUTPUT@',
-    ],
-    depend_files: adwaita_scss_files,
-  ),
-]
-
-foreach variant: adwaita_theme_variants
-  adwaita_theme_deps += custom_target('Adwaita theme variant: ' + variant,
-    input: 'Adwaita-@0@.scss'.format(variant),
-    output: 'Adwaita-@0@.css'.format(variant),
-    command: [
-      sassc, sassc_opts, '@INPUT@', '@OUTPUT@',
-    ],
-    depend_files: adwaita_scss_files,
-  )
-endforeach
diff --git a/gtk/theme/Adwaita/render-assets.sh b/gtk/theme/Adwaita/render-assets.sh
deleted file mode 100755
index 24d7675afe..0000000000
--- a/gtk/theme/Adwaita/render-assets.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="/usr/bin/inkscape"
-OPTIPNG="/usr/bin/optipng"
-
-SRC_FILE="assets.svg"
-ASSETS_DIR="assets"
-INDEX="assets.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-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/theme/Default/Default-dark.scss b/gtk/theme/Default/Default-dark.scss
new file mode 100644
index 0000000000..9207802561
--- /dev/null
+++ b/gtk/theme/Default/Default-dark.scss
@@ -0,0 +1,7 @@
+$variant: 'dark';
+$contrast: 'normal';
+
+@import 'colors';
+@import 'drawing';
+@import 'common';
+@import 'colors-public';
diff --git a/gtk/theme/Adwaita/Adwaita-dark.scss b/gtk/theme/Default/Default-hc-dark.scss
index 6e5753957b..3a7bbeaabc 100644
--- a/gtk/theme/Adwaita/Adwaita-dark.scss
+++ b/gtk/theme/Default/Default-hc-dark.scss
@@ -1,6 +1,7 @@
 $variant: 'dark';
+$contrast: 'high';
 
 @import 'colors';
+@import 'colors-public';
 @import 'drawing';
 @import 'common';
-@import 'colors-public';
diff --git a/gtk/theme/Default/Default-hc.scss b/gtk/theme/Default/Default-hc.scss
new file mode 100644
index 0000000000..85293a945e
--- /dev/null
+++ b/gtk/theme/Default/Default-hc.scss
@@ -0,0 +1,7 @@
+$variant: 'light';
+$contrast: 'high';
+
+@import 'colors';
+@import 'colors-public';
+@import 'drawing';
+@import 'common';
diff --git a/gtk/theme/Adwaita/Adwaita.scss b/gtk/theme/Default/Default-light.scss
index ee5e202856..d11373beca 100644
--- a/gtk/theme/Adwaita/Adwaita.scss
+++ b/gtk/theme/Default/Default-light.scss
@@ -5,6 +5,7 @@
 // - 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';
diff --git a/gtk/theme/Adwaita/README b/gtk/theme/Default/README
index 0588bcf5e3..f2132f7fb7 100644
--- a/gtk/theme/Adwaita/README
+++ b/gtk/theme/Default/README
@@ -6,10 +6,18 @@ Summary
 * 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
 ----------------------
 
-Adwaita is a complex theme, so to keep it maintainable it's written and
+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.
 
@@ -28,10 +36,10 @@ _colors-public.scss - SCSS colors exported through gtk to allow for 3rd party
 
 _drawing.scss       - drawing helper mixings/functions to allow easier
                       definition of widget drawing under specific context. This
-                      is why Adwaita isn't 15000 LOC.
+                      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/theme/Adwaita/_colors-public.scss b/gtk/theme/Default/_colors-public.scss
index 3b638e2bf6..3b638e2bf6 100644
--- a/gtk/theme/Adwaita/_colors-public.scss
+++ b/gtk/theme/Default/_colors-public.scss
diff --git a/gtk/theme/Adwaita/_colors.scss b/gtk/theme/Default/_colors.scss
index 825b13125b..03e812447f 100644
--- a/gtk/theme/Adwaita/_colors.scss
+++ b/gtk/theme/Default/_colors.scss
@@ -72,3 +72,30 @@ $switch_borders_color: if($variant == 'light',darken($switch_bg_color,15%),darke
 $focus_border_color: if($variant == 'light', transparentize($selected_bg_color, 0.5), transparentize($selected_bg_color, 0.3));
 $alt_focus_border_color: if($variant == 'light', transparentize(white, 0.2), transparentize(white,0.7));
 $dim_label_opacity: 0.55;
+
+// High Contrast color overrides
+@if $contrast == 'high' {
+
+  $fg_color: if($variant == 'light', darken($fg_color, 3%), lighten($fg_color, 2%));
+  $bg_color: if($variant == 'light', lighten($bg_color, 3%), darken($bg_color, 2%));
+  $selected_bg_color: darken($selected_bg_color,10%);
+  $selected_borders_color: darken($selected_borders_color, 10%);
+  $borders_color: if($variant == 'light', darken($borders_color, 30%), lighten($borders_color, 30%));
+  $alt_borders_color: if($variant == 'light', darken($alt_borders_color, 33%), lighten($alt_borders_color, 28%));
+  $menu_color: $base_color;
+  $menu_selected_color: darken($bg_color,10%);
+
+  //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: mix($borders_color, $bg_color, 80%);
+
+  //focus rings
+  $focus_border_color: if($variant == 'light', transparentize($selected_bg_color, 0.2), transparentize(white, 0.4));
+  $alt_focus_border_color: if($variant == 'light', white, transparentize(white,0.4));
+
+  $dim_label_opacity: 0.9;
+
+  $switch_borders_color: if($variant == 'light',darken($switch_bg_color,15%),lighten($switch_bg_color,15%));
+
+}
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Default/_common.scss
index c5baa58518..db7d6730b9 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Default/_common.scss
@@ -4,6 +4,7 @@
 
 $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;
@@ -2524,11 +2525,11 @@ check {
   border-radius: 3px;
   -gtk-icon-size: 14px;
 
-  &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/check-symbolic.symbolic.png")),
-                                            -gtk-recolor(url("assets/check@2-symbolic.symbolic.png"))); }
+  &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("#{$assets}/check-symbolic.symbolic.png")),
+                                            -gtk-recolor(url("#{$assets}/check@2-symbolic.symbolic.png"))); }
 
-  &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/dash-symbolic.symbolic.png")),
-                                                  -gtk-recolor(url("assets/dash@2-symbolic.symbolic.png"))); }
+  &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("#{$assets}/dash-symbolic.symbolic.png")),
+                                                  -gtk-recolor(url("#{$assets}/dash@2-symbolic.symbolic.png"))); }
 }
 
 %radio,
@@ -2536,11 +2537,11 @@ radio {
   border-radius: 100%;
   -gtk-icon-size: 14px;
 
-  &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/bullet-symbolic.symbolic.png")),
-                                            -gtk-recolor(url("assets/bullet@2-symbolic.symbolic.png"))); }
+  &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("#{$assets}/bullet-symbolic.symbolic.png")),
+                                            -gtk-recolor(url("#{$assets}/bullet@2-symbolic.symbolic.png"))); }
 
-  &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/dash-symbolic.symbolic.png")),
-                                                  -gtk-recolor(url("assets/dash@2-symbolic.symbolic.png"))); }
+  &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("#{$assets}/dash-symbolic.symbolic.png")),
+                                                  -gtk-recolor(url("#{$assets}/dash@2-symbolic.symbolic.png"))); }
 }
 
 treeview.view check,
@@ -2804,7 +2805,7 @@ scale {
               // 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}';
+              $_scale_asset: '#{$assets}/slider-#{$dir_infix}-#{$marks_infix}#{$state_infix}#{$suffix}';
               border-style: none;
               border-radius: 0;
 
@@ -4150,19 +4151,19 @@ cursor-handle {
                   (':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}';
+      $_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}';
+      $_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}';
+      $_url: '#{$assets}/slider-horz-scale-has-marks-above#{$as}#{$asset_suffix}';
       -gtk-icon-source: -gtk-scaled(url('#{$_url}.png'),
                                     url('#{$_url}@2.png'));
     }
diff --git a/gtk/theme/Adwaita/_drawing.scss b/gtk/theme/Default/_drawing.scss
index 909af03f4c..909af03f4c 100644
--- a/gtk/theme/Adwaita/_drawing.scss
+++ b/gtk/theme/Default/_drawing.scss
diff --git a/gtk/theme/HighContrast/assets.svg b/gtk/theme/Default/assets-hc.svg
index fba15312ab..fba15312ab 100644
--- a/gtk/theme/HighContrast/assets.svg
+++ b/gtk/theme/Default/assets-hc.svg
diff --git a/gtk/theme/HighContrast/assets/bullet-symbolic.svg b/gtk/theme/Default/assets-hc/bullet-symbolic.svg
index c0299734fc..c0299734fc 100644
--- a/gtk/theme/HighContrast/assets/bullet-symbolic.svg
+++ b/gtk/theme/Default/assets-hc/bullet-symbolic.svg
diff --git a/gtk/theme/HighContrast/assets/bullet-symbolic.symbolic.png b/gtk/theme/Default/assets-hc/bullet-symbolic.symbolic.png
index 2ccb0e861a..2ccb0e861a 100644
--- a/gtk/theme/HighContrast/assets/bullet-symbolic.symbolic.png
+++ b/gtk/theme/Default/assets-hc/bullet-symbolic.symbolic.png
diff --git a/gtk/theme/Adwaita/assets/bullet@2-symbolic.symbolic.png b/gtk/theme/Default/assets-hc/bullet@2-symbolic.symbolic.png
index e9df4256c0..e9df4256c0 100644
--- a/gtk/theme/Adwaita/assets/bullet@2-symbolic.symbolic.png
+++ b/gtk/theme/Default/assets-hc/bullet@2-symbolic.symbolic.png
diff --git a/gtk/theme/HighContrast/assets/check-symbolic.svg b/gtk/theme/Default/assets-hc/check-symbolic.svg
index bac5cd6aaa..bac5cd6aaa 100644
--- a/gtk/theme/HighContrast/assets/check-symbolic.svg
+++ b/gtk/theme/Default/assets-hc/check-symbolic.svg
diff --git a/gtk/theme/HighContrast/assets/check-symbolic.symbolic.png b/gtk/theme/Default/assets-hc/check-symbolic.symbolic.png
index eed1f45a58..eed1f45a58 100644
--- a/gtk/theme/HighContrast/assets/check-symbolic.symbolic.png
+++ b/gtk/theme/Default/assets-hc/check-symbolic.symbolic.png
diff --git a/gtk/theme/HighContrast/assets/check@2-symbolic.symbolic.png b/gtk/theme/Default/assets-hc/check@2-symbolic.symbolic.png
index f7c143fcc7..f7c143fcc7 100644
--- a/gtk/theme/HighContrast/assets/check@2-symbolic.symbolic.png
+++ b/gtk/theme/Default/assets-hc/check@2-symbolic.symbolic.png
diff --git a/gtk/theme/Adwaita/assets/dash-symbolic.svg b/gtk/theme/Default/assets-hc/dash-symbolic.svg
index 7886d54166..7886d54166 100644
--- a/gtk/theme/Adwaita/assets/dash-symbolic.svg
+++ b/gtk/theme/Default/assets-hc/dash-symbolic.svg
diff --git a/gtk/theme/Adwaita/assets/dash-symbolic.symbolic.png b/gtk/theme/Default/assets-hc/dash-symbolic.symbolic.png
index c20d4bac52..c20d4bac52 100644
--- a/gtk/theme/Adwaita/assets/dash-symbolic.symbolic.png
+++ b/gtk/theme/Default/assets-hc/dash-symbolic.symbolic.png
diff --git a/gtk/theme/Adwaita/assets/dash@2-symbolic.symbolic.png b/gtk/theme/Default/assets-hc/dash@2-symbolic.symbolic.png
index d2b3385ee1..d2b3385ee1 100644
--- a/gtk/theme/Adwaita/assets/dash@2-symbolic.symbolic.png
+++ b/gtk/theme/Default/assets-hc/dash@2-symbolic.symbolic.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-active-dark.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-active-dark.png
index c9709fe6d0..c9709fe6d0 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-active-dark.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-active-dark.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-active-dark@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-active-dark@2.png
index bb5481548a..bb5481548a 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-active-dark@2.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-active-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-active.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-active.png
index ce170ee3e3..ce170ee3e3 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-active.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-active.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-active@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-active@2.png
index 7e1c31e4f0..7e1c31e4f0 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-active@2.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-active@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-dark.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-dark.png
index 883cd0c4e9..883cd0c4e9 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-dark.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-dark.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-dark@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-dark@2.png
index 2606032fc4..2606032fc4 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-dark@2.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-hover-dark.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-hover-dark.png
index 1d86a1726f..1d86a1726f 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-hover-dark.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-hover-dark.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-hover-dark@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-hover-dark@2.png
index ceb98628fe..ceb98628fe 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-hover-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-hover.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-hover.png
index c92db2cccd..c92db2cccd 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-hover.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-hover.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-hover@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-hover@2.png
index 27cc91089a..27cc91089a 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-hover@2.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-hover@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive-dark.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-insensitive-dark.png
index 5d5bc7d12d..5d5bc7d12d 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-insensitive-dark.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-insensitive-dark@2.png
index 46030296cb..46030296cb 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-insensitive-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-insensitive.png
index e0faaf0979..e0faaf0979 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-insensitive.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-insensitive@2.png
index 75217d230b..75217d230b 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive@2.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-insensitive@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above.png
index 37869d96b5..37869d96b5 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above@2.png
index 7eb1d1089d..7eb1d1089d 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above@2.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-active-dark.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-active-dark.png
index d255965233..d255965233 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-active-dark.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-active-dark.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-active-dark@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-active-dark@2.png
index f25bd29975..f25bd29975 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-active-dark@2.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-active-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-active.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-active.png
index 269fcd9d26..269fcd9d26 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-active.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-active.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-active@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-active@2.png
index 62830dc34b..62830dc34b 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-active@2.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-active@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-dark.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-dark.png
index 7ab6415c84..7ab6415c84 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-dark.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-dark.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-dark@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-dark@2.png
index 5b0502b3be..5b0502b3be 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-dark@2.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-hover-dark.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-hover-dark.png
index 7044e48fcf..7044e48fcf 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-hover-dark.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-hover-dark.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-hover-dark@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-hover-dark@2.png
index 089b902d22..089b902d22 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-hover-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-hover.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-hover.png
index 00ea0c3bd2..00ea0c3bd2 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-hover.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-hover.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-hover@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-hover@2.png
index f43026aa6c..f43026aa6c 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-hover@2.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-hover@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive-dark.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-insensitive-dark.png
index 12f249a382..12f249a382 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-insensitive-dark.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-insensitive-dark@2.png
index 29c21fbfd1..29c21fbfd1 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-insensitive-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-insensitive.png
index 93cc0a65ec..93cc0a65ec 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-insensitive.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-insensitive@2.png
index 56d01a7a71..56d01a7a71 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive@2.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-insensitive@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below.png
index acffa041b6..acffa041b6 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below@2.png
index 146d377b45..146d377b45 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below@2.png
+++ b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-active-dark.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-active-dark.png
index e4f4a79092..e4f4a79092 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-active-dark.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-active-dark.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-active-dark@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-active-dark@2.png
index 814d8d324a..814d8d324a 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-active-dark@2.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-active-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-active.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-active.png
index 7896ba0ad3..7896ba0ad3 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-active.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-active.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-active@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-active@2.png
index ed202d64b8..ed202d64b8 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-active@2.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-active@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-dark.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-dark.png
index d8b1adc5a9..d8b1adc5a9 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-dark.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-dark.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-dark@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-dark@2.png
index 7012463fea..7012463fea 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-dark@2.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-hover-dark.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-hover-dark.png
index 465c7f8db4..465c7f8db4 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-hover-dark.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-hover-dark.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-hover-dark@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-hover-dark@2.png
index 10d8a8d9a7..10d8a8d9a7 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-hover-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-hover.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-hover.png
index 509d4908dc..509d4908dc 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-hover.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-hover.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-hover@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-hover@2.png
index 98ad078d9b..98ad078d9b 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-hover@2.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-hover@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive-dark.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-insensitive-dark.png
index 5d0b5bd37d..5d0b5bd37d 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-insensitive-dark.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-insensitive-dark@2.png
index 343e53dfbe..343e53dfbe 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-insensitive-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-insensitive.png
index 598a9f02b4..598a9f02b4 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-insensitive.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-insensitive@2.png
index 47d7bf7813..47d7bf7813 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive@2.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-insensitive@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above.png
index cad097b852..cad097b852 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above@2.png
index 600f11ac96..600f11ac96 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above@2.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-active-dark.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-active-dark.png
index c6bbb4fe34..c6bbb4fe34 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-active-dark.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-active-dark.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-active-dark@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-active-dark@2.png
index 2cb440be9e..2cb440be9e 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-active-dark@2.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-active-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-active.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-active.png
index 2460eaf014..2460eaf014 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-active.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-active.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-active@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-active@2.png
index b9d2047781..b9d2047781 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-active@2.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-active@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-dark.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-dark.png
index 56778d5067..56778d5067 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-dark.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-dark.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-dark@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-dark@2.png
index 44e5360c30..44e5360c30 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-dark@2.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-hover-dark.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-hover-dark.png
index 0ce28e7643..0ce28e7643 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-hover-dark.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-hover-dark.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-hover-dark@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-hover-dark@2.png
index 2c1c9251b9..2c1c9251b9 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-hover-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-hover.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-hover.png
index ff055d5851..ff055d5851 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-hover.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-hover.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-hover@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-hover@2.png
index a68e750fce..a68e750fce 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-hover@2.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-hover@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive-dark.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-insensitive-dark.png
index 69e56a9901..69e56a9901 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-insensitive-dark.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-insensitive-dark@2.png
index 612ad7eb61..612ad7eb61 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-insensitive-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-insensitive.png
index 42cc7786f6..42cc7786f6 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-insensitive.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-insensitive@2.png
index 376affc436..376affc436 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive@2.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-insensitive@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below.png
index 962abbe51e..962abbe51e 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below@2.png
index c230252abd..c230252abd 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below@2.png
+++ b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below@2.png
diff --git a/gtk/theme/HighContrast/assets/text-select-end-active-dark.png b/gtk/theme/Default/assets-hc/text-select-end-active-dark.png
index 7ea84c99e2..7ea84c99e2 100644
--- a/gtk/theme/HighContrast/assets/text-select-end-active-dark.png
+++ b/gtk/theme/Default/assets-hc/text-select-end-active-dark.png
diff --git a/gtk/theme/HighContrast/assets/text-select-end-active-dark@2.png b/gtk/theme/Default/assets-hc/text-select-end-active-dark@2.png
index e76ae1a03c..e76ae1a03c 100644
--- a/gtk/theme/HighContrast/assets/text-select-end-active-dark@2.png
+++ b/gtk/theme/Default/assets-hc/text-select-end-active-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/text-select-end-active.png b/gtk/theme/Default/assets-hc/text-select-end-active.png
index ceb48454ad..ceb48454ad 100644
--- a/gtk/theme/HighContrast/assets/text-select-end-active.png
+++ b/gtk/theme/Default/assets-hc/text-select-end-active.png
diff --git a/gtk/theme/HighContrast/assets/text-select-end-active@2.png b/gtk/theme/Default/assets-hc/text-select-end-active@2.png
index f5239f6809..f5239f6809 100644
--- a/gtk/theme/HighContrast/assets/text-select-end-active@2.png
+++ b/gtk/theme/Default/assets-hc/text-select-end-active@2.png
diff --git a/gtk/theme/HighContrast/assets/text-select-end-dark.png b/gtk/theme/Default/assets-hc/text-select-end-dark.png
index 68774257e3..68774257e3 100644
--- a/gtk/theme/HighContrast/assets/text-select-end-dark.png
+++ b/gtk/theme/Default/assets-hc/text-select-end-dark.png
diff --git a/gtk/theme/HighContrast/assets/text-select-end-dark@2.png b/gtk/theme/Default/assets-hc/text-select-end-dark@2.png
index c18f034df3..c18f034df3 100644
--- a/gtk/theme/HighContrast/assets/text-select-end-dark@2.png
+++ b/gtk/theme/Default/assets-hc/text-select-end-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/text-select-end-hover-dark.png b/gtk/theme/Default/assets-hc/text-select-end-hover-dark.png
index eca1f77ca7..eca1f77ca7 100644
--- a/gtk/theme/HighContrast/assets/text-select-end-hover-dark.png
+++ b/gtk/theme/Default/assets-hc/text-select-end-hover-dark.png
diff --git a/gtk/theme/HighContrast/assets/text-select-end-hover-dark@2.png b/gtk/theme/Default/assets-hc/text-select-end-hover-dark@2.png
index 750edc32fa..750edc32fa 100644
--- a/gtk/theme/HighContrast/assets/text-select-end-hover-dark@2.png
+++ b/gtk/theme/Default/assets-hc/text-select-end-hover-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/text-select-end-hover.png b/gtk/theme/Default/assets-hc/text-select-end-hover.png
index 0a7e0cdfb9..0a7e0cdfb9 100644
--- a/gtk/theme/HighContrast/assets/text-select-end-hover.png
+++ b/gtk/theme/Default/assets-hc/text-select-end-hover.png
diff --git a/gtk/theme/HighContrast/assets/text-select-end-hover@2.png b/gtk/theme/Default/assets-hc/text-select-end-hover@2.png
index 29e94c72aa..29e94c72aa 100644
--- a/gtk/theme/HighContrast/assets/text-select-end-hover@2.png
+++ b/gtk/theme/Default/assets-hc/text-select-end-hover@2.png
diff --git a/gtk/theme/HighContrast/assets/text-select-end.png b/gtk/theme/Default/assets-hc/text-select-end.png
index 87187dc086..87187dc086 100644
--- a/gtk/theme/HighContrast/assets/text-select-end.png
+++ b/gtk/theme/Default/assets-hc/text-select-end.png
diff --git a/gtk/theme/HighContrast/assets/text-select-end@2.png b/gtk/theme/Default/assets-hc/text-select-end@2.png
index cbbb5e9d2d..cbbb5e9d2d 100644
--- a/gtk/theme/HighContrast/assets/text-select-end@2.png
+++ b/gtk/theme/Default/assets-hc/text-select-end@2.png
diff --git a/gtk/theme/HighContrast/assets/text-select-start-active-dark.png b/gtk/theme/Default/assets-hc/text-select-start-active-dark.png
index 87a9b9e796..87a9b9e796 100644
--- a/gtk/theme/HighContrast/assets/text-select-start-active-dark.png
+++ b/gtk/theme/Default/assets-hc/text-select-start-active-dark.png
diff --git a/gtk/theme/HighContrast/assets/text-select-start-active-dark@2.png b/gtk/theme/Default/assets-hc/text-select-start-active-dark@2.png
index 7ae3297797..7ae3297797 100644
--- a/gtk/theme/HighContrast/assets/text-select-start-active-dark@2.png
+++ b/gtk/theme/Default/assets-hc/text-select-start-active-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/text-select-start-active.png b/gtk/theme/Default/assets-hc/text-select-start-active.png
index 3e7196e72d..3e7196e72d 100644
--- a/gtk/theme/HighContrast/assets/text-select-start-active.png
+++ b/gtk/theme/Default/assets-hc/text-select-start-active.png
diff --git a/gtk/theme/HighContrast/assets/text-select-start-active@2.png b/gtk/theme/Default/assets-hc/text-select-start-active@2.png
index fbdee10e5f..fbdee10e5f 100644
--- a/gtk/theme/HighContrast/assets/text-select-start-active@2.png
+++ b/gtk/theme/Default/assets-hc/text-select-start-active@2.png
diff --git a/gtk/theme/HighContrast/assets/text-select-start-dark.png b/gtk/theme/Default/assets-hc/text-select-start-dark.png
index ff80dca11e..ff80dca11e 100644
--- a/gtk/theme/HighContrast/assets/text-select-start-dark.png
+++ b/gtk/theme/Default/assets-hc/text-select-start-dark.png
diff --git a/gtk/theme/HighContrast/assets/text-select-start-dark@2.png b/gtk/theme/Default/assets-hc/text-select-start-dark@2.png
index b3ff6206ca..b3ff6206ca 100644
--- a/gtk/theme/HighContrast/assets/text-select-start-dark@2.png
+++ b/gtk/theme/Default/assets-hc/text-select-start-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/text-select-start-hover-dark.png b/gtk/theme/Default/assets-hc/text-select-start-hover-dark.png
index 9ce0aa8ae1..9ce0aa8ae1 100644
--- a/gtk/theme/HighContrast/assets/text-select-start-hover-dark.png
+++ b/gtk/theme/Default/assets-hc/text-select-start-hover-dark.png
diff --git a/gtk/theme/HighContrast/assets/text-select-start-hover-dark@2.png b/gtk/theme/Default/assets-hc/text-select-start-hover-dark@2.png
index 29b890cc30..29b890cc30 100644
--- a/gtk/theme/HighContrast/assets/text-select-start-hover-dark@2.png
+++ b/gtk/theme/Default/assets-hc/text-select-start-hover-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/text-select-start-hover.png b/gtk/theme/Default/assets-hc/text-select-start-hover.png
index 2ef001158f..2ef001158f 100644
--- a/gtk/theme/HighContrast/assets/text-select-start-hover.png
+++ b/gtk/theme/Default/assets-hc/text-select-start-hover.png
diff --git a/gtk/theme/HighContrast/assets/text-select-start-hover@2.png b/gtk/theme/Default/assets-hc/text-select-start-hover@2.png
index e08b2f82d8..e08b2f82d8 100644
--- a/gtk/theme/HighContrast/assets/text-select-start-hover@2.png
+++ b/gtk/theme/Default/assets-hc/text-select-start-hover@2.png
diff --git a/gtk/theme/HighContrast/assets/text-select-start.png b/gtk/theme/Default/assets-hc/text-select-start.png
index e43b2d7214..e43b2d7214 100644
--- a/gtk/theme/HighContrast/assets/text-select-start.png
+++ b/gtk/theme/Default/assets-hc/text-select-start.png
diff --git a/gtk/theme/HighContrast/assets/text-select-start@2.png b/gtk/theme/Default/assets-hc/text-select-start@2.png
index fe2c257c6c..fe2c257c6c 100644
--- a/gtk/theme/HighContrast/assets/text-select-start@2.png
+++ b/gtk/theme/Default/assets-hc/text-select-start@2.png
diff --git a/gtk/theme/Adwaita/assets.svg b/gtk/theme/Default/assets.svg
index a0b995fefc..a0b995fefc 100644
--- a/gtk/theme/Adwaita/assets.svg
+++ b/gtk/theme/Default/assets.svg
diff --git a/gtk/theme/Adwaita/assets.txt b/gtk/theme/Default/assets.txt
index a380d1cce5..a380d1cce5 100644
--- a/gtk/theme/Adwaita/assets.txt
+++ b/gtk/theme/Default/assets.txt
diff --git a/gtk/theme/Adwaita/assets/bullet-symbolic.svg b/gtk/theme/Default/assets/bullet-symbolic.svg
index acf880adb4..acf880adb4 100644
--- a/gtk/theme/Adwaita/assets/bullet-symbolic.svg
+++ b/gtk/theme/Default/assets/bullet-symbolic.svg
diff --git a/gtk/theme/Adwaita/assets/bullet-symbolic.symbolic.png b/gtk/theme/Default/assets/bullet-symbolic.symbolic.png
index 8e6925a5f8..8e6925a5f8 100644
--- a/gtk/theme/Adwaita/assets/bullet-symbolic.symbolic.png
+++ b/gtk/theme/Default/assets/bullet-symbolic.symbolic.png
diff --git a/gtk/theme/HighContrast/assets/bullet@2-symbolic.symbolic.png b/gtk/theme/Default/assets/bullet@2-symbolic.symbolic.png
index e9df4256c0..e9df4256c0 100644
--- a/gtk/theme/HighContrast/assets/bullet@2-symbolic.symbolic.png
+++ b/gtk/theme/Default/assets/bullet@2-symbolic.symbolic.png
diff --git a/gtk/theme/Adwaita/assets/check-symbolic.svg b/gtk/theme/Default/assets/check-symbolic.svg
index b04b5ad849..b04b5ad849 100644
--- a/gtk/theme/Adwaita/assets/check-symbolic.svg
+++ b/gtk/theme/Default/assets/check-symbolic.svg
diff --git a/gtk/theme/Adwaita/assets/check-symbolic.symbolic.png b/gtk/theme/Default/assets/check-symbolic.symbolic.png
index 14bd626ced..14bd626ced 100644
--- a/gtk/theme/Adwaita/assets/check-symbolic.symbolic.png
+++ b/gtk/theme/Default/assets/check-symbolic.symbolic.png
diff --git a/gtk/theme/Adwaita/assets/check@2-symbolic.symbolic.png b/gtk/theme/Default/assets/check@2-symbolic.symbolic.png
index 994ce3a0fd..994ce3a0fd 100644
--- a/gtk/theme/Adwaita/assets/check@2-symbolic.symbolic.png
+++ b/gtk/theme/Default/assets/check@2-symbolic.symbolic.png
diff --git a/gtk/theme/HighContrast/assets/dash-symbolic.svg b/gtk/theme/Default/assets/dash-symbolic.svg
index 7886d54166..7886d54166 100644
--- a/gtk/theme/HighContrast/assets/dash-symbolic.svg
+++ b/gtk/theme/Default/assets/dash-symbolic.svg
diff --git a/gtk/theme/HighContrast/assets/dash-symbolic.symbolic.png b/gtk/theme/Default/assets/dash-symbolic.symbolic.png
index c20d4bac52..c20d4bac52 100644
--- a/gtk/theme/HighContrast/assets/dash-symbolic.symbolic.png
+++ b/gtk/theme/Default/assets/dash-symbolic.symbolic.png
diff --git a/gtk/theme/HighContrast/assets/dash@2-symbolic.symbolic.png b/gtk/theme/Default/assets/dash@2-symbolic.symbolic.png
index d2b3385ee1..d2b3385ee1 100644
--- a/gtk/theme/HighContrast/assets/dash@2-symbolic.symbolic.png
+++ b/gtk/theme/Default/assets/dash@2-symbolic.symbolic.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active-dark.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-active-dark.png
index 6340b2e2d5..6340b2e2d5 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active-dark.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-active-dark.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active-dark@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-active-dark@2.png
index ac5218d97d..ac5218d97d 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active-dark@2.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-active-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-active.png
index 1731cb32f0..1731cb32f0 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-active.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-active@2.png
index 9431dad16a..9431dad16a 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active@2.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-active@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-dark.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-dark.png
index 3f5b203940..3f5b203940 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-dark.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-dark.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-dark@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-dark@2.png
index c3b5344d84..c3b5344d84 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-dark@2.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover-dark.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-hover-dark.png
index 9f7d932c20..9f7d932c20 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover-dark.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-hover-dark.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover-dark@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
index 8a42a02583..8a42a02583 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-hover.png
index 180aec8027..180aec8027 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-hover.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-hover@2.png
index 842af38125..842af38125 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover@2.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-hover@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-insensitive-dark.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
index 5d5bc7d12d..5d5bc7d12d 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
index 46030296cb..46030296cb 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-insensitive.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-insensitive.png
index e0faaf0979..e0faaf0979 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-insensitive.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-insensitive.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-insensitive@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-insensitive@2.png
index 75217d230b..75217d230b 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-insensitive@2.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-insensitive@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above.png
index 87128e21e3..87128e21e3 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above@2.png
index 83ff84eee4..83ff84eee4 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above@2.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active-dark.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-active-dark.png
index 502493d197..502493d197 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active-dark.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-active-dark.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active-dark@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-active-dark@2.png
index 42ababe9f8..42ababe9f8 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active-dark@2.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-active-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-active.png
index 39b1c21f6a..39b1c21f6a 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-active.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-active@2.png
index f9c144eb4c..f9c144eb4c 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active@2.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-active@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-dark.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-dark.png
index 438102d126..438102d126 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-dark.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-dark.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-dark@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-dark@2.png
index dc88ed4642..dc88ed4642 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-dark@2.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover-dark.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-hover-dark.png
index 7dd3b530d0..7dd3b530d0 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover-dark.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-hover-dark.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover-dark@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
index 84893b7a22..84893b7a22 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-hover.png
index 3052b51fef..3052b51fef 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-hover.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-hover@2.png
index bcc53289bb..bcc53289bb 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover@2.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-hover@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-insensitive-dark.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
index 12f249a382..12f249a382 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
index 29c21fbfd1..29c21fbfd1 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-insensitive.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-insensitive.png
index 93cc0a65ec..93cc0a65ec 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-insensitive.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-insensitive.png
diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-insensitive@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-insensitive@2.png
index 56d01a7a71..56d01a7a71 100644
--- a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-insensitive@2.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-insensitive@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below.png
index 05364ce3d7..05364ce3d7 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below.png
diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below@2.png
index cde1392287..cde1392287 100644
--- a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below@2.png
+++ b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active-dark.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-active-dark.png
index 8457c1b4a7..8457c1b4a7 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active-dark.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-active-dark.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active-dark@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-active-dark@2.png
index fc3962fbae..fc3962fbae 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active-dark@2.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-active-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-active.png
index 5cca0f83de..5cca0f83de 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-active.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-active@2.png
index 971c35a540..971c35a540 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active@2.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-active@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-dark.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-dark.png
index 0bf1bf370a..0bf1bf370a 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-dark.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-dark.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-dark@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-dark@2.png
index bbc3398d5e..bbc3398d5e 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-dark@2.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover-dark.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-hover-dark.png
index ce9467b09e..ce9467b09e 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover-dark.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-hover-dark.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover-dark@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
index 3562fd5526..3562fd5526 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-hover.png
index d24aced4d0..d24aced4d0 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-hover.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-hover@2.png
index 191e4e8e67..191e4e8e67 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover@2.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-hover@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-insensitive-dark.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
index 5d0b5bd37d..5d0b5bd37d 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
index 343e53dfbe..343e53dfbe 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-insensitive.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-insensitive.png
index 598a9f02b4..598a9f02b4 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-insensitive.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-insensitive.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-insensitive@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-insensitive@2.png
index 47d7bf7813..47d7bf7813 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-insensitive@2.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-insensitive@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above.png
index 4e880ad14a..4e880ad14a 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above@2.png
index 2bfa8c7b43..2bfa8c7b43 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above@2.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active-dark.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-active-dark.png
index ef21ab016c..ef21ab016c 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active-dark.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-active-dark.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active-dark@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-active-dark@2.png
index df1675e6c5..df1675e6c5 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active-dark@2.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-active-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-active.png
index 204f324735..204f324735 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-active.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-active@2.png
index 8c499ed6e9..8c499ed6e9 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active@2.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-active@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-dark.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-dark.png
index 248a0890ca..248a0890ca 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-dark.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-dark.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-dark@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-dark@2.png
index 8e3263a425..8e3263a425 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-dark@2.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover-dark.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-hover-dark.png
index 62bb1000a4..62bb1000a4 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover-dark.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-hover-dark.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover-dark@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
index ab7196279e..ab7196279e 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-hover.png
index ba9521a5d9..ba9521a5d9 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-hover.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-hover@2.png
index 87e1923f44..87e1923f44 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover@2.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-hover@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-insensitive-dark.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
index 69e56a9901..69e56a9901 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
index 612ad7eb61..612ad7eb61 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-insensitive.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-insensitive.png
index 42cc7786f6..42cc7786f6 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-insensitive.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-insensitive.png
diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-insensitive@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-insensitive@2.png
index 376affc436..376affc436 100644
--- a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-insensitive@2.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-insensitive@2.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below.png
index 705f4e6ac6..705f4e6ac6 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below.png
diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below@2.png
index 26a43e0cf9..26a43e0cf9 100644
--- a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below@2.png
+++ b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below@2.png
diff --git a/gtk/theme/Adwaita/assets/text-select-end-active-dark.png b/gtk/theme/Default/assets/text-select-end-active-dark.png
index 964afea8ce..964afea8ce 100644
--- a/gtk/theme/Adwaita/assets/text-select-end-active-dark.png
+++ b/gtk/theme/Default/assets/text-select-end-active-dark.png
diff --git a/gtk/theme/Adwaita/assets/text-select-end-active-dark@2.png b/gtk/theme/Default/assets/text-select-end-active-dark@2.png
index 167fdc8d0d..167fdc8d0d 100644
--- a/gtk/theme/Adwaita/assets/text-select-end-active-dark@2.png
+++ b/gtk/theme/Default/assets/text-select-end-active-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/text-select-end-active.png b/gtk/theme/Default/assets/text-select-end-active.png
index 59a955a9d5..59a955a9d5 100644
--- a/gtk/theme/Adwaita/assets/text-select-end-active.png
+++ b/gtk/theme/Default/assets/text-select-end-active.png
diff --git a/gtk/theme/Adwaita/assets/text-select-end-active@2.png b/gtk/theme/Default/assets/text-select-end-active@2.png
index 5aa6c778e1..5aa6c778e1 100644
--- a/gtk/theme/Adwaita/assets/text-select-end-active@2.png
+++ b/gtk/theme/Default/assets/text-select-end-active@2.png
diff --git a/gtk/theme/Adwaita/assets/text-select-end-dark.png b/gtk/theme/Default/assets/text-select-end-dark.png
index 3545bc7230..3545bc7230 100644
--- a/gtk/theme/Adwaita/assets/text-select-end-dark.png
+++ b/gtk/theme/Default/assets/text-select-end-dark.png
diff --git a/gtk/theme/Adwaita/assets/text-select-end-dark@2.png b/gtk/theme/Default/assets/text-select-end-dark@2.png
index e29a86a339..e29a86a339 100644
--- a/gtk/theme/Adwaita/assets/text-select-end-dark@2.png
+++ b/gtk/theme/Default/assets/text-select-end-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/text-select-end-hover-dark.png b/gtk/theme/Default/assets/text-select-end-hover-dark.png
index 66daba1a58..66daba1a58 100644
--- a/gtk/theme/Adwaita/assets/text-select-end-hover-dark.png
+++ b/gtk/theme/Default/assets/text-select-end-hover-dark.png
diff --git a/gtk/theme/Adwaita/assets/text-select-end-hover-dark@2.png b/gtk/theme/Default/assets/text-select-end-hover-dark@2.png
index fd4ced68f3..fd4ced68f3 100644
--- a/gtk/theme/Adwaita/assets/text-select-end-hover-dark@2.png
+++ b/gtk/theme/Default/assets/text-select-end-hover-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/text-select-end-hover.png b/gtk/theme/Default/assets/text-select-end-hover.png
index f9f5d1df3c..f9f5d1df3c 100644
--- a/gtk/theme/Adwaita/assets/text-select-end-hover.png
+++ b/gtk/theme/Default/assets/text-select-end-hover.png
diff --git a/gtk/theme/Adwaita/assets/text-select-end-hover@2.png b/gtk/theme/Default/assets/text-select-end-hover@2.png
index 0eaa261362..0eaa261362 100644
--- a/gtk/theme/Adwaita/assets/text-select-end-hover@2.png
+++ b/gtk/theme/Default/assets/text-select-end-hover@2.png
diff --git a/gtk/theme/Adwaita/assets/text-select-end.png b/gtk/theme/Default/assets/text-select-end.png
index aceb8ea120..aceb8ea120 100644
--- a/gtk/theme/Adwaita/assets/text-select-end.png
+++ b/gtk/theme/Default/assets/text-select-end.png
diff --git a/gtk/theme/Adwaita/assets/text-select-end@2.png b/gtk/theme/Default/assets/text-select-end@2.png
index 6da7b66d48..6da7b66d48 100644
--- a/gtk/theme/Adwaita/assets/text-select-end@2.png
+++ b/gtk/theme/Default/assets/text-select-end@2.png
diff --git a/gtk/theme/Adwaita/assets/text-select-start-active-dark.png b/gtk/theme/Default/assets/text-select-start-active-dark.png
index a6f3372051..a6f3372051 100644
--- a/gtk/theme/Adwaita/assets/text-select-start-active-dark.png
+++ b/gtk/theme/Default/assets/text-select-start-active-dark.png
diff --git a/gtk/theme/Adwaita/assets/text-select-start-active-dark@2.png b/gtk/theme/Default/assets/text-select-start-active-dark@2.png
index 1eb3d8ebf9..1eb3d8ebf9 100644
--- a/gtk/theme/Adwaita/assets/text-select-start-active-dark@2.png
+++ b/gtk/theme/Default/assets/text-select-start-active-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/text-select-start-active.png b/gtk/theme/Default/assets/text-select-start-active.png
index 765e60c88e..765e60c88e 100644
--- a/gtk/theme/Adwaita/assets/text-select-start-active.png
+++ b/gtk/theme/Default/assets/text-select-start-active.png
diff --git a/gtk/theme/Adwaita/assets/text-select-start-active@2.png b/gtk/theme/Default/assets/text-select-start-active@2.png
index 44d582bec1..44d582bec1 100644
--- a/gtk/theme/Adwaita/assets/text-select-start-active@2.png
+++ b/gtk/theme/Default/assets/text-select-start-active@2.png
diff --git a/gtk/theme/Adwaita/assets/text-select-start-dark.png b/gtk/theme/Default/assets/text-select-start-dark.png
index 75fa6b41fc..75fa6b41fc 100644
--- a/gtk/theme/Adwaita/assets/text-select-start-dark.png
+++ b/gtk/theme/Default/assets/text-select-start-dark.png
diff --git a/gtk/theme/Adwaita/assets/text-select-start-dark@2.png b/gtk/theme/Default/assets/text-select-start-dark@2.png
index 3a43e2e7c2..3a43e2e7c2 100644
--- a/gtk/theme/Adwaita/assets/text-select-start-dark@2.png
+++ b/gtk/theme/Default/assets/text-select-start-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/text-select-start-hover-dark.png b/gtk/theme/Default/assets/text-select-start-hover-dark.png
index cf4b9c150a..cf4b9c150a 100644
--- a/gtk/theme/Adwaita/assets/text-select-start-hover-dark.png
+++ b/gtk/theme/Default/assets/text-select-start-hover-dark.png
diff --git a/gtk/theme/Adwaita/assets/text-select-start-hover-dark@2.png b/gtk/theme/Default/assets/text-select-start-hover-dark@2.png
index 76312d5493..76312d5493 100644
--- a/gtk/theme/Adwaita/assets/text-select-start-hover-dark@2.png
+++ b/gtk/theme/Default/assets/text-select-start-hover-dark@2.png
diff --git a/gtk/theme/Adwaita/assets/text-select-start-hover.png b/gtk/theme/Default/assets/text-select-start-hover.png
index 539379d3d1..539379d3d1 100644
--- a/gtk/theme/Adwaita/assets/text-select-start-hover.png
+++ b/gtk/theme/Default/assets/text-select-start-hover.png
diff --git a/gtk/theme/Adwaita/assets/text-select-start-hover@2.png b/gtk/theme/Default/assets/text-select-start-hover@2.png
index 6ba8f51e22..6ba8f51e22 100644
--- a/gtk/theme/Adwaita/assets/text-select-start-hover@2.png
+++ b/gtk/theme/Default/assets/text-select-start-hover@2.png
diff --git a/gtk/theme/Adwaita/assets/text-select-start.png b/gtk/theme/Default/assets/text-select-start.png
index 91274257ae..91274257ae 100644
--- a/gtk/theme/Adwaita/assets/text-select-start.png
+++ b/gtk/theme/Default/assets/text-select-start.png
diff --git a/gtk/theme/Adwaita/assets/text-select-start@2.png b/gtk/theme/Default/assets/text-select-start@2.png
index b9b0aa10e9..b9b0aa10e9 100644
--- a/gtk/theme/Adwaita/assets/text-select-start@2.png
+++ b/gtk/theme/Default/assets/text-select-start@2.png
diff --git a/gtk/theme/Default/gtk-dark.css b/gtk/theme/Default/gtk-dark.css
new file mode 100644
index 0000000000..876a9b1de8
--- /dev/null
+++ b/gtk/theme/Default/gtk-dark.css
@@ -0,0 +1 @@
+@import url("resource:///org/gtk/libgtk/theme/Default/Default-dark.css");
diff --git a/gtk/theme/Default/gtk-hc-dark.css b/gtk/theme/Default/gtk-hc-dark.css
new file mode 100644
index 0000000000..99364a4635
--- /dev/null
+++ b/gtk/theme/Default/gtk-hc-dark.css
@@ -0,0 +1 @@
+@import url("resource:///org/gtk/libgtk/theme/Default/Default-hc-dark.css");
diff --git a/gtk/theme/Default/gtk-hc.css b/gtk/theme/Default/gtk-hc.css
new file mode 100644
index 0000000000..ca822a2b50
--- /dev/null
+++ b/gtk/theme/Default/gtk-hc.css
@@ -0,0 +1 @@
+@import url("resource:///org/gtk/libgtk/theme/Default/Default-hc.css");
diff --git a/gtk/theme/Default/gtk-light.css b/gtk/theme/Default/gtk-light.css
new file mode 100644
index 0000000000..cf32f0590a
--- /dev/null
+++ b/gtk/theme/Default/gtk-light.css
@@ -0,0 +1 @@
+@import url("resource:///org/gtk/libgtk/theme/Default/Default-light.css");
diff --git a/gtk/theme/Default/gtk.css b/gtk/theme/Default/gtk.css
new file mode 100644
index 0000000000..cf32f0590a
--- /dev/null
+++ b/gtk/theme/Default/gtk.css
@@ -0,0 +1 @@
+@import url("resource:///org/gtk/libgtk/theme/Default/Default-light.css");
diff --git a/gtk/theme/Default/meson.build b/gtk/theme/Default/meson.build
new file mode 100644
index 0000000000..5e52a8b3ce
--- /dev/null
+++ b/gtk/theme/Default/meson.build
@@ -0,0 +1,26 @@
+default_scss_files = files([
+  '_colors-public.scss',
+  '_colors.scss',
+  '_common.scss',
+  '_drawing.scss',
+])
+
+default_theme_variants = [
+  'light',
+  'dark',
+  'hc',
+  'hc-dark',
+]
+
+default_theme_deps = []
+
+foreach variant: default_theme_variants
+  default_theme_deps += custom_target('Default theme variant: ' + variant,
+    input: 'Default-@0@.scss'.format(variant),
+    output: 'Default-@0@.css'.format(variant),
+    command: [
+      sassc, sassc_opts, '@INPUT@', '@OUTPUT@',
+    ],
+    depend_files: default_scss_files,
+  )
+endforeach
diff --git a/gtk/theme/Default/render-assets.sh b/gtk/theme/Default/render-assets.sh
new file mode 100755
index 0000000000..f4b6998966
--- /dev/null
+++ b/gtk/theme/Default/render-assets.sh
@@ -0,0 +1,38 @@
+#! /bin/bash
+
+INKSCAPE="/usr/bin/inkscape"
+OPTIPNG="/usr/bin/optipng"
+
+INDEX="assets.txt"
+
+for s in "" "-hc";
+do
+  SRC_FILE="assets$s.svg"
+  ASSETS_DIR="assets$s"
+
+  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
+done
+exit 0
diff --git a/gtk/theme/HighContrast/HighContrast-dark.scss b/gtk/theme/HighContrast/HighContrast-dark.scss
deleted file mode 100644
index 51c57c0fbf..0000000000
--- a/gtk/theme/HighContrast/HighContrast-dark.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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: 'dark';
-
-@import '../Adwaita/colors';
-@import 'colors-hc';
-@import '../Adwaita/colors-public'; // export public colors
-@import '../Adwaita/drawing';
-@import '../Adwaita/common';
diff --git a/gtk/theme/HighContrast/HighContrast.scss b/gtk/theme/HighContrast/HighContrast.scss
deleted file mode 100644
index 236834aed8..0000000000
--- a/gtk/theme/HighContrast/HighContrast.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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';
-
-@import '../Adwaita/colors';
-@import 'colors-hc';
-@import '../Adwaita/colors-public'; // export public colors
-@import '../Adwaita/drawing';
-@import '../Adwaita/common';
diff --git a/gtk/theme/HighContrast/_colors-hc.scss b/gtk/theme/HighContrast/_colors-hc.scss
deleted file mode 100644
index f1535a64cf..0000000000
--- a/gtk/theme/HighContrast/_colors-hc.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-// High Contrast color overrides
-// When color definition differs for dark and light variant
-// it gets @if ed depending on $variant
-
-
-$fg_color: if($variant == 'light', darken($fg_color, 3%), lighten($fg_color, 2%));
-$bg_color: if($variant == 'light', lighten($bg_color, 3%), darken($bg_color, 2%));
-$selected_bg_color: darken($selected_bg_color,10%);
-$selected_borders_color: darken($selected_borders_color, 10%);
-$borders_color: if($variant == 'light', darken($borders_color, 30%), lighten($borders_color, 30%));
-$alt_borders_color: if($variant == 'light', darken($alt_borders_color, 33%), lighten($alt_borders_color, 28%));
-$menu_color: $base_color;
-$menu_selected_color: darken($bg_color,10%);
-
-//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: mix($borders_color, $bg_color, 80%);
-
-//focus rings
-$focus_border_color: if($variant == 'light', transparentize($selected_bg_color, 0.2), transparentize(white, 0.4));
-$alt_focus_border_color: if($variant == 'light', white, transparentize(white,0.4));
-
-$dim_label_opacity: 0.9;
-
-$switch_borders_color: if($variant == 'light',darken($switch_bg_color,15%),lighten($switch_bg_color,15%));
diff --git a/gtk/theme/HighContrast/assets.txt b/gtk/theme/HighContrast/assets.txt
deleted file mode 100644
index a380d1cce5..0000000000
--- a/gtk/theme/HighContrast/assets.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-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/theme/HighContrast/gtk-dark.css b/gtk/theme/HighContrast/gtk-dark.css
deleted file mode 100644
index 5f32a5edc5..0000000000
--- a/gtk/theme/HighContrast/gtk-dark.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("resource:///org/gtk/libgtk/theme/HighContrast/HighContrast-dark.css");
diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css
deleted file mode 100644
index 8dcda0018d..0000000000
--- a/gtk/theme/HighContrast/gtk.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("resource:///org/gtk/libgtk/theme/HighContrast/HighContrast.css");
diff --git a/gtk/theme/HighContrast/meson.build b/gtk/theme/HighContrast/meson.build
deleted file mode 100644
index 0bc6931392..0000000000
--- a/gtk/theme/HighContrast/meson.build
+++ /dev/null
@@ -1,29 +0,0 @@
-hc_scss_files = files([
-  '_colors-hc.scss',
-])
-
-hc_theme_variants = [
-  'dark',
-]
-
-hc_theme_deps = [
-  custom_target('HighContrast theme',
-    input: 'HighContrast.scss',
-    output: 'HighContrast.css',
-    command: [
-      sassc, sassc_opts, '@INPUT@', '@OUTPUT@',
-    ],
-    depend_files: [ hc_scss_files, adwaita_scss_files ],
-  )
-]
-
-foreach variant: hc_theme_variants
-  hc_theme_deps += custom_target('HighContrast theme variant: ' + variant,
-    input: 'HighContrast-@0@.scss'.format(variant),
-    output: 'HighContrast-@0@.css'.format(variant),
-    command: [
-      sassc, sassc_opts, '@INPUT@', '@OUTPUT@',
-    ],
-    depend_files: [ hc_scss_files, adwaita_scss_files ],
-  )
-endforeach
diff --git a/gtk/theme/HighContrast/render-assets.sh b/gtk/theme/HighContrast/render-assets.sh
deleted file mode 100755
index 24d7675afe..0000000000
--- a/gtk/theme/HighContrast/render-assets.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="/usr/bin/inkscape"
-OPTIPNG="/usr/bin/optipng"
-
-SRC_FILE="assets.svg"
-ASSETS_DIR="assets"
-INDEX="assets.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-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