[PATCH 0/3] MR7590: light.msstyles: Introduce a CSS file to isolate colors from shapes.

[Stefan Dösinger]

The goal is to make it somewhat easier to define different color schemes. This MR should not result in any changes to the generated bitmap files.

Many more will follow over time for all the other color values used in the SVG files.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7590

[PATCH 1/3] light.msstyles: Introduce a CSS file to isolate colors from shapes.

[Stefan Dösinger]

From: Stefan Dösinger <stefan(a)codeweavers.com>

The goal is to make it somewhat easier to define different color
schemes. It still won't be pretty since there is little tooling for MS
themes, but it will be nicer than having magic hex numbers in every SVG
file.

I don't know how standardized CSS in SVGs is. Imagick's convert
and Gimp support it in this way (<style>@import</style>). Another
suggestion I found is  to use <link xmlns="..." rel="stylesheet"
href="colors.css"/>, but I couldn't get it to work. KolourPaint supports
neither, so the highlight color will show up as black if you try to open
the SVG with it.
---
 dlls/light.msstyles/blue_button.svg |  5 +++-
 dlls/light.msstyles/colors.css      | 45 +++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 dlls/light.msstyles/colors.css

diff --git a/dlls/light.msstyles/blue_button.svg b/dlls/light.msstyles/blue_button.svg
index 99041a80209..0d0df4cfab2 100644
--- a/dlls/light.msstyles/blue_button.svg
+++ b/dlls/light.msstyles/blue_button.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:22-32" width="22" height="138" version="1.1" viewBox="0 0 5.8208 36.512" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -19,6 +22,6 @@
     <rect x="40.849" y="7.409" width="5.5563" height="5.8208" rx=".52917" ry=".52917"/>
    </g>
   </g>
-  <rect x="40.849" y="13.494" width="5.5563" height="5.8208" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/>
+  <rect x="40.849" y="13.494" width="5.5563" height="5.8208" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/colors.css b/dlls/light.msstyles/colors.css
new file mode 100644
index 00000000000..c8c9f7f663d
--- /dev/null
+++ b/dlls/light.msstyles/colors.css
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2025 Stefan Dösinger for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* The general approach is to use the same color names as in .rc files. If you change a color
+ * here, you probably want to make a similar change in light.rc.
+ *
+ * Imagemagick doesn't support CSS variables, so we have to put the color values into the classes
+ * directly.  The SVG files specify fill and stroke colors, and in some cases both. An SVG element
+ * can only have one class though. So as long as only one color is needed, we use
+ *
+ * <rect ... class="HighlightOutline" fill="currentColor" />
+ * <path ... class="HighlightOutline" stroke="currentColor" />
+ *
+ * If one SVG element needs two different colors we have to define a separate class:
+ *
+ * .WindowBackgroundHighlightOutline
+ * {
+ *     fill:#ffffff; /* match WindowBackground.color * /
+ *     stroke:#2979ff; /* match HighlightOutline.color * /
+ * }
+ *
+ * And then use it like
+ *
+ * <rect ... class="WindowBackgroundHighlightOutline" />
+ */
+
+.HighlightOutline
+{
+    color:#2979ff; /* 41 121 255 */
+}
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/7590

[PATCH 2/3] light.msstyles: Extract the Highlight outline color into the css file.

[Stefan Dösinger]

From: Stefan Dösinger <stefan(a)codeweavers.com>

---

Question: Is the use of #ff7929 / HighlightOutline in the filled
rectangle in blue_button.svg wrong? Should we use fill=Highlight rather
than the outline color here? This is the color the button assumes when
clicked. Last <rect /> tag in the .svg / 3rd one in the rendered image.
---
 dlls/light.msstyles/blue_checkbox_13px.svg    | 21 +++++++++++--------
 dlls/light.msstyles/blue_checkbox_16px.svg    | 21 +++++++++++--------
 dlls/light.msstyles/blue_checkbox_20px.svg    | 21 +++++++++++--------
 dlls/light.msstyles/blue_checkbox_26px.svg    | 21 +++++++++++--------
 dlls/light.msstyles/blue_checkbox_32px.svg    | 21 +++++++++++--------
 dlls/light.msstyles/blue_checkbox_40px.svg    | 21 +++++++++++--------
 dlls/light.msstyles/blue_checkbox_52px.svg    | 21 +++++++++++--------
 dlls/light.msstyles/blue_combobox_border.svg  |  5 ++++-
 .../blue_combobox_dropdownbutton.svg          |  5 ++++-
 .../blue_combobox_dropdownbutton_left.svg     |  5 ++++-
 .../blue_combobox_dropdownbutton_right.svg    |  5 ++++-
 .../light.msstyles/blue_combobox_readonly.svg |  5 ++++-
 dlls/light.msstyles/blue_commandlink.svg      |  5 ++++-
 .../blue_commandlink_glyph_30px.svg           |  5 ++++-
 .../blue_commandlink_glyph_37px.svg           |  5 ++++-
 .../blue_commandlink_glyph_45px.svg           |  5 ++++-
 .../blue_commandlink_glyph_52px.svg           |  5 ++++-
 .../blue_commandlink_glyph_60px.svg           |  5 ++++-
 .../blue_commandlink_glyph_67px.svg           |  5 ++++-
 .../blue_commandlink_glyph_75px.svg           |  5 ++++-
 .../blue_edit_border_hscroll.svg              |  5 ++++-
 .../blue_edit_border_hvscroll.svg             |  5 ++++-
 .../blue_edit_border_noscroll.svg             |  5 ++++-
 .../blue_edit_border_vscroll.svg              |  5 ++++-
 .../blue_listview_collapse_button_15px.svg    |  7 +++++--
 .../blue_listview_collapse_button_19px.svg    |  9 +++++---
 .../blue_listview_collapse_button_23px.svg    |  9 +++++---
 .../blue_listview_collapse_button_30px.svg    |  7 +++++--
 .../blue_listview_collapse_button_37px.svg    |  9 +++++---
 .../blue_listview_collapse_button_45px.svg    |  9 +++++---
 .../blue_listview_collapse_button_60px.svg    |  7 +++++--
 .../blue_listview_expand_button_15px.svg      |  7 +++++--
 .../blue_listview_expand_button_19px.svg      |  9 +++++---
 .../blue_listview_expand_button_23px.svg      |  9 +++++---
 .../blue_listview_expand_button_30px.svg      |  7 +++++--
 .../blue_listview_expand_button_37px.svg      |  9 +++++---
 .../blue_listview_expand_button_45px.svg      |  9 +++++---
 .../blue_listview_expand_button_60px.svg      |  7 +++++--
 dlls/light.msstyles/blue_menu_bar_item.svg    |  5 ++++-
 .../blue_navigation_back_button_120px.svg     |  5 ++++-
 .../blue_navigation_back_button_30px.svg      |  5 ++++-
 .../blue_navigation_back_button_38px.svg      |  5 ++++-
 .../blue_navigation_back_button_45px.svg      |  5 ++++-
 .../blue_navigation_back_button_60px.svg      |  5 ++++-
 .../blue_navigation_back_button_74px.svg      |  5 ++++-
 .../blue_navigation_back_button_90px.svg      |  5 ++++-
 .../blue_navigation_forward_button_120px.svg  |  5 ++++-
 .../blue_navigation_forward_button_30px.svg   |  5 ++++-
 .../blue_navigation_forward_button_38px.svg   |  5 ++++-
 .../blue_navigation_forward_button_45px.svg   |  5 ++++-
 .../blue_navigation_forward_button_60px.svg   |  5 ++++-
 .../blue_navigation_forward_button_74px.svg   |  5 ++++-
 .../blue_navigation_forward_button_90px.svg   |  5 ++++-
 .../blue_navigation_menu_button_13px.svg      |  7 +++++--
 .../blue_navigation_menu_button_17px.svg      |  7 +++++--
 .../blue_navigation_menu_button_19px.svg      |  7 +++++--
 .../blue_navigation_menu_button_26px.svg      |  7 +++++--
 .../blue_navigation_menu_button_32px.svg      |  7 +++++--
 .../blue_navigation_menu_button_39px.svg      |  7 +++++--
 .../blue_navigation_menu_button_52px.svg      |  7 +++++--
 dlls/light.msstyles/blue_radiobutton_13px.svg |  9 +++++---
 dlls/light.msstyles/blue_radiobutton_16px.svg |  9 +++++---
 dlls/light.msstyles/blue_radiobutton_19px.svg |  9 +++++---
 dlls/light.msstyles/blue_radiobutton_22px.svg |  9 +++++---
 dlls/light.msstyles/blue_radiobutton_25px.svg |  9 +++++---
 dlls/light.msstyles/blue_radiobutton_28px.svg |  9 +++++---
 dlls/light.msstyles/blue_radiobutton_31px.svg |  9 +++++---
 .../blue_rebar_chevron_background.svg         |  5 ++++-
 .../blue_rebar_chevron_glyph_10px.svg         |  5 ++++-
 .../blue_rebar_chevron_glyph_13px.svg         |  5 ++++-
 .../blue_rebar_chevron_glyph_15px.svg         |  5 ++++-
 .../blue_rebar_chevron_glyph_20px.svg         |  5 ++++-
 .../blue_rebar_chevron_glyph_25px.svg         |  5 ++++-
 .../blue_rebar_chevron_glyph_30px.svg         |  5 ++++-
 .../blue_rebar_chevron_glyph_40px.svg         |  5 ++++-
 ...blue_rebar_chevron_vertical_background.svg |  5 ++++-
 ...blue_rebar_chevron_vertical_glyph_10px.svg |  5 ++++-
 ...blue_rebar_chevron_vertical_glyph_13px.svg |  5 ++++-
 ...blue_rebar_chevron_vertical_glyph_15px.svg |  5 ++++-
 dlls/light.msstyles/blue_scrollbar_arrows.svg | 11 ++++++----
 .../blue_scrollbar_thumb_horizontal.svg       |  5 ++++-
 .../blue_scrollbar_thumb_vertical.svg         |  5 ++++-
 .../blue_spin_background_down.svg             |  5 ++++-
 .../blue_spin_background_left.svg             |  5 ++++-
 .../blue_spin_background_right.svg            |  5 ++++-
 .../blue_spin_background_up.svg               |  5 ++++-
 dlls/light.msstyles/blue_tab_item.svg         | 11 ++++++----
 dlls/light.msstyles/blue_tab_item_left.svg    | 11 ++++++----
 dlls/light.msstyles/blue_tab_item_right.svg   | 11 ++++++----
 ...g_expando_button_expanded_pressed_19px.svg |  9 +++++---
 ...g_expando_button_expanded_pressed_24px.svg |  9 +++++---
 ...g_expando_button_expanded_pressed_29px.svg |  9 +++++---
 ...g_expando_button_expanded_pressed_33px.svg |  9 +++++---
 ...g_expando_button_expanded_pressed_38px.svg |  9 +++++---
 ...g_expando_button_expanded_pressed_43px.svg |  9 +++++---
 ...g_expando_button_expanded_pressed_48px.svg |  9 +++++---
 ...taskdialog_expando_button_pressed_19px.svg |  9 +++++---
 ...taskdialog_expando_button_pressed_24px.svg |  9 +++++---
 ...taskdialog_expando_button_pressed_29px.svg |  9 +++++---
 ...taskdialog_expando_button_pressed_33px.svg |  9 +++++---
 ...taskdialog_expando_button_pressed_38px.svg |  9 +++++---
 ...taskdialog_expando_button_pressed_43px.svg |  9 +++++---
 ...taskdialog_expando_button_pressed_48px.svg |  9 +++++---
 dlls/light.msstyles/blue_toolbar_buttons.svg  |  9 +++++---
 .../blue_toolbar_buttons_split.svg            |  5 ++++-
 .../blue_toolbar_buttons_split_dropdown.svg   |  5 ++++-
 ...lbar_buttons_split_dropdown_glyph_11px.svg |  9 +++++---
 ...lbar_buttons_split_dropdown_glyph_14px.svg |  9 +++++---
 ...lbar_buttons_split_dropdown_glyph_17px.svg |  9 +++++---
 ...lbar_buttons_split_dropdown_glyph_21px.svg |  9 +++++---
 ...lbar_buttons_split_dropdown_glyph_28px.svg |  9 +++++---
 ...olbar_buttons_split_dropdown_glyph_7px.svg |  5 ++++-
 ...olbar_buttons_split_dropdown_glyph_9px.svg |  9 +++++---
 ...lue_toolbar_dropdown_button_glyph_11px.svg |  9 +++++---
 ...lue_toolbar_dropdown_button_glyph_14px.svg |  9 +++++---
 ...lue_toolbar_dropdown_button_glyph_17px.svg |  9 +++++---
 ...blue_toolbar_dropdown_button_glyph_7px.svg |  5 ++++-
 ...blue_toolbar_dropdown_button_glyph_9px.svg |  9 +++++---
 .../blue_tooltip_wrench_17px.svg              |  7 +++++--
 .../blue_tooltip_wrench_21px.svg              |  7 +++++--
 .../blue_tooltip_wrench_26px.svg              |  7 +++++--
 .../blue_tooltip_wrench_34px.svg              |  7 +++++--
 .../blue_tooltip_wrench_42px.svg              |  7 +++++--
 .../blue_tooltip_wrench_51px.svg              |  7 +++++--
 .../blue_tooltip_wrench_68px.svg              |  7 +++++--
 .../blue_trackbar_thumb_down_11px.svg         |  5 ++++-
 .../blue_trackbar_thumb_down_15px.svg         |  5 ++++-
 .../blue_trackbar_thumb_down_17px.svg         |  5 ++++-
 .../blue_trackbar_thumb_down_22px.svg         |  5 ++++-
 .../blue_trackbar_thumb_down_28px.svg         |  5 ++++-
 .../blue_trackbar_thumb_down_33px.svg         |  5 ++++-
 .../blue_trackbar_thumb_down_44px.svg         |  5 ++++-
 .../blue_trackbar_thumb_horizontal.svg        |  5 ++++-
 .../blue_trackbar_thumb_left_19px.svg         |  5 ++++-
 .../blue_trackbar_thumb_left_25px.svg         |  5 ++++-
 .../blue_trackbar_thumb_left_29px.svg         |  5 ++++-
 .../blue_trackbar_thumb_left_38px.svg         |  5 ++++-
 .../blue_trackbar_thumb_left_48px.svg         |  5 ++++-
 .../blue_trackbar_thumb_left_57px.svg         |  5 ++++-
 .../blue_trackbar_thumb_left_76px.svg         |  5 ++++-
 .../blue_trackbar_thumb_right_19px.svg        |  5 ++++-
 .../blue_trackbar_thumb_right_25px.svg        |  5 ++++-
 .../blue_trackbar_thumb_right_29px.svg        |  5 ++++-
 .../blue_trackbar_thumb_right_38px.svg        |  5 ++++-
 .../blue_trackbar_thumb_right_48px.svg        |  5 ++++-
 .../blue_trackbar_thumb_right_57px.svg        |  5 ++++-
 .../blue_trackbar_thumb_right_76px.svg        |  5 ++++-
 .../blue_trackbar_thumb_up_11px.svg           |  5 ++++-
 .../blue_trackbar_thumb_up_15px.svg           |  5 ++++-
 .../blue_trackbar_thumb_up_17px.svg           |  5 ++++-
 .../blue_trackbar_thumb_up_22px.svg           |  5 ++++-
 .../blue_trackbar_thumb_up_28px.svg           |  5 ++++-
 .../blue_trackbar_thumb_up_33px.svg           |  5 ++++-
 .../blue_trackbar_thumb_up_44px.svg           |  5 ++++-
 .../blue_trackbar_thumb_vertical.svg          |  5 ++++-
 .../blue_window_help_button_background.svg    |  7 +++++--
 .../blue_window_help_button_glyph_13px.svg    |  7 +++++--
 .../blue_window_help_button_glyph_19px.svg    |  7 +++++--
 .../blue_window_help_button_glyph_23px.svg    |  7 +++++--
 .../blue_window_help_button_glyph_26px.svg    |  7 +++++--
 .../blue_window_help_button_glyph_32px.svg    |  7 +++++--
 .../blue_window_help_button_glyph_39px.svg    |  7 +++++--
 .../blue_window_help_button_glyph_52px.svg    |  7 +++++--
 .../blue_window_max_button_background.svg     |  7 +++++--
 .../blue_window_max_button_glyph_13px.svg     |  7 +++++--
 .../blue_window_max_button_glyph_19px.svg     |  7 +++++--
 .../blue_window_max_button_glyph_23px.svg     |  7 +++++--
 .../blue_window_max_button_glyph_26px.svg     |  7 +++++--
 .../blue_window_max_button_glyph_32px.svg     |  7 +++++--
 .../blue_window_max_button_glyph_39px.svg     |  7 +++++--
 .../blue_window_max_button_glyph_52px.svg     |  7 +++++--
 .../blue_window_mdi_min_button_background.svg |  5 ++++-
 .../blue_window_mdi_min_button_glyph.svg      |  5 ++++-
 ...e_window_mdi_restore_button_background.svg |  5 ++++-
 .../blue_window_mdi_restore_button_glyph.svg  |  9 +++++---
 .../blue_window_min_button_background.svg     |  7 +++++--
 .../blue_window_min_button_glyph_13px.svg     |  7 +++++--
 .../blue_window_min_button_glyph_19px.svg     |  7 +++++--
 .../blue_window_min_button_glyph_23px.svg     |  7 +++++--
 .../blue_window_min_button_glyph_26px.svg     |  7 +++++--
 .../blue_window_min_button_glyph_32px.svg     |  7 +++++--
 .../blue_window_min_button_glyph_39px.svg     |  7 +++++--
 .../blue_window_min_button_glyph_52px.svg     |  7 +++++--
 .../blue_window_restore_button_background.svg |  7 +++++--
 .../blue_window_restore_button_glyph_13px.svg | 15 +++++++------
 .../blue_window_restore_button_glyph_19px.svg | 15 +++++++------
 .../blue_window_restore_button_glyph_23px.svg | 15 +++++++------
 .../blue_window_restore_button_glyph_26px.svg | 15 +++++++------
 .../blue_window_restore_button_glyph_32px.svg | 15 +++++++------
 .../blue_window_restore_button_glyph_39px.svg | 15 +++++++------
 .../blue_window_restore_button_glyph_52px.svg | 15 +++++++------
 191 files changed, 994 insertions(+), 421 deletions(-)

diff --git a/dlls/light.msstyles/blue_checkbox_13px.svg b/dlls/light.msstyles/blue_checkbox_13px.svg
index d45ce6b607a..80d4c91bbe6 100644
--- a/dlls/light.msstyles/blue_checkbox_13px.svg
+++ b/dlls/light.msstyles/blue_checkbox_13px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:13-24" width="13" height="260" fill="#000000" version="1.1" viewBox="0 0 13 260" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -14,29 +17,29 @@
   <rect x=".5" y=".5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x=".5" y="13.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/>
   <path d="m0.5 25.5h24v24h-24z"/>
-  <rect x=".5" y="26.5" width="12" height="12" rx="2" ry="2" stroke="#2979ff"/>
+  <rect x=".5" y="26.5" width="12" height="12" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="39.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
   <path d="m4.1723e-7 52h24v24h-24z"/>
   <rect x=".5" y="52.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x=".5" y="65.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/>
   <path d="m0.5 77.5h24v24h-24z"/>
-  <rect x=".5" y="78.5" width="12" height="12" rx="2" ry="2" stroke="#2979ff"/>
+  <rect x=".5" y="78.5" width="12" height="12" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="91.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
   <path d="m-1.9073e-6 104h24v24h-24z"/>
   <rect x=".5" y="104.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x=".5" y="117.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/>
   <path d="m0.5 129.5h24v24h-24z"/>
-  <rect x=".5" y="130.5" width="12" height="12" rx="2" ry="2" stroke="#2979ff"/>
+  <rect x=".5" y="130.5" width="12" height="12" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="143.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
  </g>
  <path d="m4.8636 60.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z"/>
  <path d="m4.8636 73.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#3096fa"/>
  <path d="m4.8636 99.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#aeaeae"/>
- <path d="m4.8636 86.537-2.1477-2.194-0.71591 0.73135 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#2979ff"/>
+ <path d="m4.8636 86.537-2.1477-2.194-0.71591 0.73135 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" class="HighlightOutline" fill="currentColor"/>
  <g fill="none">
   <rect x=".5" y="156.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x=".5" y="169.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/>
-  <rect x=".5" y="182.5" width="12" height="12" rx="2" ry="2" stroke="#2979ff"/>
+  <rect x=".5" y="182.5" width="12" height="12" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="195.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
  </g>
  <path d="m4.8636 164.54-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z"/>
@@ -45,18 +48,18 @@
  <g stroke-width="3.7795">
   <path d="m10 211.7-0.70498-0.705-2.795 2.795-2.795-2.795-0.70499 0.705 2.795 2.795-2.795 2.795 0.70499 0.705 2.795-2.795 2.795 2.795 0.70498-0.705-2.795-2.795z" fill="#000"/>
   <path d="m10 224.7-0.70498-0.705-2.795 2.795-2.795-2.795-0.70499 0.705 2.795 2.795-2.795 2.795 0.70499 0.70499 2.795-2.795 2.795 2.795 0.70498-0.70499-2.795-2.795z" fill="#3096fa"/>
-  <path d="m10 237.7-0.70498-0.705-2.795 2.795-2.795-2.795-0.70499 0.705 2.795 2.795-2.795 2.795 0.70499 0.705 2.795-2.795 2.795 2.795 0.70498-0.705-2.795-2.795z" fill="#2979ff"/>
+  <path d="m10 237.7-0.70498-0.705-2.795 2.795-2.795-2.795-0.70499 0.705 2.795 2.795-2.795 2.795 0.70499 0.705 2.795-2.795 2.795 2.795 0.70498-0.705-2.795-2.795z" class="HighlightOutline" fill="currentColor"/>
   <path d="m10 250.7-0.70498-0.705-2.795 2.795-2.795-2.795-0.70499 0.705 2.795 2.795-2.795 2.795 0.70499 0.70499 2.795-2.795 2.795 2.795 0.70498-0.70499-2.795-2.795z" fill="#aeaeae"/>
  </g>
- <path d="m4.8636 190.54-2.1477-2.194-0.71591 0.73135 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#2979ff"/>
+ <path d="m4.8636 190.54-2.1477-2.194-0.71591 0.73135 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" class="HighlightOutline" fill="currentColor"/>
  <g fill="none">
   <rect x=".5" y="208.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x=".5" y="221.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/>
-  <rect x=".5" y="234.5" width="12" height="12" rx="2" ry="2" stroke="#2979ff"/>
+  <rect x=".5" y="234.5" width="12" height="12" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="247.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
  </g>
  <path d="m2 110h9v1h-9z"/>
  <path d="m2 123h9v1h-9z" fill="#3096fa"/>
- <path d="m2 136h9v1h-9z" fill="#2979ff"/>
+ <path d="m2 136h9v1h-9z" class="HighlightOutline" fill="currentColor"/>
  <path d="m2 149h9v1h-9z" fill="#aeaeae"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_checkbox_16px.svg b/dlls/light.msstyles/blue_checkbox_16px.svg
index dde893689f6..8cf94874323 100644
--- a/dlls/light.msstyles/blue_checkbox_16px.svg
+++ b/dlls/light.msstyles/blue_checkbox_16px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:16-24" width="16" height="320" fill="#000000" version="1.1" viewBox="0 0 16 320" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,43 +15,43 @@
  <g fill="none">
   <rect x=".5" y=".5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x=".5" y="16.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/>
-  <rect x=".5" y="32.5" width="15" height="15" rx="2" ry="2" stroke="#2979ff"/>
+  <rect x=".5" y="32.5" width="15" height="15" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="48.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x=".5" y="256.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x=".5" y="272.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/>
-  <rect x=".5" y="288.5" width="15" height="15" rx="2" ry="2" stroke="#2979ff"/>
+  <rect x=".5" y="288.5" width="15" height="15" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="304.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
   <g stroke-width="3.7795">
    <path d="m13 260.01-1.0071-1.0072-3.9929 3.9929-3.9929-3.9929-1.0071 1.0072 3.9929 3.9928-3.9929 3.9929 1.0071 1.0071 3.9929-3.9928 3.9929 3.9928 1.0071-1.0071-3.9929-3.9929z" fill="#000"/>
    <path d="m13 276.01-1.0071-1.0072-3.9929 3.9928-3.9929-3.9928-1.0071 1.0072 3.9929 3.9928-3.9929 3.9928 1.0071 1.0072 3.9929-3.9928 3.9929 3.9928 1.0071-1.0072-3.9929-3.9928z" fill="#3096fa"/>
-   <path d="m13 292.01-1.0071-1.0072-3.9929 3.9928-3.9929-3.9928-1.0071 1.0072 3.9929 3.9928-3.9929 3.9928 1.0071 1.0072 3.9929-3.9928 3.9929 3.9928 1.0071-1.0072-3.9929-3.9928z" fill="#2979ff"/>
+   <path d="m13 292.01-1.0071-1.0072-3.9929 3.9928-3.9929-3.9928-1.0071 1.0072 3.9929 3.9928-3.9929 3.9928 1.0071 1.0072 3.9929-3.9928 3.9929 3.9928 1.0071-1.0072-3.9929-3.9928z" class="HighlightOutline" fill="currentColor"/>
    <path d="m13 308.01-1.0071-1.0072-3.9929 3.9928-3.9929-3.9928-1.0071 1.0072 3.9929 3.9928-3.9929 3.9928 1.0071 1.0072 3.9929-3.9928 3.9929 3.9928 1.0071-1.0072-3.9929-3.9928z" fill="#aeaeae"/>
   </g>
   <rect x=".5" y="64.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x=".5" y="80.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/>
-  <rect x=".5" y="96.5" width="15" height="15" rx="2" ry="2" stroke="#2979ff"/>
+  <rect x=".5" y="96.5" width="15" height="15" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="112.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x=".5" y="128.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x=".5" y="144.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/>
-  <rect x=".5" y="160.5" width="15" height="15" rx="2" ry="2" stroke="#2979ff"/>
+  <rect x=".5" y="160.5" width="15" height="15" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="176.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
  </g>
  <path d="m5.8182 74.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/>
  <path d="m5.8182 90.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#3096fa"/>
- <path d="m5.8182 106.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#2979ff"/>
+ <path d="m5.8182 106.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" class="HighlightOutline" fill="currentColor"/>
  <path d="m5.8182 122.91-2.8636-3.1343-0.95454 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/>
  <g fill="none">
   <rect x=".5" y="192.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x=".5" y="208.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/>
-  <rect x=".5" y="224.5" width="15" height="15" rx="2" ry="2" stroke="#2979ff"/>
+  <rect x=".5" y="224.5" width="15" height="15" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="240.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
  </g>
  <path d="m5.8182 202.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/>
  <path d="m5.8182 218.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#3096fa"/>
- <path d="m5.8182 234.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#2979ff"/>
+ <path d="m5.8182 234.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" class="HighlightOutline" fill="currentColor"/>
  <path d="m5.8182 250.91-2.8636-3.1343-0.95454 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/>
  <path d="m2 135h12v2h-12z"/>
  <path d="m2 151h12v2h-12z" fill="#3096fa"/>
- <path d="m2 167h12v2h-12z" fill="#2979ff"/>
+ <path d="m2 167h12v2h-12z" class="HighlightOutline" fill="currentColor"/>
  <path d="m2 183h12v2h-12z"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_checkbox_20px.svg b/dlls/light.msstyles/blue_checkbox_20px.svg
index 147da645393..91705c2adb1 100644
--- a/dlls/light.msstyles/blue_checkbox_20px.svg
+++ b/dlls/light.msstyles/blue_checkbox_20px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:20-24" width="20" height="400" fill="#000000" version="1.1" viewBox="0 0 20 400" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -14,18 +17,18 @@
   <rect x=".47226" y=".47227" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae" stroke-width="1.0527"/>
   <rect x=".47226" y="21.527" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#3096fa" stroke-width="1.0527"/>
   <path d="m0.76923 39.275h36.923v36.965h-36.923z"/>
-  <rect x=".47227" y="42.582" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#2979ff" stroke-width="1.0527"/>
+  <rect x=".47227" y="42.582" width="20" height="20.002" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor" stroke-width="1.0527"/>
   <rect x=".47227" y="63.637" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae" stroke-width="1.0527"/>
   <path d="m1.2564e-5 336.88h36.923v36.965h-36.923z"/>
   <rect x=".47227" y="337.35" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae" stroke-width="1.0527"/>
   <rect x=".47227" y="358.4" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#3096fa" stroke-width="1.0527"/>
   <path d="m0.76924 376.15h36.923v36.965h-36.923z"/>
   <g stroke-width="1.0527">
-   <rect x=".47228" y="379.46" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#2979ff"/>
+   <rect x=".47228" y="379.46" width="20" height="20.002" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor"/>
    <rect x=".47228" y="400.51" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x=".47227" y="253.13" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x=".47227" y="274.19" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
-   <rect x=".47228" y="295.24" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#2979ff"/>
+   <rect x=".47228" y="295.24" width="20" height="20.002" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor"/>
    <rect x=".47228" y="316.29" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
   </g>
   <path d="m3.5e-6 80.09h36.923v36.965h-36.923z"/>
@@ -36,18 +39,18 @@
   <rect x=".47227" y="84.692" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae" stroke-width="1.0527"/>
   <rect x=".47227" y="105.75" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#3096fa" stroke-width="1.0527"/>
   <path d="m0.76923 119.28h36.923v36.965h-36.923z"/>
-  <rect x=".47227" y="126.8" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#2979ff" stroke-width="1.0527"/>
+  <rect x=".47227" y="126.8" width="20" height="20.002" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor" stroke-width="1.0527"/>
   <rect x=".47227" y="147.86" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae" stroke-width="1.0527"/>
   <path d="m3.8669e-6 160.02h36.923v36.965h-36.923z"/>
   <rect x=".47227" y="168.91" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae" stroke-width="1.0527"/>
   <rect x=".47227" y="189.97" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#3096fa" stroke-width="1.0527"/>
   <path d="m0.76923 199.29h36.923v36.965h-36.923z"/>
-  <rect x=".47227" y="211.02" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#2979ff" stroke-width="1.0527"/>
+  <rect x=".47227" y="211.02" width="20" height="20.002" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor" stroke-width="1.0527"/>
   <rect x=".47227" y="232.08" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae" stroke-width="1.0527"/>
   <g stroke-width="3.9787">
    <path d="m16.788 342.31-1.2721-1.2723-5.0436 5.0441-5.0436-5.0441-1.2722 1.2723 5.0436 5.0441-5.0436 5.0441 1.2722 1.2723 5.0436-5.0441 5.0436 5.0441 1.2721-1.2723-5.0436-5.0441z" fill="#000"/>
    <path d="m16.788 363.36-1.2721-1.2723-5.0436 5.0441-5.0436-5.0441-1.2722 1.2723 5.0436 5.0441-5.0436 5.0441 1.2722 1.2723 5.0436-5.0441 5.0436 5.0441 1.2721-1.2723-5.0436-5.0441z" fill="#3096fa"/>
-   <path d="m16.788 384.42-1.2721-1.2723-5.0436 5.0441-5.0436-5.0441-1.2722 1.2723 5.0436 5.0441-5.0436 5.0441 1.2722 1.2723 5.0436-5.0441 5.0436 5.0441 1.2721-1.2723-5.0436-5.0441z" fill="#2979ff"/>
+   <path d="m16.788 384.42-1.2721-1.2723-5.0436 5.0441-5.0436-5.0441-1.2722 1.2723 5.0436 5.0441-5.0436 5.0441 1.2722 1.2723 5.0436-5.0441 5.0436 5.0441 1.2721-1.2723-5.0436-5.0441z" class="HighlightOutline" fill="currentColor"/>
    <path d="m16.788 405.47-1.2721-1.2723-5.0436 5.0441-5.0436-5.0441-1.2722 1.2723 5.0436 5.0441-5.0436 5.0441 1.2722 1.2723 5.0436-5.0441 5.0436 5.0441 1.2721-1.2723-5.0436-5.0441z" fill="#aeaeae"/>
   </g>
  </g>
@@ -55,18 +58,18 @@
  <g transform="matrix(1.4616 0 0 1.463 .91489 3.1433)" stroke-width=".46768">
   <path d="m4.4744 75.029-2.2858-2.1423-0.76193 0.71411 3.0476 2.8565 6.5309-6.121-0.76193-0.71411z" fill="#3096fa"/>
   <path d="m4.4744 102.37-2.2858-2.1423-0.76193 0.71411 3.0476 2.8565 6.5309-6.121-0.76193-0.71411z" fill="#aeaeae"/>
-  <path d="m4.4744 88.699-2.2858-2.1423-0.76193 0.71412 3.0476 2.8565 6.5309-6.121-0.76193-0.71411z" fill="#2979ff"/>
+  <path d="m4.4744 88.699-2.2858-2.1423-0.76193 0.71412 3.0476 2.8565 6.5309-6.121-0.76193-0.71411z" class="HighlightOutline" fill="currentColor"/>
  </g>
  <path d="m7.4546 252.91-3.3409-3.1343-1.1136 1.0447 4.4545 4.1791 9.5455-8.9553-1.1136-1.0447z" stroke-width=".99999"/>
  <g transform="matrix(1.4616 0 0 1.463 .91489 163.14)" stroke-width=".46768">
   <path d="m4.4744 75.029-2.2858-2.1423-0.76193 0.71411 3.0476 2.8565 6.5309-6.121-0.76193-0.71411z" fill="#3096fa"/>
   <path d="m4.4744 102.37-2.2858-2.1423-0.76193 0.71411 3.0476 2.8565 6.5309-6.121-0.76193-0.71411z" fill="#aeaeae"/>
-  <path d="m4.4744 88.699-2.2858-2.1423-0.76193 0.71412 3.0476 2.8565 6.5309-6.121-0.76193-0.71411z" fill="#2979ff"/>
+  <path d="m4.4744 88.699-2.2858-2.1423-0.76193 0.71412 3.0476 2.8565 6.5309-6.121-0.76193-0.71411z" class="HighlightOutline" fill="currentColor"/>
  </g>
  <path d="m3 169h14v2h-14z"/>
  <g transform="matrix(1.4616 0 0 1.463 .051167 .62675)" stroke-width=".46768">
   <path d="m2.0175 128.76h9.5785v1.367h-9.5785z" fill="#3096fa"/>
-  <path d="m2.0175 142.43h9.5785v1.3671h-9.5785z" fill="#2979ff"/>
+  <path d="m2.0175 142.43h9.5785v1.3671h-9.5785z" class="HighlightOutline" fill="currentColor"/>
   <path d="m2.0175 156.1h9.5785v1.3671h-9.5785z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_checkbox_26px.svg b/dlls/light.msstyles/blue_checkbox_26px.svg
index bb5c5b9f281..5798bfb04b7 100644
--- a/dlls/light.msstyles/blue_checkbox_26px.svg
+++ b/dlls/light.msstyles/blue_checkbox_26px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:26-24" width="26" height="520" fill="#000000" version="1.1" viewBox="0 0 26 520" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -14,39 +17,39 @@
  <path d="m4 220h18v2h-18z"/>
  <g transform="matrix(1.0407 0 0 1.0001 -.040662 -.0030241)" fill="none" stroke-width="1.9604">
   <rect x="1.0206" y="26.979" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#3096fa"/>
-  <rect x="1.0206" y="52.979" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#2979ff"/>
+  <rect x="1.0206" y="52.979" width="22.959" height="24.042" rx="1.9167" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1.0206" y="78.979" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#aeaeae"/>
   <rect x="1.0193" y="312.95" width="23.061" height="23.997" rx="1.9217" ry="1.9998" fill="none" stroke="#aeaeae"/>
   <rect x="1.0399" y="338.92" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#3096fa"/>
-  <rect x="1.0399" y="364.92" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#2979ff"/>
+  <rect x="1.0399" y="364.92" width="22.959" height="24.042" rx="1.9167" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1.0399" y="390.92" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#aeaeae"/>
   <rect x="1.0193" y="416.94" width="23.061" height="23.997" rx="1.9217" ry="1.9998" fill="none" stroke="#aeaeae"/>
   <rect x="1.0399" y="442.91" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#3096fa"/>
-  <rect x="1.0399" y="468.91" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#2979ff"/>
+  <rect x="1.0399" y="468.91" width="22.959" height="24.042" rx="1.9167" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1.0399" y="494.91" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#aeaeae"/>
   <rect x="1.0206" y="104.98" width="22.959" height="24.042" rx="1.9132" ry="2.0035" fill="none" stroke="#aeaeae"/>
   <rect x="1.0206" y="130.98" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#3096fa"/>
-  <rect x="1.0412" y="156.96" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#2979ff"/>
+  <rect x="1.0412" y="156.96" width="22.959" height="24.042" rx="1.9167" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1.0412" y="182.96" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#aeaeae"/>
   <rect x="1.0193" y="208.96" width="23.022" height="24.037" rx="1.9185" ry="2.0031" fill="none" stroke="#aeaeae"/>
   <rect x="1.0407" y="234.94" width="22.979" height="24.039" rx="1.9184" ry="1.9998" stroke="#3096fa"/>
-  <rect x="1.0407" y="260.93" width="22.979" height="24.039" rx="1.9184" ry="1.9998" stroke="#2979ff"/>
+  <rect x="1.0407" y="260.93" width="22.979" height="24.039" rx="1.9184" ry="1.9998" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1.0407" y="286.93" width="22.979" height="24.039" rx="1.9184" ry="1.9998" stroke="#aeaeae"/>
  </g>
  <path d="m9.7272 147.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z" fill="#3096fa"/>
- <path d="m9.7272 173.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z" fill="#2979ff"/>
+ <path d="m9.7272 173.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z" class="HighlightOutline" fill="currentColor"/>
  <path d="m9.7272 199.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z" fill="#aeaeae"/>
  <path d="m9.7272 329.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z"/>
  <path d="m9.7272 355.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z" fill="#3096fa"/>
- <path d="m9.7272 381.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z" fill="#2979ff"/>
+ <path d="m9.7272 381.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z" class="HighlightOutline" fill="currentColor"/>
  <path d="m9.7272 407.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z" fill="#aeaeae"/>
  <path d="m4 246h18v2h-18z" fill="#3096fa"/>
- <path d="m4 272h18v2h-18z" fill="#2979ff"/>
+ <path d="m4 272h18v2h-18z" class="HighlightOutline" fill="currentColor"/>
  <path d="m4 298h18v2h-18z" fill="#aeaeae"/>
  <g transform="matrix(.88889 0 0 1 .44444 0)" stroke-width="4.2519">
   <path d="m23.125 422.61-1.8128-1.6115-7.1872 6.3885-7.1872-6.3885-1.8128 1.6115 7.1872 6.3885-7.1872 6.3885 1.8128 1.6115 7.1872-6.3885 7.1872 6.3885 1.8128-1.6115-7.1872-6.3885z" fill="#000"/>
   <path d="m23.125 448.61-1.8128-1.6115-7.1872 6.3885-7.1872-6.3885-1.8128 1.6115 7.1872 6.3885-7.1872 6.3885 1.8128 1.6115 7.1872-6.3885 7.1872 6.3885 1.8128-1.6115-7.1872-6.3885z" fill="#3096fa"/>
-  <path d="m23.125 474.61-1.8128-1.6115-7.1872 6.3885-7.1872-6.3885-1.8128 1.6115 7.1872 6.3885-7.1872 6.3885 1.8128 1.6115 7.1872-6.3885 7.1872 6.3885 1.8128-1.6115-7.1872-6.3885z" fill="#2979ff"/>
+  <path d="m23.125 474.61-1.8128-1.6115-7.1872 6.3885-7.1872-6.3885-1.8128 1.6115 7.1872 6.3885-7.1872 6.3885 1.8128 1.6115 7.1872-6.3885 7.1872 6.3885 1.8128-1.6115-7.1872-6.3885z" class="HighlightOutline" fill="currentColor"/>
   <path d="m23.125 500.71-1.8128-1.7122-7.1872 6.7878-7.1872-6.7878-1.8128 1.7122 7.1872 6.7878-7.1872 6.7878 1.8128 1.7122 7.1872-6.7878 7.1872 6.7878 1.8128-1.7122-7.1872-6.7878z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_checkbox_32px.svg b/dlls/light.msstyles/blue_checkbox_32px.svg
index 732648b70ae..7a1260d5bf3 100644
--- a/dlls/light.msstyles/blue_checkbox_32px.svg
+++ b/dlls/light.msstyles/blue_checkbox_32px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:32-24" width="32" height="640" fill="#000000" version="1.1" viewBox="0 0 32 640" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,45 +15,45 @@
  <g fill="none" stroke-width="2">
   <rect x="1" y="1" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x="1" y="97" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
-  <rect x="1" y="65" width="30" height="30" rx="2" ry="2" stroke="#2979ff"/>
+  <rect x="1" y="65" width="30" height="30" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1" y="33" width="30" height="30" rx="2" ry="2" stroke="#3096fa"/>
   <rect x="1" y="129" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x="1" y="225" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
-  <rect x="1" y="193" width="30" height="30" rx="2" ry="2" stroke="#2979ff"/>
+  <rect x="1" y="193" width="30" height="30" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1" y="161" width="30" height="30" rx="2" ry="2" stroke="#3096fa"/>
   <rect x="1" y="257" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x="1" y="353" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
-  <rect x="1" y="321" width="30" height="30" rx="2" ry="2" stroke="#2979ff"/>
+  <rect x="1" y="321" width="30" height="30" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1" y="289" width="30" height="30" rx="2" ry="2" stroke="#3096fa"/>
   <rect x="1" y="385" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x="1" y="481" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
-  <rect x="1" y="449" width="30" height="30" rx="2" ry="2" stroke="#2979ff"/>
+  <rect x="1" y="449" width="30" height="30" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1" y="417" width="30" height="30" rx="2" ry="2" stroke="#3096fa"/>
   <rect x="1" y="513" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x="1" y="609" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
-  <rect x="1" y="577" width="30" height="30" rx="2" ry="2" stroke="#2979ff"/>
+  <rect x="1" y="577" width="30" height="30" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1" y="545" width="30" height="30" rx="2" ry="2" stroke="#3096fa"/>
  </g>
  <path d="m12 148.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z"/>
  <path d="m5 271h22v2h-22z"/>
  <g transform="translate(-79.273 -1)">
   <path d="m91.273 181.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z" fill="#3096fa"/>
-  <path d="m91.273 213.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z" fill="#2979ff"/>
+  <path d="m91.273 213.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z" class="HighlightOutline" fill="currentColor"/>
   <path d="m91.273 245.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z" fill="#aeaeae"/>
   <path d="m91.273 405.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z"/>
   <path d="m91.273 437.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z" fill="#3096fa"/>
-  <path d="m91.273 469.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z" fill="#2979ff"/>
+  <path d="m91.273 469.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z" class="HighlightOutline" fill="currentColor"/>
   <path d="m91.273 501.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z" fill="#aeaeae"/>
  </g>
  <g transform="matrix(1.2222 0 0 1 77.111 30)" stroke-width=".81818">
   <path d="m-59 273h18v2h-18z" fill="#3096fa"/>
-  <path d="m-59 305h18v2h-18z" fill="#2979ff"/>
+  <path d="m-59 305h18v2h-18z" class="HighlightOutline" fill="currentColor"/>
   <path d="m-59 337h18v2h-18z" fill="#aeaeae"/>
  </g>
  <g transform="translate(34.187 93.003)" stroke-width="3.7795">
   <path d="m-8.1872 427.01-2.0142-2.0143-7.9858 7.9857-7.9858-7.9857-2.0142 2.0143 7.9858 7.9857-7.9858 7.9857 2.0142 2.0143 7.9858-7.9857 7.9858 7.9857 2.0142-2.0143-7.9858-7.9857z" fill="#000"/>
   <path d="m-8.1872 459.01-2.0142-2.0143-7.9858 7.9857-7.9858-7.9857-2.0142 2.0143 7.9858 7.9857-7.9858 7.9857 2.0142 2.0143 7.9858-7.9857 7.9858 7.9857 2.0142-2.0143-7.9858-7.9857z" fill="#3096fa"/>
-  <path d="m-8.1872 491.01-2.0142-2.0143-7.9858 7.9857-7.9858-7.9857-2.0142 2.0143 7.9858 7.9857-7.9858 7.9857 2.0142 2.0143 7.9858-7.9857 7.9858 7.9857 2.0142-2.0143-7.9858-7.9857z" fill="#2979ff"/>
+  <path d="m-8.1872 491.01-2.0142-2.0143-7.9858 7.9857-7.9858-7.9857-2.0142 2.0143 7.9858 7.9857-7.9858 7.9857 2.0142 2.0143 7.9858-7.9857 7.9858 7.9857 2.0142-2.0143-7.9858-7.9857z" class="HighlightOutline" fill="currentColor"/>
   <path d="m-8.1872 523.01-2.0142-2.0143-7.9858 7.9857-7.9858-7.9857-2.0142 2.0143 7.9858 7.9857-7.9858 7.9857 2.0142 2.0143 7.9858-7.9857 7.9858 7.9857 2.0142-2.0143-7.9858-7.9857z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_checkbox_40px.svg b/dlls/light.msstyles/blue_checkbox_40px.svg
index b9783ddb10a..a789d9791b3 100644
--- a/dlls/light.msstyles/blue_checkbox_40px.svg
+++ b/dlls/light.msstyles/blue_checkbox_40px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:40-24" width="40" height="800" fill="#000000" version="1.1" viewBox="0 0 40 800" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -18,23 +21,23 @@
   </g>
   <path d="m0.76923 39.275h36.923v36.965h-36.923z"/>
   <g stroke-width="3.1581">
-   <rect x="1.525" y="85.744" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#2979ff"/>
+   <rect x="1.525" y="85.744" width="38.947" height="38.952" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor"/>
    <rect x="1.525" y="169.96" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x="1.525" y="296.29" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x="1.525" y="212.07" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
-   <rect x="1.525" y="254.18" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#2979ff"/>
+   <rect x="1.525" y="254.18" width="38.947" height="38.952" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor"/>
    <rect x="1.525" y="338.4" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x="1.525" y="464.73" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x="1.525" y="380.51" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
-   <rect x="1.525" y="422.62" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#2979ff"/>
+   <rect x="1.525" y="422.62" width="38.947" height="38.952" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor"/>
    <rect x="1.525" y="506.84" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x="1.525" y="633.17" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x="1.525" y="548.95" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
-   <rect x="1.525" y="591.06" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#2979ff"/>
+   <rect x="1.525" y="591.06" width="38.947" height="38.952" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor"/>
    <rect x="1.525" y="675.28" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x="1.525" y="801.61" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x="1.525" y="717.39" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
-   <rect x="1.525" y="759.5" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#2979ff"/>
+   <rect x="1.525" y="759.5" width="38.947" height="38.952" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <path d="m1.2564e-5 336.88h36.923v36.965h-36.923z"/>
   <path d="m0.76924 376.15h36.923v36.965h-36.923z"/>
@@ -49,7 +52,7 @@
   <g transform="translate(119.78 21.052)" stroke-width="3.9787">
    <path d="m-86.15 663.62-2.5442-2.5446-10.087 10.088-10.087-10.088-2.5444 2.5446 10.087 10.088-10.087 10.088 2.5444 2.5446 10.087-10.088 10.087 10.088 2.5442-2.5446-10.087-10.088z" fill="#000"/>
    <path d="m-86.15 705.73-2.5442-2.5446-10.087 10.088-10.087-10.088-2.5444 2.5446 10.087 10.088-10.087 10.088 2.5444 2.5446 10.087-10.088 10.087 10.088 2.5442-2.5446-10.087-10.088z" fill="#3096fa"/>
-   <path d="m-86.15 747.84-2.5442-2.5446-10.087 10.088-10.087-10.088-2.5444 2.5446 10.087 10.088-10.087 10.088 2.5444 2.5446 10.087-10.088 10.087 10.088 2.5442-2.5446-10.087-10.088z" fill="#2979ff"/>
+   <path d="m-86.15 747.84-2.5442-2.5446-10.087 10.088-10.087-10.088-2.5444 2.5446 10.087 10.088-10.087 10.088 2.5444 2.5446 10.087-10.088 10.087 10.088 2.5442-2.5446-10.087-10.088z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-86.15 789.95-2.5442-2.5446-10.087 10.088-10.087-10.088-2.5444 2.5446 10.087 10.088-10.087 10.088 2.5444 2.5446 10.087-10.088 10.087 10.088 2.5442-2.5446-10.087-10.088z" fill="#aeaeae"/>
   </g>
  </g>
@@ -57,18 +60,18 @@
  <g transform="matrix(1.4616 0 0 1.463 88.915 17.099)" stroke-width=".46768">
   <path d="m-50.633 142.67-4.5716-4.2847-1.5239 1.4282 6.0952 5.7131 13.062-12.242-1.5239-1.4283z" fill="#3096fa"/>
   <path d="m-50.633 197.35-4.5716-4.2847-1.5239 1.4282 6.0952 5.7131 13.062-12.242-1.5239-1.4283z" fill="#aeaeae"/>
-  <path d="m-50.633 170.01-4.5716-4.2847-1.5239 1.4283 6.0952 5.7131 13.062-12.242-1.5239-1.4282z" fill="#2979ff"/>
+  <path d="m-50.633 170.01-4.5716-4.2847-1.5239 1.4283 6.0952 5.7131 13.062-12.242-1.5239-1.4282z" class="HighlightOutline" fill="currentColor"/>
  </g>
  <path d="m14.909 505.82-6.6818-6.2686-2.2272 2.0894 8.909 8.3582 19.091-17.911-2.2272-2.0894z" stroke-width=".99999"/>
  <g transform="matrix(1.4616 0 0 1.463 88.915 337.1)" stroke-width=".46768">
   <path d="m-50.633 142.67-4.5716-4.2847-1.5239 1.4282 6.0952 5.7131 13.062-12.242-1.5239-1.4283z" fill="#3096fa"/>
   <path d="m-50.633 197.35-4.5716-4.2847-1.5239 1.4282 6.0952 5.7131 13.062-12.242-1.5239-1.4283z" fill="#aeaeae"/>
-  <path d="m-50.633 170.01-4.5716-4.2847-1.5239 1.4283 6.0952 5.7131 13.062-12.242-1.5239-1.4282z" fill="#2979ff"/>
+  <path d="m-50.633 170.01-4.5716-4.2847-1.5239 1.4283 6.0952 5.7131 13.062-12.242-1.5239-1.4282z" class="HighlightOutline" fill="currentColor"/>
  </g>
  <path d="m6 338h28v4h-28z"/>
  <g transform="matrix(1.4616 0 0 1.463 128.05 33.624)" stroke-width=".46768">
   <path d="m-83.505 235.39h19.157v2.7341h-19.157z" fill="#3096fa"/>
-  <path d="m-83.505 262.73h19.157v2.7341h-19.157z" fill="#2979ff"/>
+  <path d="m-83.505 262.73h19.157v2.7341h-19.157z" class="HighlightOutline" fill="currentColor"/>
   <path d="m-83.505 290.07h19.157v2.7341h-19.157z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_checkbox_52px.svg b/dlls/light.msstyles/blue_checkbox_52px.svg
index b2fef70a3f5..8cf40d132ba 100644
--- a/dlls/light.msstyles/blue_checkbox_52px.svg
+++ b/dlls/light.msstyles/blue_checkbox_52px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:52-24" width="52" height="1040" fill="#000000" version="1.1" viewBox="0 0 52 1040" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -17,7 +20,7 @@
    <rect x="2.0513" y="56.794" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
   </g>
   <path d="m0.76923 39.275h36.923v36.965h-36.923z"/>
-  <rect x="2.0512" y="111.54" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#2979ff" stroke-width="4.2108"/>
+  <rect x="2.0512" y="111.54" width="50.526" height="50.532" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor" stroke-width="4.2108"/>
   <path d="m64.211 340.04h36.923v36.965h-36.923z"/>
   <path d="m64.98 379.31h36.923v36.965h-36.923z"/>
   <path d="m3.5e-6 80.09h36.923v36.965h-36.923z"/>
@@ -34,7 +37,7 @@
    <rect x="2.0514" y="275.76" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
   </g>
   <path d="m0.76934 258.25h36.923v36.965h-36.923z"/>
-  <rect x="2.0513" y="330.51" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#2979ff" stroke-width="4.2108"/>
+  <rect x="2.0513" y="330.51" width="50.526" height="50.532" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor" stroke-width="4.2108"/>
   <path d="m1.1538e-4 299.06h36.923v36.965h-36.923z"/>
   <path d="m0.76934 338.33h36.923v36.965h-36.923z"/>
   <path d="m1.1238e-4 379.15h36.923v36.965h-36.923z"/>
@@ -48,7 +51,7 @@
    <rect x="2.0512" y="494.73" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
   </g>
   <path d="m0.76912 477.22h36.923v36.965h-36.923z"/>
-  <rect x="2.0511" y="549.48" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#2979ff" stroke-width="4.2108"/>
+  <rect x="2.0511" y="549.48" width="50.526" height="50.532" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor" stroke-width="4.2108"/>
   <path d="m-1.0846e-4 518.03h36.923v36.965h-36.923z"/>
   <path d="m0.76912 557.3h36.923v36.965h-36.923z"/>
   <path d="m-1.1146e-4 598.12h36.923v36.965h-36.923z"/>
@@ -62,7 +65,7 @@
    <rect x="2.0513" y="713.71" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
   </g>
   <path d="m0.76923 696.19h36.923v36.965h-36.923z"/>
-  <rect x="2.0512" y="768.45" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#2979ff" stroke-width="4.2108"/>
+  <rect x="2.0512" y="768.45" width="50.526" height="50.532" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor" stroke-width="4.2108"/>
   <path d="m3.5403e-6 737h36.923v36.965h-36.923z"/>
   <path d="m0.76923 776.27h36.923v36.965h-36.923z"/>
   <path d="m5.4029e-7 817.09h36.923v36.965h-36.923z"/>
@@ -76,7 +79,7 @@
    <rect x="2.0514" y="932.68" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
   </g>
   <path d="m0.76934 915.16h36.923v36.965h-36.923z"/>
-  <rect x="2.0513" y="987.42" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#2979ff" stroke-width="4.2108"/>
+  <rect x="2.0513" y="987.42" width="50.526" height="50.532" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor" stroke-width="4.2108"/>
   <path d="m1.1755e-4 955.97h36.923v36.965h-36.923z"/>
   <path d="m0.76934 995.24h36.923v36.965h-36.923z"/>
   <path d="m1.1455e-4 1036.1h36.923v36.965h-36.923z"/>
@@ -88,7 +91,7 @@
    <path d="m-83.444 650.16-2.9077-3.3928-11.528 13.451-11.528-13.451-2.9079 3.3928 11.528 13.451-11.528 13.451 2.9079 3.3928 11.528-13.451 11.528 13.451 2.9077-3.3928-11.528-13.451z" fill="#000" stroke-width="3.6836"/>
    <g stroke-width="3.6836">
     <path d="m-83.444 704.91-2.9077-3.3928-11.528 13.451-11.528-13.451-2.9079 3.3928 11.528 13.451-11.528 13.451 2.9079 3.3928 11.528-13.451 11.528 13.451 2.9077-3.3928-11.528-13.451z" fill="#3096fa"/>
-    <path d="m-83.444 759.65-2.9077-3.3928-11.528 13.451-11.528-13.451-2.9079 3.3928 11.528 13.451-11.528 13.451 2.9079 3.3928 11.528-13.451 11.528 13.451 2.9077-3.3928-11.528-13.451z" fill="#2979ff"/>
+    <path d="m-83.444 759.65-2.9077-3.3928-11.528 13.451-11.528-13.451-2.9079 3.3928 11.528 13.451-11.528 13.451 2.9079 3.3928 11.528-13.451 11.528 13.451 2.9077-3.3928-11.528-13.451z" class="HighlightOutline" fill="currentColor"/>
     <path d="m-83.444 814.39-2.9077-3.3928-11.528 13.451-11.528-13.451-2.9079 3.3928 11.528 13.451-11.528 13.451 2.9079 3.3928 11.528-13.451 11.528 13.451 2.9077-3.3928-11.528-13.451z" fill="#aeaeae"/>
    </g>
   </g>
@@ -97,18 +100,18 @@
  <g transform="matrix(1.8792 0 0 1.463 114.6 79.099)" stroke-width=".41246">
   <path d="m-50.633 146.99-4.5716-5.9986-1.5239 1.9996 6.0952 7.9984 13.062-17.139-1.5239-1.9996z" fill="#3096fa"/>
   <path d="m-50.633 218.08-4.5716-5.9986-1.5239 1.9996 6.0952 7.9984 13.062-17.139-1.5239-1.9996z" fill="#aeaeae"/>
-  <path d="m-50.633 182.54-4.5716-5.9986-1.5239 1.9996 6.0952 7.9984 13.062-17.139-1.5239-1.9996z" fill="#2979ff"/>
+  <path d="m-50.633 182.54-4.5716-5.9986-1.5239 1.9996 6.0952 7.9984 13.062-17.139-1.5239-1.9996z" class="HighlightOutline" fill="currentColor"/>
  </g>
  <path d="m19.454 658.22-8.5909-8.776-2.8635 2.9252 11.454 11.701 24.546-25.075-2.8635-2.9252z" stroke-width=".99999"/>
  <g transform="matrix(1.8792 0 0 1.463 114.6 495.17)" stroke-width=".41246">
   <path d="m-50.633 146.99-4.5716-5.9986-1.5239 1.9996 6.0952 7.9984 13.062-17.139-1.5239-1.9996z" fill="#3096fa"/>
   <path d="m-50.633 218.08-4.5716-5.9986-1.5239 1.9996 6.0952 7.9984 13.062-17.139-1.5239-1.9996z" fill="#aeaeae"/>
-  <path d="m-50.633 182.54-4.5716-5.9986-1.5239 1.9996 6.0952 7.9984 13.062-17.139-1.5239-1.9996z" fill="#2979ff"/>
+  <path d="m-50.633 182.54-4.5716-5.9986-1.5239 1.9996 6.0952 7.9984 13.062-17.139-1.5239-1.9996z" class="HighlightOutline" fill="currentColor"/>
  </g>
  <path d="m8 440h36v4h-36z"/>
  <g transform="matrix(1.8792 0 0 1.463 164.92 146.62)" stroke-width=".41246">
   <path d="m-83.505 236.07h19.157v2.7341h-19.157z" fill="#3096fa"/>
-  <path d="m-83.505 271.62h19.157v2.7341h-19.157z" fill="#2979ff"/>
+  <path d="m-83.505 271.62h19.157v2.7341h-19.157z" class="HighlightOutline" fill="currentColor"/>
   <path d="m-83.505 307.16h19.157v2.7341h-19.157z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_combobox_border.svg b/dlls/light.msstyles/blue_combobox_border.svg
index 5afea6400fe..71dd2393f05 100644
--- a/dlls/light.msstyles/blue_combobox_border.svg
+++ b/dlls/light.msstyles/blue_combobox_border.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:5-24" width="5" height="20" version="1.1" viewBox="0 0 1.3229 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="#fff" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.0583" height="1.0583" stroke="#aeaeae"/>
   <rect x=".13228" y="1.4553" width="1.0583" height="1.0583" stroke="#3096fa"/>
-  <rect x=".13228" y="2.7782" width="1.0583" height="1.0583" stroke="#2979ff"/>
+  <rect x=".13228" y="2.7782" width="1.0583" height="1.0583" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="4.1011" width="1.0583" height="1.0583" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton.svg
index 76c9598e75b..9f741857974 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-24" width="7" height="84" version="1.1" viewBox="0 0 1.8521 22.225" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,7 +15,7 @@
  <g transform="translate(5.0184e-6,-6.4982e-5)" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.5875" height="5.2917" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae"/>
   <rect x=".13228" y="5.6886" width="1.5875" height="5.2917" rx=".52917" ry=".52917" fill="none" stroke="#3096fa"/>
-  <rect x=".13228" y="11.245" width="1.5875" height="5.2917" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/>
+  <rect x=".13228" y="11.245" width="1.5875" height="5.2917" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <rect x=".13228" y="16.801" width="1.5875" height="5.2917" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_left.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_left.svg
index 8cd8ef1be6b..331fc87c382 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_left.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_left.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:6-32" width="6" height="92" version="1.1" viewBox="0 0 1.5875 24.342" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -10,6 +13,6 @@
  </metadata>
  <g transform="matrix(1.2501 0 0 1 -.033073 -6.4982e-5)" stroke-width=".21165">
   <rect x=".13228" y="6.2177" width="1.0583" height="5.8209" rx=".42332" ry=".52917" fill="#fff" stroke="#3096fa"/>
-  <rect x=".13228" y="12.303" width="1.0583" height="5.8209" rx=".42332" ry=".52917" fill="#2979ff" stroke="#2979ff"/>
+  <rect x=".13228" y="12.303" width="1.0583" height="5.8209" rx=".42332" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_right.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_right.svg
index 2aeb7254f19..dc3c43439b9 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_right.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_right.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:5-32" width="5" height="92" version="1.1" viewBox="0 0 1.3229 24.342" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -10,6 +13,6 @@
  </metadata>
  <g transform="translate(5.0184e-6,-6.4982e-5)" stroke-width=".26458">
   <rect x=".13228" y="6.2177" width="1.0583" height="5.8209" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/>
-  <rect x=".13228" y="12.303" width="1.0583" height="5.8209" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/>
+  <rect x=".13228" y="12.303" width="1.0583" height="5.8209" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_combobox_readonly.svg b/dlls/light.msstyles/blue_combobox_readonly.svg
index 73561539089..12c7468e5eb 100644
--- a/dlls/light.msstyles/blue_combobox_readonly.svg
+++ b/dlls/light.msstyles/blue_combobox_readonly.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-24" width="7" height="84" version="1.1" viewBox="0 0 1.8521 22.225" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,7 +15,7 @@
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="none" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.5875" height="5.2917" rx=".52917" ry=".52917" stroke="#aeaeae"/>
   <rect x=".13228" y="5.6886" width="1.5875" height="5.2917" rx=".52917" ry=".52917" stroke="#3096fa"/>
-  <rect x=".13228" y="11.245" width="1.5875" height="5.2917" rx=".52917" ry=".52917" stroke="#2979ff"/>
+  <rect x=".13228" y="11.245" width="1.5875" height="5.2917" rx=".52917" ry=".52917" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="16.801" width="1.5875" height="5.2917" rx=".52917" ry=".52917" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_commandlink.svg b/dlls/light.msstyles/blue_commandlink.svg
index 77f23aca6e1..a0e9a296a32 100644
--- a/dlls/light.msstyles/blue_commandlink.svg
+++ b/dlls/light.msstyles/blue_commandlink.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:11-32" width="11" height="294" version="1.1" viewBox="0 0 2.9104 77.788" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  </metadata>
  <g fill="none" stroke-linecap="round" stroke-width=".26458">
   <rect x=".13229" y="13.097" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#3096fa"/>
-  <rect x=".13229" y="26.061" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#2979ff"/>
+  <rect x=".13229" y="26.061" width="2.6456" height="12.7" rx=".52917" ry=".52917" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13229" y="51.991" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#3096fa"/>
   <rect x=".13229" y="64.955" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#3096fa"/>
  </g>
diff --git a/dlls/light.msstyles/blue_commandlink_glyph_30px.svg b/dlls/light.msstyles/blue_commandlink_glyph_30px.svg
index cb367b792a2..0d030b8d06e 100644
--- a/dlls/light.msstyles/blue_commandlink_glyph_30px.svg
+++ b/dlls/light.msstyles/blue_commandlink_glyph_30px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:30-32" width="30" height="150" version="1.1" viewBox="0 0 7.9375 39.688" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,7 +15,7 @@
  <g stroke-width=".26458">
   <path d="m4.7625 2.1167-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/>
   <path d="m4.7625 10.054-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/>
-  <path d="m4.7625 17.992-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#2979ff"/>
+  <path d="m4.7625 17.992-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.7625 25.929-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#aeaeae"/>
   <path d="m4.7625 33.867-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/>
  </g>
diff --git a/dlls/light.msstyles/blue_commandlink_glyph_37px.svg b/dlls/light.msstyles/blue_commandlink_glyph_37px.svg
index 34aa72aba74..a5603331b9d 100644
--- a/dlls/light.msstyles/blue_commandlink_glyph_37px.svg
+++ b/dlls/light.msstyles/blue_commandlink_glyph_37px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:37-32" width="37" height="185" version="1.1" viewBox="0 0 9.7896 48.949" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,7 +15,7 @@
  <g transform="matrix(1.25 0 0 1.25 -.066217 -1.3229)" stroke-width=".16933">
   <path d="m4.7625 2.9633-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#3096fa"/>
   <path d="m4.7625 10.795-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#3096fa"/>
-  <path d="m4.7625 18.627-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#2979ff"/>
+  <path d="m4.7625 18.627-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.7625 26.459-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#aeaeae"/>
   <path d="m4.7625 34.29-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#3096fa"/>
  </g>
diff --git a/dlls/light.msstyles/blue_commandlink_glyph_45px.svg b/dlls/light.msstyles/blue_commandlink_glyph_45px.svg
index b724ef6bd96..5a3957a892d 100644
--- a/dlls/light.msstyles/blue_commandlink_glyph_45px.svg
+++ b/dlls/light.msstyles/blue_commandlink_glyph_45px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:45-32" width="45" height="225" version="1.1" viewBox="0 0 11.906 59.531" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,7 +15,7 @@
  <g stroke-width=".26458">
   <path d="m7.1834 3.175-0.57825 0.55959 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#3096fa"/>
   <path d="m7.1834 15.081-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#3096fa"/>
-  <path d="m7.1834 26.988-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#2979ff"/>
+  <path d="m7.1834 26.988-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" class="HighlightOutline" fill="currentColor"/>
   <path d="m7.1834 50.8-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#3096fa"/>
   <path d="m7.1834 38.894-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_commandlink_glyph_52px.svg b/dlls/light.msstyles/blue_commandlink_glyph_52px.svg
index 9065e1c1836..311a9b5a1fb 100644
--- a/dlls/light.msstyles/blue_commandlink_glyph_52px.svg
+++ b/dlls/light.msstyles/blue_commandlink_glyph_52px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:52-32" width="52" height="260" version="1.1" viewBox="0 0 13.758 68.793" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,7 +15,7 @@
  <g transform="matrix(1.73 0 0 1.73 -.17208 .042322)" stroke-width=".088403">
   <path d="m4.8558 2.1167-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#3096fa"/>
   <path d="m4.8558 10.07-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#3096fa"/>
-  <path d="m4.8558 18.022-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#2979ff"/>
+  <path d="m4.8558 18.022-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.8558 25.975-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#aeaeae"/>
   <path d="m4.8558 33.928-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#3096fa"/>
  </g>
diff --git a/dlls/light.msstyles/blue_commandlink_glyph_60px.svg b/dlls/light.msstyles/blue_commandlink_glyph_60px.svg
index 39c0b268689..1aa81e4784c 100644
--- a/dlls/light.msstyles/blue_commandlink_glyph_60px.svg
+++ b/dlls/light.msstyles/blue_commandlink_glyph_60px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:60-32" width="60" height="300" version="1.1" viewBox="0 0 15.875 79.376" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,7 +15,7 @@
  <g transform="matrix(2 0 0 2 -.00011333 -1.3333e-5)" stroke-width=".066145">
   <path d="m4.7625 2.1167-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/>
   <path d="m4.7625 10.054-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/>
-  <path d="m4.7625 17.992-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#2979ff"/>
+  <path d="m4.7625 17.992-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.7625 25.929-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#aeaeae"/>
   <path d="m4.7625 33.867-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/>
  </g>
diff --git a/dlls/light.msstyles/blue_commandlink_glyph_67px.svg b/dlls/light.msstyles/blue_commandlink_glyph_67px.svg
index 3bec4747060..acfcbc47644 100644
--- a/dlls/light.msstyles/blue_commandlink_glyph_67px.svg
+++ b/dlls/light.msstyles/blue_commandlink_glyph_67px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:67-32" width="67" height="335" version="1.1" viewBox="0 0 17.727 88.637" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,7 +15,7 @@
  <g transform="matrix(2.3333 0 0 2.3333 -.17651 -.1764)" stroke-width=".048596">
   <path d="m4.6737 2.0033-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#3096fa"/>
   <path d="m4.6737 9.6007-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#3096fa"/>
-  <path d="m4.6737 17.198-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#2979ff"/>
+  <path d="m4.6737 17.198-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.6737 24.796-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#aeaeae"/>
   <path d="m4.6738 32.393-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#3096fa"/>
  </g>
diff --git a/dlls/light.msstyles/blue_commandlink_glyph_75px.svg b/dlls/light.msstyles/blue_commandlink_glyph_75px.svg
index f24c34fe6b6..5934e77a0ef 100644
--- a/dlls/light.msstyles/blue_commandlink_glyph_75px.svg
+++ b/dlls/light.msstyles/blue_commandlink_glyph_75px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:75-32" width="75" height="375" version="1.1" viewBox="0 0 19.844 99.22" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,7 +15,7 @@
  <g transform="matrix(2.5 0 0 2.5 .13215 -5e-5)" stroke-width=".042333">
   <path d="m4.7625 2.1167-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#3096fa"/>
   <path d="m4.7625 10.054-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#3096fa"/>
-  <path d="m4.7625 17.992-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#2979ff"/>
+  <path d="m4.7625 17.992-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.7625 25.929-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#aeaeae"/>
   <path d="m4.7625 33.867-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#3096fa"/>
  </g>
diff --git a/dlls/light.msstyles/blue_edit_border_hscroll.svg b/dlls/light.msstyles/blue_edit_border_hscroll.svg
index 5afea6400fe..71dd2393f05 100644
--- a/dlls/light.msstyles/blue_edit_border_hscroll.svg
+++ b/dlls/light.msstyles/blue_edit_border_hscroll.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:5-24" width="5" height="20" version="1.1" viewBox="0 0 1.3229 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="#fff" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.0583" height="1.0583" stroke="#aeaeae"/>
   <rect x=".13228" y="1.4553" width="1.0583" height="1.0583" stroke="#3096fa"/>
-  <rect x=".13228" y="2.7782" width="1.0583" height="1.0583" stroke="#2979ff"/>
+  <rect x=".13228" y="2.7782" width="1.0583" height="1.0583" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="4.1011" width="1.0583" height="1.0583" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_edit_border_hvscroll.svg b/dlls/light.msstyles/blue_edit_border_hvscroll.svg
index 5afea6400fe..71dd2393f05 100644
--- a/dlls/light.msstyles/blue_edit_border_hvscroll.svg
+++ b/dlls/light.msstyles/blue_edit_border_hvscroll.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:5-24" width="5" height="20" version="1.1" viewBox="0 0 1.3229 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="#fff" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.0583" height="1.0583" stroke="#aeaeae"/>
   <rect x=".13228" y="1.4553" width="1.0583" height="1.0583" stroke="#3096fa"/>
-  <rect x=".13228" y="2.7782" width="1.0583" height="1.0583" stroke="#2979ff"/>
+  <rect x=".13228" y="2.7782" width="1.0583" height="1.0583" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="4.1011" width="1.0583" height="1.0583" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_edit_border_noscroll.svg b/dlls/light.msstyles/blue_edit_border_noscroll.svg
index 5afea6400fe..71dd2393f05 100644
--- a/dlls/light.msstyles/blue_edit_border_noscroll.svg
+++ b/dlls/light.msstyles/blue_edit_border_noscroll.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:5-24" width="5" height="20" version="1.1" viewBox="0 0 1.3229 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="#fff" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.0583" height="1.0583" stroke="#aeaeae"/>
   <rect x=".13228" y="1.4553" width="1.0583" height="1.0583" stroke="#3096fa"/>
-  <rect x=".13228" y="2.7782" width="1.0583" height="1.0583" stroke="#2979ff"/>
+  <rect x=".13228" y="2.7782" width="1.0583" height="1.0583" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="4.1011" width="1.0583" height="1.0583" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_edit_border_vscroll.svg b/dlls/light.msstyles/blue_edit_border_vscroll.svg
index 5afea6400fe..71dd2393f05 100644
--- a/dlls/light.msstyles/blue_edit_border_vscroll.svg
+++ b/dlls/light.msstyles/blue_edit_border_vscroll.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:5-24" width="5" height="20" version="1.1" viewBox="0 0 1.3229 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="#fff" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.0583" height="1.0583" stroke="#aeaeae"/>
   <rect x=".13228" y="1.4553" width="1.0583" height="1.0583" stroke="#3096fa"/>
-  <rect x=".13228" y="2.7782" width="1.0583" height="1.0583" stroke="#2979ff"/>
+  <rect x=".13228" y="2.7782" width="1.0583" height="1.0583" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="4.1011" width="1.0583" height="1.0583" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_collapse_button_15px.svg b/dlls/light.msstyles/blue_listview_collapse_button_15px.svg
index 66db98c9ae5..36f01bf4015 100644
--- a/dlls/light.msstyles/blue_listview_collapse_button_15px.svg
+++ b/dlls/light.msstyles/blue_listview_collapse_button_15px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:15-32" width="15" height="45" version="1.1" viewBox="0 0 3.9688 11.906" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <circle cx="1.9844" cy="5.9532" r="1.8521" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
  <g transform="matrix(.8 0 0 -.80002 -.026461 4.3393)" stroke-width=".66146">
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
@@ -9,8 +12,8 @@
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
- <ellipse cx="1.9844" cy="9.922" rx="1.8521" ry="1.8521" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <g transform="matrix(.8 0 0 -.80002 .058659 12.277)" fill="#2979ff" stroke-width=".66146">
+ <ellipse cx="1.9844" cy="9.922" rx="1.8521" ry="1.8521" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <g transform="matrix(.8 0 0 -.80002 .058659 12.277)" class="HighlightOutline" fill="currentColor" stroke-width=".66146">
   <path d="m3.7301 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.2718 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
diff --git a/dlls/light.msstyles/blue_listview_collapse_button_19px.svg b/dlls/light.msstyles/blue_listview_collapse_button_19px.svg
index 1073f98bed3..9f05d682b54 100644
--- a/dlls/light.msstyles/blue_listview_collapse_button_19px.svg
+++ b/dlls/light.msstyles/blue_listview_collapse_button_19px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:19-32" width="19" height="57" version="1.1" viewBox="0 0 5.0271 15.081" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <ellipse cx="2.5136" cy="7.5407" rx="2.3813" ry="2.3813" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
  <g stroke-width=".99996">
   <path d="m3.8367 8.0267-1.3131-1.1474-0.18757 0.16391 1.3131 1.1474z" fill="#3096fa"/>
@@ -7,7 +10,7 @@
   <path d="m3.8368 2.9993-1.3131-1.1474-0.18757 0.16391 1.3131 1.1474z"/>
   <path d="m1.3782 3.1748 1.3131-1.1474-0.18758-0.16391-1.3131 1.1474z"/>
  </g>
- <ellipse cx="2.5133" cy="12.568" rx="2.381" ry="2.3813" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <path d="m3.8363 13.053-1.3129-1.1474-0.18755 0.16391 1.3129 1.1474z" fill="#2979ff" stroke-width=".99996"/>
- <path d="m1.378 13.229 1.3129-1.1474-0.18756-0.16391-1.3129 1.1474z" fill="#2979ff" stroke-width=".99996"/>
+ <ellipse cx="2.5133" cy="12.568" rx="2.381" ry="2.3813" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m3.8363 13.053-1.3129-1.1474-0.18755 0.16391 1.3129 1.1474z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
+ <path d="m1.378 13.229 1.3129-1.1474-0.18756-0.16391-1.3129 1.1474z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_collapse_button_23px.svg b/dlls/light.msstyles/blue_listview_collapse_button_23px.svg
index 0f6105f8d94..34f819093aa 100644
--- a/dlls/light.msstyles/blue_listview_collapse_button_23px.svg
+++ b/dlls/light.msstyles/blue_listview_collapse_button_23px.svg
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:23-32" width="23" height="69" version="1.1" viewBox="0 0 6.0854 18.256" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <path d="m4.7625 3.7581-1.7068-1.3769-0.24381 0.1967 1.7068 1.3769z" stroke-width=".99996"/>
  <path d="m1.5667 3.9687 1.7068-1.3769-0.24383-0.1967-1.7068 1.3769z" stroke-width=".99996"/>
  <circle cx="3.0427" cy="9.1281" r="2.9104" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
  <path d="m4.7625 9.8435-1.7068-1.3769-0.24381 0.1967 1.7068 1.3769z" fill="#3096fa" stroke-width=".99996"/>
  <path d="m1.5667 10.054 1.7068-1.3769-0.24383-0.1967-1.7068 1.3769z" fill="#3096fa" stroke-width=".99996"/>
- <circle cx="3.0427" cy="15.214" r="2.9104" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <path d="m4.7625 15.929-1.7068-1.3769-0.24381 0.1967 1.7068 1.3769z" fill="#2979ff" stroke-width=".99996"/>
- <path d="m1.5667 16.14 1.7068-1.3769-0.24383-0.1967-1.7068 1.3769z" fill="#2979ff" stroke-width=".99996"/>
+ <circle cx="3.0427" cy="15.214" r="2.9104" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m4.7625 15.929-1.7068-1.3769-0.24381 0.1967 1.7068 1.3769z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
+ <path d="m1.5667 16.14 1.7068-1.3769-0.24383-0.1967-1.7068 1.3769z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_collapse_button_30px.svg b/dlls/light.msstyles/blue_listview_collapse_button_30px.svg
index 249ab6cc630..9213983632f 100644
--- a/dlls/light.msstyles/blue_listview_collapse_button_30px.svg
+++ b/dlls/light.msstyles/blue_listview_collapse_button_30px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:30-32" width="30" height="90" version="1.1" viewBox="0 0 7.9376 23.812" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <circle cx="3.9688" cy="11.906" r="3.8365" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
  <g transform="matrix(1.6 0 0 -1.6 -.052922 8.4133)" stroke-width=".33073">
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
@@ -9,8 +12,8 @@
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
- <circle cx="3.9688" cy="19.844" r="3.8365" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <g transform="matrix(1.6 0 0 -1.6 .11732 24.288)" fill="#2979ff" stroke-width=".33073">
+ <circle cx="3.9688" cy="19.844" r="3.8365" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <g transform="matrix(1.6 0 0 -1.6 .11732 24.288)" class="HighlightOutline" fill="currentColor" stroke-width=".33073">
   <path d="m3.7301 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.2718 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
diff --git a/dlls/light.msstyles/blue_listview_collapse_button_37px.svg b/dlls/light.msstyles/blue_listview_collapse_button_37px.svg
index 15f991f9628..30104b4c340 100644
--- a/dlls/light.msstyles/blue_listview_collapse_button_37px.svg
+++ b/dlls/light.msstyles/blue_listview_collapse_button_37px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:37-32" width="37" height="111" version="1.1" viewBox="0 0 9.7897 29.368" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <ellipse cx="4.8946" cy="14.684" rx="4.7623" ry="4.7623" fill="#fff" stroke="#3096fa" stroke-width=".26459"/>
  <g stroke-width=".99993">
   <path d="m7.5403 15.524-2.6258-2.2947-0.37508 0.32782 2.6258 2.2947z" fill="#3096fa"/>
@@ -7,7 +10,7 @@
   <path d="m7.5404 5.7342-2.6258-2.2947-0.37508 0.32782 2.6258 2.2947z"/>
   <path d="m2.6241 6.0851 2.6258-2.2947-0.3751-0.32782-2.6258 2.2947z"/>
  </g>
- <ellipse cx="4.8946" cy="24.474" rx="4.7623" ry="4.7623" fill="#fff" stroke="#2979ff" stroke-width=".26459"/>
- <path d="m7.5403 25.314-2.6258-2.2947-0.37508 0.32782 2.6258 2.2947z" fill="#2979ff" stroke-width=".99993"/>
- <path d="m2.624 25.665 2.6258-2.2947-0.3751-0.32782-2.6258 2.2947z" fill="#2979ff" stroke-width=".99993"/>
+ <ellipse cx="4.8946" cy="24.474" rx="4.7623" ry="4.7623" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26459"/>
+ <path d="m7.5403 25.314-2.6258-2.2947-0.37508 0.32782 2.6258 2.2947z" class="HighlightOutline" fill="currentColor" stroke-width=".99993"/>
+ <path d="m2.624 25.665 2.6258-2.2947-0.3751-0.32782-2.6258 2.2947z" class="HighlightOutline" fill="currentColor" stroke-width=".99993"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_collapse_button_45px.svg b/dlls/light.msstyles/blue_listview_collapse_button_45px.svg
index 38a6f92ef6a..320c9d7b745 100644
--- a/dlls/light.msstyles/blue_listview_collapse_button_45px.svg
+++ b/dlls/light.msstyles/blue_listview_collapse_button_45px.svg
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:45-32" width="45" height="135" version="1.1" viewBox="0 0 11.906 35.718" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <path d="m9.2605 7.2167-3.2824-2.9835-0.46889 0.42622 3.2824 2.9835z" stroke-width=".99992"/>
  <path d="m3.1148 7.6728 3.2824-2.9835-0.46891-0.42622-3.2824 2.9835z" stroke-width=".99992"/>
  <ellipse cx="5.9532" cy="17.859" rx="5.8209" ry="5.8209" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
  <path d="m9.2605 19.123-3.2824-2.9834-0.46889 0.42622 3.2824 2.9834z" fill="#3096fa" stroke-width=".99992"/>
  <path d="m3.1148 19.579 3.2824-2.9835-0.46891-0.42622-3.2824 2.9834z" fill="#3096fa" stroke-width=".99992"/>
- <ellipse cx="5.9532" cy="29.766" rx="5.8209" ry="5.8209" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <path d="m9.2605 31.029-3.2824-2.9834-0.46889 0.42622 3.2824 2.9834z" fill="#2979ff" stroke-width=".99992"/>
- <path d="m3.1148 31.485 3.2824-2.9835-0.46891-0.42622-3.2824 2.9834z" fill="#2979ff" stroke-width=".99992"/>
+ <ellipse cx="5.9532" cy="29.766" rx="5.8209" ry="5.8209" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m9.2605 31.029-3.2824-2.9834-0.46889 0.42622 3.2824 2.9834z" class="HighlightOutline" fill="currentColor" stroke-width=".99992"/>
+ <path d="m3.1148 31.485 3.2824-2.9835-0.46891-0.42622-3.2824 2.9834z" class="HighlightOutline" fill="currentColor" stroke-width=".99992"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_collapse_button_60px.svg b/dlls/light.msstyles/blue_listview_collapse_button_60px.svg
index f17efd022ac..1e080887895 100644
--- a/dlls/light.msstyles/blue_listview_collapse_button_60px.svg
+++ b/dlls/light.msstyles/blue_listview_collapse_button_60px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:60-32" width="60" height="180" version="1.1" viewBox="0 0 15.875 47.624" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <circle cx="7.9376" cy="23.812" r="7.8053" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
  <g transform="matrix(3.2 0 0 -3.2001 -.10584 16.827)" stroke-width=".16536">
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
@@ -9,8 +12,8 @@
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
- <circle cx="7.9376" cy="39.687" r="7.8053" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <g transform="matrix(3.2 0 0 -3.2001 .23464 48.578)" fill="#2979ff" stroke-width=".16536">
+ <circle cx="7.9376" cy="39.687" r="7.8053" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <g transform="matrix(3.2 0 0 -3.2001 .23464 48.578)" class="HighlightOutline" fill="currentColor" stroke-width=".16536">
   <path d="m3.7301 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.2718 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
diff --git a/dlls/light.msstyles/blue_listview_expand_button_15px.svg b/dlls/light.msstyles/blue_listview_expand_button_15px.svg
index 59bba602335..e61ed7a28cc 100644
--- a/dlls/light.msstyles/blue_listview_expand_button_15px.svg
+++ b/dlls/light.msstyles/blue_listview_expand_button_15px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:15-32" width="15" height="45" version="1.1" viewBox="0 0 3.9688 11.906" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <circle cx="1.9844" cy="5.9532" r="1.8521" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
  <g transform="matrix(.8 0 0 .80002 -.026461 -.10588)" stroke-width=".66146">
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
@@ -9,8 +12,8 @@
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
- <ellipse cx="1.9844" cy="9.922" rx="1.8521" ry="1.8521" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <g transform="matrix(.8 0 0 .80002 .058659 7.8317)" fill="#2979ff" stroke-width=".66146">
+ <ellipse cx="1.9844" cy="9.922" rx="1.8521" ry="1.8521" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <g transform="matrix(.8 0 0 .80002 .058659 7.8317)" class="HighlightOutline" fill="currentColor" stroke-width=".66146">
   <path d="m3.7301 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.2718 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
diff --git a/dlls/light.msstyles/blue_listview_expand_button_19px.svg b/dlls/light.msstyles/blue_listview_expand_button_19px.svg
index 13ed39766f4..b00bca1053c 100644
--- a/dlls/light.msstyles/blue_listview_expand_button_19px.svg
+++ b/dlls/light.msstyles/blue_listview_expand_button_19px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:19-32" width="19" height="57" version="1.1" viewBox="0 0 5.0271 15.081" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <ellipse cx="2.5136" cy="7.5407" rx="2.3813" ry="2.3813" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
  <g stroke-width=".99996">
   <path d="m3.8367 7.0548-1.3131 1.1474-0.18757-0.16391 1.3131-1.1474z" fill="#3096fa"/>
@@ -7,7 +10,7 @@
   <path d="m3.8368 2.0274-1.3131 1.1474-0.18757-0.16391 1.3131-1.1474z"/>
   <path d="m1.3782 1.8519 1.3131 1.1474-0.18758 0.16391-1.3131-1.1474z"/>
  </g>
- <ellipse cx="2.5133" cy="12.568" rx="2.381" ry="2.3813" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <path d="m3.8363 12.082-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z" fill="#2979ff" stroke-width=".99996"/>
- <path d="m1.378 11.906 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z" fill="#2979ff" stroke-width=".99996"/>
+ <ellipse cx="2.5133" cy="12.568" rx="2.381" ry="2.3813" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m3.8363 12.082-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
+ <path d="m1.378 11.906 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_expand_button_23px.svg b/dlls/light.msstyles/blue_listview_expand_button_23px.svg
index 7cdf9db5313..c45d3eda474 100644
--- a/dlls/light.msstyles/blue_listview_expand_button_23px.svg
+++ b/dlls/light.msstyles/blue_listview_expand_button_23px.svg
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:23-32" width="23" height="69" version="1.1" viewBox="0 0 6.0854 18.256" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <path d="m4.7625 2.5918-1.7068 1.3769-0.24381-0.1967 1.7068-1.3769z" stroke-width=".99996"/>
  <path d="m1.5667 2.3812 1.7068 1.3769-0.24383 0.1967-1.7068-1.3769z" stroke-width=".99996"/>
  <circle cx="3.0427" cy="9.1281" r="2.9104" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
  <path d="m4.7625 8.6772-1.7068 1.3769-0.24381-0.1967 1.7068-1.3769z" fill="#3096fa" stroke-width=".99996"/>
  <path d="m1.5667 8.4666 1.7068 1.3769-0.24383 0.1967-1.7068-1.3769z" fill="#3096fa" stroke-width=".99996"/>
- <circle cx="3.0427" cy="15.214" r="2.9104" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <path d="m4.7625 14.763-1.7068 1.3769-0.24381-0.1967 1.7068-1.3769z" fill="#2979ff" stroke-width=".99996"/>
- <path d="m1.5667 14.552 1.7068 1.3769-0.24383 0.1967-1.7068-1.3769z" fill="#2979ff" stroke-width=".99996"/>
+ <circle cx="3.0427" cy="15.214" r="2.9104" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m4.7625 14.763-1.7068 1.3769-0.24381-0.1967 1.7068-1.3769z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
+ <path d="m1.5667 14.552 1.7068 1.3769-0.24383 0.1967-1.7068-1.3769z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_expand_button_30px.svg b/dlls/light.msstyles/blue_listview_expand_button_30px.svg
index 3d8785f4df8..3d731bbc241 100644
--- a/dlls/light.msstyles/blue_listview_expand_button_30px.svg
+++ b/dlls/light.msstyles/blue_listview_expand_button_30px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:30-32" width="30" height="90" version="1.1" viewBox="0 0 7.9376 23.812" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <circle cx="3.9688" cy="11.906" r="3.8365" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
  <g transform="matrix(1.6 0 0 1.6 -.052922 -.47675)" stroke-width=".33073">
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
@@ -9,8 +12,8 @@
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
- <circle cx="3.9688" cy="19.844" r="3.8365" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <g transform="matrix(1.6 0 0 1.6 .11732 15.398)" fill="#2979ff" stroke-width=".33073">
+ <circle cx="3.9688" cy="19.844" r="3.8365" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <g transform="matrix(1.6 0 0 1.6 .11732 15.398)" class="HighlightOutline" fill="currentColor" stroke-width=".33073">
   <path d="m3.7301 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.2718 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
diff --git a/dlls/light.msstyles/blue_listview_expand_button_37px.svg b/dlls/light.msstyles/blue_listview_expand_button_37px.svg
index 8f9e3c20dc7..79c3dd07809 100644
--- a/dlls/light.msstyles/blue_listview_expand_button_37px.svg
+++ b/dlls/light.msstyles/blue_listview_expand_button_37px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:37-32" width="37" height="111" version="1.1" viewBox="0 0 9.7897 29.368" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <ellipse cx="4.8946" cy="14.684" rx="4.7623" ry="4.7623" fill="#fff" stroke="#3096fa" stroke-width=".26459"/>
  <g stroke-width=".99993">
   <path d="m7.5403 13.58-2.6258 2.2947-0.37508-0.32782 2.6258-2.2947z" fill="#3096fa"/>
@@ -7,7 +10,7 @@
   <path d="m7.5404 3.7904-2.6258 2.2947-0.37508-0.32782 2.6258-2.2947z"/>
   <path d="m2.6241 3.4395 2.6258 2.2947-0.3751 0.32782-2.6258-2.2947z"/>
  </g>
- <ellipse cx="4.8946" cy="24.474" rx="4.7623" ry="4.7623" fill="#fff" stroke="#2979ff" stroke-width=".26459"/>
- <path d="m7.5403 23.37-2.6258 2.2947-0.37508-0.32782 2.6258-2.2947z" fill="#2979ff" stroke-width=".99993"/>
- <path d="m2.624 23.019 2.6258 2.2947-0.3751 0.32782-2.6258-2.2947z" fill="#2979ff" stroke-width=".99993"/>
+ <ellipse cx="4.8946" cy="24.474" rx="4.7623" ry="4.7623" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26459"/>
+ <path d="m7.5403 23.37-2.6258 2.2947-0.37508-0.32782 2.6258-2.2947z" class="HighlightOutline" fill="currentColor" stroke-width=".99993"/>
+ <path d="m2.624 23.019 2.6258 2.2947-0.3751 0.32782-2.6258-2.2947z" class="HighlightOutline" fill="currentColor" stroke-width=".99993"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_expand_button_45px.svg b/dlls/light.msstyles/blue_listview_expand_button_45px.svg
index 0bb0f65791f..92cd5768c37 100644
--- a/dlls/light.msstyles/blue_listview_expand_button_45px.svg
+++ b/dlls/light.msstyles/blue_listview_expand_button_45px.svg
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:45-32" width="45" height="135" version="1.1" viewBox="0 0 11.906 35.718" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <path d="m9.2605 4.6893-3.2824 2.9835-0.46889-0.42622 3.2824-2.9835z" stroke-width=".99992"/>
  <path d="m3.1148 4.2332 3.2824 2.9835-0.46891 0.42622-3.2824-2.9835z" stroke-width=".99992"/>
  <ellipse cx="5.9532" cy="17.859" rx="5.8209" ry="5.8209" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
  <path d="m9.2605 16.596-3.2824 2.9834-0.46889-0.42622 3.2824-2.9834z" fill="#3096fa" stroke-width=".99992"/>
  <path d="m3.1148 16.14 3.2824 2.9835-0.46891 0.42622-3.2824-2.9834z" fill="#3096fa" stroke-width=".99992"/>
- <ellipse cx="5.9532" cy="29.766" rx="5.8209" ry="5.8209" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <path d="m9.2605 28.502-3.2824 2.9834-0.46889-0.42622 3.2824-2.9834z" fill="#2979ff" stroke-width=".99992"/>
- <path d="m3.1148 28.046 3.2824 2.9835-0.46891 0.42622-3.2824-2.9834z" fill="#2979ff" stroke-width=".99992"/>
+ <ellipse cx="5.9532" cy="29.766" rx="5.8209" ry="5.8209" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m9.2605 28.502-3.2824 2.9834-0.46889-0.42622 3.2824-2.9834z" class="HighlightOutline" fill="currentColor" stroke-width=".99992"/>
+ <path d="m3.1148 28.046 3.2824 2.9835-0.46891 0.42622-3.2824-2.9834z" class="HighlightOutline" fill="currentColor" stroke-width=".99992"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_expand_button_60px.svg b/dlls/light.msstyles/blue_listview_expand_button_60px.svg
index 14ddc0f30a6..6564b2f877c 100644
--- a/dlls/light.msstyles/blue_listview_expand_button_60px.svg
+++ b/dlls/light.msstyles/blue_listview_expand_button_60px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:60-32" width="60" height="180" version="1.1" viewBox="0 0 15.875 47.624" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <circle cx="7.9376" cy="23.812" r="7.8053" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
  <g transform="matrix(3.2 0 0 3.2001 -.10584 -.9535)" stroke-width=".16536">
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
@@ -9,8 +12,8 @@
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
- <circle cx="7.9376" cy="39.687" r="7.8053" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <g transform="matrix(3.2 0 0 3.2001 .23464 30.797)" fill="#2979ff" stroke-width=".16536">
+ <circle cx="7.9376" cy="39.687" r="7.8053" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <g transform="matrix(3.2 0 0 3.2001 .23464 30.797)" class="HighlightOutline" fill="currentColor" stroke-width=".16536">
   <path d="m3.7301 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.2718 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
diff --git a/dlls/light.msstyles/blue_menu_bar_item.svg b/dlls/light.msstyles/blue_menu_bar_item.svg
index c6cad61152f..de69b454b41 100644
--- a/dlls/light.msstyles/blue_menu_bar_item.svg
+++ b/dlls/light.msstyles/blue_menu_bar_item.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:9-32" width="9" height="54" version="1.1" viewBox="0 0 2.3812 14.288" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -10,6 +13,6 @@
  </metadata>
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="none" stroke-width=".26458">
   <rect x=".13228" y="2.5136" width="2.1167" height="2.1167" stroke="#3096fa"/>
-  <rect x=".13228" y="4.8949" width="2.1167" height="2.1167" stroke="#2979ff"/>
+  <rect x=".13228" y="4.8949" width="2.1167" height="2.1167" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_navigation_back_button_120px.svg b/dlls/light.msstyles/blue_navigation_back_button_120px.svg
index debf903ee5b..32135998ba6 100644
--- a/dlls/light.msstyles/blue_navigation_back_button_120px.svg
+++ b/dlls/light.msstyles/blue_navigation_back_button_120px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:120-32" width="120" height="480" version="1.1" viewBox="0 0 31.749 127" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <path d="m14.049 10.848 0.85803 1.0126-2.7871 3.2963h9.8401v1.4364h-9.8401l2.7933 3.2963-0.86413 1.0126-4.2598-5.0269z" fill="#aeaeae" stroke-width=".26458"/>
  <g transform="matrix(1.4839 0 0 1 -2.9586 0)" stroke-width=".17831">
   <path d="m11.462 42.598 0.57824 1.0126-1.8783 3.2963h6.6314v1.4364h-6.6314l1.8824 3.2963-0.58235 1.0126-2.8708-5.0269z" fill="#3096fa"/>
-  <path d="m11.462 74.348 0.57824 1.0126-1.8783 3.2963h6.6314v1.4364h-6.6314l1.8824 3.2963-0.58235 1.0126-2.8708-5.0269z" fill="#2979ff"/>
+  <path d="m11.462 74.348 0.57824 1.0126-1.8783 3.2963h6.6314v1.4364h-6.6314l1.8824 3.2963-0.58235 1.0126-2.8708-5.0269z" class="HighlightOutline" fill="currentColor"/>
   <path d="m11.462 106.1 0.57824 1.0126-1.8783 3.2963h6.6314v1.4364h-6.6314l1.8824 3.2963-0.58235 1.0126-2.8708-5.0269z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_navigation_back_button_30px.svg b/dlls/light.msstyles/blue_navigation_back_button_30px.svg
index 6037b24ec0b..47f47185ddd 100644
--- a/dlls/light.msstyles/blue_navigation_back_button_30px.svg
+++ b/dlls/light.msstyles/blue_navigation_back_button_30px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:30-32" width="30" height="120" version="1.1" viewBox="0 0 7.9375 31.75" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <g stroke-width=".26458">
   <path d="m3.3206 2.3812 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" fill="#aeaeae"/>
   <path d="m3.3206 10.319 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" fill="#3096fa"/>
-  <path d="m3.3206 18.256 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" fill="#2979ff"/>
+  <path d="m3.3206 18.256 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" class="HighlightOutline" fill="currentColor"/>
   <path d="m3.3206 26.194 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_navigation_back_button_38px.svg b/dlls/light.msstyles/blue_navigation_back_button_38px.svg
index 31f819c327d..0e742a6730a 100644
--- a/dlls/light.msstyles/blue_navigation_back_button_38px.svg
+++ b/dlls/light.msstyles/blue_navigation_back_button_38px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:38-32" width="38" height="152" version="1.1" viewBox="0 0 10.054 40.217" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <g stroke-width=".26458">
   <path d="m4.1276 3.4396 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" fill="#aeaeae"/>
   <path d="m4.1276 13.494 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" fill="#3096fa"/>
-  <path d="m4.1276 23.548 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" fill="#2979ff"/>
+  <path d="m4.1276 23.548 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.1276 33.602 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_navigation_back_button_45px.svg b/dlls/light.msstyles/blue_navigation_back_button_45px.svg
index e4d2c6af0c9..2fde237bcbb 100644
--- a/dlls/light.msstyles/blue_navigation_back_button_45px.svg
+++ b/dlls/light.msstyles/blue_navigation_back_button_45px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:45-32" width="45" height="180" version="1.1" viewBox="0 0 11.906 47.625" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <g stroke-width=".26458">
   <path d="m5.0271 3.7042 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" fill="#aeaeae"/>
   <path d="m5.0271 15.611 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" fill="#3096fa"/>
-  <path d="m5.0271 27.517 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" fill="#2979ff"/>
+  <path d="m5.0271 27.517 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" class="HighlightOutline" fill="currentColor"/>
   <path d="m5.0271 39.423 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_navigation_back_button_60px.svg b/dlls/light.msstyles/blue_navigation_back_button_60px.svg
index a3f181a263a..05f33a1f276 100644
--- a/dlls/light.msstyles/blue_navigation_back_button_60px.svg
+++ b/dlls/light.msstyles/blue_navigation_back_button_60px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:60-32" width="60" height="240" version="1.1" viewBox="0 0 15.875 63.5" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <g stroke-width=".26458">
   <path d="m7.1569 5.2917 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" fill="#aeaeae"/>
   <path d="m7.1569 21.167 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" fill="#3096fa"/>
-  <path d="m7.1569 37.042 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" fill="#2979ff"/>
+  <path d="m7.1569 37.042 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" class="HighlightOutline" fill="currentColor"/>
   <path d="m7.1569 52.917 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_navigation_back_button_74px.svg b/dlls/light.msstyles/blue_navigation_back_button_74px.svg
index 88aaa27977a..69b80499923 100644
--- a/dlls/light.msstyles/blue_navigation_back_button_74px.svg
+++ b/dlls/light.msstyles/blue_navigation_back_button_74px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:74-32" width="74" height="296" version="1.1" viewBox="0 0 19.579 78.317" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <path d="m8.6917 6.6146 0.57824 0.66619-1.8783 2.1686h6.6314v0.94496h-6.6314l1.8824 2.1686-0.58235 0.66619-2.8708-3.3072z" fill="#aeaeae" stroke-width=".26458"/>
  <g stroke-width=".26458">
   <path d="m8.6917 25.929 0.57824 0.66619-1.8783 2.1686h6.6314v0.94496h-6.6314l1.8824 2.1686-0.58235 0.66619-2.8708-3.3072z" fill="#3096fa"/>
-  <path d="m8.6917 45.508 0.57824 0.66619-1.8783 2.1686h6.6314v0.94496h-6.6314l1.8824 2.1686-0.58235 0.66619-2.8708-3.3072z" fill="#2979ff"/>
+  <path d="m8.6917 45.508 0.57824 0.66619-1.8783 2.1686h6.6314v0.94496h-6.6314l1.8824 2.1686-0.58235 0.66619-2.8708-3.3072z" class="HighlightOutline" fill="currentColor"/>
   <path d="m8.6917 65.088 0.57824 0.66619-1.8783 2.1686h6.6314v0.94496h-6.6314l1.8824 2.1686-0.58235 0.66619-2.8708-3.3072z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_navigation_back_button_90px.svg b/dlls/light.msstyles/blue_navigation_back_button_90px.svg
index 2c19b601e44..0b1f19bccb0 100644
--- a/dlls/light.msstyles/blue_navigation_back_button_90px.svg
+++ b/dlls/light.msstyles/blue_navigation_back_button_90px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:90-32" width="90" height="360" version="1.1" viewBox="0 0 23.812 95.25" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <path d="m10.226 7.4084 0.72746 0.90603-2.363 2.9493h8.3427v1.2852h-8.3427l2.3682 2.9493-0.73263 0.90603-3.6116-4.4978z" fill="#aeaeae" stroke-width=".26458"/>
  <g transform="matrix(1.2581 0 0 1 -1.5021 0)" stroke-width=".21031">
   <path d="m9.3225 31.221 0.57824 0.90603-1.8783 2.9493h6.6314v1.2852h-6.6314l1.8824 2.9493-0.58235 0.90603-2.8708-4.4978z" fill="#3096fa"/>
-  <path d="m9.3225 55.034 0.57824 0.90603-1.8783 2.9493h6.6314v1.2852h-6.6314l1.8824 2.9493-0.58235 0.90603-2.8708-4.4978z" fill="#2979ff"/>
+  <path d="m9.3225 55.034 0.57824 0.90603-1.8783 2.9493h6.6314v1.2852h-6.6314l1.8824 2.9493-0.58235 0.90603-2.8708-4.4978z" class="HighlightOutline" fill="currentColor"/>
   <path d="m9.3225 78.846 0.57824 0.90603-1.8783 2.9493h6.6314v1.2852h-6.6314l1.8824 2.9493-0.58235 0.90603-2.8708-4.4978z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_navigation_forward_button_120px.svg b/dlls/light.msstyles/blue_navigation_forward_button_120px.svg
index 3340df32ace..94299277aa5 100644
--- a/dlls/light.msstyles/blue_navigation_forward_button_120px.svg
+++ b/dlls/light.msstyles/blue_navigation_forward_button_120px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:120-32" width="120" height="480" version="1.1" viewBox="0 0 31.749 127" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <path d="m17.701 10.848-0.85803 1.0126 2.7871 3.2963h-9.8401v1.4364h9.8401l-2.7933 3.2963 0.86413 1.0126 4.2598-5.0269z" fill="#aeaeae" stroke-width=".26458"/>
  <g transform="matrix(-1.4839 0 0 1 34.709 0)" stroke-width=".17831">
   <path d="m11.462 42.598 0.57824 1.0126-1.8783 3.2963h6.6314v1.4364h-6.6314l1.8824 3.2963-0.58235 1.0126-2.8708-5.0269z" fill="#3096fa"/>
-  <path d="m11.462 74.348 0.57824 1.0126-1.8783 3.2963h6.6314v1.4364h-6.6314l1.8824 3.2963-0.58235 1.0126-2.8708-5.0269z" fill="#2979ff"/>
+  <path d="m11.462 74.348 0.57824 1.0126-1.8783 3.2963h6.6314v1.4364h-6.6314l1.8824 3.2963-0.58235 1.0126-2.8708-5.0269z" class="HighlightOutline" fill="currentColor"/>
   <path d="m11.462 106.1 0.57824 1.0126-1.8783 3.2963h6.6314v1.4364h-6.6314l1.8824 3.2963-0.58235 1.0126-2.8708-5.0269z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_navigation_forward_button_30px.svg b/dlls/light.msstyles/blue_navigation_forward_button_30px.svg
index 81d01bac2c8..31f71e68ea5 100644
--- a/dlls/light.msstyles/blue_navigation_forward_button_30px.svg
+++ b/dlls/light.msstyles/blue_navigation_forward_button_30px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:30-32" width="30" height="120" version="1.1" viewBox="0 0 7.9375 31.75" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <g transform="matrix(-1,0,0,1,7.673,0)" stroke-width=".26458">
   <path d="m3.3206 2.3812 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" fill="#aeaeae"/>
   <path d="m3.3206 10.319 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" fill="#3096fa"/>
-  <path d="m3.3206 18.256 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" fill="#2979ff"/>
+  <path d="m3.3206 18.256 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" class="HighlightOutline" fill="currentColor"/>
   <path d="m3.3206 26.194 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_navigation_forward_button_38px.svg b/dlls/light.msstyles/blue_navigation_forward_button_38px.svg
index 280ad5563a4..774ed38e0c5 100644
--- a/dlls/light.msstyles/blue_navigation_forward_button_38px.svg
+++ b/dlls/light.msstyles/blue_navigation_forward_button_38px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:38-32" width="38" height="152" version="1.1" viewBox="0 0 10.054 40.217" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <g transform="matrix(-1 0 0 1 9.5251 0)" stroke-width=".26458">
   <path d="m4.1276 3.4396 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" fill="#aeaeae"/>
   <path d="m4.1276 13.494 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" fill="#3096fa"/>
-  <path d="m4.1276 23.548 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" fill="#2979ff"/>
+  <path d="m4.1276 23.548 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.1276 33.602 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_navigation_forward_button_45px.svg b/dlls/light.msstyles/blue_navigation_forward_button_45px.svg
index 09a19914072..4a25e841223 100644
--- a/dlls/light.msstyles/blue_navigation_forward_button_45px.svg
+++ b/dlls/light.msstyles/blue_navigation_forward_button_45px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:45-32" width="45" height="180" version="1.1" viewBox="0 0 11.906 47.625" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <g transform="matrix(-1 0 0 1 11.642 0)" stroke-width=".26458">
   <path d="m5.0271 3.7042 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" fill="#aeaeae"/>
   <path d="m5.0271 15.611 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" fill="#3096fa"/>
-  <path d="m5.0271 27.517 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" fill="#2979ff"/>
+  <path d="m5.0271 27.517 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" class="HighlightOutline" fill="currentColor"/>
   <path d="m5.0271 39.423 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_navigation_forward_button_60px.svg b/dlls/light.msstyles/blue_navigation_forward_button_60px.svg
index eb4f7bf77d5..e1711a3d38b 100644
--- a/dlls/light.msstyles/blue_navigation_forward_button_60px.svg
+++ b/dlls/light.msstyles/blue_navigation_forward_button_60px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:60-32" width="60" height="240" version="1.1" viewBox="0 0 15.875 63.5" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <g transform="matrix(-1 0 0 1 16.139 0)" stroke-width=".26458">
   <path d="m7.1569 5.2917 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" fill="#aeaeae"/>
   <path d="m7.1569 21.167 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" fill="#3096fa"/>
-  <path d="m7.1569 37.042 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" fill="#2979ff"/>
+  <path d="m7.1569 37.042 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" class="HighlightOutline" fill="currentColor"/>
   <path d="m7.1569 52.917 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_navigation_forward_button_74px.svg b/dlls/light.msstyles/blue_navigation_forward_button_74px.svg
index f235180d131..8d90c583bf1 100644
--- a/dlls/light.msstyles/blue_navigation_forward_button_74px.svg
+++ b/dlls/light.msstyles/blue_navigation_forward_button_74px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:74-32" width="74" height="296" version="1.1" viewBox="0 0 19.579 78.317" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <path d="m11.152 6.6146-0.57824 0.66619 1.8783 2.1686h-6.6314v0.94496h6.6314l-1.8824 2.1686 0.58235 0.66619 2.8708-3.3072z" fill="#aeaeae" stroke-width=".26458"/>
  <g transform="matrix(-1 0 0 1 19.844 0)" stroke-width=".26458">
   <path d="m8.6917 25.929 0.57824 0.66619-1.8783 2.1686h6.6314v0.94496h-6.6314l1.8824 2.1686-0.58235 0.66619-2.8708-3.3072z" fill="#3096fa"/>
-  <path d="m8.6917 45.508 0.57824 0.66619-1.8783 2.1686h6.6314v0.94496h-6.6314l1.8824 2.1686-0.58235 0.66619-2.8708-3.3072z" fill="#2979ff"/>
+  <path d="m8.6917 45.508 0.57824 0.66619-1.8783 2.1686h6.6314v0.94496h-6.6314l1.8824 2.1686-0.58235 0.66619-2.8708-3.3072z" class="HighlightOutline" fill="currentColor"/>
   <path d="m8.6917 65.088 0.57824 0.66619-1.8783 2.1686h6.6314v0.94496h-6.6314l1.8824 2.1686-0.58235 0.66619-2.8708-3.3072z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_navigation_forward_button_90px.svg b/dlls/light.msstyles/blue_navigation_forward_button_90px.svg
index 3f5994e8b7f..0ee8b1c73b4 100644
--- a/dlls/light.msstyles/blue_navigation_forward_button_90px.svg
+++ b/dlls/light.msstyles/blue_navigation_forward_button_90px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:90-32" width="90" height="360" version="1.1" viewBox="0 0 23.812 95.25" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <path d="m13.322 7.4084-0.72746 0.90603 2.363 2.9493h-8.3427v1.2852h8.3427l-2.3682 2.9493 0.73263 0.90603 3.6116-4.4978z" fill="#aeaeae" stroke-width=".26458"/>
  <g transform="matrix(-1.2581 0 0 1 25.05 0)" stroke-width=".21031">
   <path d="m9.3225 31.221 0.57824 0.90603-1.8783 2.9493h6.6314v1.2852h-6.6314l1.8824 2.9493-0.58235 0.90603-2.8708-4.4978z" fill="#3096fa"/>
-  <path d="m9.3225 55.034 0.57824 0.90603-1.8783 2.9493h6.6314v1.2852h-6.6314l1.8824 2.9493-0.58235 0.90603-2.8708-4.4978z" fill="#2979ff"/>
+  <path d="m9.3225 55.034 0.57824 0.90603-1.8783 2.9493h6.6314v1.2852h-6.6314l1.8824 2.9493-0.58235 0.90603-2.8708-4.4978z" class="HighlightOutline" fill="currentColor"/>
   <path d="m9.3225 78.846 0.57824 0.90603-1.8783 2.9493h6.6314v1.2852h-6.6314l1.8824 2.9493-0.58235 0.90603-2.8708-4.4978z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_navigation_menu_button_13px.svg b/dlls/light.msstyles/blue_navigation_menu_button_13px.svg
index a7e8585715e..a016426281f 100644
--- a/dlls/light.msstyles/blue_navigation_menu_button_13px.svg
+++ b/dlls/light.msstyles/blue_navigation_menu_button_13px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:13-32" width="13" height="108" version="1.1" viewBox="0 0 3.4396 28.575" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -15,8 +18,8 @@
    <g stroke-width=".23122">
     <path d="m-7.3868 19.44-0.91792 0.91767-0.13113-0.1311 0.91792-0.91767z" fill="#3096fa"/>
     <path d="m-9.1055 19.299 0.91792 0.91767-0.13113 0.1311-0.91792-0.91767z" fill="#3096fa"/>
-    <path d="m-7.3868 26.583-0.91792 0.91854-0.13113-0.13122 0.91792-0.91854z" fill="#2979ff"/>
-    <path d="m-9.1055 26.443 0.91792 0.91854-0.13113 0.13122-0.91792-0.91854z" fill="#2979ff"/>
+    <path d="m-7.3868 26.583-0.91792 0.91854-0.13113-0.13122 0.91792-0.91854z" class="HighlightOutline" fill="currentColor"/>
+    <path d="m-9.1055 26.443 0.91792 0.91854-0.13113 0.13122-0.91792-0.91854z" class="HighlightOutline" fill="currentColor"/>
    </g>
    <path d="m-7.3868 33.727-0.91792 0.91854-0.13113-0.13122 0.91792-0.91854z" fill="#aeaeae"/>
    <path d="m-9.1055 33.587 0.91792 0.91854-0.13113 0.13122-0.91792-0.91854z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_navigation_menu_button_17px.svg b/dlls/light.msstyles/blue_navigation_menu_button_17px.svg
index d25bf3bbf7e..5be256a6fdb 100644
--- a/dlls/light.msstyles/blue_navigation_menu_button_17px.svg
+++ b/dlls/light.msstyles/blue_navigation_menu_button_17px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:17-32" width="17" height="136" version="1.1" viewBox="0 0 4.4979 35.983" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -14,8 +17,8 @@
   <g transform="matrix(1.1443,0,0,1,10.306,-10.039)" stroke-width=".18501">
    <path d="m-7.202 22.121-0.91792 1.1467-0.13113-0.16382 0.91792-1.1467z" fill="#3096fa"/>
    <path d="m-8.9207 21.945 0.91792 1.1467-0.13113 0.16382-0.91792-1.1467z" fill="#3096fa"/>
-   <path d="m-7.202 31.116-0.91792 1.148-0.13113-0.16399 0.91792-1.148z" fill="#2979ff"/>
-   <path d="m-8.9207 30.941 0.91792 1.148-0.13113 0.16399-0.91792-1.148z" fill="#2979ff"/>
+   <path d="m-7.202 31.116-0.91792 1.148-0.13113-0.16399 0.91792-1.148z" class="HighlightOutline" fill="currentColor"/>
+   <path d="m-8.9207 30.941 0.91792 1.148-0.13113 0.16399-0.91792-1.148z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-7.202 40.112-0.91792 1.148-0.13113-0.16399 0.91792-1.148z" fill="#aeaeae"/>
    <path d="m-8.9207 39.937 0.91792 1.148-0.13113 0.16399-0.91792-1.148z" fill="#aeaeae"/>
   </g>
diff --git a/dlls/light.msstyles/blue_navigation_menu_button_19px.svg b/dlls/light.msstyles/blue_navigation_menu_button_19px.svg
index 1a25163458c..664441762ab 100644
--- a/dlls/light.msstyles/blue_navigation_menu_button_19px.svg
+++ b/dlls/light.msstyles/blue_navigation_menu_button_19px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:19-32" width="19" height="160" version="1.1" viewBox="0 0 5.0271 42.333" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -14,8 +17,8 @@
   <g transform="matrix(1.1443,0,0,1,10.306,-10.039)" stroke-width=".15416">
    <path d="m-7.202 24.273-0.91792 1.3763-0.13113-0.19662 0.91792-1.3763z" fill="#3096fa"/>
    <path d="m-8.9207 24.062 0.91792 1.3763-0.13113 0.19662-0.91792-1.3763z" fill="#3096fa"/>
-   <path d="m-7.202 34.855-0.91792 1.3775-0.13113-0.19678 0.91792-1.3775z" fill="#2979ff"/>
-   <path d="m-8.9207 34.645 0.91792 1.3775-0.13113 0.19678-0.91792-1.3775z" fill="#2979ff"/>
+   <path d="m-7.202 34.855-0.91792 1.3775-0.13113-0.19678 0.91792-1.3775z" class="HighlightOutline" fill="currentColor"/>
+   <path d="m-8.9207 34.645 0.91792 1.3775-0.13113 0.19678-0.91792-1.3775z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-7.202 45.438-0.91792 1.3775-0.13113-0.19677 0.91792-1.3775z" fill="#aeaeae"/>
    <path d="m-8.9207 45.228 0.91792 1.3775-0.13113 0.19678-0.91792-1.3775z" fill="#aeaeae"/>
   </g>
diff --git a/dlls/light.msstyles/blue_navigation_menu_button_26px.svg b/dlls/light.msstyles/blue_navigation_menu_button_26px.svg
index 937cc1c25b0..fced0115c7d 100644
--- a/dlls/light.msstyles/blue_navigation_menu_button_26px.svg
+++ b/dlls/light.msstyles/blue_navigation_menu_button_26px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:26-32" width="26" height="216" version="1.1" viewBox="0 0 6.8792 57.15" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -14,8 +17,8 @@
   <g transform="matrix(1.1443,0,0,1,10.306,-10.039)" stroke-width=".11562">
    <path d="m-7.0286 29.635-0.91792 1.8353-0.13113-0.26219 0.91792-1.8353z" fill="#3096fa"/>
    <path d="m-8.7473 29.354 0.91792 1.8353-0.13113 0.26219-0.91792-1.8353z" fill="#3096fa"/>
-   <path d="m-7.0286 43.921-0.91792 1.8367-0.13113-0.26237 0.91792-1.8367z" fill="#2979ff"/>
-   <path d="m-8.7473 43.641 0.91792 1.8367-0.13113 0.26237-0.91792-1.8367z" fill="#2979ff"/>
+   <path d="m-7.0286 43.921-0.91792 1.8367-0.13113-0.26237 0.91792-1.8367z" class="HighlightOutline" fill="currentColor"/>
+   <path d="m-8.7473 43.641 0.91792 1.8367-0.13113 0.26237-0.91792-1.8367z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-7.0286 58.208-0.91792 1.8367-0.13113-0.26236 0.91792-1.8367z" fill="#aeaeae"/>
    <path d="m-8.7473 57.928 0.91792 1.8367-0.13113 0.26237-0.91792-1.8367z" fill="#aeaeae"/>
   </g>
diff --git a/dlls/light.msstyles/blue_navigation_menu_button_32px.svg b/dlls/light.msstyles/blue_navigation_menu_button_32px.svg
index d5e308c3d08..fc7ec589e78 100644
--- a/dlls/light.msstyles/blue_navigation_menu_button_32px.svg
+++ b/dlls/light.msstyles/blue_navigation_menu_button_32px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:32-32" width="32" height="268" version="1.1" viewBox="0 0 8.4667 70.908" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -14,8 +17,8 @@
   <g transform="matrix(1.1443,0,0,1,10.306,-10.039)" stroke-width=".092495">
    <path d="m-6.9361 34.732-0.91792 2.2945-0.13113-0.3278 0.91792-2.2945z" fill="#3096fa"/>
    <path d="m-8.6548 34.381 0.91792 2.2945-0.13113 0.3278-0.91792-2.2945z" fill="#3096fa"/>
-   <path d="m-6.9361 52.458-0.91792 2.2958-0.13113-0.32796 0.91792-2.2958z" fill="#2979ff"/>
-   <path d="m-8.6548 52.108 0.91792 2.2959-0.13113 0.32796-0.91792-2.2958z" fill="#2979ff"/>
+   <path d="m-6.9361 52.458-0.91792 2.2958-0.13113-0.32796 0.91792-2.2958z" class="HighlightOutline" fill="currentColor"/>
+   <path d="m-8.6548 52.108 0.91792 2.2959-0.13113 0.32796-0.91792-2.2958z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-6.9361 70.185-0.91792 2.2958-0.13113-0.32795 0.91792-2.2958z" fill="#aeaeae"/>
    <path d="m-8.6548 69.835 0.91792 2.2958-0.13113 0.32796-0.91792-2.2958z" fill="#aeaeae"/>
   </g>
diff --git a/dlls/light.msstyles/blue_navigation_menu_button_39px.svg b/dlls/light.msstyles/blue_navigation_menu_button_39px.svg
index 57416b1ec0c..2b6390c7d67 100644
--- a/dlls/light.msstyles/blue_navigation_menu_button_39px.svg
+++ b/dlls/light.msstyles/blue_navigation_menu_button_39px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:39-32" width="39" height="324" version="1.1" viewBox="0 0 10.319 85.725" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -14,8 +17,8 @@
   <g transform="matrix(1.1443,0,0,1,10.306,-10.039)" stroke-width=".077079">
    <path d="m-6.8205 40.094-0.91792 2.7538-0.13113-0.39341 0.91792-2.7538z" fill="#3096fa"/>
    <path d="m-8.5392 39.672 0.91792 2.7538-0.13113 0.39341-0.91792-2.7538z" fill="#3096fa"/>
-   <path d="m-6.8205 61.524-0.91792 2.755-0.13113-0.39356 0.91792-2.755z" fill="#2979ff"/>
-   <path d="m-8.5392 61.104 0.91792 2.7551-0.13113 0.39356-0.91792-2.755z" fill="#2979ff"/>
+   <path d="m-6.8205 61.524-0.91792 2.755-0.13113-0.39356 0.91792-2.755z" class="HighlightOutline" fill="currentColor"/>
+   <path d="m-8.5392 61.104 0.91792 2.7551-0.13113 0.39356-0.91792-2.755z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-6.8205 82.955-0.91792 2.755-0.13113-0.39355 0.91792-2.755z" fill="#aeaeae"/>
    <path d="m-8.5392 82.535 0.91792 2.755-0.13113 0.39356-0.91792-2.755z" fill="#aeaeae"/>
   </g>
diff --git a/dlls/light.msstyles/blue_navigation_menu_button_52px.svg b/dlls/light.msstyles/blue_navigation_menu_button_52px.svg
index 6862a4d89d7..680145812e5 100644
--- a/dlls/light.msstyles/blue_navigation_menu_button_52px.svg
+++ b/dlls/light.msstyles/blue_navigation_menu_button_52px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:52-32" width="52" height="432" version="1.1" viewBox="0 0 13.759 114.3" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -14,8 +17,8 @@
   <g transform="matrix(1.1443,0,0,1,10.306,-10.039)" stroke-width=".057808">
    <path d="m-6.676 50.289-0.91792 3.6709-0.13113-0.52443 0.91792-3.6709z" fill="#3096fa"/>
    <path d="m-8.3947 49.727 0.91792 3.6709-0.13113 0.52443-0.91792-3.6709z" fill="#3096fa"/>
-   <path d="m-6.676 78.862-0.91792 3.6734-0.13113-0.52476 0.91792-3.6734z" fill="#2979ff"/>
-   <path d="m-8.3947 78.302 0.91792 3.6736-0.13113 0.52476-0.91792-3.6734z" fill="#2979ff"/>
+   <path d="m-6.676 78.862-0.91792 3.6734-0.13113-0.52476 0.91792-3.6734z" class="HighlightOutline" fill="currentColor"/>
+   <path d="m-8.3947 78.302 0.91792 3.6736-0.13113 0.52476-0.91792-3.6734z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-6.676 107.44-0.91792 3.6734-0.13113-0.52475 0.91792-3.6734z" fill="#aeaeae"/>
    <path d="m-8.3947 106.88 0.91792 3.6734-0.13113 0.52476-0.91792-3.6734z" fill="#aeaeae"/>
   </g>
diff --git a/dlls/light.msstyles/blue_radiobutton_13px.svg b/dlls/light.msstyles/blue_radiobutton_13px.svg
index c47a790cd42..aa277cb0d49 100644
--- a/dlls/light.msstyles/blue_radiobutton_13px.svg
+++ b/dlls/light.msstyles/blue_radiobutton_13px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:13-32" width="13" height="104" version="1.1" viewBox="0 0 13 104" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,18 +15,18 @@
   <g fill="#fff">
    <ellipse cx="6.5" cy="6.5" rx="6" ry="6" stroke="#aeaeae"/>
    <ellipse cx="6.5" cy="19.5" rx="6" ry="6" stroke="#3096fa"/>
-   <ellipse cx="6.5" cy="32.5" rx="6" ry="6" stroke="#2979ff"/>
+   <ellipse cx="6.5" cy="32.5" rx="6" ry="6" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <ellipse cx="6.5" cy="45.5" rx="6" ry="6" stroke="#aeaeae"/>
   <g fill="#fff">
    <ellipse cx="6.5" cy="58.5" rx="6" ry="6" stroke="#aeaeae"/>
    <ellipse cx="6.5" cy="71.5" rx="6" ry="6" stroke="#3096fa"/>
-   <ellipse cx="6.5" cy="84.5" rx="6" ry="6" stroke="#2979ff"/>
+   <ellipse cx="6.5" cy="84.5" rx="6" ry="6" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <ellipse cx="6.5" cy="97.5" rx="6" ry="6" stroke="#aeaeae"/>
  </g>
  <path d="m10 58.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z"/>
  <path d="m10 71.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#3096fa"/>
- <path d="m10 84.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#2979ff"/>
+ <path d="m10 84.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" class="HighlightOutline" fill="currentColor"/>
  <path d="m10 97.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#aeaeae"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_radiobutton_16px.svg b/dlls/light.msstyles/blue_radiobutton_16px.svg
index abc996e08cf..b60955e2ee8 100644
--- a/dlls/light.msstyles/blue_radiobutton_16px.svg
+++ b/dlls/light.msstyles/blue_radiobutton_16px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:16-32" width="16" height="128" version="1.1" viewBox="0 0 16 128" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,18 +15,18 @@
   <g fill="#fff">
    <circle cx="8" cy="8" r="7.5" stroke="#aeaeae"/>
    <circle cx="8" cy="24" r="7.5" stroke="#3096fa"/>
-   <circle cx="8" cy="40" r="7.5" stroke="#2979ff"/>
+   <circle cx="8" cy="40" r="7.5" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <circle cx="8" cy="56" r="7.5" stroke="#aeaeae"/>
   <g fill="#fff">
    <circle cx="8" cy="72" r="7.5" stroke="#aeaeae"/>
    <circle cx="8" cy="88" r="7.5" stroke="#3096fa"/>
-   <circle cx="8" cy="104" r="7.5" stroke="#2979ff"/>
+   <circle cx="8" cy="104" r="7.5" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <circle cx="8" cy="120" r="7.5" stroke="#aeaeae"/>
  </g>
  <path d="m13 72a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z"/>
  <path d="m12.5 88a4.5 4.5 0 0 1-4.5 4.5 4.5 4.5 0 0 1-4.5-4.5 4.5 4.5 0 0 1 4.5-4.5 4.5 4.5 0 0 1 4.5 4.5z" fill="#3096fa" stroke="#3096fa"/>
- <path d="m13 104a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#2979ff"/>
+ <path d="m13 104a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" class="HighlightOutline" fill="currentColor"/>
  <path d="m13 120a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#aeaeae"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_radiobutton_19px.svg b/dlls/light.msstyles/blue_radiobutton_19px.svg
index 9d2528e61eb..15e0effa0ec 100644
--- a/dlls/light.msstyles/blue_radiobutton_19px.svg
+++ b/dlls/light.msstyles/blue_radiobutton_19px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:19-32" width="19" height="152" version="1.1" viewBox="0 0 19 152" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,20 +15,20 @@
   <g>
    <ellipse cx="8" cy="8.1396" rx="7.4306" ry="7.5733" fill="#fffff9" stroke="#aeaeae"/>
    <ellipse cx="8" cy="24.12" rx="7.4306" ry="7.5733" fill="#fff" stroke="#3096fa"/>
-   <ellipse cx="8" cy="40.1" rx="7.4306" ry="7.5733" fill="#fff" stroke="#2979ff"/>
+   <ellipse cx="8" cy="40.1" rx="7.4306" ry="7.5733" fill="#fff" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <ellipse cx="8" cy="56.08" rx="7.4306" ry="7.5733" stroke="#aeaeae"/>
   <g fill="#fff">
    <ellipse cx="8" cy="72.06" rx="7.4306" ry="7.5733" stroke="#aeaeae"/>
    <ellipse cx="8" cy="88.04" rx="7.4306" ry="7.5733" stroke="#3096fa"/>
-   <ellipse cx="8" cy="104.02" rx="7.4306" ry="7.5733" stroke="#2979ff"/>
+   <ellipse cx="8" cy="104.02" rx="7.4306" ry="7.5733" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <ellipse cx="8" cy="120" rx="7.4306" ry="7.5733" stroke="#aeaeae"/>
  </g>
  <path d="m15 85.5a5.5 5.5 0 0 1-5.5 5.5 5.5 5.5 0 0 1-5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" stroke-width=".99999"/>
  <g transform="matrix(1.0159 0 0 1.1881 1.3728 -.10631)">
   <path d="m12.967 88.044a5 4.2482 0 0 1-5 4.2482 5 4.2482 0 0 1-5-4.2482 5 4.2482 0 0 1 5-4.2482 5 4.2482 0 0 1 5 4.2482z" fill="#3096fa" stroke="#3096fa" stroke-width=".76202"/>
-  <path d="m13.414 104.04a5.414 4.6292 0 0 1-5.414 4.6292 5.414 4.6292 0 0 1-5.414-4.6292 5.414 4.6292 0 0 1 5.414-4.6292 5.414 4.6292 0 0 1 5.414 4.6292z" fill="#2979ff" stroke-width=".76202"/>
+  <path d="m13.414 104.04a5.414 4.6292 0 0 1-5.414 4.6292 5.414 4.6292 0 0 1-5.414-4.6292 5.414 4.6292 0 0 1 5.414-4.6292 5.414 4.6292 0 0 1 5.414 4.6292z" class="HighlightOutline" fill="currentColor" stroke-width=".76202"/>
   <path d="m13.414 120.03a5.414 4.6292 0 0 1-5.414 4.6292 5.414 4.6292 0 0 1-5.414-4.6292 5.414 4.6292 0 0 1 5.414-4.6292 5.414 4.6292 0 0 1 5.414 4.6292z" fill="#aeaeae" stroke-width=".76203"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_radiobutton_22px.svg b/dlls/light.msstyles/blue_radiobutton_22px.svg
index a8da8bfab35..fb9b083975c 100644
--- a/dlls/light.msstyles/blue_radiobutton_22px.svg
+++ b/dlls/light.msstyles/blue_radiobutton_22px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:22-32" width="22" height="176" version="1.1" viewBox="0 0 22 176" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,20 +15,20 @@
   <g fill="#fff">
    <circle cx="11" cy="11" r="10" stroke="#aeaeae"/>
    <circle cx="11" cy="33" r="10" stroke="#3096fa"/>
-   <circle cx="11" cy="55" r="10" stroke="#2979ff"/>
+   <circle cx="11" cy="55" r="10" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <circle cx="11" cy="77" r="10" stroke="#aeaeae"/>
   <g fill="#fff">
    <circle cx="11" cy="99" r="10" stroke="#aeaeae"/>
    <circle cx="11" cy="121" r="10" stroke="#3096fa"/>
-   <circle cx="11.055" cy="143" r="10" stroke="#2979ff"/>
+   <circle cx="11.055" cy="143" r="10" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <circle cx="11" cy="165" r="10" stroke="#aeaeae"/>
  </g>
  <path d="m17 99a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z"/>
  <g transform="translate(0 -16)">
   <path d="m17 137a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z" fill="#3096fa"/>
-  <path d="m17 159a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z" fill="#2979ff"/>
+  <path d="m17 159a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z" class="HighlightOutline" fill="currentColor"/>
   <path d="m17 181a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_radiobutton_25px.svg b/dlls/light.msstyles/blue_radiobutton_25px.svg
index e478008e2ea..6121c484d8b 100644
--- a/dlls/light.msstyles/blue_radiobutton_25px.svg
+++ b/dlls/light.msstyles/blue_radiobutton_25px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:25-32" width="25" height="200" version="1.1" viewBox="0 0 25 200" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,18 +15,18 @@
   <g>
    <ellipse cx="12.5" cy="12.5" rx="11.5" ry="11.5" fill="#fffff9" stroke="#aeaeae"/>
    <ellipse cx="12.5" cy="37.5" rx="11.5" ry="11.5" fill="#fff" stroke="#3096fa"/>
-   <ellipse cx="12.5" cy="62.5" rx="11.5" ry="11.5" fill="#fff" stroke="#2979ff"/>
+   <ellipse cx="12.5" cy="62.5" rx="11.5" ry="11.5" fill="#fff" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <ellipse cx="12.5" cy="87.5" rx="11.5" ry="11.5" stroke="#aeaeae"/>
   <g fill="#fff">
    <ellipse cx="12.5" cy="112.5" rx="11.5" ry="11.5" stroke="#aeaeae"/>
    <ellipse cx="12.5" cy="137.5" rx="11.5" ry="11.5" stroke="#3096fa"/>
-   <ellipse cx="12.5" cy="162.5" rx="11.5" ry="11.5" stroke="#2979ff"/>
+   <ellipse cx="12.5" cy="162.5" rx="11.5" ry="11.5" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <ellipse cx="12.5" cy="187.5" rx="11.5" ry="11.5" stroke="#aeaeae"/>
  </g>
  <path d="m20 112.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z"/>
  <path d="m20 137.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#3096fa"/>
- <path d="m20 162.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#2979ff"/>
+ <path d="m20 162.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" class="HighlightOutline" fill="currentColor"/>
  <path d="m20 187.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#aeaeae"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_radiobutton_28px.svg b/dlls/light.msstyles/blue_radiobutton_28px.svg
index c1dc2cb3cf8..cafe3be7eeb 100644
--- a/dlls/light.msstyles/blue_radiobutton_28px.svg
+++ b/dlls/light.msstyles/blue_radiobutton_28px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:28-32" width="28" height="224" version="1.1" viewBox="0 0 28 224" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,20 +15,20 @@
   <g fill="#fff">
    <circle cx="14" cy="14" r="13" stroke="#aeaeae"/>
    <circle cx="14" cy="42" r="13" stroke="#3096fa"/>
-   <circle cx="14" cy="70" r="13" stroke="#2979ff"/>
+   <circle cx="14" cy="70" r="13" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <circle cx="14" cy="98" r="13" stroke="#aeaeae"/>
   <g fill="#fff">
    <circle cx="14" cy="126" r="13" stroke="#aeaeae"/>
    <circle cx="14" cy="154" r="13" stroke="#3096fa"/>
-   <circle cx="14" cy="182" r="13" stroke="#2979ff"/>
+   <circle cx="14" cy="182" r="13" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <circle cx="14" cy="210" r="13" stroke="#aeaeae"/>
  </g>
  <path d="m22 126a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z"/>
  <g transform="matrix(1.0667 0 0 1 1.6667 20.5)" stroke-width=".9375">
   <path d="m19.062 133.5a7.5 8 0 0 1-7.5 8 7.5 8 0 0 1-7.5-8 7.5 8 0 0 1 7.5-8 7.5 8 0 0 1 7.5 8z" fill="#3096fa"/>
-  <path d="m19.062 161.5a7.5 8 0 0 1-7.5 8 7.5 8 0 0 1-7.5-8 7.5 8 0 0 1 7.5-8 7.5 8 0 0 1 7.5 8z" fill="#2979ff"/>
+  <path d="m19.062 161.5a7.5 8 0 0 1-7.5 8 7.5 8 0 0 1-7.5-8 7.5 8 0 0 1 7.5-8 7.5 8 0 0 1 7.5 8z" class="HighlightOutline" fill="currentColor"/>
   <path d="m19.062 189.5a7.5 8 0 0 1-7.5 8 7.5 8 0 0 1-7.5-8 7.5 8 0 0 1 7.5-8 7.5 8 0 0 1 7.5 8z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_radiobutton_31px.svg b/dlls/light.msstyles/blue_radiobutton_31px.svg
index 69f0845edfa..6a5e6aed1b5 100644
--- a/dlls/light.msstyles/blue_radiobutton_31px.svg
+++ b/dlls/light.msstyles/blue_radiobutton_31px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:31-32" width="31" height="248" version="1.1" viewBox="0 0 31 248" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,20 +15,20 @@
   <g fill="#fff">
    <circle cx="15.5" cy="15.5" r="14.5" stroke="#aeaeae"/>
    <circle cx="15.5" cy="46.5" r="14.5" stroke="#3096fa"/>
-   <circle cx="15.5" cy="77.5" r="14.5" stroke="#2979ff"/>
+   <circle cx="15.5" cy="77.5" r="14.5" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <circle cx="15.5" cy="108.5" r="14.5" stroke="#aeaeae"/>
   <g fill="#fff">
    <circle cx="15.5" cy="139.5" r="14.5" stroke="#aeaeae"/>
    <circle cx="15.5" cy="170.5" r="14.5" stroke="#3096fa"/>
-   <circle cx="15.5" cy="201.5" r="14.5" stroke="#2979ff"/>
+   <circle cx="15.5" cy="201.5" r="14.5" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <circle cx="15.5" cy="232.5" r="14.5" stroke="#aeaeae"/>
  </g>
  <path d="m25 139.5a9.5 9.5 0 0 1-9.5 9.5 9.5 9.5 0 0 1-9.5-9.5 9.5 9.5 0 0 1 9.5-9.5 9.5 9.5 0 0 1 9.5 9.5z"/>
  <g transform="matrix(1.0667 0 0 1 3.6666 40.5)" stroke-width=".9375">
   <path d="m19.999 130a8.906 9.5 0 0 1-8.906 9.5 8.906 9.5 0 0 1-8.906-9.5 8.906 9.5 0 0 1 8.906-9.5 8.906 9.5 0 0 1 8.906 9.5z" fill="#3096fa"/>
-  <path d="m19.999 161a8.906 9.5 0 0 1-8.906 9.5 8.906 9.5 0 0 1-8.906-9.5 8.906 9.5 0 0 1 8.906-9.5 8.906 9.5 0 0 1 8.906 9.5z" fill="#2979ff"/>
+  <path d="m19.999 161a8.906 9.5 0 0 1-8.906 9.5 8.906 9.5 0 0 1-8.906-9.5 8.906 9.5 0 0 1 8.906-9.5 8.906 9.5 0 0 1 8.906 9.5z" class="HighlightOutline" fill="currentColor"/>
   <path d="m19.999 192a8.906 9.5 0 0 1-8.906 9.5 8.906 9.5 0 0 1-8.906-9.5 8.906 9.5 0 0 1 8.906-9.5 8.906 9.5 0 0 1 8.906 9.5z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_background.svg b/dlls/light.msstyles/blue_rebar_chevron_background.svg
index 10660d006f6..92a4d216716 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_background.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_background.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:19-32" width="19" height="69" version="1.1" viewBox="0 0 5.027 18.256" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -10,6 +13,6 @@
  </metadata>
  <g fill="#fffffe" stroke-linejoin="bevel" stroke-width=".26458">
   <rect x=".13229" y="6.4823" width="4.7625" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/>
-  <rect x=".13224" y="12.568" width="4.7625" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/>
+  <rect x=".13224" y="12.568" width="4.7625" height="5.5563" rx=".52917" ry=".52917" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_glyph_10px.svg b/dlls/light.msstyles/blue_rebar_chevron_glyph_10px.svg
index 39cc0801f61..6a7f165038f 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_glyph_10px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_glyph_10px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:10-32" width="10" height="27" version="1.1" viewBox="0 0 2.6458 7.144" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -20,7 +23,7 @@
   <path d="m1.4891 4.5518-0.6885-1.0503 0.098356-0.15005 0.6885 1.0503z"/>
   <path d="m1.5806 4.4178-0.6885 1.0503-0.098356-0.15005 0.6885-1.0503z"/>
  </g>
- <g transform="matrix(1 0 0 .75 0 1.2568)" fill="#2979ff" stroke-width=".30551">
+ <g transform="matrix(1 0 0 .75 0 1.2568)" class="HighlightOutline" fill="currentColor" stroke-width=".30551">
   <path d="m2.5475 6.9332-0.6885-1.0503 0.098356-0.15005 0.6885 1.0503z"/>
   <path d="m2.6389 6.7993-0.6885 1.0503-0.098356-0.15005 0.6885-1.0503z"/>
   <path d="m1.4891 6.9332-0.6885-1.0503 0.098356-0.15005 0.6885 1.0503z"/>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_glyph_13px.svg b/dlls/light.msstyles/blue_rebar_chevron_glyph_13px.svg
index ce78f604b7a..e83f1836a2a 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_glyph_13px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_glyph_13px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:13-32" width="13" height="33" version="1.1" viewBox="0 0 3.4395 8.7316" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -21,7 +24,7 @@
    <path d="m1.3158 3.7042-0.91792-1.0503 0.13113-0.15005 0.91792 1.0503z"/>
    <path d="m1.4377 3.5702-0.91792 1.0503-0.13113-0.15005 0.91792-1.0503z"/>
   </g>
-  <g fill="#2979ff">
+  <g class="HighlightOutline" fill="currentColor">
    <path d="m3.3084 7.8152-0.91792-1.0503 0.13113-0.15005 0.91792 1.0503z"/>
    <path d="m3.4303 7.6813-0.91792 1.0503-0.13113-0.15005 0.91792-1.0503z"/>
    <path d="m1.9854 7.8152-0.91792-1.0503 0.13113-0.15005 0.91792 1.0503z"/>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_glyph_15px.svg b/dlls/light.msstyles/blue_rebar_chevron_glyph_15px.svg
index 8b6b3db6242..2c3377a36cb 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_glyph_15px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_glyph_15px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:15-32" width="15" height="42" version="1.1" viewBox="0 0 3.9687 11.113" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -20,7 +23,7 @@
   <path d="m1.8122 4.5509-1.1475-1.0503 0.16393-0.15005 1.1475 1.0503z"/>
   <path d="m1.9646 4.4169-1.1475 1.0503-0.16393-0.15005 1.1475-1.0503z"/>
  </g>
- <g transform="matrix(1 0 0 1.25 .1639 .28556)" fill="#2979ff" stroke-width=".23665">
+ <g transform="matrix(1 0 0 1.25 .1639 .28556)" class="HighlightOutline" fill="currentColor" stroke-width=".23665">
   <path d="m3.641 7.7455-1.1475-1.0503 0.16393-0.15005 1.1475 1.0503z"/>
   <path d="m3.7933 7.6116-1.1475 1.0503-0.16393-0.15005 1.1475-1.0503z"/>
   <path d="m2.318 7.7455-1.1475-1.0503 0.16393-0.15005 1.1475 1.0503z"/>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_glyph_20px.svg b/dlls/light.msstyles/blue_rebar_chevron_glyph_20px.svg
index e28a24a7573..3ad4b7255f7 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_glyph_20px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_glyph_20px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:20-32" width="20" height="54" version="1.1" viewBox="0 0 5.2916 14.288" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -20,7 +23,7 @@
   <path d="m2.5732 5.6092-1.377-1.0503 0.19672-0.15005 1.377 1.0503z"/>
   <path d="m2.7561 5.4752-1.377 1.0503-0.19672-0.15005 1.377-1.0503z"/>
  </g>
- <g transform="matrix(1 0 0 1.5 .1639 -1.3508)" fill="#2979ff" stroke-width=".21603">
+ <g transform="matrix(1 0 0 1.5 .1639 -1.3508)" class="HighlightOutline" fill="currentColor" stroke-width=".21603">
   <path d="m4.9311 9.5095-1.3769-1.0503 0.1967-0.15005 1.3769 1.0503z"/>
   <path d="m5.1139 9.3756-1.3769 1.0503-0.1967-0.15005 1.3769-1.0503z"/>
   <path d="m3.079 9.5095-1.377-1.0503 0.19672-0.15005 1.377 1.0503z"/>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_glyph_25px.svg b/dlls/light.msstyles/blue_rebar_chevron_glyph_25px.svg
index ff07a7bf83e..f7505da0266 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_glyph_25px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_glyph_25px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:25-32" width="25" height="66" version="1.1" viewBox="0 0 6.6145 17.463" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -20,7 +23,7 @@
   <path d="m2.0303 5.6184-1.6065-1.0503 0.22951-0.15005 1.6065 1.0503z"/>
   <path d="m2.2436 5.4844-1.6065 1.0503-0.22951-0.15005 1.6065-1.0503z"/>
  </g>
- <g transform="matrix(1 0 0 1.75 1.1871 -.766)" fill="#2979ff" stroke-width=".2">
+ <g transform="matrix(1 0 0 1.75 1.1871 -.766)" class="HighlightOutline" fill="currentColor" stroke-width=".2">
   <path d="m5.1981 9.5003-1.6064-1.0503 0.22949-0.15005 1.6064 1.0503z"/>
   <path d="m5.4113 9.3664-1.6064 1.0503-0.22949-0.15005 1.6064-1.0503z"/>
   <path d="m2.5521 9.5003-1.6064-1.0503 0.22949-0.15005 1.6064 1.0503z"/>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_glyph_30px.svg b/dlls/light.msstyles/blue_rebar_chevron_glyph_30px.svg
index 3ec069617c6..f787006bec6 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_glyph_30px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_glyph_30px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:30-32" width="30" height="81" version="1.1" viewBox="0 0 7.9374 21.432" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -20,7 +23,7 @@
   <path d="m1.7168 5.6087-1.8359-1.0503 0.26229-0.15005 1.8359 1.0503z"/>
   <path d="m1.9606 5.4747-1.8359 1.0503-0.26229-0.15005 1.8359-1.0503z"/>
  </g>
- <g transform="matrix(1 0 0 1.75 2.2617 2.6929)" fill="#2979ff" stroke-width=".2">
+ <g transform="matrix(1 0 0 1.75 2.2617 2.6929)" class="HighlightOutline" fill="currentColor" stroke-width=".2">
   <path d="m5.4136 9.6607-1.8358-1.2003 0.26227-0.17148 1.8358 1.2003z"/>
   <path d="m5.6572 9.5077-1.8358 1.2003-0.26227-0.17148 1.8358-1.2003z"/>
   <path d="m2.2385 9.6607-1.8359-1.2003 0.26228-0.17148 1.8359 1.2003z"/>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_glyph_40px.svg b/dlls/light.msstyles/blue_rebar_chevron_glyph_40px.svg
index 46e74ed901e..e278b0cef48 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_glyph_40px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_glyph_40px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:40-32" width="40" height="108" version="1.1" viewBox="0 0 10.583 28.576" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -20,7 +23,7 @@
   <path d="m3.2387 7.0903-2.2949-1.0503 0.32787-0.15005 2.2949 1.0503z"/>
   <path d="m3.5435 6.9563-2.2949 1.0503-0.32787-0.15005 2.2949-1.0503z"/>
  </g>
- <g transform="matrix(1 0 0 2.1875 2.2617 -.93389)" fill="#2979ff" stroke-width=".17888">
+ <g transform="matrix(1 0 0 2.1875 2.2617 -.93389)" class="HighlightOutline" fill="currentColor" stroke-width=".17888">
   <path d="m7.9939 12.443-2.2948-1.2003 0.32784-0.17148 2.2948 1.2003z"/>
   <path d="m8.2984 12.29-2.2948 1.2003-0.32784-0.17148 2.2948-1.2003z"/>
   <path d="m3.7604 12.443-2.2949-1.2003 0.32785-0.17148 2.2949 1.2003z"/>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_vertical_background.svg b/dlls/light.msstyles/blue_rebar_chevron_vertical_background.svg
index 10660d006f6..92a4d216716 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_vertical_background.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_vertical_background.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:19-32" width="19" height="69" version="1.1" viewBox="0 0 5.027 18.256" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -10,6 +13,6 @@
  </metadata>
  <g fill="#fffffe" stroke-linejoin="bevel" stroke-width=".26458">
   <rect x=".13229" y="6.4823" width="4.7625" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/>
-  <rect x=".13224" y="12.568" width="4.7625" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/>
+  <rect x=".13224" y="12.568" width="4.7625" height="5.5563" rx=".52917" ry=".52917" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_10px.svg b/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_10px.svg
index 39cc0801f61..6a7f165038f 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_10px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_10px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:10-32" width="10" height="27" version="1.1" viewBox="0 0 2.6458 7.144" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -20,7 +23,7 @@
   <path d="m1.4891 4.5518-0.6885-1.0503 0.098356-0.15005 0.6885 1.0503z"/>
   <path d="m1.5806 4.4178-0.6885 1.0503-0.098356-0.15005 0.6885-1.0503z"/>
  </g>
- <g transform="matrix(1 0 0 .75 0 1.2568)" fill="#2979ff" stroke-width=".30551">
+ <g transform="matrix(1 0 0 .75 0 1.2568)" class="HighlightOutline" fill="currentColor" stroke-width=".30551">
   <path d="m2.5475 6.9332-0.6885-1.0503 0.098356-0.15005 0.6885 1.0503z"/>
   <path d="m2.6389 6.7993-0.6885 1.0503-0.098356-0.15005 0.6885-1.0503z"/>
   <path d="m1.4891 6.9332-0.6885-1.0503 0.098356-0.15005 0.6885 1.0503z"/>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_13px.svg b/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_13px.svg
index ce78f604b7a..e83f1836a2a 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_13px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_13px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:13-32" width="13" height="33" version="1.1" viewBox="0 0 3.4395 8.7316" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -21,7 +24,7 @@
    <path d="m1.3158 3.7042-0.91792-1.0503 0.13113-0.15005 0.91792 1.0503z"/>
    <path d="m1.4377 3.5702-0.91792 1.0503-0.13113-0.15005 0.91792-1.0503z"/>
   </g>
-  <g fill="#2979ff">
+  <g class="HighlightOutline" fill="currentColor">
    <path d="m3.3084 7.8152-0.91792-1.0503 0.13113-0.15005 0.91792 1.0503z"/>
    <path d="m3.4303 7.6813-0.91792 1.0503-0.13113-0.15005 0.91792-1.0503z"/>
    <path d="m1.9854 7.8152-0.91792-1.0503 0.13113-0.15005 0.91792 1.0503z"/>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_15px.svg b/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_15px.svg
index 8b6b3db6242..2c3377a36cb 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_15px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_15px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:15-32" width="15" height="42" version="1.1" viewBox="0 0 3.9687 11.113" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -20,7 +23,7 @@
   <path d="m1.8122 4.5509-1.1475-1.0503 0.16393-0.15005 1.1475 1.0503z"/>
   <path d="m1.9646 4.4169-1.1475 1.0503-0.16393-0.15005 1.1475-1.0503z"/>
  </g>
- <g transform="matrix(1 0 0 1.25 .1639 .28556)" fill="#2979ff" stroke-width=".23665">
+ <g transform="matrix(1 0 0 1.25 .1639 .28556)" class="HighlightOutline" fill="currentColor" stroke-width=".23665">
   <path d="m3.641 7.7455-1.1475-1.0503 0.16393-0.15005 1.1475 1.0503z"/>
   <path d="m3.7933 7.6116-1.1475 1.0503-0.16393-0.15005 1.1475-1.0503z"/>
   <path d="m2.318 7.7455-1.1475-1.0503 0.16393-0.15005 1.1475 1.0503z"/>
diff --git a/dlls/light.msstyles/blue_scrollbar_arrows.svg b/dlls/light.msstyles/blue_scrollbar_arrows.svg
index c2e7093f481..0dc49da9c8b 100644
--- a/dlls/light.msstyles/blue_scrollbar_arrows.svg
+++ b/dlls/light.msstyles/blue_scrollbar_arrows.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:17-24" width="17" height="340" version="1.1" viewBox="0 0 4.4979 89.959" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -20,25 +23,25 @@
     <rect x=".13227" y="85.593" width="4.2334" height="4.2333" rx=".52917" ry=".52917"/>
    </g>
   </g>
-  <rect x=".13229" y="9.1281" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/>
+  <rect x=".13229" y="9.1281" width="4.2333" height="4.2333" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <g fill="#fefefe">
    <rect x=".13229" y="13.626" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/>
    <rect x=".13229" y="18.124" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/>
    <rect x=".13229" y="22.622" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#3096fa"/>
   </g>
-  <rect x=".13229" y="27.12" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/>
+  <rect x=".13229" y="27.12" width="4.2333" height="4.2333" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <g fill="#fefefe">
    <rect x=".13229" y="31.618" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/>
    <rect x=".13229" y="36.116" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/>
    <rect x=".13229" y="40.614" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#3096fa"/>
   </g>
-  <rect x=".13229" y="45.111" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/>
+  <rect x=".13229" y="45.111" width="4.2333" height="4.2333" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <g fill="#fefefe">
    <rect x=".13229" y="49.609" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/>
    <rect x=".13229" y="54.107" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/>
    <rect x=".13229" y="58.605" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#3096fa"/>
   </g>
-  <rect x=".13229" y="63.103" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/>
+  <rect x=".13229" y="63.103" width="4.2333" height="4.2333" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <rect x=".13229" y="67.601" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#fefefe" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg b/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg
index d05b9b11b46..f16f526740d 100644
--- a/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg
+++ b/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:20-24" width="20" height="85" version="1.1" viewBox="0 0 5.2916 22.49" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -14,7 +17,7 @@
    <rect x=".13229" y=".13229" width="5.0272" height="4.2333" rx=".52918" ry=".52918" stroke="#aeaeae"/>
    <rect x=".13229" y="4.6302" width="5.0272" height="4.2333" rx=".52918" ry=".52918" stroke="#3096fa"/>
    <rect x=".13223" y="18.124" width="5.0272" height="4.2333" rx=".52918" ry=".52918" stroke="#3096fa"/>
-   <rect x=".13229" y="9.1281" width="5.0272" height="4.2333" rx=".52918" ry=".52918" stroke="#2979ff"/>
+   <rect x=".13229" y="9.1281" width="5.0272" height="4.2333" rx=".52918" ry=".52918" class="HighlightOutline" stroke="currentColor"/>
    <rect x=".13229" y="13.626" width="5.0272" height="4.2333" rx=".52918" ry=".52918" stroke="#aeaeae"/>
   </g>
  </g>
diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg b/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg
index 61f0bde183c..a5aa8b89651 100644
--- a/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg
+++ b/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:17-24" width="17" height="55" version="1.1" viewBox="0 0 4.4979 14.552" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -13,7 +16,7 @@
   <rect transform="rotate(90)" x=".13229" y="-4.3656" width="2.6458" height="4.2333" rx=".52916" ry=".52916" stroke="#aeaeae"/>
   <rect transform="rotate(90)" x="3.0426" y="-4.3656" width="2.6458" height="4.2333" rx=".52916" ry=".52916" stroke="#3096fa"/>
   <rect transform="rotate(90)" x="11.774" y="-4.3656" width="2.6458" height="4.2333" rx=".52916" ry=".52916" stroke="#3096fa"/>
-  <rect transform="rotate(90)" x="5.953" y="-4.3656" width="2.6458" height="4.2333" rx=".52916" ry=".52916" stroke="#2979ff"/>
+  <rect transform="rotate(90)" x="5.953" y="-4.3656" width="2.6458" height="4.2333" rx=".52916" ry=".52916" class="HighlightOutline" stroke="currentColor"/>
   <rect transform="rotate(90)" x="8.8634" y="-4.3656" width="2.6458" height="4.2333" rx=".52916" ry=".52916" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_spin_background_down.svg b/dlls/light.msstyles/blue_spin_background_down.svg
index 6742bd1c57f..a22f7cad681 100644
--- a/dlls/light.msstyles/blue_spin_background_down.svg
+++ b/dlls/light.msstyles/blue_spin_background_down.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:8-24" width="8" height="64" version="1.1" viewBox="0 0 2.1167 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -13,7 +16,7 @@
  <g stroke-width=".265">
   <rect x=".39708" y=".1325" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
   <rect x=".39708" y="4.3658" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/>
-  <rect x=".39708" y="8.5992" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/>
+  <rect x=".39708" y="8.5992" width="1.3229" height="3.7042" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <rect x=".39708" y="12.832" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_spin_background_left.svg b/dlls/light.msstyles/blue_spin_background_left.svg
index 84d342d124d..3fc32f3f61c 100644
--- a/dlls/light.msstyles/blue_spin_background_left.svg
+++ b/dlls/light.msstyles/blue_spin_background_left.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-24" width="7" height="64" version="1.1" viewBox="0 0 1.8521 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -13,7 +16,7 @@
  <g stroke-width=".265">
   <rect x=".39708" y=".39708" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
   <rect x=".39708" y="4.6305" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/>
-  <rect x=".39708" y="8.8636" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/>
+  <rect x=".39708" y="8.8636" width="1.3229" height="3.7042" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <rect x=".39708" y="13.097" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_spin_background_right.svg b/dlls/light.msstyles/blue_spin_background_right.svg
index c8ac6d2146b..6c4cb4ba2a0 100644
--- a/dlls/light.msstyles/blue_spin_background_right.svg
+++ b/dlls/light.msstyles/blue_spin_background_right.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-24" width="7" height="64" version="1.1" viewBox="0 0 1.8521 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -13,7 +16,7 @@
  <g stroke-width=".265">
   <rect x=".1325" y=".39708" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
   <rect x=".1325" y="4.6305" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/>
-  <rect x=".1325" y="8.8636" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/>
+  <rect x=".1325" y="8.8636" width="1.3229" height="3.7042" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <rect x=".1325" y="13.097" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_spin_background_up.svg b/dlls/light.msstyles/blue_spin_background_up.svg
index 1ec9953a6c1..3c0ce6a5550 100644
--- a/dlls/light.msstyles/blue_spin_background_up.svg
+++ b/dlls/light.msstyles/blue_spin_background_up.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:8-24" width="8" height="64" version="1.1" viewBox="0 0 2.1167 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -13,7 +16,7 @@
  <g stroke-width=".265">
   <rect x=".39708" y=".39708" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
   <rect x=".39708" y="4.6304" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/>
-  <rect x=".39708" y="8.8637" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/>
+  <rect x=".39708" y="8.8637" width="1.3229" height="3.7042" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <rect x=".39708" y="13.097" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_tab_item.svg b/dlls/light.msstyles/blue_tab_item.svg
index ec462d22cd7..c810cff31a0 100644
--- a/dlls/light.msstyles/blue_tab_item.svg
+++ b/dlls/light.msstyles/blue_tab_item.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:5-24" width="5" height="95" version="1.1" viewBox="0 0 1.3229 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -64,7 +67,7 @@
    <rect transform="rotate(90)" x="14.288" y="-1.0583" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="14.817" y="-.79375" width=".26458" height=".26458"/>
   </g>
-  <rect x=".13229" y="20.241" width="1.0583" height="4.7625" rx=".52917" ry=".52916" stroke="#2979ff" stroke-width=".26458"/>
+  <rect x=".13229" y="20.241" width="1.0583" height="4.7625" rx=".52917" ry=".52916" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
   <rect transform="rotate(90)" x="24.871" y="-1.0583" width=".26458" height=".79375" stroke-width="0"/>
   <rect transform="rotate(90)" x="24.606" y="-.52917" width=".26458" height=".26458" stroke-width="0"/>
  </g>
@@ -78,7 +81,7 @@
    <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/>
   </g>
   <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/>
-  <g fill="#2979ff">
+  <g class="HighlightOutline" fill="currentColor">
    <rect transform="rotate(90)" x="24.606" y="-1.3229" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="24.871" y="-.26458" width=".26458" height=".26458"/>
@@ -89,8 +92,8 @@
   <rect transform="rotate(90)" x="9.2604" y="-.26458" width=".26458" height=".26458" fill="#3096fa"/>
   <rect transform="rotate(90)" x="14.287" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/>
   <rect transform="rotate(90)" x="14.288" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/>
-  <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458" fill="#2979ff"/>
-  <rect transform="rotate(90)" x="24.342" y="-.26458" width=".26458" height=".26458" fill="#2979ff"/>
+  <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458" class="HighlightOutline" fill="currentColor"/>
+  <rect transform="rotate(90)" x="24.342" y="-.26458" width=".26458" height=".26458" class="HighlightOutline" fill="currentColor"/>
  </g>
  <rect x=".13229" y=".13229" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#f5f5f5" stroke="#aeaeae" stroke-width=".26458"/>
  <g fill="#aeaeae" stroke-width="0">
diff --git a/dlls/light.msstyles/blue_tab_item_left.svg b/dlls/light.msstyles/blue_tab_item_left.svg
index 26bd9353a2b..2530f7c0918 100644
--- a/dlls/light.msstyles/blue_tab_item_left.svg
+++ b/dlls/light.msstyles/blue_tab_item_left.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:5-24" width="5" height="95" version="1.1" viewBox="0 0 1.3229 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -48,7 +51,7 @@
    <rect transform="rotate(90)" x="14.288" y="-1.0583" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="14.817" y="-.79375" width=".26458" height=".26458"/>
   </g>
-  <rect x=".13229" y="20.241" width="1.0583" height="4.7625" rx=".52917" ry=".52916" stroke="#2979ff" stroke-width=".26458"/>
+  <rect x=".13229" y="20.241" width="1.0583" height="4.7625" rx=".52917" ry=".52916" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
   <rect transform="rotate(90)" x="24.871" y="-1.0583" width=".26458" height=".79375" stroke-width="0"/>
   <rect transform="rotate(90)" x="24.606" y="-.52917" width=".26458" height=".26458" stroke-width="0"/>
  </g>
@@ -62,7 +65,7 @@
    <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/>
   </g>
   <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/>
-  <g fill="#2979ff">
+  <g class="HighlightOutline" fill="currentColor">
    <rect transform="rotate(90)" x="24.606" y="-1.3229" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="24.871" y="-.26459" width=".26458" height=".26458"/>
@@ -73,8 +76,8 @@
   <rect transform="rotate(90)" x="9.2604" y="-.26458" width=".26458" height=".26458" fill="#3096fa"/>
   <rect transform="rotate(90)" x="14.288" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/>
   <rect transform="rotate(90)" x="14.288" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/>
-  <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458" fill="#2979ff"/>
-  <rect transform="rotate(90)" x="24.342" y="-.26458" width=".26458" height=".26458" fill="#2979ff"/>
+  <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458" class="HighlightOutline" fill="currentColor"/>
+  <rect transform="rotate(90)" x="24.342" y="-.26458" width=".26458" height=".26458" class="HighlightOutline" fill="currentColor"/>
   <g fill="#aeaeae">
    <rect transform="rotate(90)" x="14.552" y="-.26459" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="14.817" y="-.26458" width=".26458" height=".26458"/>
diff --git a/dlls/light.msstyles/blue_tab_item_right.svg b/dlls/light.msstyles/blue_tab_item_right.svg
index 5043e6e2bf7..3d69116ceda 100644
--- a/dlls/light.msstyles/blue_tab_item_right.svg
+++ b/dlls/light.msstyles/blue_tab_item_right.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:5-24" width="5" height="95" version="1.1" viewBox="0 0 1.3229 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -76,7 +79,7 @@
    <rect transform="rotate(90)" x="14.288" y="-1.0583" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="14.817" y="-.79375" width=".26458" height=".26458"/>
   </g>
-  <rect x=".13229" y="20.241" width="1.0583" height="4.7625" rx=".52917" ry=".52916" stroke="#2979ff" stroke-width=".26458"/>
+  <rect x=".13229" y="20.241" width="1.0583" height="4.7625" rx=".52917" ry=".52916" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
   <rect transform="rotate(90)" x="24.871" y="-1.0583" width=".26458" height=".79375" stroke-width="0"/>
   <rect transform="rotate(90)" x="24.606" y="-.52917" width=".26458" height=".26458" stroke-width="0"/>
  </g>
@@ -90,7 +93,7 @@
    <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/>
   </g>
   <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/>
-  <g fill="#2979ff">
+  <g class="HighlightOutline" fill="currentColor">
    <rect transform="rotate(90)" x="24.606" y="-1.3229" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="24.871" y="-.26458" width=".26458" height=".26458"/>
@@ -101,8 +104,8 @@
   <rect transform="rotate(90)" x="9.2604" y="-.26458" width=".26458" height=".26458" fill="#3096fa"/>
   <rect transform="rotate(90)" x="14.288" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/>
   <rect transform="rotate(90)" x="14.288" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/>
-  <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458" fill="#2979ff"/>
-  <rect transform="rotate(90)" x="24.342" y="-.26458" width=".26458" height=".26458" fill="#2979ff"/>
+  <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458" class="HighlightOutline" fill="currentColor"/>
+  <rect transform="rotate(90)" x="24.342" y="-.26458" width=".26458" height=".26458" class="HighlightOutline" fill="currentColor"/>
   <rect transform="rotate(90)" x="14.552" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/>
   <rect transform="rotate(90)" x="14.817" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_19px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_19px.svg
index cd1f1d2418d..6c0e896227e 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_19px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_19px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:19-32" width="19" height="21" version="1.1" viewBox="0 0 5.0271 5.5563" xmlns="http://www.w3.org/2000/svg">
- <ellipse cx="2.5135" cy="2.7781" rx="2.381" ry="2.3813" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <path d="m3.8365 3.2641-1.3129-1.1474-0.18755 0.16391 1.3129 1.1474z" fill="#2979ff" stroke-width=".99996"/>
- <path d="m1.3782 3.4396 1.3129-1.1474-0.18756-0.16391-1.3129 1.1474z" fill="#2979ff" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <ellipse cx="2.5135" cy="2.7781" rx="2.381" ry="2.3813" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m3.8365 3.2641-1.3129-1.1474-0.18755 0.16391 1.3129 1.1474z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
+ <path d="m1.3782 3.4396 1.3129-1.1474-0.18756-0.16391-1.3129 1.1474z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_24px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_24px.svg
index 894131b5d7e..b3f981f11b4 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_24px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_24px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:24-32" width="24" height="26" version="1.1" viewBox="0 0 6.35 6.8792" xmlns="http://www.w3.org/2000/svg">
- <ellipse cx="3.1752" cy="3.4395" rx="3.0427" ry="3.0427" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <path d="m4.8948 4.0227-1.7068-1.3769-0.24381 0.1967 1.7068 1.3769z" fill="#2979ff" stroke-width=".99996"/>
- <path d="m1.699 4.2333 1.7068-1.3769-0.24383-0.1967-1.7068 1.3769z" fill="#2979ff" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <ellipse cx="3.1752" cy="3.4395" rx="3.0427" ry="3.0427" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m4.8948 4.0227-1.7068-1.3769-0.24381 0.1967 1.7068 1.3769z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
+ <path d="m1.699 4.2333 1.7068-1.3769-0.24383-0.1967-1.7068 1.3769z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_29px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_29px.svg
index 81ab02d8850..f7f58663287 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_29px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_29px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:29-32" width="29" height="32" version="1.1" viewBox="0 0 7.6729 8.4667" xmlns="http://www.w3.org/2000/svg">
- <circle cx="3.8367" cy="4.101" r="3.7042" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <path d="m5.8208 4.7814-1.9694-1.6064-0.28132 0.22948 1.9694 1.6064z" fill="#2979ff" stroke-width=".99996"/>
- <path d="m2.1334 5.0271 1.9694-1.6064-0.28134-0.22948-1.9694 1.6064z" fill="#2979ff" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <circle cx="3.8367" cy="4.101" r="3.7042" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m5.8208 4.7814-1.9694-1.6064-0.28132 0.22948 1.9694 1.6064z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
+ <path d="m2.1334 5.0271 1.9694-1.6064-0.28134-0.22948-1.9694 1.6064z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_33px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_33px.svg
index 21a637a8de1..c82ef4a9269 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_33px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_33px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:33-32" width="33" height="37" version="1.1" viewBox="0 0 8.7312 9.7896" xmlns="http://www.w3.org/2000/svg">
- <ellipse cx="4.3659" cy="4.8948" rx="4.2334" ry="4.2334" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <path d="m6.7469 5.7696-2.3633-2.0654-0.33759 0.29504 2.3633 2.0654z" fill="#2979ff" stroke-width=".99996"/>
- <path d="m2.322 6.0855 2.3633-2.0654-0.33761-0.29504-2.3633 2.0654z" fill="#2979ff" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <ellipse cx="4.3659" cy="4.8948" rx="4.2334" ry="4.2334" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m6.7469 5.7696-2.3633-2.0654-0.33759 0.29504 2.3633 2.0654z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
+ <path d="m2.322 6.0855 2.3633-2.0654-0.33761-0.29504-2.3633 2.0654z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_38px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_38px.svg
index f85fb14a3c2..80941234093 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_38px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_38px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:38-32" width="38" height="42" version="1.1" viewBox="0 0 10.054 11.113" xmlns="http://www.w3.org/2000/svg">
- <circle cx="5.0271" cy="5.5563" r="4.7625" fill="#fff" stroke="#2979ff" stroke-width=".52917"/>
- <path d="m7.6729 6.5282-2.6259-2.2948-0.3751 0.32783 2.6259 2.2948z" fill="#2979ff" stroke-width=".99996"/>
- <path d="m2.7564 6.8791 2.6259-2.2948-0.37512-0.32783-2.6259 2.2948z" fill="#2979ff" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <circle cx="5.0271" cy="5.5563" r="4.7625" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".52917"/>
+ <path d="m7.6729 6.5282-2.6259-2.2948-0.3751 0.32783 2.6259 2.2948z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
+ <path d="m2.7564 6.8791 2.6259-2.2948-0.37512-0.32783-2.6259 2.2948z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_43px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_43px.svg
index 3bc3bc42bc5..57659adb384 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_43px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_43px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:43-32" width="43" height="47" version="1.1" viewBox="0 0 11.377 12.436" xmlns="http://www.w3.org/2000/svg">
- <circle cx="5.6888" cy="6.218" r="5.4242" fill="#fff" stroke="#2979ff" stroke-width=".52917"/>
- <path d="m8.599 7.2872-2.8886-2.5245-0.41263 0.36065 2.8886 2.5245z" fill="#2979ff" stroke-width=".99996"/>
- <path d="m3.1906 7.6732 2.8886-2.5245-0.41265-0.36065-2.8886 2.5245z" fill="#2979ff" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <circle cx="5.6888" cy="6.218" r="5.4242" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".52917"/>
+ <path d="m8.599 7.2872-2.8886-2.5245-0.41263 0.36065 2.8886 2.5245z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
+ <path d="m3.1906 7.6732 2.8886-2.5245-0.41265-0.36065-2.8886 2.5245z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_48px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_48px.svg
index 25a3f945a06..911bd6540ee 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_48px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_pressed_48px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:48-32" width="48" height="53" version="1.1" viewBox="0 0 12.7 14.024" xmlns="http://www.w3.org/2000/svg">
- <circle cx="6.3503" cy="6.8795" r="6.0857" fill="#fff" stroke="#2979ff" stroke-width=".52917"/>
- <path d="m9.6573 8.0459-3.2826-2.754-0.4689 0.39343 3.2826 2.754z" fill="#2979ff" stroke-width=".99996"/>
- <path d="m3.5114 8.467 3.2826-2.754-0.46893-0.39343-3.2826 2.754z" fill="#2979ff" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <circle cx="6.3503" cy="6.8795" r="6.0857" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".52917"/>
+ <path d="m9.6573 8.0459-3.2826-2.754-0.4689 0.39343 3.2826 2.754z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
+ <path d="m3.5114 8.467 3.2826-2.754-0.46893-0.39343-3.2826 2.754z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_19px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_19px.svg
index 8e5f64c9101..784de38d5b4 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_19px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_19px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:19-32" width="19" height="21" version="1.1" viewBox="0 0 5.0271 5.5563" xmlns="http://www.w3.org/2000/svg">
- <ellipse cx="2.5135" cy="2.7781" rx="2.381" ry="2.3813" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z" fill="#2979ff" stroke-width=".99996"/>
- <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z" fill="#2979ff" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <ellipse cx="2.5135" cy="2.7781" rx="2.381" ry="2.3813" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
+ <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_24px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_24px.svg
index 11c058a84cc..217543d1c05 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_24px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_24px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:24-32" width="24" height="26" version="1.1" viewBox="0 0 6.35 6.8792" xmlns="http://www.w3.org/2000/svg">
- <ellipse cx="3.1752" cy="3.4395" rx="3.0427" ry="3.0427" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <path d="m4.8948 2.8564-1.7068 1.3769-0.24381-0.1967 1.7068-1.3769z" fill="#2979ff" stroke-width=".99996"/>
- <path d="m1.699 2.6458 1.7068 1.3769-0.24383 0.1967-1.7068-1.3769z" fill="#2979ff" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <ellipse cx="3.1752" cy="3.4395" rx="3.0427" ry="3.0427" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m4.8948 2.8564-1.7068 1.3769-0.24381-0.1967 1.7068-1.3769z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
+ <path d="m1.699 2.6458 1.7068 1.3769-0.24383 0.1967-1.7068-1.3769z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_29px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_29px.svg
index 3d65e6a160f..28f24ea8224 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_29px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_29px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:29-32" width="29" height="32" version="1.1" viewBox="0 0 7.6729 8.4667" xmlns="http://www.w3.org/2000/svg">
- <circle cx="3.8367" cy="4.101" r="3.7042" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <path d="m5.8208 3.4207-1.9694 1.6064-0.28132-0.22948 1.9694-1.6064z" fill="#2979ff" stroke-width=".99996"/>
- <path d="m2.1334 3.175 1.9694 1.6064-0.28134 0.22948-1.9694-1.6064z" fill="#2979ff" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <circle cx="3.8367" cy="4.101" r="3.7042" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m5.8208 3.4207-1.9694 1.6064-0.28132-0.22948 1.9694-1.6064z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
+ <path d="m2.1334 3.175 1.9694 1.6064-0.28134 0.22948-1.9694-1.6064z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_33px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_33px.svg
index d2e377c440d..84f92d22160 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_33px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_33px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:33-32" width="33" height="37" version="1.1" viewBox="0 0 8.7312 9.7896" xmlns="http://www.w3.org/2000/svg">
- <ellipse cx="4.3659" cy="4.8948" rx="4.2334" ry="4.2334" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
- <path d="m6.7469 4.0201-2.3633 2.0654-0.33759-0.29504 2.3633-2.0654z" fill="#2979ff" stroke-width=".99996"/>
- <path d="m2.322 3.7042 2.3633 2.0654-0.33761 0.29504-2.3633-2.0654z" fill="#2979ff" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <ellipse cx="4.3659" cy="4.8948" rx="4.2334" ry="4.2334" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m6.7469 4.0201-2.3633 2.0654-0.33759-0.29504 2.3633-2.0654z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
+ <path d="m2.322 3.7042 2.3633 2.0654-0.33761 0.29504-2.3633-2.0654z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_38px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_38px.svg
index ef565b3ba54..3003dc8c2be 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_38px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_38px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:38-32" width="38" height="42" version="1.1" viewBox="0 0 10.054 11.113" xmlns="http://www.w3.org/2000/svg">
- <circle cx="5.0271" cy="5.5563" r="4.7625" fill="#fff" stroke="#2979ff" stroke-width=".52917"/>
- <path d="m7.6729 4.5843-2.6259 2.2948-0.3751-0.32783 2.6259-2.2948z" fill="#2979ff" stroke-width=".99996"/>
- <path d="m2.7564 4.2334 2.6259 2.2948-0.37512 0.32783-2.6259-2.2948z" fill="#2979ff" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <circle cx="5.0271" cy="5.5563" r="4.7625" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".52917"/>
+ <path d="m7.6729 4.5843-2.6259 2.2948-0.3751-0.32783 2.6259-2.2948z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
+ <path d="m2.7564 4.2334 2.6259 2.2948-0.37512 0.32783-2.6259-2.2948z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_43px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_43px.svg
index 719d1546ce3..dda40f06c90 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_43px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_43px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:43-32" width="43" height="47" version="1.1" viewBox="0 0 11.377 12.436" xmlns="http://www.w3.org/2000/svg">
- <circle cx="5.6888" cy="6.218" r="5.4242" fill="#fff" stroke="#2979ff" stroke-width=".52917"/>
- <path d="m8.599 5.1487-2.8886 2.5245-0.41263-0.36065 2.8886-2.5245z" fill="#2979ff" stroke-width=".99996"/>
- <path d="m3.1906 4.7627 2.8886 2.5245-0.41265 0.36065-2.8886-2.5245z" fill="#2979ff" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <circle cx="5.6888" cy="6.218" r="5.4242" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".52917"/>
+ <path d="m8.599 5.1487-2.8886 2.5245-0.41263-0.36065 2.8886-2.5245z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
+ <path d="m3.1906 4.7627 2.8886 2.5245-0.41265 0.36065-2.8886-2.5245z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_48px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_48px.svg
index e158a2a0546..aec51cec574 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_48px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_pressed_48px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:48-32" width="48" height="53" version="1.1" viewBox="0 0 12.7 14.024" xmlns="http://www.w3.org/2000/svg">
- <circle cx="6.3503" cy="6.8795" r="6.0857" fill="#fff" stroke="#2979ff" stroke-width=".52917"/>
- <path d="m9.6573 5.713-3.2826 2.754-0.4689-0.39343 3.2826-2.754z" fill="#2979ff" stroke-width=".99996"/>
- <path d="m3.5114 5.2919 3.2826 2.754-0.46893 0.39343-3.2826-2.754z" fill="#2979ff" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <circle cx="6.3503" cy="6.8795" r="6.0857" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".52917"/>
+ <path d="m9.6573 5.713-3.2826 2.754-0.4689-0.39343 3.2826-2.754z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
+ <path d="m3.5114 5.2919 3.2826 2.754-0.46893 0.39343-3.2826-2.754z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons.svg b/dlls/light.msstyles/blue_toolbar_buttons.svg
index 0bb0982ac46..892bd18c14d 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="144" version="1.1" viewBox="0 0 1.852 38.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -13,13 +16,13 @@
   <rect x=".13227" y="33.47" width="1.5875" height="4.4979" rx=".52917" ry=".52917" fill="#fffffe" stroke="#3096fa" stroke-width=".26458"/>
   <g fill="#fff">
    <g transform="translate(0 -2.1167)">
-    <rect x=".13229" y="11.774" width="1.5875" height="4.4979" rx=".52917" ry=".42836" stroke="#2979ff" stroke-width=".26458"/>
+    <rect x=".13229" y="11.774" width="1.5875" height="4.4979" rx=".52917" ry=".42836" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
    </g>
    <g transform="translate(-1.9467e-5 7.4083)">
-    <rect x=".13229" y="11.774" width="1.5875" height="4.4979" rx=".52917" ry=".42836" stroke="#2979ff" stroke-width=".26458"/>
+    <rect x=".13229" y="11.774" width="1.5875" height="4.4979" rx=".52917" ry=".42836" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
    </g>
    <g transform="translate(-1.9467e-5 12.171)">
-    <rect x=".13229" y="11.774" width="1.5875" height="4.4979" rx=".52917" ry=".42836" stroke="#2979ff" stroke-width=".26458"/>
+    <rect x=".13229" y="11.774" width="1.5875" height="4.4979" rx=".52917" ry=".42836" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
    </g>
   </g>
  </g>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split.svg b/dlls/light.msstyles/blue_toolbar_buttons_split.svg
index 1f6f88fa156..334b534f96d 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons_split.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons_split.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:6-32" width="6" height="144" version="1.1" viewBox="0 0 1.5875 38.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <g fill="#fff" stroke-linejoin="bevel" stroke-width=".26458">
   <rect x=".13229" y="4.8948" width="1.3229" height="4.4979" rx=".52917" ry=".52917" stroke="#3096fa"/>
   <rect x=".13229" y="33.47" width="1.3229" height="4.4979" rx=".52917" ry=".52917" stroke="#3096fa"/>
-  <g stroke="#2979ff">
+  <g class="HighlightOutline" stroke="currentColor">
    <rect x=".13229" y="9.6573" width="1.3229" height="4.4979" rx=".52917" ry=".52917"/>
    <rect x=".13229" y="19.182" width="1.3229" height="4.4979" rx=".52917" ry=".52917"/>
    <rect x=".13229" y="23.945" width="1.3229" height="4.4979" rx=".52917" ry=".52917"/>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg
index c69cfd4424c..58b81f8a634 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:5-32" width="5" height="144" version="1.1" viewBox="0 0 1.3229 38.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  <g fill="#fff" stroke-linejoin="bevel" stroke-width=".26458">
   <rect x=".13229" y="4.8948" width="1.0583" height="4.4979" rx=".52917" ry=".52917" stroke="#3096fa"/>
   <rect x=".13228" y="33.47" width="1.0583" height="4.4979" rx=".52917" ry=".52917" stroke="#3096fa"/>
-  <g stroke="#2979ff">
+  <g class="HighlightOutline" stroke="currentColor">
    <rect x=".13229" y="9.6573" width="1.0583" height="4.4979" rx=".52917" ry=".52917"/>
    <rect x=".13228" y="19.182" width="1.0583" height="4.4979" rx=".52917" ry=".52917"/>
    <rect x=".13228" y="23.945" width="1.0583" height="4.4979" rx=".52917" ry=".52917"/>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_11px.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_11px.svg
index 768c09a29eb..24306bc8fee 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_11px.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_11px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:11-32" width="11" height="72" version="1.1" viewBox="0 0 2.9105 19.049" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -19,17 +22,17 @@
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2222 0 0 1.5 5e-5 -.13267)" fill="#2979ff" stroke-width=".17233">
+  <g transform="matrix(1.2222 0 0 1.5 5e-5 -.13267)" class="HighlightOutline" fill="currentColor" stroke-width=".17233">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
   <path d="m2.2635 7.6188-1.1232 1.3769-0.16046-0.1967 1.1232-1.3769z" fill="#aeaeae" stroke-width=".20579"/>
   <path d="m0.16045 7.4082 1.1232 1.3769-0.16046 0.1967-1.1232-1.3769z" fill="#aeaeae" stroke-width=".20579"/>
-  <g transform="matrix(1.2222 0 0 1.5 5e-5 7.011)" fill="#2979ff" stroke-width=".17233">
+  <g transform="matrix(1.2222 0 0 1.5 5e-5 7.011)" class="HighlightOutline" fill="currentColor" stroke-width=".17233">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2222 0 0 1.5 5e-5 4.6298)" fill="#2979ff" stroke-width=".17233">
+  <g transform="matrix(1.2222 0 0 1.5 5e-5 4.6298)" class="HighlightOutline" fill="currentColor" stroke-width=".17233">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_14px.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_14px.svg
index e46942799de..7589867375d 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_14px.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_14px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:14-32" width="14" height="96" version="1.1" viewBox="0 0 3.7043 25.399" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -19,17 +22,17 @@
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2222 0 0 2.0001 4.621e-5 -.00064156)" fill="#2979ff" stroke-width=".13229">
+  <g transform="matrix(1.2222 0 0 2.0001 4.621e-5 -.00064156)" class="HighlightOutline" fill="currentColor" stroke-width=".13229">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
   <path d="m2.2637 10.335-1.1233 1.8359-0.16048-0.26227 1.1233-1.8359z" fill="#aeaeae" stroke-width=".18241"/>
   <path d="m0.16046 10.054 1.1233 1.8359-0.16048 0.26227-1.1233-1.8359z" fill="#aeaeae" stroke-width=".18241"/>
-  <g transform="matrix(1.2222 0 0 2.0001 4.621e-5 9.5242)" fill="#2979ff" stroke-width=".13229">
+  <g transform="matrix(1.2222 0 0 2.0001 4.621e-5 9.5242)" class="HighlightOutline" fill="currentColor" stroke-width=".13229">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2222 0 0 2.0001 4.621e-5 6.3493)" fill="#2979ff" stroke-width=".13229">
+  <g transform="matrix(1.2222 0 0 2.0001 4.621e-5 6.3493)" class="HighlightOutline" fill="currentColor" stroke-width=".13229">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_17px.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_17px.svg
index 90fdf8f53e8..592d354fc4b 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_17px.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_17px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:17-32" width="17" height="120" version="1.1" viewBox="0 0 4.4981 31.749" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -19,17 +22,17 @@
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2275 0 0 2.2501 4.5595e-5 .99149)" fill="#2979ff" stroke-width=".11319">
+  <g transform="matrix(1.2275 0 0 2.2501 4.5595e-5 .99149)" class="HighlightOutline" fill="currentColor" stroke-width=".11319">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
   <path d="m2.2735 13.016-1.1282 2.0652-0.16118-0.29503 1.1282-2.0652z" fill="#aeaeae" stroke-width=".1659"/>
   <path d="m0.16116 12.7 1.1282 2.0652-0.16118 0.29503-1.1282-2.0652z" fill="#aeaeae" stroke-width=".1659"/>
-  <g transform="matrix(1.2275 0 0 2.2501 4.5595e-5 12.898)" fill="#2979ff" stroke-width=".11319">
+  <g transform="matrix(1.2275 0 0 2.2501 4.5595e-5 12.898)" class="HighlightOutline" fill="currentColor" stroke-width=".11319">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2275 0 0 2.2501 4.5595e-5 8.929)" fill="#2979ff" stroke-width=".11319">
+  <g transform="matrix(1.2275 0 0 2.2501 4.5595e-5 8.929)" class="HighlightOutline" fill="currentColor" stroke-width=".11319">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_21px.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_21px.svg
index ab7d3215e2b..f06f37be6dc 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_21px.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_21px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:21-32" width="21" height="144" version="1.1" viewBox="0 0 5.5565 38.099" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -19,17 +22,17 @@
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2276 0 0 2.7501 4.4792e-5 .59447)" fill="#2979ff" stroke-width=".092117">
+  <g transform="matrix(1.2276 0 0 2.7501 4.4792e-5 .59447)" class="HighlightOutline" fill="currentColor" stroke-width=".092117">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
   <path d="m2.2736 15.203-1.1282 2.5243-0.16119-0.36061 1.1282-2.5243z" fill="#aeaeae" stroke-width=".14927"/>
   <path d="m0.16117 14.817 1.1282 2.5243-0.16119 0.36062-1.1282-2.5243z" fill="#aeaeae" stroke-width=".14927"/>
-  <g transform="matrix(1.2276 0 0 2.7501 4.4792e-5 14.882)" fill="#2979ff" stroke-width=".092117">
+  <g transform="matrix(1.2276 0 0 2.7501 4.4792e-5 14.882)" class="HighlightOutline" fill="currentColor" stroke-width=".092117">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2276 0 0 2.7501 4.4792e-5 10.12)" fill="#2979ff" stroke-width=".092117">
+  <g transform="matrix(1.2276 0 0 2.7501 4.4792e-5 10.12)" class="HighlightOutline" fill="currentColor" stroke-width=".092117">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_28px.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_28px.svg
index 9af6d12d05f..1246f58021d 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_28px.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_28px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:28-32" width="28" height="192" version="1.1" viewBox="0 0 7.4087 50.799" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -19,17 +22,17 @@
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2276 0 0 3.5002 3.3723e-5 1.4541)" fill="#2979ff" stroke-width=".070714">
+  <g transform="matrix(1.2276 0 0 3.5002 3.3723e-5 1.4541)" class="HighlightOutline" fill="currentColor" stroke-width=".070714">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
   <path d="m2.2737 20.335-1.1283 3.213-0.1612-0.459 1.1283-3.213z" fill="#aeaeae" stroke-width=".12928"/>
   <path d="m0.16117 19.844 1.1283 3.213-0.1612 0.45901-1.1283-3.213z" fill="#aeaeae" stroke-width=".12928"/>
-  <g transform="matrix(1.2276 0 0 3.5002 3.3723e-5 20.504)" fill="#2979ff" stroke-width=".070714">
+  <g transform="matrix(1.2276 0 0 3.5002 3.3723e-5 20.504)" class="HighlightOutline" fill="currentColor" stroke-width=".070714">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2276 0 0 3.5002 3.3723e-5 14.154)" fill="#2979ff" stroke-width=".070714">
+  <g transform="matrix(1.2276 0 0 3.5002 3.3723e-5 14.154)" class="HighlightOutline" fill="currentColor" stroke-width=".070714">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_7px.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_7px.svg
index 8002bb7979d..a944c64858b 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_7px.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_7px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="48" version="1.1" viewBox="0 0 1.8521 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -17,7 +20,7 @@
    <path d="m1.8521 11.518-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 11.377 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g fill="#2979ff">
+  <g class="HighlightOutline" fill="currentColor">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
    <path d="m1.8521 6.7552-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_9px.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_9px.svg
index 3d44fc40849..cd64d324020 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_9px.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_9px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:9-32" width="9" height="40" version="1.1" viewBox="0 0 2.3813 10.583" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -19,17 +22,17 @@
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1 0 0 1.25 0 -1.6538)" fill="#2979ff" stroke-width=".2087">
+  <g transform="matrix(1 0 0 1.25 0 -1.6538)" class="HighlightOutline" fill="currentColor" stroke-width=".2087">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
   <path d="m1.852 4.1443-0.91903 1.1474-0.13129-0.16391 0.91903-1.1474z" fill="#aeaeae" stroke-width=".20579"/>
   <path d="m0.13124 3.9688 0.91903 1.1474-0.13129 0.16391-0.91903-1.1474z" fill="#aeaeae" stroke-width=".20579"/>
-  <g transform="matrix(1 0 0 1.25 3.889e-5 2.3149)" fill="#2979ff" stroke-width=".2087">
+  <g transform="matrix(1 0 0 1.25 3.889e-5 2.3149)" class="HighlightOutline" fill="currentColor" stroke-width=".2087">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1 0 0 1.25 3.889e-5 .992)" fill="#2979ff" stroke-width=".2087">
+  <g transform="matrix(1 0 0 1.25 3.889e-5 .992)" class="HighlightOutline" fill="currentColor" stroke-width=".2087">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_11px.svg b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_11px.svg
index 768c09a29eb..24306bc8fee 100644
--- a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_11px.svg
+++ b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_11px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:11-32" width="11" height="72" version="1.1" viewBox="0 0 2.9105 19.049" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -19,17 +22,17 @@
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2222 0 0 1.5 5e-5 -.13267)" fill="#2979ff" stroke-width=".17233">
+  <g transform="matrix(1.2222 0 0 1.5 5e-5 -.13267)" class="HighlightOutline" fill="currentColor" stroke-width=".17233">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
   <path d="m2.2635 7.6188-1.1232 1.3769-0.16046-0.1967 1.1232-1.3769z" fill="#aeaeae" stroke-width=".20579"/>
   <path d="m0.16045 7.4082 1.1232 1.3769-0.16046 0.1967-1.1232-1.3769z" fill="#aeaeae" stroke-width=".20579"/>
-  <g transform="matrix(1.2222 0 0 1.5 5e-5 7.011)" fill="#2979ff" stroke-width=".17233">
+  <g transform="matrix(1.2222 0 0 1.5 5e-5 7.011)" class="HighlightOutline" fill="currentColor" stroke-width=".17233">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2222 0 0 1.5 5e-5 4.6298)" fill="#2979ff" stroke-width=".17233">
+  <g transform="matrix(1.2222 0 0 1.5 5e-5 4.6298)" class="HighlightOutline" fill="currentColor" stroke-width=".17233">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_14px.svg b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_14px.svg
index e46942799de..7589867375d 100644
--- a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_14px.svg
+++ b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_14px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:14-32" width="14" height="96" version="1.1" viewBox="0 0 3.7043 25.399" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -19,17 +22,17 @@
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2222 0 0 2.0001 4.621e-5 -.00064156)" fill="#2979ff" stroke-width=".13229">
+  <g transform="matrix(1.2222 0 0 2.0001 4.621e-5 -.00064156)" class="HighlightOutline" fill="currentColor" stroke-width=".13229">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
   <path d="m2.2637 10.335-1.1233 1.8359-0.16048-0.26227 1.1233-1.8359z" fill="#aeaeae" stroke-width=".18241"/>
   <path d="m0.16046 10.054 1.1233 1.8359-0.16048 0.26227-1.1233-1.8359z" fill="#aeaeae" stroke-width=".18241"/>
-  <g transform="matrix(1.2222 0 0 2.0001 4.621e-5 9.5242)" fill="#2979ff" stroke-width=".13229">
+  <g transform="matrix(1.2222 0 0 2.0001 4.621e-5 9.5242)" class="HighlightOutline" fill="currentColor" stroke-width=".13229">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2222 0 0 2.0001 4.621e-5 6.3493)" fill="#2979ff" stroke-width=".13229">
+  <g transform="matrix(1.2222 0 0 2.0001 4.621e-5 6.3493)" class="HighlightOutline" fill="currentColor" stroke-width=".13229">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_17px.svg b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_17px.svg
index 90fdf8f53e8..592d354fc4b 100644
--- a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_17px.svg
+++ b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_17px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:17-32" width="17" height="120" version="1.1" viewBox="0 0 4.4981 31.749" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -19,17 +22,17 @@
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2275 0 0 2.2501 4.5595e-5 .99149)" fill="#2979ff" stroke-width=".11319">
+  <g transform="matrix(1.2275 0 0 2.2501 4.5595e-5 .99149)" class="HighlightOutline" fill="currentColor" stroke-width=".11319">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
   <path d="m2.2735 13.016-1.1282 2.0652-0.16118-0.29503 1.1282-2.0652z" fill="#aeaeae" stroke-width=".1659"/>
   <path d="m0.16116 12.7 1.1282 2.0652-0.16118 0.29503-1.1282-2.0652z" fill="#aeaeae" stroke-width=".1659"/>
-  <g transform="matrix(1.2275 0 0 2.2501 4.5595e-5 12.898)" fill="#2979ff" stroke-width=".11319">
+  <g transform="matrix(1.2275 0 0 2.2501 4.5595e-5 12.898)" class="HighlightOutline" fill="currentColor" stroke-width=".11319">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2275 0 0 2.2501 4.5595e-5 8.929)" fill="#2979ff" stroke-width=".11319">
+  <g transform="matrix(1.2275 0 0 2.2501 4.5595e-5 8.929)" class="HighlightOutline" fill="currentColor" stroke-width=".11319">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_7px.svg b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_7px.svg
index 8002bb7979d..a944c64858b 100644
--- a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_7px.svg
+++ b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_7px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="48" version="1.1" viewBox="0 0 1.8521 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -17,7 +20,7 @@
    <path d="m1.8521 11.518-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 11.377 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g fill="#2979ff">
+  <g class="HighlightOutline" fill="currentColor">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
    <path d="m1.8521 6.7552-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
diff --git a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_9px.svg b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_9px.svg
index 3d44fc40849..cd64d324020 100644
--- a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_9px.svg
+++ b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_9px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:9-32" width="9" height="40" version="1.1" viewBox="0 0 2.3813 10.583" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -19,17 +22,17 @@
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1 0 0 1.25 0 -1.6538)" fill="#2979ff" stroke-width=".2087">
+  <g transform="matrix(1 0 0 1.25 0 -1.6538)" class="HighlightOutline" fill="currentColor" stroke-width=".2087">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
   <path d="m1.852 4.1443-0.91903 1.1474-0.13129-0.16391 0.91903-1.1474z" fill="#aeaeae" stroke-width=".20579"/>
   <path d="m0.13124 3.9688 0.91903 1.1474-0.13129 0.16391-0.91903-1.1474z" fill="#aeaeae" stroke-width=".20579"/>
-  <g transform="matrix(1 0 0 1.25 3.889e-5 2.3149)" fill="#2979ff" stroke-width=".2087">
+  <g transform="matrix(1 0 0 1.25 3.889e-5 2.3149)" class="HighlightOutline" fill="currentColor" stroke-width=".2087">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1 0 0 1.25 3.889e-5 .992)" fill="#2979ff" stroke-width=".2087">
+  <g transform="matrix(1 0 0 1.25 3.889e-5 .992)" class="HighlightOutline" fill="currentColor" stroke-width=".2087">
    <path d="m1.8521 3.5801-0.91903 0.91793-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 3.4397 0.91903 0.91793-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_tooltip_wrench_17px.svg b/dlls/light.msstyles/blue_tooltip_wrench_17px.svg
index 2d03c8e1462..056a3cb1335 100644
--- a/dlls/light.msstyles/blue_tooltip_wrench_17px.svg
+++ b/dlls/light.msstyles/blue_tooltip_wrench_17px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:17-32" width="17" height="48" version="1.1" viewBox="0 0 4.4979 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -14,11 +17,11 @@
     <rect x="40.849" y="7.409" width="5.5564" height="5.8208" rx=".69743" ry=".77319" stroke-width=".36716"/>
    </g>
   </g>
-  <rect x="40.849" y="9.7902" width="4.2333" height="3.9687" rx=".52917" ry=".52917" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
+  <rect x="40.849" y="9.7902" width="4.2333" height="3.9687" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
   <g stroke-width=".070003">
    <path d="m43.648 4.5906-0.94415-0.95147q-0.08417 0.029276-0.16834 0.047573-0.08417 0.018299-0.172 0.018299-0.35497 0-0.60382-0.24702t-0.24885-0.60199q0-0.11344 0.02928-0.2214t0.08417-0.2031l0.53063 0.53063 0.33667-0.31472-0.54526-0.54527q0.09515-0.054893 0.20127-0.085998 0.10613-0.031106 0.21591-0.031106 0.36229 0 0.61663 0.25434t0.25434 0.61663q0 0.087828-0.0183 0.172-0.0183 0.084168-0.04757 0.16834l0.94781 0.94415q0.04025 0.040255 0.04025 0.096977t-0.04025 0.096977l-0.27812 0.25616q-0.04026 0.040255-0.09515 0.040255t-0.09515-0.040255zm0.10247-0.20859 0.14638-0.14638-0.99904-0.99904q0.05855-0.076849 0.08783-0.18115 0.02928-0.1043 0.02928-0.19944 0-0.27446-0.2031-0.46476-0.2031-0.19029-0.46293-0.19395l0.36961 0.37693q0.03294 0.032935 0.03294 0.080509t-0.03294 0.080509l-0.48305 0.45378q-0.03294 0.032935-0.08051 0.032935t-0.08051-0.032935l-0.35497-0.35131q0.01098 0.28178 0.19944 0.46476t0.44463 0.18298q0.09149 0 0.19395-0.029276 0.10247-0.029276 0.17932-0.087828z" fill="#aeaeae"/>
    <path d="m43.648 8.8239-0.94415-0.95147q-0.08417 0.029276-0.16834 0.047573-0.08417 0.018299-0.172 0.018299-0.35497 0-0.60382-0.24702t-0.24885-0.60199q0-0.11344 0.02928-0.2214t0.08417-0.2031l0.53063 0.53063 0.33667-0.31472-0.54526-0.54527q0.09515-0.054893 0.20127-0.085998 0.10613-0.031106 0.21591-0.031106 0.36229 0 0.61663 0.25434t0.25434 0.61663q0 0.087828-0.0183 0.172-0.0183 0.084168-0.04757 0.16834l0.94781 0.94415q0.04025 0.040255 0.04025 0.096977t-0.04025 0.096977l-0.27812 0.25616q-0.04026 0.040255-0.09515 0.040255t-0.09515-0.040255zm0.10247-0.20859 0.14638-0.14638-0.99904-0.99904q0.05855-0.076849 0.08783-0.18115 0.02928-0.1043 0.02928-0.19944 0-0.27446-0.2031-0.46476-0.2031-0.19029-0.46293-0.19395l0.36961 0.37693q0.03294 0.032935 0.03294 0.080509t-0.03294 0.080509l-0.48305 0.45378q-0.03294 0.032935-0.08051 0.032935t-0.08051-0.032935l-0.35497-0.35131q0.01098 0.28178 0.19944 0.46476t0.44463 0.18298q0.09149 0 0.19395-0.029276 0.10247-0.029276 0.17932-0.087828z" fill="#3096fa"/>
-   <path d="m43.648 13.057-0.94415-0.95147q-0.08417 0.02928-0.16834 0.04757-0.08417 0.0183-0.172 0.0183-0.35497 0-0.60382-0.24702t-0.24885-0.60199q0-0.11344 0.02928-0.2214t0.08417-0.2031l0.53063 0.53063 0.33667-0.31472-0.54526-0.54527q0.09515-0.05489 0.20127-0.086 0.10613-0.03111 0.21591-0.03111 0.36229 0 0.61663 0.25434t0.25434 0.61663q0 0.08783-0.0183 0.172t-0.04757 0.16834l0.94781 0.94415q0.04025 0.04026 0.04025 0.09698t-0.04025 0.09698l-0.27812 0.25616q-0.04026 0.04026-0.09515 0.04026t-0.09515-0.04026zm0.10247-0.20859 0.14638-0.14638-0.99904-0.99904q0.05855-0.07685 0.08783-0.18114 0.02928-0.1043 0.02928-0.19944 0-0.27446-0.2031-0.46476-0.2031-0.19029-0.46293-0.19395l0.36961 0.37693q0.03294 0.03294 0.03294 0.08051t-0.03294 0.08051l-0.48305 0.45378q-0.03294 0.03294-0.08051 0.03294t-0.08051-0.03294l-0.35497-0.35131q0.01098 0.28178 0.19944 0.46476t0.44463 0.18298q0.09149 0 0.19395-0.02928 0.10247-0.02928 0.17932-0.08783z" fill="#2979ff"/>
+   <path d="m43.648 13.057-0.94415-0.95147q-0.08417 0.02928-0.16834 0.04757-0.08417 0.0183-0.172 0.0183-0.35497 0-0.60382-0.24702t-0.24885-0.60199q0-0.11344 0.02928-0.2214t0.08417-0.2031l0.53063 0.53063 0.33667-0.31472-0.54526-0.54527q0.09515-0.05489 0.20127-0.086 0.10613-0.03111 0.21591-0.03111 0.36229 0 0.61663 0.25434t0.25434 0.61663q0 0.08783-0.0183 0.172t-0.04757 0.16834l0.94781 0.94415q0.04025 0.04026 0.04025 0.09698t-0.04025 0.09698l-0.27812 0.25616q-0.04026 0.04026-0.09515 0.04026t-0.09515-0.04026zm0.10247-0.20859 0.14638-0.14638-0.99904-0.99904q0.05855-0.07685 0.08783-0.18114 0.02928-0.1043 0.02928-0.19944 0-0.27446-0.2031-0.46476-0.2031-0.19029-0.46293-0.19395l0.36961 0.37693q0.03294 0.03294 0.03294 0.08051t-0.03294 0.08051l-0.48305 0.45378q-0.03294 0.03294-0.08051 0.03294t-0.08051-0.03294l-0.35497-0.35131q0.01098 0.28178 0.19944 0.46476t0.44463 0.18298q0.09149 0 0.19395-0.02928 0.10247-0.02928 0.17932-0.08783z" class="HighlightOutline" fill="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_tooltip_wrench_21px.svg b/dlls/light.msstyles/blue_tooltip_wrench_21px.svg
index 1dd1a42edee..044c07496e6 100644
--- a/dlls/light.msstyles/blue_tooltip_wrench_21px.svg
+++ b/dlls/light.msstyles/blue_tooltip_wrench_21px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:21-32" width="21" height="60" version="1.1" viewBox="0 0 5.5562 15.875" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -14,11 +17,11 @@
     <rect x="40.849" y="7.409" width="5.5562" height="5.8208" rx=".55687" ry=".61134" stroke-width=".29173"/>
    </g>
   </g>
-  <rect x="40.849" y="11.907" width="5.2917" height="5.0271" rx=".52917" ry=".52917" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
+  <rect x="40.849" y="11.907" width="5.2917" height="5.0271" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
   <g stroke-width=".070003">
    <path d="m44.554 5.6369-1.2274-1.2369q-0.10942 0.038059-0.21884 0.061845-0.10942 0.023789-0.2236 0.023789-0.46146 0-0.78497-0.32113-0.3235-0.32113-0.3235-0.78259 0-0.14747 0.03806-0.28782t0.10942-0.26403l0.68982 0.68982 0.43767-0.40914-0.70884-0.70885q0.1237-0.071361 0.26165-0.1118 0.13797-0.040438 0.28068-0.040438 0.47098 0 0.80162 0.33064t0.33064 0.80162q0 0.11418-0.02379 0.2236t-0.06184 0.21884l1.2322 1.2274q0.05232 0.052332 0.05232 0.12607 0 0.073739-0.05232 0.12607l-0.36156 0.33301q-0.05234 0.052332-0.1237 0.052332t-0.1237-0.052332zm0.13321-0.27117 0.1903-0.19029-1.2988-1.2988q0.07612-0.099904 0.11418-0.2355 0.03806-0.13559 0.03806-0.25927 0-0.3568-0.26403-0.60419-0.26403-0.24738-0.60181-0.25214l0.48049 0.49001q0.04282 0.042816 0.04282 0.10466 0 0.061846-0.04282 0.10466l-0.62797 0.58991q-0.04282 0.042816-0.10466 0.042816t-0.10466-0.042816l-0.46146-0.4567q0.01427 0.36631 0.25927 0.60419 0.245 0.23787 0.57802 0.23787 0.11894 0 0.25214-0.038059 0.13321-0.038059 0.23312-0.11418z
 " fill="#aeaeae"/>
    <path d="m44.554 10.929-1.2274-1.2369q-0.10942 0.03806-0.21884 0.06184-0.10942 0.02379-0.2236 0.02379-0.46146 0-0.78497-0.32113-0.3235-0.32112-0.3235-0.78258 0-0.14747 0.03806-0.28782t0.10942-0.26403l0.68982 0.68982 0.43767-0.40914-0.70884-0.70885q0.1237-0.07136 0.26165-0.1118 0.13797-0.04044 0.28068-0.04044 0.47098 0 0.80162 0.33064t0.33064 0.80162q0 0.11418-0.02379 0.2236t-0.06184 0.21884l1.2322 1.2274q0.05233 0.05234 0.05233 0.12607 0 0.07374-0.05233 0.12607l-0.36156 0.33301q-0.05234 0.05234-0.1237 0.05234t-0.1237-0.05234zm0.13321-0.27117 0.19029-0.19029-1.2988-1.2987q0.07611-0.0999 0.11418-0.23549 0.03806-0.13559 0.03806-0.25927 0-0.3568-0.26403-0.60419-0.26403-0.24738-0.60181-0.25213l0.48049 0.49001q0.04282 0.04282 0.04282 0.10466t-0.04282 0.10466l-0.62797 0.58991q-0.04282 0.04282-0.10466 0.04282t-0.10466-0.04282l-0.46146-0.4567q0.01427 0.36631 0.25927 0.60419 0.245 0.23787 0.57802 0.23787 0.11894 0 0.25214-0.03806 0.13321-0.03806 0.23312-0.11418z" fill="#3096fa"/>
-   <path d="m44.554 16.22-1.2274-1.2369q-0.10942 0.03806-0.21884 0.06184-0.10942 0.02379-0.2236 0.02379-0.46146 0-0.78497-0.32112-0.3235-0.32113-0.3235-0.78258 0-0.14747 0.03806-0.28782t0.10942-0.26403l0.68982 0.68982 0.43767-0.40914-0.70884-0.70885q0.1237-0.07136 0.26165-0.1118 0.13797-0.04044 0.28068-0.04044 0.47098 0 0.80162 0.33064t0.33064 0.80162q0 0.11418-0.02379 0.2236t-0.06184 0.21884l1.2322 1.2274q0.05233 0.05234 0.05233 0.12607 0 0.07374-0.05233 0.12607l-0.36156 0.33301q-0.05234 0.05234-0.1237 0.05234t-0.1237-0.05234zm0.13321-0.27117 0.19029-0.19029-1.2988-1.2987q0.07611-0.0999 0.11418-0.23548 0.03806-0.13559 0.03806-0.25927 0-0.3568-0.26403-0.60419-0.26403-0.24738-0.60181-0.25213l0.48049 0.49001q0.04282 0.04282 0.04282 0.10466t-0.04282 0.10466l-0.62797 0.58991q-0.04282 0.04282-0.10466 0.04282t-0.10466-0.04282l-0.46146-0.4567q0.01427 0.36631 0.25927 0.60419 0.245 0.23787 0.57802 0.23787 0.11894 0 0.25214-0.03806 0.13321-0.03806 0.23312-0.11418z" fill="#2979ff"/>
+   <path d="m44.554 16.22-1.2274-1.2369q-0.10942 0.03806-0.21884 0.06184-0.10942 0.02379-0.2236 0.02379-0.46146 0-0.78497-0.32112-0.3235-0.32113-0.3235-0.78258 0-0.14747 0.03806-0.28782t0.10942-0.26403l0.68982 0.68982 0.43767-0.40914-0.70884-0.70885q0.1237-0.07136 0.26165-0.1118 0.13797-0.04044 0.28068-0.04044 0.47098 0 0.80162 0.33064t0.33064 0.80162q0 0.11418-0.02379 0.2236t-0.06184 0.21884l1.2322 1.2274q0.05233 0.05234 0.05233 0.12607 0 0.07374-0.05233 0.12607l-0.36156 0.33301q-0.05234 0.05234-0.1237 0.05234t-0.1237-0.05234zm0.13321-0.27117 0.19029-0.19029-1.2988-1.2987q0.07611-0.0999 0.11418-0.23548 0.03806-0.13559 0.03806-0.25927 0-0.3568-0.26403-0.60419-0.26403-0.24738-0.60181-0.25213l0.48049 0.49001q0.04282 0.04282 0.04282 0.10466t-0.04282 0.10466l-0.62797 0.58991q-0.04282 0.04282-0.10466 0.04282t-0.10466-0.04282l-0.46146-0.4567q0.01427 0.36631 0.25927 0.60419 0.245 0.23787 0.57802 0.23787 0.11894 0 0.25214-0.03806 0.13321-0.03806 0.23312-0.11418z" class="HighlightOutline" fi
 ll="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_tooltip_wrench_26px.svg b/dlls/light.msstyles/blue_tooltip_wrench_26px.svg
index 38969c106fd..5ed89db2681 100644
--- a/dlls/light.msstyles/blue_tooltip_wrench_26px.svg
+++ b/dlls/light.msstyles/blue_tooltip_wrench_26px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:26-32" width="26" height="72" version="1.1" viewBox="0 0 6.8791 19.05" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -14,11 +17,11 @@
     <rect x="40.849" y="7.409" width="5.5562" height="5.8208" rx=".4456" ry=".50486" stroke-width=".23716"/>
    </g>
   </g>
-  <rect x="40.849" y="14.024" width="6.6146" height="6.0854" rx=".52917" ry=".52917" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
+  <rect x="40.849" y="14.024" width="6.6146" height="6.0854" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
   <g stroke-width=".070003">
    <path d="m45.459 6.4186-1.5106-1.5223q-0.13467 0.046842-0.26934 0.076117-0.13467 0.029279-0.2752 0.029279-0.56795 0-0.96611-0.39524-0.39815-0.39524-0.39815-0.96319 0-0.1815 0.04684-0.35424t0.13467-0.32496l0.849 0.84901 0.53867-0.50356-0.87241-0.87243q0.15224-0.087829 0.32203-0.1376 0.16981-0.04977 0.34545-0.04977 0.57966 0 0.9866 0.40694t0.40694 0.98661q0 0.14053-0.02928 0.2752t-0.07611 0.26934l1.5165 1.5106q0.06439 0.064409 0.06439 0.15516 0 0.090756-0.06439 0.15516l-0.44499 0.40986q-0.06442 0.064409-0.15224 0.064409-0.08783 0-0.15224-0.064409zm0.16395-0.33375 0.23421-0.2342-1.5985-1.5985q0.09369-0.12296 0.14053-0.28985 0.04684-0.16688 0.04684-0.3191 0-0.43914-0.32496-0.74362-0.32495-0.30447-0.74068-0.31033l0.59137 0.60309q0.0527 0.052697 0.0527 0.12881 0 0.076118-0.0527 0.12881l-0.77288 0.72604q-0.0527 0.052697-0.12881 0.052697t-0.12881-0.052697l-0.56795-0.56209q0.01756 0.45084 0.3191 0.74362 0.30154 0.29276 0.7114 0.29276 0.14639 0 0.31032-0.046842 0.16395-0.046842 0.28692-0.1
 4053z" fill="#aeaeae"/>
    <path d="m45.459 12.769-1.5106-1.5223q-0.13467 0.04684-0.26934 0.07611-0.13467 0.02928-0.2752 0.02928-0.56794 0-0.96611-0.39524-0.39815-0.39522-0.39815-0.96317 0-0.1815 0.04684-0.35424t0.13467-0.32496l0.849 0.84901 0.53867-0.50356-0.87241-0.87243q0.15224-0.087828 0.32203-0.1376 0.16981-0.049772 0.34545-0.049772 0.57966 0 0.9866 0.40694t0.40694 0.98661q0 0.14053-0.02928 0.2752t-0.07611 0.26934l1.5165 1.5106q0.06441 0.06442 0.06441 0.15516 0 0.09076-0.06441 0.15516l-0.44499 0.40986q-0.06442 0.06442-0.15224 0.06442-0.08783 0-0.15224-0.06442zm0.16395-0.33375 0.2342-0.2342-1.5985-1.5984q0.09367-0.12295 0.14053-0.28983 0.04684-0.16688 0.04684-0.3191 0-0.43914-0.32496-0.74362-0.32496-0.30447-0.74068-0.31031l0.59137 0.60309q0.0527 0.052701 0.0527 0.12881 0 0.076111-0.0527 0.12881l-0.77288 0.72604q-0.0527 0.0527-0.12881 0.0527t-0.12881-0.0527l-0.56794-0.56209q0.01756 0.45084 0.3191 0.74362 0.30154 0.29276 0.7114 0.29276 0.14639 0 0.31032-0.04684 0.16395-0.04684 0.28691-0.14053z" fill="#30
 96fa"/>
-   <path d="m45.459 19.119-1.5106-1.5223q-0.13467 0.04684-0.26934 0.07611-0.13467 0.02928-0.2752 0.02928-0.56794 0-0.96611-0.39522-0.39815-0.39524-0.39815-0.96317 0-0.1815 0.04684-0.35424t0.13467-0.32496l0.849 0.84901 0.53866-0.50356-0.87241-0.87243q0.15224-0.08783 0.32203-0.1376 0.16981-0.04977 0.34545-0.04977 0.57966 0 0.9866 0.40694t0.40694 0.98661q0 0.14053-0.02928 0.2752t-0.07611 0.26934l1.5165 1.5106q0.06441 0.06442 0.06441 0.15516 0 0.09076-0.06441 0.15516l-0.44499 0.40986q-0.06442 0.06442-0.15224 0.06442-0.08783 0-0.15224-0.06442zm0.16395-0.33375 0.2342-0.2342-1.5985-1.5984q0.09367-0.12295 0.14053-0.28982 0.04684-0.16688 0.04684-0.3191 0-0.43914-0.32496-0.74362-0.32496-0.30447-0.74068-0.31031l0.59137 0.60309q0.0527 0.0527 0.0527 0.12881t-0.0527 0.12881l-0.77288 0.72604q-0.0527 0.0527-0.12881 0.0527t-0.12881-0.0527l-0.56794-0.56209q0.01756 0.45084 0.3191 0.74362 0.30154 0.29276 0.7114 0.29276 0.14639 0 0.31032-0.04684 0.16395-0.04684 0.28691-0.14053z" fill="#2979ff"/>
+   <path d="m45.459 19.119-1.5106-1.5223q-0.13467 0.04684-0.26934 0.07611-0.13467 0.02928-0.2752 0.02928-0.56794 0-0.96611-0.39522-0.39815-0.39524-0.39815-0.96317 0-0.1815 0.04684-0.35424t0.13467-0.32496l0.849 0.84901 0.53866-0.50356-0.87241-0.87243q0.15224-0.08783 0.32203-0.1376 0.16981-0.04977 0.34545-0.04977 0.57966 0 0.9866 0.40694t0.40694 0.98661q0 0.14053-0.02928 0.2752t-0.07611 0.26934l1.5165 1.5106q0.06441 0.06442 0.06441 0.15516 0 0.09076-0.06441 0.15516l-0.44499 0.40986q-0.06442 0.06442-0.15224 0.06442-0.08783 0-0.15224-0.06442zm0.16395-0.33375 0.2342-0.2342-1.5985-1.5984q0.09367-0.12295 0.14053-0.28982 0.04684-0.16688 0.04684-0.3191 0-0.43914-0.32496-0.74362-0.32496-0.30447-0.74068-0.31031l0.59137 0.60309q0.0527 0.0527 0.0527 0.12881t-0.0527 0.12881l-0.77288 0.72604q-0.0527 0.0527-0.12881 0.0527t-0.12881-0.0527l-0.56794-0.56209q0.01756 0.45084 0.3191 0.74362 0.30154 0.29276 0.7114 0.29276 0.14639 0 0.31032-0.04684 0.16395-0.04684 0.28691-0.14053z" class="HighlightOutline"
  fill="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_tooltip_wrench_34px.svg b/dlls/light.msstyles/blue_tooltip_wrench_34px.svg
index 2bacadd5172..6c77638d941 100644
--- a/dlls/light.msstyles/blue_tooltip_wrench_34px.svg
+++ b/dlls/light.msstyles/blue_tooltip_wrench_34px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:34-32" width="34" height="96" version="1.1" viewBox="0 0 8.9957 25.4" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -14,11 +17,11 @@
     <rect x="40.849" y="7.409" width="5.5562" height="5.8208" rx=".33729" ry=".37492" stroke-width=".17781"/>
    </g>
   </g>
-  <rect x="40.849" y="18.257" width="8.7313" height="8.2021" rx=".52917" ry=".52917" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
+  <rect x="40.849" y="18.257" width="8.7313" height="8.2021" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
   <g stroke-width=".070003">
    <path d="m46.579 7.99-1.8883-1.9029q-0.16834 0.058553-0.33668 0.095148-0.16834 0.036599-0.344 0.036599-0.70994 0-1.2076-0.49406-0.49769-0.49406-0.49769-1.204 0-0.22688 0.05855-0.44281 0.05854-0.21593 0.16834-0.40621l1.0613 1.0613 0.67334-0.62946-1.0905-1.0906q0.1903-0.10979 0.40254-0.172 0.21226-0.062213 0.43182-0.062213 0.72458 0 1.2333 0.50868 0.50868 0.50868 0.50868 1.2333 0 0.17566-0.0366 0.344t-0.09513 0.33668l1.8956 1.8883q0.08049 0.080512 0.08049 0.19395 0 0.11345-0.08049 0.19395l-0.55624 0.51233q-0.08052 0.080512-0.1903 0.080512-0.10979 0-0.1903-0.080512zm0.20494-0.41719 0.29276-0.29275-1.9981-1.9982q0.11711-0.1537 0.17566-0.36232 0.05856-0.2086 0.05856-0.39888 0-0.54893-0.4062-0.92954-0.40619-0.38059-0.92586-0.38792l0.73922 0.75387q0.06588 0.065872 0.06588 0.16101 0 0.095149-0.06588 0.16101l-0.96611 0.90756q-0.06588 0.065872-0.16101 0.065872-0.09515 0-0.16102-0.065872l-0.70995-0.70262q0.02196 0.56356 0.39888 0.92954 0.37693 0.36595 0.88926 0.36595 0.18299 0 0.3879-0.0585
 53 0.20494-0.058553 0.35865-0.17566z" fill="#aeaeae"/>
    <path d="m46.579 16.457-1.8883-1.9029q-0.16834 0.05855-0.33668 0.09514-0.16834 0.0366-0.344 0.0366-0.70993 0-1.2076-0.49406-0.49769-0.49403-0.49769-1.204 0-0.22688 0.05855-0.4428t0.16834-0.4062l1.0613 1.0613 0.67334-0.62946-1.0905-1.0905q0.1903-0.10979 0.40254-0.172 0.21226-0.06221 0.43181-0.06221 0.72458 0 1.2333 0.50868t0.50868 1.2333q0 0.17566-0.0366 0.344t-0.09514 0.33668l1.8956 1.8883q0.08051 0.08052 0.08051 0.19395 0 0.11345-0.08051 0.19395l-0.55624 0.51233q-0.08053 0.08053-0.1903 0.08053-0.10979 0-0.1903-0.08053zm0.20494-0.41719 0.29275-0.29275-1.9981-1.998q0.11709-0.15369 0.17566-0.36229 0.05855-0.2086 0.05855-0.39888 0-0.54893-0.4062-0.92953-0.4062-0.38059-0.92586-0.38789l0.73922 0.75387q0.06588 0.06588 0.06588 0.16101 0 0.09514-0.06588 0.16101l-0.9661 0.90756q-0.06587 0.06588-0.16101 0.06588t-0.16101-0.06588l-0.70993-0.70262q0.02195 0.56356 0.39888 0.92954 0.37693 0.36595 0.88925 0.36595 0.18299 0 0.3879-0.05855 0.20494-0.05855 0.35864-0.17566z" fill="#3096fa"/>
-   <path d="m46.579 24.923-1.8883-1.9029q-0.16834 0.05855-0.33668 0.09514-0.16834 0.0366-0.344 0.0366-0.70993 0-1.2076-0.49403-0.49769-0.49406-0.49769-1.204 0-0.22688 0.05855-0.4428t0.16834-0.4062l1.0613 1.0613 0.67333-0.62946-1.0905-1.0905q0.1903-0.10979 0.40254-0.172 0.21226-0.06221 0.43182-0.06221 0.72458 0 1.2333 0.50868t0.50868 1.2333q0 0.17566-0.0366 0.344t-0.09514 0.33668l1.8956 1.8883q0.08051 0.08053 0.08051 0.19395 0 0.11345-0.08051 0.19395l-0.55624 0.51233q-0.08053 0.08053-0.1903 0.08053-0.10979 0-0.1903-0.08053zm0.20494-0.41719 0.29275-0.29275-1.9981-1.998q0.11709-0.15369 0.17566-0.36228 0.05855-0.2086 0.05855-0.39888 0-0.54893-0.4062-0.92954-0.4062-0.38059-0.92586-0.38789l0.73922 0.75387q0.06587 0.06588 0.06587 0.16101 0 0.09514-0.06587 0.16101l-0.96611 0.90756q-0.06588 0.06587-0.16101 0.06587-0.09514 0-0.16101-0.06587l-0.70993-0.70262q0.02195 0.56356 0.39888 0.92953 0.37693 0.36595 0.88926 0.36595 0.18299 0 0.3879-0.05855 0.20494-0.05855 0.35864-0.17566z" fill="#2979ff"
 />
+   <path d="m46.579 24.923-1.8883-1.9029q-0.16834 0.05855-0.33668 0.09514-0.16834 0.0366-0.344 0.0366-0.70993 0-1.2076-0.49403-0.49769-0.49406-0.49769-1.204 0-0.22688 0.05855-0.4428t0.16834-0.4062l1.0613 1.0613 0.67333-0.62946-1.0905-1.0905q0.1903-0.10979 0.40254-0.172 0.21226-0.06221 0.43182-0.06221 0.72458 0 1.2333 0.50868t0.50868 1.2333q0 0.17566-0.0366 0.344t-0.09514 0.33668l1.8956 1.8883q0.08051 0.08053 0.08051 0.19395 0 0.11345-0.08051 0.19395l-0.55624 0.51233q-0.08053 0.08053-0.1903 0.08053-0.10979 0-0.1903-0.08053zm0.20494-0.41719 0.29275-0.29275-1.9981-1.998q0.11709-0.15369 0.17566-0.36228 0.05855-0.2086 0.05855-0.39888 0-0.54893-0.4062-0.92954-0.4062-0.38059-0.92586-0.38789l0.73922 0.75387q0.06587 0.06588 0.06587 0.16101 0 0.09514-0.06587 0.16101l-0.96611 0.90756q-0.06588 0.06587-0.16101 0.06587-0.09514 0-0.16101-0.06587l-0.70993-0.70262q0.02195 0.56356 0.39888 0.92953 0.37693 0.36595 0.88926 0.36595 0.18299 0 0.3879-0.05855 0.20494-0.05855 0.35864-0.17566z" class="Highlig
 htOutline" fill="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_tooltip_wrench_42px.svg b/dlls/light.msstyles/blue_tooltip_wrench_42px.svg
index 9183aa0c921..eaf7f8a1230 100644
--- a/dlls/light.msstyles/blue_tooltip_wrench_42px.svg
+++ b/dlls/light.msstyles/blue_tooltip_wrench_42px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:42-32" width="42" height="120" version="1.1" viewBox="0 0 11.112 31.75" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -14,11 +17,11 @@
     <rect x="40.849" y="7.409" width="5.5564" height="5.8208" rx=".27135" ry=".29815" stroke-width=".14222"/>
    </g>
   </g>
-  <rect x="40.849" y="22.49" width="10.848" height="10.319" rx=".52917" ry=".52917" fill="#fff" stroke="#2979ff" stroke-width=".26458"/>
+  <rect x="40.849" y="22.49" width="10.848" height="10.319" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
   <g stroke-width=".070003">
    <path d="m48.227 9.5614-2.2659-2.2835q-0.20201 0.070263-0.40401 0.11418-0.202 0.043919-0.4128 0.043919-0.85192 0-1.4491-0.59287-0.59722-0.59287-0.59722-1.4448 0-0.27225 0.07026-0.53137 0.07025-0.25911 0.20201-0.48745l1.2735 1.2736 0.808-0.75535-1.3086-1.3087q0.22836-0.13175 0.48304-0.2064 0.25471-0.074655 0.51818-0.074655 0.86949 0 1.4799 0.61041t0.61041 1.48q0 0.21079-0.04392 0.4128t-0.11416 0.40401l2.2747 2.2659q0.09659 0.096614 0.09659 0.23274 0 0.13614-0.09659 0.23274l-0.66748 0.61479q-0.09662 0.096614-0.22836 0.096614-0.13175 0-0.22836-0.096614zm0.24592-0.50062 0.35131-0.3513-2.3977-2.3978q0.14053-0.18444 0.21079-0.43478 0.07027-0.25032 0.07027-0.47865 0-0.65871-0.48743-1.1154-0.48742-0.4567-1.111-0.4655l0.88705 0.90464q0.07905 0.079046 0.07905 0.19321 0 0.11418-0.07905 0.19321l-1.1593 1.0891q-0.07905 0.079046-0.19321 0.079046-0.11418 0-0.19322-0.079046l-0.85193-0.84314q0.02635 0.67627 0.47865 1.1154 0.45231 0.43914 1.0671 0.43914 0.21959 0 0.46548-0.070263 0.24592-0.070263 
 0.43038-0.21079z" fill="#aeaeae"/>
    <path d="m48.227 20.145-2.2659-2.2835q-0.20201 0.07026-0.40401 0.11417-0.202 0.04392-0.4128 0.04392-0.8519 0-1.4491-0.59287-0.59722-0.59283-0.59722-1.4448 0-0.27225 0.07026-0.53135t0.20201-0.48744l1.2735 1.2735 0.808-0.75534-1.3086-1.3086q0.22836-0.13175 0.48304-0.2064 0.25471-0.07465 0.51816-0.07465 0.86949 0 1.4799 0.61041 0.61046 0.61041 0.61041 1.4799 0 0.21079-0.04392 0.4128t-0.11417 0.40401l2.2747 2.2659q0.09661 0.09662 0.09661 0.23274 0 0.13614-0.09661 0.23274l-0.66748 0.61479q-0.09663 0.09664-0.22836 0.09664-0.13175 0-0.22836-0.09664zm0.24592-0.50062 0.3513-0.3513-2.3977-2.3976q0.14051-0.18443 0.21079-0.43474 0.07026-0.25032 0.07026-0.47865 0-0.65871-0.48743-1.1154-0.48744-0.4567-1.111-0.46546l0.88705 0.90464q0.07906 0.07906 0.07906 0.19321 0 0.11417-0.07906 0.19321l-1.1593 1.0891q-0.07904 0.07906-0.19321 0.07906t-0.19321-0.07906l-0.85191-0.84314q0.02634 0.67626 0.47865 1.1154t1.0671 0.43914q0.21959 0 0.46548-0.07026 0.24592-0.07026 0.43036-0.21079z" fill="#3096fa"/>
-   <path d="m48.227 30.728-2.2659-2.2835q-0.20201 0.07026-0.40401 0.11417-0.202 0.04392-0.4128 0.04392-0.8519 0-1.4491-0.59283-0.59722-0.59287-0.59722-1.4448 0-0.27225 0.07026-0.53136t0.20201-0.48744l1.2735 1.2735 0.80799-0.75534-1.3086-1.3086q0.22836-0.13175 0.48304-0.2064 0.25471-0.07465 0.51818-0.07465 0.86949 0 1.4799 0.61041 0.61046 0.61041 0.61041 1.4799 0 0.21079-0.04392 0.4128t-0.11417 0.40401l2.2747 2.2659q0.09661 0.09663 0.09661 0.23274 0 0.13614-0.09661 0.23274l-0.66748 0.61479q-0.09663 0.09663-0.22836 0.09663-0.13175 0-0.22836-0.09663zm0.24592-0.50062 0.3513-0.3513-2.3977-2.3976q0.14051-0.18443 0.21079-0.43473 0.07026-0.25032 0.07026-0.47865 0-0.65871-0.48743-1.1154-0.48744-0.4567-1.111-0.46546l0.88705 0.90464q0.07904 0.07906 0.07904 0.19321 0 0.11417-0.07904 0.19321l-1.1593 1.0891q-0.07905 0.07904-0.19321 0.07904-0.11417 0-0.19321-0.07904l-0.85191-0.84314q0.02634 0.67626 0.47865 1.1154t1.0671 0.43914q0.21959 0 0.46548-0.07026 0.24592-0.07026 0.43036-0.21079z" fill="#297
 9ff"/>
+   <path d="m48.227 30.728-2.2659-2.2835q-0.20201 0.07026-0.40401 0.11417-0.202 0.04392-0.4128 0.04392-0.8519 0-1.4491-0.59283-0.59722-0.59287-0.59722-1.4448 0-0.27225 0.07026-0.53136t0.20201-0.48744l1.2735 1.2735 0.80799-0.75534-1.3086-1.3086q0.22836-0.13175 0.48304-0.2064 0.25471-0.07465 0.51818-0.07465 0.86949 0 1.4799 0.61041 0.61046 0.61041 0.61041 1.4799 0 0.21079-0.04392 0.4128t-0.11417 0.40401l2.2747 2.2659q0.09661 0.09663 0.09661 0.23274 0 0.13614-0.09661 0.23274l-0.66748 0.61479q-0.09663 0.09663-0.22836 0.09663-0.13175 0-0.22836-0.09663zm0.24592-0.50062 0.3513-0.3513-2.3977-2.3976q0.14051-0.18443 0.21079-0.43473 0.07026-0.25032 0.07026-0.47865 0-0.65871-0.48743-1.1154-0.48744-0.4567-1.111-0.46546l0.88705 0.90464q0.07904 0.07906 0.07904 0.19321 0 0.11417-0.07904 0.19321l-1.1593 1.0891q-0.07905 0.07904-0.19321 0.07904-0.11417 0-0.19321-0.07904l-0.85191-0.84314q0.02634 0.67626 0.47865 1.1154t1.0671 0.43914q0.21959 0 0.46548-0.07026 0.24592-0.07026 0.43036-0.21079z" class="Hig
 hlightOutline" fill="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_tooltip_wrench_51px.svg b/dlls/light.msstyles/blue_tooltip_wrench_51px.svg
index cbc22c89c92..a3ae1dd3625 100644
--- a/dlls/light.msstyles/blue_tooltip_wrench_51px.svg
+++ b/dlls/light.msstyles/blue_tooltip_wrench_51px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:51-32" width="51" height="144" version="1.1" viewBox="0 0 13.493 38.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -14,11 +17,11 @@
     <rect x="40.849" y="7.409" width="5.5563" height="5.8208" rx=".22727" ry=".25253" stroke-width=".23957"/>
    </g>
   </g>
-  <rect x="40.981" y="26.856" width="12.965" height="12.171" rx=".52917" ry=".52917" fill="#fff" stroke="#2979ff" stroke-width=".52917"/>
+  <rect x="40.981" y="26.856" width="12.965" height="12.171" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".52917"/>
   <g transform="translate(0 .26455)" stroke-width=".070003">
    <path d="m49.723 11.385-2.9268-2.9495q-0.26093 0.090757-0.52185 0.14748-0.26092 0.056729-0.53321 0.056729-1.1004 0-1.8718-0.76579-0.77142-0.76579-0.77142-1.8662 0-0.35166 0.09076-0.68635 0.09074-0.33468 0.26093-0.62962l1.645 1.6451 1.0437-0.97566-1.6903-1.6904q0.29497-0.17018 0.62394-0.2666 0.329-0.09643 0.66932-0.09643 1.1231 0 1.9116 0.78845 0.78846 0.78845 0.78846 1.9117 0 0.27227-0.05673 0.5332-0.05673 0.26093-0.14746 0.52185l2.9382 2.9268q0.12476 0.12479 0.12476 0.30062 0 0.17585-0.12476 0.30062l-0.86217 0.7941q-0.1248 0.12479-0.29497 0.12479-0.17018 0-0.29497-0.12479zm0.31765-0.64663 0.45378-0.45376-3.0971-3.0972q0.18152-0.23823 0.27227-0.56159 0.09077-0.32333 0.09077-0.61826 0-0.85083-0.6296-1.4407-0.6296-0.5899-1.4351-0.60127l1.1458 1.1685q0.1021 0.1021 0.1021 0.24956 0 0.14748-0.1021 0.24956l-1.4974 1.4068q-0.1021 0.1021-0.24957 0.1021-0.14748 0-0.24958-0.1021l-1.1004-1.0891q0.03404 0.87351 0.61826 1.4407 0.58424 0.56722 1.3784 0.56722 0.28364 0 0.60125-0.090757 0.31765-
 0.090757 0.55592-0.27227z" fill="#aeaeae"/>
    <path d="m49.723 24.085-2.9268-2.9496q-0.26093 0.09075-0.52185 0.14747-0.26092 0.05673-0.53321 0.05673-1.1004 0-1.8718-0.7658-0.77142-0.76575-0.77142-1.8662 0-0.35166 0.09075-0.68634 0.09075-0.33467 0.26094-0.62962l1.645 1.645 1.0437-0.97566-1.6903-1.6903q0.29497-0.17018 0.62394-0.2666 0.32901-0.09642 0.6693-0.09642 1.1231 0 1.9116 0.78846 0.78852 0.78846 0.78846 1.9116 0 0.27227-0.05673 0.53321-0.05673 0.26093-0.14747 0.52185l2.9382 2.9268q0.12479 0.1248 0.12479 0.30063 0 0.17585-0.12479 0.30063l-0.86218 0.79411q-0.12482 0.12483-0.29497 0.12483-0.17018 0-0.29497-0.12483zm0.31765-0.64664 0.45377-0.45377-3.0971-3.0969q0.1815-0.23822 0.27228-0.56155 0.09075-0.32333 0.09075-0.61826 0-0.85084-0.62961-1.4407-0.62962-0.58991-1.4351-0.60122l1.1458 1.1685q0.10212 0.10212 0.10212 0.24956 0 0.14747-0.10212 0.24957l-1.4975 1.4068q-0.1021 0.10212-0.24957 0.10212t-0.24957-0.10212l-1.1004-1.0891q0.03402 0.87351 0.61827 1.4407 0.58424 0.56723 1.3784 0.56723 0.28364 0 0.60125-0.09075 0.31765-0.0
 9075 0.55589-0.27227z" fill="#3096fa"/>
-   <path d="m49.723 36.785-2.9268-2.9496q-0.26093 0.09075-0.52185 0.14747-0.26092 0.05673-0.53321 0.05673-1.1004 0-1.8718-0.76575-0.77142-0.7658-0.77142-1.8662 0-0.35166 0.09075-0.68635t0.26093-0.62962l1.645 1.645 1.0437-0.97566-1.6903-1.6903q0.29497-0.17018 0.62394-0.2666 0.329-0.09642 0.66933-0.09642 1.1231 0 1.9116 0.78846 0.78852 0.78846 0.78846 1.9116 0 0.27227-0.05673 0.53321t-0.14747 0.52185l2.9382 2.9268q0.12479 0.12482 0.12479 0.30063 0 0.17585-0.12479 0.30063l-0.86217 0.79411q-0.12482 0.12482-0.29497 0.12482-0.17018 0-0.29497-0.12482zm0.31765-0.64664 0.45377-0.45377-3.0971-3.0969q0.1815-0.23822 0.27228-0.56153 0.09075-0.32333 0.09075-0.61826 0-0.85084-0.62961-1.4407-0.62962-0.58991-1.4351-0.60123l1.1458 1.1685q0.10209 0.10212 0.10209 0.24957 0 0.14747-0.10209 0.24957l-1.4975 1.4068q-0.10211 0.10209-0.24957 0.10209-0.14747 0-0.24957-0.10209l-1.1004-1.0891q0.03402 0.87351 0.61826 1.4407 0.58424 0.56723 1.3784 0.56723 0.28364 0 0.60125-0.09075 0.31765-0.09075 0.55589-0.27227z
 " fill="#2979ff"/>
+   <path d="m49.723 36.785-2.9268-2.9496q-0.26093 0.09075-0.52185 0.14747-0.26092 0.05673-0.53321 0.05673-1.1004 0-1.8718-0.76575-0.77142-0.7658-0.77142-1.8662 0-0.35166 0.09075-0.68635t0.26093-0.62962l1.645 1.645 1.0437-0.97566-1.6903-1.6903q0.29497-0.17018 0.62394-0.2666 0.329-0.09642 0.66933-0.09642 1.1231 0 1.9116 0.78846 0.78852 0.78846 0.78846 1.9116 0 0.27227-0.05673 0.53321t-0.14747 0.52185l2.9382 2.9268q0.12479 0.12482 0.12479 0.30063 0 0.17585-0.12479 0.30063l-0.86217 0.79411q-0.12482 0.12482-0.29497 0.12482-0.17018 0-0.29497-0.12482zm0.31765-0.64664 0.45377-0.45377-3.0971-3.0969q0.1815-0.23822 0.27228-0.56153 0.09075-0.32333 0.09075-0.61826 0-0.85084-0.62961-1.4407-0.62962-0.58991-1.4351-0.60123l1.1458 1.1685q0.10209 0.10212 0.10209 0.24957 0 0.14747-0.10209 0.24957l-1.4975 1.4068q-0.10211 0.10209-0.24957 0.10209-0.14747 0-0.24957-0.10209l-1.1004-1.0891q0.03402 0.87351 0.61826 1.4407 0.58424 0.56723 1.3784 0.56723 0.28364 0 0.60125-0.09075 0.31765-0.09075 0.55589-0.27227z
 " class="HighlightOutline" fill="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_tooltip_wrench_68px.svg b/dlls/light.msstyles/blue_tooltip_wrench_68px.svg
index 60087e40c33..17c4c05840e 100644
--- a/dlls/light.msstyles/blue_tooltip_wrench_68px.svg
+++ b/dlls/light.msstyles/blue_tooltip_wrench_68px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:68-32" width="68" height="192" version="1.1" viewBox="0 0 17.991 50.8" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -14,11 +17,11 @@
     <rect x="40.849" y="7.409" width="5.5563" height="5.8208" rx=".16865" ry=".18747" stroke-width=".17781"/>
    </g>
   </g>
-  <rect x="40.981" y="35.323" width="17.462" height="16.404" rx=".52917" ry=".52917" fill="#fff" stroke="#2979ff" stroke-width=".52917"/>
+  <rect x="40.981" y="35.323" width="17.462" height="16.404" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".52917"/>
   <g transform="translate(.26454 .52937)" stroke-width=".070003">
    <path d="m52.074 14.251-3.9653-3.9961q-0.35351 0.12296-0.70701 0.19981-0.3535 0.07686-0.7224 0.07686-1.4908 0-2.536-1.0375-1.0451-1.0375-1.0451-2.5284 0-0.47644 0.12296-0.92989 0.12294-0.45343 0.35351-0.85303l2.2287 2.2288 1.414-1.3219-2.2901-2.2902q0.39963-0.23056 0.84533-0.3612 0.44574-0.13065 0.90681-0.13065 1.5216 0 2.5899 1.0682 1.0682 1.0682 1.0682 2.59 0 0.36888-0.07686 0.7224-0.07686 0.35352-0.19978 0.70702l3.9807 3.9653q0.16903 0.16907 0.16903 0.40729 0 0.23825-0.16903 0.40729l-1.1681 1.0759q-0.16908 0.16907-0.39963 0.16907-0.23056 0-0.39963-0.16907zm0.43036-0.87607 0.61479-0.61477-4.196-4.1962q0.24593-0.32276 0.36888-0.76086 0.12298-0.43806 0.12298-0.83764 0-1.1527-0.853-1.9519-0.853-0.79922-1.9443-0.81462l1.5524 1.5831q0.13833 0.13833 0.13833 0.33811 0 0.19981-0.13833 0.33811l-2.0287 1.906q-0.13833 0.13833-0.33812 0.13833-0.19981 0-0.33814-0.13833l-1.4908-1.4755q0.04612 1.1835 0.83763 1.9519 0.79154 0.76849 1.8675 0.76849 0.38428 0 0.81459-0.12296 0.43036-0.12296 0.753
 17-0.36888z" fill="#aeaeae"/>
    <path d="m52.074 31.185-3.9653-3.9962q-0.35351 0.12295-0.70701 0.1998-0.3535 0.07686-0.7224 0.07686-1.4908 0-2.536-1.0375-1.0451-1.0375-1.0451-2.5284 0-0.47644 0.12295-0.92988 0.12295-0.45342 0.35353-0.85303l2.2287 2.2287 1.414-1.3219-2.2901-2.2901q0.39963-0.23057 0.84533-0.3612 0.44575-0.13063 0.90678-0.13063 1.5216 0 2.5899 1.0682 1.0683 1.0682 1.0682 2.5899 0 0.36888-0.07686 0.72241-0.07686 0.35352-0.1998 0.70702l3.9807 3.9653q0.16907 0.16908 0.16907 0.4073 0 0.23825-0.16907 0.4073l-1.1681 1.0759q-0.16911 0.16912-0.39963 0.16912-0.23056 0-0.39963-0.16912zm0.43036-0.87609 0.61478-0.61478-4.196-4.1958q0.2459-0.32275 0.36889-0.76081 0.12295-0.43806 0.12295-0.83764 0-1.1527-0.85301-1.9519-0.85302-0.79923-1.9443-0.81455l1.5524 1.5831q0.13836 0.13836 0.13836 0.33811 0 0.1998-0.13836 0.33812l-2.0288 1.906q-0.13833 0.13836-0.33812 0.13836-0.1998 0-0.33812-0.13836l-1.4908-1.4755q0.04609 1.1835 0.83765 1.9519 0.79154 0.7685 1.8675 0.7685 0.38428 0 0.81459-0.12295 0.43036-0.12295 0.75313
 -0.36888z" fill="#3096fa"/>
-   <path d="m52.074 48.118-3.9653-3.9962q-0.35351 0.12295-0.70701 0.1998-0.3535 0.07686-0.7224 0.07686-1.4908 0-2.536-1.0375-1.0451-1.0375-1.0451-2.5284 0-0.47644 0.12296-0.92989 0.12296-0.45345 0.35351-0.85303l2.2287 2.2287 1.414-1.3219-2.2901-2.2901q0.39963-0.23057 0.84533-0.3612 0.44574-0.13063 0.90682-0.13063 1.5216 0 2.5899 1.0682 1.0683 1.0682 1.0682 2.5899 0 0.36888-0.07686 0.72241-0.07686 0.35353-0.1998 0.70702l3.9807 3.9653q0.16907 0.16911 0.16907 0.4073 0 0.23825-0.16907 0.4073l-1.1681 1.0759q-0.16911 0.16911-0.39963 0.16911-0.23056 0-0.39963-0.16911zm0.43036-0.87609 0.61478-0.61478-4.196-4.1958q0.2459-0.32275 0.36889-0.76078 0.12296-0.43806 0.12296-0.83764 0-1.1527-0.85301-1.9519-0.85302-0.79923-1.9443-0.81457l1.5524 1.5831q0.13831 0.13836 0.13831 0.33813 0 0.1998-0.13831 0.33813l-2.0288 1.906q-0.13834 0.13832-0.33812 0.13832-0.1998 0-0.33812-0.13832l-1.4908-1.4756q0.04609 1.1835 0.83763 1.9519 0.79154 0.7685 1.8675 0.7685 0.38428 0 0.81458-0.12295 0.43036-0.12295 0.75313
 -0.36888z" fill="#2979ff"/>
+   <path d="m52.074 48.118-3.9653-3.9962q-0.35351 0.12295-0.70701 0.1998-0.3535 0.07686-0.7224 0.07686-1.4908 0-2.536-1.0375-1.0451-1.0375-1.0451-2.5284 0-0.47644 0.12296-0.92989 0.12296-0.45345 0.35351-0.85303l2.2287 2.2287 1.414-1.3219-2.2901-2.2901q0.39963-0.23057 0.84533-0.3612 0.44574-0.13063 0.90682-0.13063 1.5216 0 2.5899 1.0682 1.0683 1.0682 1.0682 2.5899 0 0.36888-0.07686 0.72241-0.07686 0.35353-0.1998 0.70702l3.9807 3.9653q0.16907 0.16911 0.16907 0.4073 0 0.23825-0.16907 0.4073l-1.1681 1.0759q-0.16911 0.16911-0.39963 0.16911-0.23056 0-0.39963-0.16911zm0.43036-0.87609 0.61478-0.61478-4.196-4.1958q0.2459-0.32275 0.36889-0.76078 0.12296-0.43806 0.12296-0.83764 0-1.1527-0.85301-1.9519-0.85302-0.79923-1.9443-0.81457l1.5524 1.5831q0.13831 0.13836 0.13831 0.33813 0 0.1998-0.13831 0.33813l-2.0288 1.906q-0.13834 0.13832-0.33812 0.13832-0.1998 0-0.33812-0.13832l-1.4908-1.4756q0.04609 1.1835 0.83763 1.9519 0.79154 0.7685 1.8675 0.7685 0.38428 0 0.81458-0.12295 0.43036-0.12295 0.75313
 -0.36888z" class="HighlightOutline" fill="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_11px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_11px.svg
index b362067684e..963fefba7b0 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_down_11px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_down_11px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:11-32" width="11" height="95" version="1.1" viewBox="0 0 2.9104 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -10,7 +13,7 @@
  </metadata>
  <g stroke-width=".26458">
   <path d="m2.7781 3.6131-0.0018888-3.4809h-2.642l-0.0018938 3.4809 1.3229 1.2331z" fill="#fff" stroke="#aeaeae"/>
-  <path d="m2.9104 13.766-0.00208-3.7121h-2.9062l-0.002084 3.7121 1.4552 1.315z" fill="#2979ff"/>
+  <path d="m2.9104 13.766-0.00208-3.7121h-2.9062l-0.002084 3.7121 1.4552 1.315z" class="HighlightOutline" fill="currentColor"/>
   <g fill="#fff">
    <path d="m2.7781 23.728-0.00189-3.4877h-2.642l-0.001887 3.4877 1.3229 1.2355z" stroke="#aeaeae"/>
    <path d="m2.7781 8.6469-0.00188-3.4877h-2.642l-0.001888 3.4877 1.3229 1.2355z" stroke="#3096fa"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_15px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_15px.svg
index aa9ef02a8a3..e6cb816af2d 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_down_15px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_down_15px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:15-32" width="15" height="120" version="1.1" viewBox="0 0 3.9687 31.75" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -10,7 +13,7 @@
  </metadata>
  <g stroke-width=".26458">
   <path d="m3.5718 4.3935-0.00227-4.2612h-3.1704l-0.002271 4.2612 1.5875 1.5095z" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/>
-  <path d="m3.7042 17.194-0.00246-4.4936h-3.4347l-0.002463 4.4936 1.7198 1.5918z" fill="#2979ff"/>
+  <path d="m3.7042 17.194-0.00246-4.4936h-3.4347l-0.002463 4.4936 1.7198 1.5918z" class="HighlightOutline" fill="currentColor"/>
   <g fill="#fff">
    <path d="m3.5718 10.74-0.00227-4.2576h-3.1704l-0.002273 4.2576 1.5875 1.5082z" stroke="#3096fa"/>
    <path d="m3.5718 29.79-0.0023-4.2576h-3.1704l-0.00227 4.2576 1.5875 1.5082z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_17px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_17px.svg
index 6d011002a62..45d63ecd6b5 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_down_17px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_down_17px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:17-32" width="17" height="145" version="1.1" viewBox="0 0 4.4979 38.365" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -10,7 +13,7 @@
  </metadata>
  <g stroke-width=".26458">
   <path d="m4.101 5.3667-0.0026483-5.2344h-3.6988l-0.00265 5.2344 1.8521 1.8542z" fill="#fff" stroke="#aeaeae"/>
-  <path d="m4.2333 20.816-0.00284-5.4705h-3.9631l-0.00284 5.4705 1.9844 1.9378z" fill="#2979ff"/>
+  <path d="m4.2333 20.816-0.00284-5.4705h-3.9631l-0.00284 5.4705 1.9844 1.9378z" class="HighlightOutline" fill="currentColor"/>
   <g transform="translate(4.3679 10.716)" fill="#fff">
    <path d="m-0.26696 2.3365-0.002648-5.2468h-3.6988l-0.00265 5.2468 1.8521 1.8586z" stroke="#3096fa"/>
    <path d="m-0.26696 25.355-0.00268-5.2468h-3.6988l-0.00265 5.2468 1.8521 1.8586z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_22px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_22px.svg
index 7cf5da9f98d..4776322358d 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_down_22px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_down_22px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:22-32" width="22" height="190" version="1.1" viewBox="0 0 5.8208 50.271" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -10,7 +13,7 @@
  </metadata>
  <g stroke-width=".26458">
   <path d="m5.5562 7.255-0.0037857-6.9904h-5.284l-0.003786 6.9904 2.6459 2.4762z" fill="#fff" stroke="#aeaeae" stroke-width=".52917"/>
-  <path d="m5.8209 27.533-0.00417-7.4244h-5.8126l-0.004165 7.4244 2.9105 2.6299z" fill="#2979ff" stroke-width=".26458"/>
+  <path d="m5.8209 27.533-0.00417-7.4244h-5.8126l-0.004165 7.4244 2.9105 2.6299z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
   <g transform="translate(4.3679,10.716)" fill="#fff">
    <path d="m1.1883 6.593-0.00378-6.9902h-5.284l-0.00379 6.9902 2.6459 2.4762z" stroke="#3096fa" stroke-width=".52917"/>
    <path d="m1.1882 36.756-0.00383-6.9902h-5.2839l-0.00379 6.9902 2.6458 2.4762z" stroke="#aeaeae" stroke-width=".52917"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_28px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_28px.svg
index db44463f96d..6fc9688a9df 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_down_28px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_down_28px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:28-32" width="28" height="240" version="1.1" viewBox="0 0 7.4083 63.5" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -9,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <path d="m7.1437 9.1454-0.0049271-8.8808h-6.8692l-0.0049218 8.8808 3.4397 3.1458z" fill="#fff" stroke="#aeaeae" stroke-width=".52917"/>
- <path d="m7.4083 34.778-0.00531-9.3781h-7.3977l-0.0053008 9.3781 3.7042 3.3219z" fill="#2979ff" stroke-width=".26458"/>
+ <path d="m7.4083 34.778-0.00531-9.3781h-7.3977l-0.0053008 9.3781 3.7042 3.3219z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(4.3679,10.716)" fill="#fff" stroke-width=".52917">
   <path d="m2.7758 11.191-0.00491-8.9419h-6.8692l-0.00493 8.9419 3.4397 3.1676z" stroke="#3096fa"/>
   <path d="m2.7758 49.291-0.00498-8.9419h-6.8692l-0.00493 8.9419 3.4396 3.1676z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_33px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_33px.svg
index 7a0f56cd937..9c1cbb2643f 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_down_33px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_down_33px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:33-32" width="33" height="285" version="1.1" viewBox="0 0 8.7312 75.406" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -9,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <path d="m8.3343 10.839-0.0056884-10.442h-7.9259l-0.005679 10.442 3.9689 3.6989z" fill="#fff" stroke="#aeaeae" stroke-width=".79375"/>
- <path d="m8.7312 41.299-0.00626-11.136h-8.7187l-0.0062474 11.136 4.3657 3.9448z" fill="#2979ff" stroke-width=".26458"/>
+ <path d="m8.7312 41.299-0.00626-11.136h-8.7187l-0.0062474 11.136 4.3657 3.9448z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(4.3679,10.716)" fill="#fff" stroke-width=".79375">
   <path d="m3.9664 15.23-0.00567-10.468h-7.926l-0.00569 10.468 3.9689 3.7083z" stroke="#3096fa"/>
   <path d="m3.9664 60.474-0.00575-10.468h-7.9259l-0.00569 10.468 3.9687 3.7083z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_44px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_44px.svg
index f6affe83363..6fac6de32c1 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_down_44px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_down_44px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:44-32" width="44" height="380" version="1.1" viewBox="0 0 11.642 100.54" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -9,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <path d="m11.112 14.51-0.007584-13.981h-10.568l-0.007572 13.981 5.2919 4.9525z" fill="#fff" stroke="#aeaeae" stroke-width="1.0583"/>
- <path d="m11.642 55.065-0.0084-14.848h-11.625l-0.00833 14.848 5.8209 5.2599z" fill="#2979ff" stroke-width=".26458"/>
+ <path d="m11.642 55.065-0.0084-14.848h-11.625l-0.00833 14.848 5.8209 5.2599z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(4.3679,10.716)" fill="#fff" stroke-width="1.0583">
   <path d="m6.7444 23.902-0.00756-13.98h-10.568l-0.00759 13.98 5.2918 4.9526z" stroke="#3096fa"/>
   <path d="m6.7444 84.227-0.0076666-13.98h-10.568l-0.00759 13.98 5.2916 4.9526z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg
index 4aa6c26b068..7196981367b 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:11-24" width="11" height="105" version="1.1" viewBox="0 0 2.9104 27.781" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,7 +15,7 @@
  <g stroke-width=".26458">
   <rect x=".13229" y=".13206" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
   <rect x=".13229" y="5.6883" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/>
-  <rect x=".13229" y="11.245" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/>
+  <rect x=".13229" y="11.245" width="2.6458" height="5.2917" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <rect x=".13229" y="16.801" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
   <rect x=".13229" y="22.357" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_19px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_19px.svg
index 024b2809586..8a3b55fd7e0 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_left_19px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_left_19px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:19-32" width="19" height="55" version="1.1" viewBox="0 0 5.0271 14.552" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -9,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <path d="m1.4113 2.7781 3.474-0.00189v-2.642l-3.474-0.001895-1.2306 1.3229z" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/>
- <path d="m1.315 8.7312 3.7121-0.00211v-2.9062l-3.7121-0.0021144-1.315 1.4552z" fill="#2979ff" stroke-width=".26458"/>
+ <path d="m1.315 8.7312 3.7121-0.00211v-2.9062l-3.7121-0.0021144-1.315 1.4552z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(-.27412)" fill="#fff" stroke-width=".26458">
   <path d="m1.6854 5.6885 3.474-0.00189v-2.642l-3.474-0.0018875-1.2306 1.3229z" stroke="#3096fa"/>
   <path d="m1.6854 14.42 3.474-0.0019v-2.642l-3.474-0.0019-1.2306 1.3229z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_25px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_25px.svg
index d5b482d0cad..d987a62ab2e 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_left_25px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_left_25px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:25-32" width="25" height="75" version="1.1" viewBox="0 0 6.6146 19.844" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,7 +14,7 @@
  </metadata>
  <g stroke-width=".26458">
   <path d="m1.9572 3.5718 4.2628-0.00227v-3.1704l-4.2628-0.0022736-1.5101 1.5875z" fill="#fff" stroke="#aeaeae"/>
-  <path d="m1.8564 11.642 4.4936-0.0025v-3.4347l-4.4936-0.0025-1.5918 1.7198z" fill="#2979ff"/>
+  <path d="m1.8564 11.642 4.4936-0.0025v-3.4347l-4.4936-0.0025-1.5918 1.7198z" class="HighlightOutline" fill="currentColor"/>
   <g fill="#fff">
    <path d="m1.9572 7.5406 4.2628-0.00227v-3.1704l-4.2628-0.0022666-1.5101 1.5875z" stroke="#3096fa"/>
    <path d="m1.9572 19.447 4.2628-0.0023v-3.1704l-4.2628-0.0023-1.5101 1.5875z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_29px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_29px.svg
index 023c3f9a69b..c565cbd0c33 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_left_29px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_left_29px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:29-32" width="29" height="85" version="1.1" viewBox="0 0 7.6729 22.49" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -10,7 +13,7 @@
  </metadata>
  <g stroke-width=".26458">
   <path d="m2.0415 4.101 5.2345-0.00265v-3.6989l-5.2345-0.0026531-1.8543 1.8521z" fill="#fff" stroke="#aeaeae"/>
-  <path d="m1.9378 13.229 5.4706-0.0029v-3.963l-5.4706-0.0028846-1.9379 1.9843z" fill="#2979ff"/>
+  <path d="m1.9378 13.229 5.4706-0.0029v-3.963l-5.4706-0.0028846-1.9379 1.9843z" class="HighlightOutline" fill="currentColor"/>
   <g transform="translate(-.26464)" fill="#fff">
    <path d="m2.3061 8.5991 5.2345-0.00265v-3.6989l-5.2345-0.0026484-1.8543 1.8521z" stroke="#3096fa"/>
    <path d="m2.3061 22.093 5.2345-0.0027v-3.6988l-5.2345-0.0027-1.8543 1.8521z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_38px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_38px.svg
index 6b1686d108a..7fe45ed29a5 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_left_38px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_left_38px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:38-32" width="38" height="110" version="1.1" viewBox="0 0 10.054 29.105" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -9,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <path d="m2.8243 5.5563 6.9525-0.00379v-5.2841l-6.9525-0.00379-2.4629 2.6458z" fill="#fff" stroke="#aeaeae" stroke-width=".52918"/>
- <path d="m2.6299 17.463 7.4244-0.0043v-5.8124l-7.4244-0.0042-2.63 2.9103z" fill="#2979ff" stroke-width=".26458"/>
+ <path d="m2.6299 17.463 7.4244-0.0043v-5.8124l-7.4244-0.0042-2.63 2.9103z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(-.26464)" fill="#fff" stroke-width=".52918">
   <path d="m3.0923 11.377 6.962-0.0038v-5.2841l-6.962-0.0037857-2.4663 2.6458z" stroke="#3096fa"/>
   <path d="m3.0889 28.84 6.9525-0.0039v-5.284l-6.9525-0.0039-2.4629 2.6458z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_48px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_48px.svg
index e4036b8cb4d..7076fed2795 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_left_48px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_left_48px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:48-32" width="48" height="140" version="1.1" viewBox="0 0 12.7 37.043" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -9,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <path d="m3.5173 7.1439 8.9159-0.00493v-6.8694l-8.9159-0.0049271-3.1584 3.4396z" fill="#fff" stroke="#aeaeae" stroke-width=".52918"/>
- <path d="m3.3218 22.226 9.3782-0.0055v-7.3977l-9.3782-0.0053-3.3221 3.7041z" fill="#2979ff" stroke-width=".26458"/>
+ <path d="m3.3218 22.226 9.3782-0.0055v-7.3977l-9.3782-0.0053-3.3221 3.7041z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(-.26464 1.5879)" fill="#fff">
   <path d="m3.7844 12.965 8.9157-0.0049v-6.8695l-8.9157-0.0049271-3.1584 3.4396z" stroke="#3096fa" stroke-width=".52918"/>
   <path d="m3.782 35.19 8.9159-0.0051v-6.8691l-8.9159-0.0051-3.1584 3.4395z" stroke="#aeaeae" stroke-width=".52918"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_57px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_57px.svg
index 2f75b60ee0a..7fb8e8f857f 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_left_57px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_left_57px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:57-32" width="57" height="165" version="1.1" viewBox="0 0 15.081 43.658" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -9,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <path d="m4.2427 8.3346 10.446-0.0056885v-7.9263l-10.446-0.005685-3.7003 3.9688z" fill="#fff" stroke="#aeaeae" stroke-width=".79378"/>
- <path d="m3.9448 26.195 11.137-0.0065v-8.7188l-11.137-0.0062-3.945 4.3656z" fill="#2979ff" stroke-width=".26458"/>
+ <path d="m3.9448 26.195 11.137-0.0065v-8.7188l-11.137-0.0062-3.945 4.3656z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(-.26464 1.5879)" fill="#fff" stroke-width=".79378">
   <path d="m4.5074 15.478 10.446-0.0057v-7.9262l-10.446-0.0056885-3.7004 3.9687z" stroke="#3096fa"/>
   <path d="m4.5073 41.673 10.446-0.0059v-7.9258l-10.446-0.0059-3.7003 3.9686z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_76px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_76px.svg
index 8dd09c51895..ea95ede4760 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_left_76px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_left_76px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:76-32" width="76" height="220" version="1.1" viewBox="0 0 20.108 58.211" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -9,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <path d="m5.6552 11.113 13.924-0.007586v-10.568l-13.924-0.00758-4.9323 5.2918z" fill="#fff" stroke="#aeaeae" stroke-width="1.0584"/>
- <path d="m5.2594 34.926 14.849-0.008667v-11.625l-14.849-0.0083-5.2599 5.8209z" fill="#2979ff" stroke-width=".26458"/>
+ <path d="m5.2594 34.926 14.849-0.008667v-11.625l-14.849-0.0083-5.2599 5.8209z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(-.084146 4.631)" fill="#fff" stroke-width="1.0584">
   <path d="m5.7394 18.124 13.924-0.0076v-10.568l-13.924-0.0075847-4.9324 5.2917z" stroke="#3096fa"/>
   <path d="m5.7393 53.05 13.924-0.0079v-10.568l-13.924-0.0079-4.9323 5.2915z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_19px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_19px.svg
index ac95ca29a43..a4fa7eee34a 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_right_19px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_right_19px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:19-32" width="19" height="55" version="1.1" viewBox="0 0 5.0271 14.552" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -10,7 +13,7 @@
  </metadata>
  <g stroke-width=".26458">
   <path d="m3.6158 2.7781-3.474-0.00189v-2.642l3.474-0.001895 1.2306 1.3229z" fill="#fff" stroke="#aeaeae"/>
-  <path d="m3.7121 8.7312-3.7121-0.00211v-2.9062l3.7121-0.00211 1.315 1.4552z" fill="#2979ff"/>
+  <path d="m3.7121 8.7312-3.7121-0.00211v-2.9062l3.7121-0.00211 1.315 1.4552z" class="HighlightOutline" fill="currentColor"/>
   <g transform="matrix(-1 0 0 1 5.3012 0)" fill="#fff">
    <path d="m1.6854 5.6885 3.474-0.00189v-2.642l-3.474-0.00189-1.2306 1.3229z" stroke="#3096fa"/>
    <path d="m1.6854 14.42 3.474-0.0019v-2.642l-3.474-0.0019-1.2306 1.3229z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_25px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_25px.svg
index 4b9310c8697..358f625756e 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_right_25px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_right_25px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:25-32" width="25" height="75" version="1.1" viewBox="0 0 6.6146 19.844" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -10,7 +13,7 @@
  </metadata>
  <g transform="matrix(-1 0 0 1 6.6168 0)" stroke-width=".26458">
   <path d="m1.9572 3.5718 4.2628-0.00227v-3.1704l-4.2628-0.002274-1.5101 1.5875z" fill="#fff" stroke="#aeaeae"/>
-  <path d="m1.8564 11.642 4.4936-0.0025v-3.4347l-4.4936-0.0025-1.5918 1.7198z" fill="#2979ff"/>
+  <path d="m1.8564 11.642 4.4936-0.0025v-3.4347l-4.4936-0.0025-1.5918 1.7198z" class="HighlightOutline" fill="currentColor"/>
   <g fill="#fff">
    <path d="m1.9572 7.5406 4.2628-0.00227v-3.1704l-4.2628-0.00227-1.5101 1.5875z" stroke="#3096fa"/>
    <path d="m1.9572 19.447 4.2628-0.0023v-3.1704l-4.2628-0.0023-1.5101 1.5875z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_29px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_29px.svg
index d9dffdba9c2..fadf813e627 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_right_29px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_right_29px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:29-32" width="29" height="85" version="1.1" viewBox="0 0 7.6729 22.49" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -10,7 +13,7 @@
  </metadata>
  <g transform="matrix(-1 0 0 1 7.6729 0)" stroke-width=".26458">
   <path d="m2.0415 4.101 5.2345-0.00265v-3.6989l-5.2345-0.002653-1.8543 1.8521z" fill="#fff" stroke="#aeaeae"/>
-  <path d="m1.9378 13.229 5.4706-0.0029v-3.963l-5.4706-0.0028846-1.9379 1.9843z" fill="#2979ff"/>
+  <path d="m1.9378 13.229 5.4706-0.0029v-3.963l-5.4706-0.0028846-1.9379 1.9843z" class="HighlightOutline" fill="currentColor"/>
   <g transform="translate(-.26464)" fill="#fff">
    <path d="m2.3061 8.5991 5.2345-0.00265v-3.6989l-5.2345-0.00265-1.8543 1.8521z" stroke="#3096fa"/>
    <path d="m2.3061 22.093 5.2345-0.0027v-3.6988l-5.2345-0.0027-1.8543 1.8521z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_38px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_38px.svg
index fd532df8773..3dc5ae7197c 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_right_38px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_right_38px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:38-32" width="38" height="110" version="1.1" viewBox="0 0 10.054 29.105" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -9,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <path d="m7.2296 5.5563-6.9525-0.00379v-5.2841l6.9525-0.00379 2.4629 2.6458z" fill="#fff" stroke="#aeaeae" stroke-width=".52918"/>
- <path d="m7.424 17.463-7.4244-0.0043v-5.8124l7.4244-0.0042 2.63 2.9103z" fill="#2979ff" stroke-width=".26458"/>
+ <path d="m7.424 17.463-7.4244-0.0043v-5.8124l7.4244-0.0042 2.63 2.9103z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="matrix(-1 0 0 1 10.319 0)" fill="#fff" stroke-width=".52918">
   <path d="m3.0923 11.377 6.962-0.0038v-5.2841l-6.962-0.00379-2.4663 2.6458z" stroke="#3096fa"/>
   <path d="m3.0889 28.84 6.9525-0.0039v-5.284l-6.9525-0.0039-2.4629 2.6458z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_48px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_48px.svg
index 1fd3225d66c..13a44a69909 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_right_48px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_right_48px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:48-32" width="48" height="140" version="1.1" viewBox="0 0 12.7 37.043" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -9,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <path d="m9.1824 7.1439-8.9159-0.00493v-6.8694l8.9159-0.004927 3.1584 3.4396z" fill="#fff" stroke="#aeaeae" stroke-width=".52918"/>
- <path d="m9.3779 22.226-9.3782-0.0055v-7.3977l9.3782-0.0053 3.3221 3.7041z" fill="#2979ff" stroke-width=".26458"/>
+ <path d="m9.3779 22.226-9.3782-0.0055v-7.3977l9.3782-0.0053 3.3221 3.7041z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="matrix(-1 0 0 1 12.964 1.5879)" fill="#fff" stroke-width=".52918">
   <path d="m3.7844 12.965 8.9157-0.0049v-6.8695l-8.9157-0.00493-3.1584 3.4396z" stroke="#3096fa"/>
   <path d="m3.782 35.19 8.9159-0.0051v-6.8691l-8.9159-0.0051-3.1584 3.4395z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_57px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_57px.svg
index 11c83db5b6a..b24197fe2ea 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_right_57px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_right_57px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:57-32" width="57" height="165" version="1.1" viewBox="0 0 15.081 43.658" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -9,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <path d="m10.843 8.3346-10.446-0.0056885v-7.9263l10.446-0.005685 3.7003 3.9688z" fill="#fff" stroke="#aeaeae" stroke-width=".79378"/>
- <path d="m11.141 26.195-11.137-0.0065v-8.7188l11.137-0.0062 3.945 4.3656z" fill="#2979ff" stroke-width=".26458"/>
+ <path d="m11.141 26.195-11.137-0.0065v-8.7188l11.137-0.0062 3.945 4.3656z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="matrix(-1 0 0 1 15.35 1.5879)" fill="#fff" stroke-width=".79378">
   <path d="m4.5074 15.478 10.446-0.0057v-7.9262l-10.446-0.0056885-3.7004 3.9687z" stroke="#3096fa"/>
   <path d="m4.5073 41.673 10.446-0.0059v-7.9258l-10.446-0.0059-3.7003 3.9686z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_76px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_76px.svg
index 1dcfd74b9d6..b583c9240be 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_right_76px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_right_76px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:76-32" width="76" height="220" version="1.1" viewBox="0 0 20.108 58.211" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -9,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <path d="m14.453 11.113-13.924-0.0076v-10.568l13.924-0.00758 4.9323 5.2918z" fill="#fff" stroke="#aeaeae" stroke-width="1.0584"/>
- <path d="m14.848 34.926-14.849-0.0087v-11.625l14.849-0.008267 5.2599 5.8209z" fill="#2979ff" stroke-width=".26458"/>
+ <path d="m14.848 34.926-14.849-0.0087v-11.625l14.849-0.008267 5.2599 5.8209z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="matrix(-1 0 0 1 20.192 4.631)" fill="#fff" stroke-width="1.0584">
   <path d="m5.7394 18.124 13.924-0.0076v-10.568l-13.924-0.0075847-4.9324 5.2917z" stroke="#3096fa"/>
   <path d="m5.7393 53.05 13.924-0.0079v-10.568l-13.924-0.0079-4.9323 5.2915z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_11px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_11px.svg
index 67c4d69cbe3..259f880c4e9 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_up_11px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_up_11px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:11-32" width="11" height="95" version="1.1" viewBox="0 0 2.9104 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -10,7 +13,7 @@
  </metadata>
  <g stroke-width=".26458">
   <path d="m2.7781 1.4139-0.00189 3.4809h-2.642l-0.001894-3.4809 1.3229-1.2331z" fill="#fff" stroke="#aeaeae"/>
-  <path d="m2.9104 11.369-0.00208 3.7121h-2.9062l-0.002084-3.7121 1.4552-1.315z" fill="#2979ff"/>
+  <path d="m2.9104 11.369-0.00208 3.7121h-2.9062l-0.002084-3.7121 1.4552-1.315z" class="HighlightOutline" fill="currentColor"/>
   <g fill="#fff">
    <path d="m2.7781 21.525-0.00189 3.4877h-2.642l-0.001887-3.4877 1.3229-1.2355z" stroke="#aeaeae"/>
    <path d="m2.7781 6.4434-0.00188 3.4877h-2.642l-0.001888-3.4877 1.3229-1.2355z" stroke="#3096fa"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_15px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_15px.svg
index 53f795a386d..2305bb46b2b 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_up_15px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_up_15px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:15-32" width="15" height="120" version="1.1" viewBox="0 0 3.9687 31.75" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -10,7 +13,7 @@
  </metadata>
  <g stroke-width=".26458">
   <path d="m3.5718 1.6921-0.00227 4.2612h-3.1704l-0.002271-4.2612 1.5875-1.5095z" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/>
-  <path d="m3.7042 14.292-0.00246 4.4936h-3.4347l-0.002463-4.4936 1.7198-1.5918z" fill="#2979ff"/>
+  <path d="m3.7042 14.292-0.00246 4.4936h-3.4347l-0.002463-4.4936 1.7198-1.5918z" class="HighlightOutline" fill="currentColor"/>
   <g fill="#fff">
    <path d="m3.5718 8.0408-0.00227 4.2576h-3.1704l-0.002273-4.2576 1.5875-1.5082z" stroke="#3096fa"/>
    <path d="m3.5718 27.091-0.0023 4.2576h-3.1704l-0.00227-4.2576 1.5875-1.5082z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_17px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_17px.svg
index 9914cc3423b..e9908ed8e56 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_up_17px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_up_17px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:17-32" width="17" height="145" version="1.1" viewBox="0 0 4.4979 38.365" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -10,7 +13,7 @@
  </metadata>
  <g stroke-width=".26458">
   <path d="m4.101 2.0414-0.00265 5.2344h-3.6988l-0.00265-5.2344 1.8521-1.8542z" fill="#fff" stroke="#aeaeae"/>
-  <path d="m4.2333 17.283-0.00284 5.4705h-3.9631l-0.00284-5.4705 1.9844-1.9378z" fill="#2979ff"/>
+  <path d="m4.2333 17.283-0.00284 5.4705h-3.9631l-0.00284-5.4705 1.9844-1.9378z" class="HighlightOutline" fill="currentColor"/>
   <g transform="translate(4.3679 10.716)" fill="#fff">
    <path d="m-0.26696-0.99657-0.002648 5.2468h-3.6988l-0.00265-5.2468 1.8521-1.8586z" stroke="#3096fa"/>
    <path d="m-0.26696 22.022-0.00268 5.2468h-3.6988l-0.00265-5.2468 1.8521-1.8586z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_22px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_22px.svg
index 14d59da0d00..deee2201167 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_up_22px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_up_22px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:22-32" width="22" height="190" version="1.1" viewBox="0 0 5.8208 50.271" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -9,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <path d="m5.5562 2.8386-0.00379 6.9904h-5.284l-0.003786-6.9904 2.6459-2.4762z" fill="#fff" stroke="#aeaeae" stroke-width=".52917"/>
- <path d="m5.8209 22.738-0.00417 7.4244h-5.8126l-0.004165-7.4244 2.9105-2.6299z" fill="#2979ff" stroke-width=".26458"/>
+ <path d="m5.8209 22.738-0.00417 7.4244h-5.8126l-0.004165-7.4244 2.9105-2.6299z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(4.3679,10.716)" fill="#fff" stroke-width=".52917">
   <path d="m1.1883 2.1768-0.00378 6.9902h-5.284l-0.00379-6.9902 2.6459-2.4762z" stroke="#3096fa"/>
   <path d="m1.1882 32.34-0.00383 6.9902h-5.2839l-0.00379-6.9902 2.6458-2.4762z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_28px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_28px.svg
index ad634ed8a52..c40eeeb011f 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_up_28px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_up_28px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:28-32" width="28" height="240" version="1.1" viewBox="0 0 7.4083 63.5" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -9,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <path d="m7.1437 3.5044-0.00493 8.8808h-6.8692l-0.004922-8.8808 3.4397-3.1458z" fill="#fff" stroke="#aeaeae" stroke-width=".52917"/>
- <path d="m7.4083 28.722-0.00531 9.3781h-7.3977l-0.0053008-9.3781 3.7042-3.3219z" fill="#2979ff" stroke-width=".26458"/>
+ <path d="m7.4083 28.722-0.00531 9.3781h-7.3977l-0.0053008-9.3781 3.7042-3.3219z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(4.3679,10.716)" fill="#fff" stroke-width=".52917">
   <path d="m2.7758 5.5118-0.00491 8.9419h-6.8692l-0.00493-8.9419 3.4397-3.1676z" stroke="#3096fa"/>
   <path d="m2.7758 43.612-0.00498 8.9419h-6.8692l-0.00493-8.9419 3.4396-3.1676z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_33px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_33px.svg
index a74df9acba7..c6b85b7ea93 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_up_33px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_up_33px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:33-32" width="33" height="285" version="1.1" viewBox="0 0 8.7312 75.406" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -9,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <path d="m8.3343 4.2416-0.00569 10.442h-7.9259l-0.005679-10.442 3.9689-3.6989z" fill="#fff" stroke="#aeaeae" stroke-width=".79375"/>
- <path d="m8.7312 34.108-0.00626 11.136h-8.7187l-0.0062474-11.136 4.3657-3.9448z" fill="#2979ff" stroke-width=".26458"/>
+ <path d="m8.7312 34.108-0.00626 11.136h-8.7187l-0.0062474-11.136 4.3657-3.9448z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(4.3679,10.716)" fill="#fff" stroke-width=".79375">
   <path d="m3.9664 8.6166-0.00567 10.468h-7.926l-0.00569-10.468 3.9689-3.7083z" stroke="#3096fa"/>
   <path d="m3.9664 53.861-0.00575 10.468h-7.9259l-0.00569-10.468 3.9687-3.7083z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_44px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_44px.svg
index e10be8ef078..3d890ca7c7e 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_up_44px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_up_44px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:44-32" width="44" height="380" version="1.1" viewBox="0 0 11.642 100.54" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -9,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <path d="m11.112 5.6771-0.0076 13.981h-10.568l-0.007556-13.981 5.2919-4.9525z" fill="#fff" stroke="#aeaeae" stroke-width="1.0583"/>
- <path d="m11.642 45.477-0.0084 14.848h-11.625l-0.00833-14.848 5.8209-5.2599z" fill="#2979ff" stroke-width=".26458"/>
+ <path d="m11.642 45.477-0.0084 14.848h-11.625l-0.00833-14.848 5.8209-5.2599z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(4.3679,10.716)" fill="#fff" stroke-width="1.0583">
   <path d="m6.7444 15.07-0.00756 13.98h-10.568l-0.00759-13.98 5.2918-4.9526z" stroke="#3096fa"/>
   <path d="m6.7444 75.395-0.00767 13.98h-10.568l-0.00759-13.98 5.2916-4.9526z" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg b/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg
index f15c9fd1baa..3b8913c09c7 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:21-24" width="21" height="55" version="1.1" viewBox="0 0 5.5562 14.552" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,7 +15,7 @@
  <g stroke-width=".26458">
   <rect x=".13229" y=".13229" width="5.2916" height="2.6458" rx=".52916" ry=".52916" fill="#fff" stroke="#aeaeae"/>
   <rect x=".13229" y="3.0427" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" stroke="#3096fa"/>
-  <rect x=".13229" y="5.9531" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#2979ff" stroke="#2979ff"/>
+  <rect x=".13229" y="5.9531" width="5.2917" height="2.6458" rx=".52917" ry=".52916" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <rect x=".13229" y="8.8635" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" stroke="#aeaeae"/>
   <rect x=".13229" y="11.774" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_window_help_button_background.svg b/dlls/light.msstyles/blue_window_help_button_background.svg
index 3c8d6149f5a..41b6e51f1f7 100644
--- a/dlls/light.msstyles/blue_window_help_button_background.svg
+++ b/dlls/light.msstyles/blue_window_help_button_background.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:5-24" width="5" height="136" version="1.1" viewBox="0 0 1.3229 35.983" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,11 +15,11 @@
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="none" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
   <rect x=".13228" y="4.6303" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#3096fa"/>
-  <rect x=".13228" y="9.1282" width="1.0583" height="4.2334" rx=".52917" ry=".52917" fill="#fff" stroke="#2979ff"/>
+  <rect x=".13228" y="9.1282" width="1.0583" height="4.2334" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="13.626" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
   <rect x=".13228" y="18.124" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
   <rect x=".13228" y="22.622" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#3096fa"/>
-  <rect x=".13228" y="27.12" width="1.0583" height="4.2334" rx=".52917" ry=".52917" fill="#fff" stroke="#2979ff"/>
+  <rect x=".13228" y="27.12" width="1.0583" height="4.2334" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="31.618" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_help_button_glyph_13px.svg b/dlls/light.msstyles/blue_window_help_button_glyph_13px.svg
index d1e057183da..c8ee389ed72 100644
--- a/dlls/light.msstyles/blue_window_help_button_glyph_13px.svg
+++ b/dlls/light.msstyles/blue_window_help_button_glyph_13px.svg
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:13-32" width="13" height="104" version="1.1" viewBox="0 0 3.4396 27.517" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g stroke-width=".070004">
   <path d="m1.7393 1.7637c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26695 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22183-0.28463 0.28951-0.35973 0.43239-0.03028 0.057652-0.042393 0.095251-0.042393 0.28074h-0.35004c-0.00121-0.097758-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" fill="#aeaeae"/>
   <path d="m1.7393 5.2033c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26695 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22183-0.28463 0.28951-0.35973 0.43239-0.03028 0.057652-0.042393 0.095251-0.042393 0.28074h-0.35004c-0.00121-0.097758-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" fill="#3096fa"/>
-  <path d="m1.7393 8.6429c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26695 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22183-0.28463 0.28951-0.35973 0.43239-0.03028 0.057652-0.042393 0.095251-0.042393 0.28074h-0.35004c-0.00121-0.097758-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" fill="#2979ff"/>
+  <path d="m1.7393 8.6429c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26695 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22183-0.28463 0.28951-0.35973 0.43239-0.03028 0.057652-0.042393 0.095251-0.042393 0.28074h-0.35004c-0.00121-0.097758-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" class="HighlightOutline" fill="currentColor"/>
   <path d="m1.7393 12.083c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26695 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22184-0.28463 0.28951-0.35973 0.43239-0.03028 0.05765-0.042393 0.09525-0.042393 0.28074h-0.35004c-0.00121-0.09776-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" fill="#aeaeae"/>
   <path d="m1.7393 15.522c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26695 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22184-0.28463 0.28951-0.35973 0.43239-0.03028 0.05765-0.042393 0.09525-0.042393 0.28074h-0.35004c-0.00121-0.09776-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" fill="#aeaeae"/>
   <path d="m1.7393 18.962c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26696 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22184-0.28463 0.28951-0.35973 0.43239-0.03028 0.05765-0.042393 0.09525-0.042393 0.28074h-0.35004c-0.00121-0.09776-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" fill="#3096fa"/>
-  <path d="m1.7393 22.401c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26695 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22184-0.28463 0.28951-0.35973 0.43239-0.03028 0.05765-0.042393 0.09525-0.042393 0.28074h-0.35004c-0.00121-0.09776-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" fill="#2979ff"/>
+  <path d="m1.7393 22.401c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26695 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22184-0.28463 0.28951-0.35973 0.43239-0.03028 0.05765-0.042393 0.09525-0.042393 0.28074h-0.35004c-0.00121-0.09776-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" class="HighlightOutline" fill="currentColor"/>
   <path d="m1.7393 25.841c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26695 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22184-0.28463 0.28951-0.35973 0.43239-0.03028 0.05765-0.042393 0.09525-0.042393 0.28074h-0.35004c-0.00121-0.09776-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_help_button_glyph_19px.svg b/dlls/light.msstyles/blue_window_help_button_glyph_19px.svg
index bd69e45952a..e921ce37708 100644
--- a/dlls/light.msstyles/blue_window_help_button_glyph_19px.svg
+++ b/dlls/light.msstyles/blue_window_help_button_glyph_19px.svg
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:19-32" width="19" height="152" version="1.1" viewBox="0 0 5.0271 40.217" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g stroke-width=".070004">
   <path d="m2.3556 2.5769c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42731 0.23172-0.48666 0.42362l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 0.00502 0.88706-0.20349 0.32043-0.39849 0.41818-0.50362 0.62456-0.042397 0.083271-0.059348 0.13758-0.059348 0.40551h-0.49006c-0.00163-0.14121-0.022038-0.37111 0.081399-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206s0.15261-0.36206 0.33914-0.36206c0.18653 0 0.33914 0.16293 0.33914 0.36206z" fill="#aeaeae"/>
   <path d="m2.3557 7.604c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42732 0.23172-0.48666 0.42361l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 5e-3 0.88706-0.20348 0.32043-0.39849 0.41818-0.50362 0.62456-0.0424 0.08327-0.05935 0.13758-0.05935 0.40551h-0.49006c-0.0016-0.14121-0.02204-0.37111 0.0814-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206s0.15261-0.36206 0.33914-0.36206c0.18653 0 0.33914 0.16293 0.33914 0.36206z" fill="#3096fa"/>
-  <path d="m2.3557 12.631c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42732 0.23172-0.48666 0.42361l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 5e-3 0.88706-0.20348 0.32043-0.39849 0.41818-0.50362 0.62456-0.0424 0.08327-0.05935 0.13758-0.05935 0.40551h-0.49006c-0.0016-0.14121-0.02204-0.37112 0.0814-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206s0.15261-0.36206 0.33914-0.36206c0.18653 0 0.33914 0.16293 0.33914 0.36206z" fill="#2979ff"/>
+  <path d="m2.3557 12.631c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42732 0.23172-0.48666 0.42361l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 5e-3 0.88706-0.20348 0.32043-0.39849 0.41818-0.50362 0.62456-0.0424 0.08327-0.05935 0.13758-0.05935 0.40551h-0.49006c-0.0016-0.14121-0.02204-0.37112 0.0814-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206s0.15261-0.36206 0.33914-0.36206c0.18653 0 0.33914 0.16293 0.33914 0.36206z" class="HighlightOutline" fill="currentColor"/>
   <path d="m2.3556 17.658c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42731 0.23172-0.48666 0.42362l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 0.00502 0.88706-0.20349 0.32043-0.39849 0.41818-0.50362 0.62456-0.042397 0.08327-0.059349 0.13758-0.059349 0.40551h-0.49006c-0.00163-0.14121-0.022038-0.37112 0.081399-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206s0.15261-0.36206 0.33914-0.36206c0.18653 0 0.33914 0.16293 0.33914 0.36206z" fill="#aeaeae"/>
   <path d="m2.3556 22.685c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42731 0.23172-0.48666 0.42362l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 0.00502 0.88706-0.20349 0.32043-0.39849 0.41818-0.50362 0.62456-0.042397 0.08327-0.059349 0.13758-0.059349 0.40551h-0.49006c-0.00163-0.14121-0.022038-0.37112 0.081399-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206 0-0.19914 0.15261-0.36206 0.33914-0.36206 0.18653 0 0.33914 0.16293 0.33914 0.36206z" fill="#aeaeae"/>
   <path d="m2.3557 27.713c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42732 0.23172-0.48666 0.42361l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 5e-3 0.88706-0.20348 0.32043-0.39849 0.41818-0.50362 0.62456-0.0424 0.08327-0.05935 0.13758-0.05935 0.40551h-0.49006c-0.0016-0.14121-0.02204-0.37111 0.0814-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206s0.15261-0.36206 0.33914-0.36206c0.18653 0 0.33914 0.16293 0.33914 0.36206z" fill="#3096fa"/>
-  <path d="m2.3557 32.74c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42732 0.23172-0.48666 0.42361l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 5e-3 0.88706-0.20348 0.32043-0.39849 0.41818-0.50362 0.62456-0.0424 0.08327-0.05935 0.13758-0.05935 0.40551h-0.49006c-0.0016-0.14121-0.02204-0.37112 0.0814-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206s0.15261-0.36206 0.33914-0.36206c0.18653 0 0.33914 0.16293 0.33914 0.36206z" fill="#2979ff"/>
+  <path d="m2.3557 32.74c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42732 0.23172-0.48666 0.42361l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 5e-3 0.88706-0.20348 0.32043-0.39849 0.41818-0.50362 0.62456-0.0424 0.08327-0.05935 0.13758-0.05935 0.40551h-0.49006c-0.0016-0.14121-0.02204-0.37112 0.0814-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206s0.15261-0.36206 0.33914-0.36206c0.18653 0 0.33914 0.16293 0.33914 0.36206z" class="HighlightOutline" fill="currentColor"/>
   <path d="m2.3556 37.767c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42731 0.23172-0.48666 0.42362l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 0.00502 0.88706-0.20349 0.32043-0.39849 0.41818-0.50362 0.62456-0.042397 0.08327-0.059349 0.13758-0.059349 0.40551h-0.49006c-0.00163-0.14121-0.022038-0.37112 0.081399-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206s0.15261-0.36206 0.33914-0.36206c0.18653 0 0.33914 0.16293 0.33914 0.36206z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_help_button_glyph_23px.svg b/dlls/light.msstyles/blue_window_help_button_glyph_23px.svg
index 02bdfec724b..ffa209ca80d 100644
--- a/dlls/light.msstyles/blue_window_help_button_glyph_23px.svg
+++ b/dlls/light.msstyles/blue_window_help_button_glyph_23px.svg
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:23-32" width="23" height="184" version="1.1" viewBox="0 0 6.0854 48.684" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g stroke-width=".26458">
   <path d="m2.8397 3.253c0.16786-0.3097 0.49054-0.49241 0.67804-0.76646 0.1984-0.28742 0.08721-0.8244-0.47528-0.8244-0.36845 0-0.5494 0.28519-0.62571 0.52138l-0.56466-0.24286c0.1548-0.47459 0.57557-0.88233 1.1882-0.88233 0.51235 0 0.86336 0.2384 1.0421 0.53697 0.15263 0.25623 0.242 0.73528 0.00645 1.0918-0.26163 0.39438-0.51235 0.51469-0.64752 0.76869-0.05451 0.10249-0.076305 0.16933-0.076305 0.49909h-0.63008c-0.0021-0.1738-0.028335-0.45675 0.10466-0.70185zm0.6388 1.5931c0 0.2451-0.19621 0.44561-0.43604 0.44561s-0.43604-0.20053-0.43604-0.44561c0-0.24508 0.19621-0.44561 0.43604-0.44561s0.43604 0.20053 0.43604 0.44561z" fill="#aeaeae"/>
   <path d="m2.8397 21.51c0.16786-0.3097 0.49054-0.49241 0.67804-0.76646 0.1984-0.28742 0.08721-0.8244-0.47528-0.8244-0.36845 0-0.5494 0.28519-0.62571 0.52138l-0.56466-0.24286c0.1548-0.47459 0.57557-0.88233 1.1882-0.88233 0.51235 0 0.86336 0.2384 1.0421 0.53698 0.15263 0.25623 0.242 0.73528 0.0064 1.0918-0.26163 0.39438-0.51235 0.51468-0.64752 0.76869-0.05451 0.10249-0.0763 0.16933-0.0763 0.49909h-0.63008c-0.0021-0.1738-0.02834-0.45675 0.10466-0.70185zm0.6388 1.5931c0 0.2451-0.19622 0.44561-0.43604 0.44561-0.23983 0-0.43604-0.20053-0.43604-0.44561 0-0.24508 0.19622-0.44561 0.43604-0.44561 0.23982 0 0.43604 0.20053 0.43604 0.44561z" fill="#aeaeae"/>
   <path d="m2.8397 9.3385c0.16786-0.3097 0.49054-0.49241 0.67804-0.76646 0.1984-0.28742 0.08721-0.82439-0.47528-0.82439-0.36845 0-0.54942 0.28519-0.62571 0.52137l-0.56466-0.24286c0.1548-0.47458 0.57557-0.88233 1.1882-0.88233 0.51235 0 0.86336 0.2384 1.0421 0.53697 0.15263 0.25623 0.242 0.73527 0.00643 1.0918-0.26162 0.39437-0.51235 0.51468-0.64752 0.76869-0.054514 0.10249-0.076307 0.16933-0.076307 0.49909h-0.63008c-0.00206-0.1738-0.028337-0.45675 0.10466-0.70185zm0.6388 1.5931c0 0.2451-0.19621 0.44561-0.43604 0.44561-0.23983 0-0.43604-0.20053-0.43604-0.44561s0.19621-0.44561 0.43604-0.44561c0.23983 0 0.43604 0.20053 0.43604 0.44561z" fill="#3096fa"/>
-  <path d="m2.8397 15.424c0.16786-0.3097 0.49054-0.49241 0.67804-0.76646 0.1984-0.28742 0.08721-0.8244-0.47528-0.8244-0.36845 0-0.54942 0.28519-0.62571 0.52137l-0.56466-0.24286c0.1548-0.47458 0.57557-0.88233 1.1882-0.88233 0.51235 0 0.86336 0.2384 1.0421 0.53697 0.15263 0.25623 0.242 0.73527 0.00643 1.0918-0.26162 0.39438-0.51235 0.51468-0.64752 0.76869-0.054514 0.10249-0.076307 0.16933-0.076307 0.49909h-0.63008c-0.00206-0.1738-0.028337-0.45676 0.10466-0.70185zm0.6388 1.5931c0 0.2451-0.19621 0.44561-0.43604 0.44561-0.23983 0-0.43604-0.20053-0.43604-0.44561s0.19621-0.44561 0.43604-0.44561c0.23983 0 0.43604 0.20053 0.43604 0.44561z" fill="#2979ff"/>
+  <path d="m2.8397 15.424c0.16786-0.3097 0.49054-0.49241 0.67804-0.76646 0.1984-0.28742 0.08721-0.8244-0.47528-0.8244-0.36845 0-0.54942 0.28519-0.62571 0.52137l-0.56466-0.24286c0.1548-0.47458 0.57557-0.88233 1.1882-0.88233 0.51235 0 0.86336 0.2384 1.0421 0.53697 0.15263 0.25623 0.242 0.73527 0.00643 1.0918-0.26162 0.39438-0.51235 0.51468-0.64752 0.76869-0.054514 0.10249-0.076307 0.16933-0.076307 0.49909h-0.63008c-0.00206-0.1738-0.028337-0.45676 0.10466-0.70185zm0.6388 1.5931c0 0.2451-0.19621 0.44561-0.43604 0.44561-0.23983 0-0.43604-0.20053-0.43604-0.44561s0.19621-0.44561 0.43604-0.44561c0.23983 0 0.43604 0.20053 0.43604 0.44561z" class="HighlightOutline" fill="currentColor"/>
   <path d="m2.8397 27.595c0.16786-0.3097 0.49054-0.4924 0.67804-0.76646 0.1984-0.28742 0.08721-0.8244-0.47528-0.8244-0.36845 0-0.5494 0.2852-0.62571 0.52138l-0.56466-0.24285c0.1548-0.47459 0.57557-0.88233 1.1882-0.88233 0.51235 0 0.86336 0.2384 1.0421 0.53697 0.15263 0.25624 0.242 0.73528 0.0064 1.0918-0.26163 0.39438-0.51235 0.51469-0.64752 0.76869-0.05451 0.10249-0.0763 0.16933-0.0763 0.49909h-0.63008c-0.0021-0.17379-0.02834-0.45675 0.10466-0.70184zm0.6388 1.5931c0 0.24509-0.19622 0.44561-0.43604 0.44561-0.23983 0-0.43604-0.20053-0.43604-0.44561 0-0.24509 0.19622-0.44562 0.43604-0.44562 0.23982 0 0.43604 0.20053 0.43604 0.44562z" fill="#aeaeae"/>
   <path d="m2.8397 45.852c0.16786-0.3097 0.49054-0.4924 0.67804-0.76646 0.1984-0.28742 0.08721-0.8244-0.47528-0.8244-0.36845 0-0.5494 0.2852-0.62571 0.52138l-0.56466-0.24285c0.1548-0.47459 0.57557-0.88233 1.1882-0.88233 0.51235 0 0.86336 0.2384 1.0421 0.53697 0.15263 0.25624 0.242 0.73528 0.0064 1.0918-0.26163 0.39438-0.51235 0.51469-0.64752 0.76869-0.05451 0.10249-0.0763 0.16933-0.0763 0.49909h-0.63008c-0.0021-0.17379-0.02834-0.45675 0.10466-0.70184zm0.6388 1.5931c0 0.24509-0.19622 0.44561-0.43604 0.44561-0.23983 0-0.43604-0.20053-0.43604-0.44561 0-0.24509 0.19622-0.44562 0.43604-0.44562 0.23982 0 0.43604 0.20053 0.43604 0.44562z" fill="#aeaeae"/>
   <path d="m2.8397 33.681c0.16786-0.3097 0.49054-0.49241 0.67804-0.76646 0.1984-0.28742 0.08721-0.8244-0.47528-0.8244-0.36845 0-0.54942 0.2852-0.62571 0.52137l-0.56466-0.24286c0.1548-0.47458 0.57557-0.88232 1.1882-0.88232 0.51235 0 0.86336 0.2384 1.0421 0.53697 0.15263 0.25624 0.242 0.73528 0.0064 1.0918-0.26162 0.39437-0.51235 0.51468-0.64752 0.76869-0.05451 0.10248-0.07631 0.16933-0.07631 0.49908h-0.63008c-0.0021-0.17379-0.02834-0.45674 0.10466-0.70184zm0.6388 1.5931c0 0.24509-0.19622 0.44561-0.43604 0.44561-0.23983 0-0.43604-0.20053-0.43604-0.44561 0-0.24509 0.19621-0.44562 0.43604-0.44562 0.23983 0 0.43604 0.20053 0.43604 0.44562z" fill="#3096fa"/>
-  <path d="m2.8397 39.766c0.16786-0.3097 0.49054-0.49241 0.67804-0.76646 0.1984-0.28742 0.08721-0.8244-0.47528-0.8244-0.36845 0-0.54942 0.2852-0.62571 0.52137l-0.56466-0.24286c0.1548-0.47458 0.57557-0.88232 1.1882-0.88232 0.51235 0 0.86336 0.2384 1.0421 0.53697 0.15263 0.25623 0.242 0.73527 0.0064 1.0918-0.26162 0.39437-0.51235 0.51468-0.64752 0.76869-0.05451 0.10248-0.07631 0.16933-0.07631 0.49909h-0.63008c-0.0021-0.1738-0.02834-0.45677 0.10466-0.70185zm0.6388 1.5931c0 0.24509-0.19622 0.44561-0.43604 0.44561-0.23983 0-0.43604-0.20053-0.43604-0.44561 0-0.24509 0.19621-0.44562 0.43604-0.44562 0.23983 0 0.43604 0.20053 0.43604 0.44562z" fill="#2979ff"/>
+  <path d="m2.8397 39.766c0.16786-0.3097 0.49054-0.49241 0.67804-0.76646 0.1984-0.28742 0.08721-0.8244-0.47528-0.8244-0.36845 0-0.54942 0.2852-0.62571 0.52137l-0.56466-0.24286c0.1548-0.47458 0.57557-0.88232 1.1882-0.88232 0.51235 0 0.86336 0.2384 1.0421 0.53697 0.15263 0.25623 0.242 0.73527 0.0064 1.0918-0.26162 0.39437-0.51235 0.51468-0.64752 0.76869-0.05451 0.10248-0.07631 0.16933-0.07631 0.49909h-0.63008c-0.0021-0.1738-0.02834-0.45677 0.10466-0.70185zm0.6388 1.5931c0 0.24509-0.19622 0.44561-0.43604 0.44561-0.23983 0-0.43604-0.20053-0.43604-0.44561 0-0.24509 0.19621-0.44562 0.43604-0.44562 0.23983 0 0.43604 0.20053 0.43604 0.44562z" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_help_button_glyph_26px.svg b/dlls/light.msstyles/blue_window_help_button_glyph_26px.svg
index 65e5b9f17ed..f372666a6f5 100644
--- a/dlls/light.msstyles/blue_window_help_button_glyph_26px.svg
+++ b/dlls/light.msstyles/blue_window_help_button_glyph_26px.svg
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:26-32" width="26" height="208" version="1.1" viewBox="0 0 6.8791 55.034" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g transform="translate(-.18147 23.974)" stroke-width=".070004">
   <path d="m3.3954-20.446c0.18653-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.096896-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.00728 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.084785 0.1905-0.084785 0.56148h-0.70008c-0.00242-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132-0.26646 0-0.48448-0.2256-0.48448-0.50132 0-0.27572 0.21802-0.50132 0.48448-0.50132 0.26646 0 0.48448 0.2256 0.48448 0.50132z" fill="#aeaeae"/>
   <path d="m3.3954 0.1915c0.18652-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.0969-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.0073 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.08479 0.1905-0.08479 0.56148h-0.70008c-0.0024-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132s-0.48448-0.2256-0.48448-0.50132c0-0.27572 0.21802-0.50132 0.48448-0.50132s0.48448 0.2256 0.48448 0.50132z" fill="#aeaeae"/>
   <path d="m3.3954-13.567c0.18653-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.096896-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.00728 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.084786 0.1905-0.084786 0.56148h-0.70008c-0.00242-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132s-0.48448-0.2256-0.48448-0.50132 0.21802-0.50132 0.48448-0.50132 0.48448 0.2256 0.48448 0.50132z" fill="#3096fa"/>
-  <path d="m3.3954-6.6877c0.18653-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.096896-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.00728 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.084785 0.1905-0.084785 0.56148h-0.70008c-0.00242-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132s-0.48448-0.2256-0.48448-0.50132c0-0.27572 0.21802-0.50132 0.48448-0.50132s0.48448 0.2256 0.48448 0.50132z" fill="#2979ff"/>
+  <path d="m3.3954-6.6877c0.18653-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.096896-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.00728 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.084785 0.1905-0.084785 0.56148h-0.70008c-0.00242-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132s-0.48448-0.2256-0.48448-0.50132c0-0.27572 0.21802-0.50132 0.48448-0.50132s0.48448 0.2256 0.48448 0.50132z" class="HighlightOutline" fill="currentColor"/>
   <path d="m3.3954 7.0708c0.18652-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.0969-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.0073 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.08479 0.1905-0.08479 0.56148h-0.70009c-0.00242-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132-0.26646 0-0.48448-0.2256-0.48448-0.50132 0-0.27572 0.21802-0.50132 0.48448-0.50132 0.26646 0 0.48448 0.2256 0.48448 0.50132z" fill="#aeaeae"/>
   <path d="m3.3954 27.709c0.18652-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.0969-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.0073 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.08479 0.1905-0.08479 0.56148h-0.70008c-0.0024-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132-0.26646 0-0.48448-0.2256-0.48448-0.50132 0-0.27572 0.21802-0.50132 0.48448-0.50132 0.26646 0 0.48448 0.2256 0.48448 0.50132z" fill="#aeaeae"/>
   <path d="m3.3954 13.95c0.18653-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.0969-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.0073 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.08479 0.1905-0.08479 0.56148h-0.70009c-0.00242-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132-0.26646 0-0.48448-0.2256-0.48448-0.50132s0.21802-0.50132 0.48448-0.50132c0.26646 0 0.48448 0.2256 0.48448 0.50132z" fill="#3096fa"/>
-  <path d="m3.3954 20.829c0.18653-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.0969-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.0073 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.08479 0.1905-0.08479 0.56148h-0.70009c-0.00242-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132-0.26646 0-0.48448-0.2256-0.48448-0.50132 0-0.27572 0.21802-0.50132 0.48448-0.50132 0.26646 0 0.48448 0.2256 0.48448 0.50132z" fill="#2979ff"/>
+  <path d="m3.3954 20.829c0.18653-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.0969-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.0073 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.08479 0.1905-0.08479 0.56148h-0.70009c-0.00242-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132-0.26646 0-0.48448-0.2256-0.48448-0.50132 0-0.27572 0.21802-0.50132 0.48448-0.50132 0.26646 0 0.48448 0.2256 0.48448 0.50132z" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_help_button_glyph_32px.svg b/dlls/light.msstyles/blue_window_help_button_glyph_32px.svg
index 05797079a9f..58428441a3b 100644
--- a/dlls/light.msstyles/blue_window_help_button_glyph_32px.svg
+++ b/dlls/light.msstyles/blue_window_help_button_glyph_32px.svg
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:32-32" width="32" height="256" version="1.1" viewBox="0 0 8.4666 67.734" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g stroke-width=".070004">
   <path d="m4.1174 4.3309c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10659-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18653 0.32029 0.29577 0.91909 0.00801 1.3647-0.31975 0.49295-0.62618 0.64335-0.7914 0.96086-0.066616 0.12812-0.093263 0.21167-0.093263 0.62387h-0.77008c-0.00266-0.21724-0.034639-0.57095 0.1279-0.87731zm0.78073 1.9914c0 0.30636-0.23982 0.55702-0.53292 0.55702-0.2931 0-0.53292-0.25066-0.53292-0.55702 0-0.30635 0.23982-0.55702 0.53292-0.55702 0.2931 0 0.53292 0.25067 0.53292 0.55702z" fill="#aeaeae"/>
   <path d="m4.1174 29.731c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10658-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18653 0.32029 0.29577 0.91909 8e-3 1.3647-0.31975 0.49295-0.62618 0.64335-0.7914 0.96086-0.06662 0.12812-0.09326 0.21167-0.09326 0.62387h-0.77008c-0.0027-0.21724-0.03464-0.57095 0.1279-0.87731zm0.78073 1.9914c0 0.30636-0.23982 0.55702-0.53292 0.55702s-0.53292-0.25066-0.53292-0.55702c0-0.30635 0.23982-0.55702 0.53292-0.55702s0.53292 0.25067 0.53292 0.55702z" fill="#aeaeae"/>
   <path d="m4.1174 12.798c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10659-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18653 0.32029 0.29577 0.91908 0.00801 1.3647-0.31975 0.49296-0.62618 0.64336-0.7914 0.96086-0.066616 0.12811-0.093265 0.21167-0.093265 0.62386h-0.77008c-0.00266-0.21724-0.034639-0.57095 0.1279-0.87731zm0.78073 1.9914c0 0.30636-0.23982 0.55702-0.53292 0.55702s-0.53292-0.25066-0.53292-0.55702 0.23982-0.55702 0.53292-0.55702 0.53292 0.25067 0.53292 0.55702z" fill="#3096fa"/>
-  <path d="m4.1174 21.264c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10659-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18653 0.32029 0.29577 0.91909 0.00801 1.3647-0.31975 0.49296-0.62618 0.64335-0.7914 0.96086-0.066616 0.12811-0.093263 0.21167-0.093263 0.62386h-0.77008c-0.00266-0.21724-0.034639-0.57095 0.1279-0.87731zm0.78073 1.9913c0 0.30636-0.23982 0.55702-0.53292 0.55702s-0.53292-0.25066-0.53292-0.55702c0-0.30635 0.23982-0.55702 0.53292-0.55702s0.53292 0.25067 0.53292 0.55702z" fill="#2979ff"/>
+  <path d="m4.1174 21.264c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10659-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18653 0.32029 0.29577 0.91909 0.00801 1.3647-0.31975 0.49296-0.62618 0.64335-0.7914 0.96086-0.066616 0.12811-0.093263 0.21167-0.093263 0.62386h-0.77008c-0.00266-0.21724-0.034639-0.57095 0.1279-0.87731zm0.78073 1.9913c0 0.30636-0.23982 0.55702-0.53292 0.55702s-0.53292-0.25066-0.53292-0.55702c0-0.30635 0.23982-0.55702 0.53292-0.55702s0.53292 0.25067 0.53292 0.55702z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.1174 38.198c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10659-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18652 0.32029 0.29577 0.91909 8e-3 1.3647-0.31975 0.49295-0.62618 0.64335-0.7914 0.96086-0.06662 0.12812-0.09326 0.21167-0.09326 0.62387h-0.77008c-0.0027-0.21724-0.03464-0.57095 0.1279-0.87731zm0.78073 1.9914c0 0.30636-0.23982 0.55702-0.53292 0.55702s-0.53292-0.25066-0.53292-0.55702c0-0.30635 0.23982-0.55702 0.53292-0.55702s0.53292 0.25067 0.53292 0.55702z" fill="#aeaeae"/>
   <path d="m4.1174 63.598c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10658-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18653 0.32029 0.29577 0.91909 8e-3 1.3647-0.31975 0.49295-0.62618 0.64335-0.7914 0.96086-0.06662 0.12812-0.09326 0.21167-0.09326 0.62387h-0.77008c-0.0027-0.21724-0.03464-0.57095 0.1279-0.87731zm0.78073 1.9914c0 0.30636-0.23982 0.55702-0.53292 0.55702s-0.53292-0.25066-0.53292-0.55702c0-0.30635 0.23982-0.55702 0.53292-0.55702s0.53292 0.25067 0.53292 0.55702z" fill="#aeaeae"/>
   <path d="m4.1174 46.665c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10658-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18653 0.32029 0.29577 0.91909 8e-3 1.3647-0.31975 0.49296-0.62618 0.64336-0.7914 0.96086-0.06662 0.12811-0.09326 0.21167-0.09326 0.62386h-0.77008c-0.0027-0.21724-0.03464-0.57095 0.1279-0.87731zm0.78073 1.9913c0 0.30636-0.23982 0.55702-0.53292 0.55702-0.2931 0-0.53292-0.25066-0.53292-0.55702 0-0.30636 0.23982-0.55702 0.53292-0.55702 0.2931 0 0.53292 0.25067 0.53292 0.55702z" fill="#3096fa"/>
-  <path d="m4.1174 55.131c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10658-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18653 0.32029 0.29577 0.91909 8e-3 1.3647-0.31975 0.49296-0.62618 0.64335-0.7914 0.96086-0.06662 0.12811-0.09326 0.21167-0.09326 0.62386h-0.77008c-0.0027-0.21724-0.03464-0.57095 0.1279-0.87731zm0.78073 1.9913c0 0.30636-0.23982 0.55702-0.53292 0.55702-0.2931 0-0.53292-0.25066-0.53292-0.55702 0-0.30635 0.23982-0.55702 0.53292-0.55702 0.2931 0 0.53292 0.25067 0.53292 0.55702z" fill="#2979ff"/>
+  <path d="m4.1174 55.131c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10658-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18653 0.32029 0.29577 0.91909 8e-3 1.3647-0.31975 0.49296-0.62618 0.64335-0.7914 0.96086-0.06662 0.12811-0.09326 0.21167-0.09326 0.62386h-0.77008c-0.0027-0.21724-0.03464-0.57095 0.1279-0.87731zm0.78073 1.9913c0 0.30636-0.23982 0.55702-0.53292 0.55702-0.2931 0-0.53292-0.25066-0.53292-0.55702 0-0.30635 0.23982-0.55702 0.53292-0.55702 0.2931 0 0.53292 0.25067 0.53292 0.55702z" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_help_button_glyph_39px.svg b/dlls/light.msstyles/blue_window_help_button_glyph_39px.svg
index 4bb3b9aa606..774bf1aea62 100644
--- a/dlls/light.msstyles/blue_window_help_button_glyph_39px.svg
+++ b/dlls/light.msstyles/blue_window_help_button_glyph_39px.svg
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:39-32" width="39" height="312" version="1.1" viewBox="0 0 10.319 82.551" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g>
   <path d="m4.8211 5.2493c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48126-1.0429 0.87982l-0.94111-0.40984c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.4023 1.7369 0.90616 0.25436 0.4324 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.00363-0.29328-0.047235-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41359-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.3384-0.72673-0.75199 0-0.41358 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.3384 0.72673 0.75199z" fill="#aeaeae"/>
   <path d="m4.8211 36.248c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48126-1.0429 0.87982l-0.94111-0.40984c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.4023 1.7369 0.90616 0.25436 0.4324 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.00363-0.29328-0.047235-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41359-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.3384-0.72673-0.75199 0-0.41358 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.3384 0.72673 0.75199z" fill="#aeaeae"/>
   <path d="m4.8211 15.61c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48127-1.0429 0.87982l-0.94111-0.40984c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.40231 1.7369 0.90616 0.25436 0.43239 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.00363-0.29328-0.047235-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41358-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.33841-0.72673-0.75199 0-0.41359 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.3384 0.72673 0.75199z" fill="#3096fa"/>
-  <path d="m4.8211 25.929c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48127-1.0429 0.87982l-0.94111-0.40983c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.4023 1.7369 0.90616 0.25436 0.4324 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.00363-0.29328-0.047235-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41359-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.3384-0.72673-0.75199 0-0.41358 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.33841 0.72673 0.75199z" fill="#2979ff"/>
+  <path d="m4.8211 25.929c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48127-1.0429 0.87982l-0.94111-0.40983c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.4023 1.7369 0.90616 0.25436 0.4324 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.00363-0.29328-0.047235-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41359-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.3384-0.72673-0.75199 0-0.41358 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.33841 0.72673 0.75199z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.8211 46.567c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48126-1.0429 0.87982l-0.94111-0.40984c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.4023 1.7369 0.90616 0.25436 0.4324 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.0036-0.29328-0.04724-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41359-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.3384-0.72673-0.75199 0-0.41358 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.3384 0.72673 0.75199z" fill="#aeaeae"/>
   <path d="m4.8211 77.565c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48126-1.0429 0.87982l-0.94111-0.40984c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.4023 1.7369 0.90616 0.25436 0.4324 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.0036-0.29328-0.04724-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41359-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.3384-0.72673-0.75199 0-0.41358 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.3384 0.72673 0.75199z" fill="#aeaeae"/>
   <path d="m4.8211 56.927c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48127-1.0429 0.87982l-0.94111-0.40984c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.40231 1.7369 0.90616 0.25436 0.43239 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.0036-0.29328-0.04724-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41358-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.33841-0.72673-0.75199 0-0.41359 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.3384 0.72673 0.75199z" fill="#3096fa"/>
-  <path d="m4.8211 67.246c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48127-1.0429 0.87982l-0.94111-0.40983c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.4023 1.7369 0.90616 0.25436 0.4324 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.0036-0.29328-0.04724-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41359-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.3384-0.72673-0.75199 0-0.41358 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.33841 0.72673 0.75199z" fill="#2979ff"/>
+  <path d="m4.8211 67.246c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48127-1.0429 0.87982l-0.94111-0.40983c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.4023 1.7369 0.90616 0.25436 0.4324 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.0036-0.29328-0.04724-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41359-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.3384-0.72673-0.75199 0-0.41358 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.33841 0.72673 0.75199z" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_help_button_glyph_52px.svg b/dlls/light.msstyles/blue_window_help_button_glyph_52px.svg
index 1cf4b09e279..65c47907bda 100644
--- a/dlls/light.msstyles/blue_window_help_button_glyph_52px.svg
+++ b/dlls/light.msstyles/blue_window_help_button_glyph_52px.svg
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:52-32" width="52" height="416" version="1.1" viewBox="0 0 13.759 110.07" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g>
   <path d="m6.4283 7.0549c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64675 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.6417-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57654 0.53779 1.6544 0.0146 2.4565-0.58139 0.88736-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38102-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027s0.43606-1.0027 0.969-1.0027c0.53295 0 0.96901 0.45122 0.96901 1.0027z" fill="#aeaeae"/>
   <path d="m6.4283 48.332c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64675 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.6417-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57654 0.53779 1.6544 0.0146 2.4565-0.58139 0.88736-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38102-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027s0.43606-1.0027 0.969-1.0027c0.53295 0 0.96901 0.45122 0.96901 1.0027z" fill="#aeaeae"/>
   <path d="m6.4283 20.814c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64675 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.6417-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57654 0.53779 1.6544 0.0146 2.4565-0.58139 0.88736-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38102-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027s0.43606-1.0027 0.969-1.0027c0.53295 0 0.96901 0.45122 0.96901 1.0027z" fill="#3096fa"/>
-  <path d="m6.4283 34.573c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64675 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.64171-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57654 0.53779 1.6544 0.0146 2.4565-0.58139 0.88736-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38101-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027 0-0.55146 0.43606-1.0027 0.969-1.0027 0.53295 0 0.96901 0.45122 0.96901 1.0027z" fill="#2979ff"/>
+  <path d="m6.4283 34.573c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64675 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.64171-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57654 0.53779 1.6544 0.0146 2.4565-0.58139 0.88736-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38101-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027 0-0.55146 0.43606-1.0027 0.969-1.0027 0.53295 0 0.96901 0.45122 0.96901 1.0027z" class="HighlightOutline" fill="currentColor"/>
   <path d="m6.4283 62.09c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64675 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.6417-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57654 0.53779 1.6544 0.0146 2.4565-0.58139 0.88736-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38102-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027s0.43606-1.0027 0.969-1.0027c0.53295 0 0.96901 0.45122 0.96901 1.0027z" fill="#aeaeae"/>
   <path d="m6.4283 103.37c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64674 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.64171-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57655 0.53779 1.6544 0.0146 2.4565-0.58139 0.88735-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38102-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027s0.43606-1.0027 0.969-1.0027c0.53295 0 0.96901 0.45122 0.96901 1.0027z" fill="#aeaeae"/>
   <path d="m6.4283 75.849c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64675 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.6417-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57654 0.53779 1.6544 0.0146 2.4565-0.58139 0.88736-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38102-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027s0.43606-1.0027 0.969-1.0027c0.53295 0 0.96901 0.45122 0.96901 1.0027z" fill="#3096fa"/>
-  <path d="m6.4283 89.608c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64675 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.64171-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57654 0.53779 1.6544 0.0146 2.4565-0.58139 0.88736-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38101-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027 0-0.55146 0.43606-1.0027 0.969-1.0027 0.53295 0 0.96901 0.45122 0.96901 1.0027z" fill="#2979ff"/>
+  <path d="m6.4283 89.608c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64675 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.64171-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57654 0.53779 1.6544 0.0146 2.4565-0.58139 0.88736-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38101-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027 0-0.55146 0.43606-1.0027 0.969-1.0027 0.53295 0 0.96901 0.45122 0.96901 1.0027z" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_max_button_background.svg b/dlls/light.msstyles/blue_window_max_button_background.svg
index 3c8d6149f5a..41b6e51f1f7 100644
--- a/dlls/light.msstyles/blue_window_max_button_background.svg
+++ b/dlls/light.msstyles/blue_window_max_button_background.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:5-24" width="5" height="136" version="1.1" viewBox="0 0 1.3229 35.983" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,11 +15,11 @@
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="none" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
   <rect x=".13228" y="4.6303" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#3096fa"/>
-  <rect x=".13228" y="9.1282" width="1.0583" height="4.2334" rx=".52917" ry=".52917" fill="#fff" stroke="#2979ff"/>
+  <rect x=".13228" y="9.1282" width="1.0583" height="4.2334" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="13.626" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
   <rect x=".13228" y="18.124" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
   <rect x=".13228" y="22.622" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#3096fa"/>
-  <rect x=".13228" y="27.12" width="1.0583" height="4.2334" rx=".52917" ry=".52917" fill="#fff" stroke="#2979ff"/>
+  <rect x=".13228" y="27.12" width="1.0583" height="4.2334" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="31.618" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_max_button_glyph_13px.svg b/dlls/light.msstyles/blue_window_max_button_glyph_13px.svg
index a7b2ba67362..51e3130807f 100644
--- a/dlls/light.msstyles/blue_window_max_button_glyph_13px.svg
+++ b/dlls/light.msstyles/blue_window_max_button_glyph_13px.svg
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:13-32" width="13" height="104" version="1.1" viewBox="0 0 3.4396 27.517" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g fill="none" stroke-width=".26458">
   <rect x=".66146" y=".66146" width="2.1167" height="2.1167" stroke="#aeaeae"/>
   <rect x=".66146" y="10.98" width="2.1167" height="2.1167" stroke="#aeaeae"/>
   <rect x=".66146" y="4.101" width="2.1167" height="2.1167" stroke="#3096fa"/>
-  <rect x=".66146" y="7.5406" width="2.1167" height="2.1167" stroke="#2979ff"/>
+  <rect x=".66146" y="7.5406" width="2.1167" height="2.1167" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".66146" y="14.42" width="2.1167" height="2.1167" stroke="#aeaeae"/>
   <rect x=".66146" y="24.739" width="2.1167" height="2.1167" stroke="#aeaeae"/>
   <rect x=".66146" y="17.859" width="2.1167" height="2.1167" stroke="#3096fa"/>
-  <rect x=".66146" y="21.299" width="2.1167" height="2.1167" stroke="#2979ff"/>
+  <rect x=".66146" y="21.299" width="2.1167" height="2.1167" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_max_button_glyph_19px.svg b/dlls/light.msstyles/blue_window_max_button_glyph_19px.svg
index ebd6d031856..4ea6a58859c 100644
--- a/dlls/light.msstyles/blue_window_max_button_glyph_19px.svg
+++ b/dlls/light.msstyles/blue_window_max_button_glyph_19px.svg
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:19-32" width="19" height="152" version="1.1" viewBox="0 0 5.0271 40.217" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g fill="none" stroke-width=".26458">
   <rect x=".92603" y=".92605" width="3.175" height="3.175" stroke="#aeaeae"/>
   <rect x=".92603" y="16.007" width="3.175" height="3.175" stroke="#aeaeae"/>
   <rect x=".92603" y="5.9532" width="3.175" height="3.175" stroke="#3096fa"/>
-  <rect x=".92603" y="10.98" width="3.175" height="3.175" stroke="#2979ff"/>
+  <rect x=".92603" y="10.98" width="3.175" height="3.175" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".92603" y="21.035" width="3.175" height="3.175" stroke="#aeaeae"/>
   <rect x=".92603" y="36.116" width="3.175" height="3.175" stroke="#aeaeae"/>
   <rect x=".92603" y="26.062" width="3.175" height="3.175" stroke="#3096fa"/>
-  <rect x=".92603" y="31.089" width="3.175" height="3.175" stroke="#2979ff"/>
+  <rect x=".92603" y="31.089" width="3.175" height="3.175" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_max_button_glyph_23px.svg b/dlls/light.msstyles/blue_window_max_button_glyph_23px.svg
index 86887431cf2..fcb61c08eb5 100644
--- a/dlls/light.msstyles/blue_window_max_button_glyph_23px.svg
+++ b/dlls/light.msstyles/blue_window_max_button_glyph_23px.svg
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:23-32" width="23" height="184" version="1.1" viewBox="0 0 6.0854 48.684" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g fill="none" stroke-width=".26458">
   <rect x="1.1906" y="1.1906" width="3.7042" height="3.7042" stroke="#aeaeae"/>
   <rect x="1.1906" y="19.447" width="3.7042" height="3.7042" stroke="#aeaeae"/>
   <rect x="1.1906" y="7.2761" width="3.7042" height="3.7042" stroke="#3096fa"/>
-  <rect x="1.1906" y="13.362" width="3.7042" height="3.7042" stroke="#2979ff"/>
+  <rect x="1.1906" y="13.362" width="3.7042" height="3.7042" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1.1906" y="25.532" width="3.7042" height="3.7042" stroke="#aeaeae"/>
   <rect x="1.1906" y="43.789" width="3.7042" height="3.7042" stroke="#aeaeae"/>
   <rect x="1.1906" y="31.618" width="3.7042" height="3.7042" stroke="#3096fa"/>
-  <rect x="1.1906" y="37.703" width="3.7042" height="3.7042" stroke="#2979ff"/>
+  <rect x="1.1906" y="37.703" width="3.7042" height="3.7042" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_max_button_glyph_26px.svg b/dlls/light.msstyles/blue_window_max_button_glyph_26px.svg
index 150e9b44578..14eaede371b 100644
--- a/dlls/light.msstyles/blue_window_max_button_glyph_26px.svg
+++ b/dlls/light.msstyles/blue_window_max_button_glyph_26px.svg
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:26-32" width="26" height="208" version="1.1" viewBox="0 0 6.8791 55.034" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g fill="none" stroke-width=".52917">
   <rect x="1.3229" y="1.3229" width="4.2334" height="4.2334" stroke="#aeaeae"/>
   <rect x="1.3229" y="21.961" width="4.2334" height="4.2334" stroke="#aeaeae"/>
   <rect x="1.3229" y="8.2022" width="4.2334" height="4.2334" stroke="#3096fa"/>
-  <rect x="1.3229" y="15.081" width="4.2334" height="4.2334" stroke="#2979ff"/>
+  <rect x="1.3229" y="15.081" width="4.2334" height="4.2334" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1.3229" y="28.84" width="4.2334" height="4.2334" stroke="#aeaeae"/>
   <rect x="1.3229" y="49.478" width="4.2334" height="4.2334" stroke="#aeaeae"/>
   <rect x="1.3229" y="35.719" width="4.2334" height="4.2334" stroke="#3096fa"/>
-  <rect x="1.3229" y="42.599" width="4.2334" height="4.2334" stroke="#2979ff"/>
+  <rect x="1.3229" y="42.599" width="4.2334" height="4.2334" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_max_button_glyph_32px.svg b/dlls/light.msstyles/blue_window_max_button_glyph_32px.svg
index 3c838138547..2191b6e48b6 100644
--- a/dlls/light.msstyles/blue_window_max_button_glyph_32px.svg
+++ b/dlls/light.msstyles/blue_window_max_button_glyph_32px.svg
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:32-32" width="32" height="256" version="1.1" viewBox="0 0 8.4666 67.734" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g fill="none" stroke-width=".52917">
   <rect x="1.852" y="1.8521" width="4.7626" height="4.7626" stroke="#aeaeae"/>
   <rect x="1.852" y="27.252" width="4.7626" height="4.7626" stroke="#aeaeae"/>
   <rect x="1.852" y="10.319" width="4.7626" height="4.7626" stroke="#3096fa"/>
-  <rect x="1.852" y="18.786" width="4.7626" height="4.7626" stroke="#2979ff"/>
+  <rect x="1.852" y="18.786" width="4.7626" height="4.7626" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1.852" y="35.719" width="4.7626" height="4.7626" stroke="#aeaeae"/>
   <rect x="1.852" y="61.119" width="4.7626" height="4.7626" stroke="#aeaeae"/>
   <rect x="1.852" y="44.186" width="4.7626" height="4.7626" stroke="#3096fa"/>
-  <rect x="1.852" y="52.653" width="4.7626" height="4.7626" stroke="#2979ff"/>
+  <rect x="1.852" y="52.653" width="4.7626" height="4.7626" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_max_button_glyph_39px.svg b/dlls/light.msstyles/blue_window_max_button_glyph_39px.svg
index 9cbc912f703..f2dce71e010 100644
--- a/dlls/light.msstyles/blue_window_max_button_glyph_39px.svg
+++ b/dlls/light.msstyles/blue_window_max_button_glyph_39px.svg
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:39-32" width="39" height="312" version="1.1" viewBox="0 0 10.319 82.551" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g fill="none" stroke-width=".79376">
   <rect x="1.9843" y="1.9844" width="6.3501" height="6.3501" stroke="#aeaeae"/>
   <rect x="1.9843" y="32.941" width="6.3501" height="6.3501" stroke="#aeaeae"/>
   <rect x="1.9843" y="12.303" width="6.3501" height="6.3501" stroke="#3096fa"/>
-  <rect x="1.9843" y="22.622" width="6.3501" height="6.3501" stroke="#2979ff"/>
+  <rect x="1.9843" y="22.622" width="6.3501" height="6.3501" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1.9843" y="43.26" width="6.3501" height="6.3501" stroke="#aeaeae"/>
   <rect x="1.9843" y="74.216" width="6.3501" height="6.3501" stroke="#aeaeae"/>
   <rect x="1.9843" y="53.579" width="6.3501" height="6.3501" stroke="#3096fa"/>
-  <rect x="1.9843" y="63.898" width="6.3501" height="6.3501" stroke="#2979ff"/>
+  <rect x="1.9843" y="63.898" width="6.3501" height="6.3501" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_max_button_glyph_52px.svg b/dlls/light.msstyles/blue_window_max_button_glyph_52px.svg
index a97bea1eb5c..af43cad72df 100644
--- a/dlls/light.msstyles/blue_window_max_button_glyph_52px.svg
+++ b/dlls/light.msstyles/blue_window_max_button_glyph_52px.svg
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:52-32" width="52" height="416" version="1.1" viewBox="0 0 13.759 110.07" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g fill="none" stroke-width="1.0584">
   <rect x="2.6459" y="2.6458" width="8.4669" height="8.4669" stroke="#aeaeae"/>
   <rect x="2.6459" y="43.922" width="8.4669" height="8.4669" stroke="#aeaeae"/>
   <rect x="2.6459" y="16.404" width="8.4669" height="8.4669" stroke="#3096fa"/>
-  <rect x="2.6459" y="30.163" width="8.4669" height="8.4669" stroke="#2979ff"/>
+  <rect x="2.6459" y="30.163" width="8.4669" height="8.4669" class="HighlightOutline" stroke="currentColor"/>
   <rect x="2.6459" y="57.68" width="8.4669" height="8.4669" stroke="#aeaeae"/>
   <rect x="2.6459" y="98.956" width="8.4669" height="8.4669" stroke="#aeaeae"/>
   <rect x="2.6459" y="71.438" width="8.4669" height="8.4669" stroke="#3096fa"/>
-  <rect x="2.6459" y="85.197" width="8.4669" height="8.4669" stroke="#2979ff"/>
+  <rect x="2.6459" y="85.197" width="8.4669" height="8.4669" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_mdi_min_button_background.svg b/dlls/light.msstyles/blue_window_mdi_min_button_background.svg
index 098e8c98632..ffe87a4c4c3 100644
--- a/dlls/light.msstyles/blue_window_mdi_min_button_background.svg
+++ b/dlls/light.msstyles/blue_window_mdi_min_button_background.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:6-24" width="6" height="40" version="1.1" viewBox="0 0 1.5875 10.583" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,7 +15,7 @@
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="none" stroke-width=".26458">
   <rect x=".13228" y=".39694" width="1.0583" height="2.1166" stroke="#aeaeae"/>
   <rect x=".13228" y="3.0427" width="1.0583" height="2.1166" stroke="#3096fa"/>
-  <rect x=".13228" y="5.6886" width="1.0583" height="2.1166" stroke="#2979ff"/>
+  <rect x=".13228" y="5.6886" width="1.0583" height="2.1166" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="8.3344" width="1.0583" height="2.1166" fill="#aeaeae" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_mdi_min_button_glyph.svg b/dlls/light.msstyles/blue_window_mdi_min_button_glyph.svg
index aa5358dbc80..f70343ac83a 100644
--- a/dlls/light.msstyles/blue_window_mdi_min_button_glyph.svg
+++ b/dlls/light.msstyles/blue_window_mdi_min_button_glyph.svg
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:10-32" width="10" height="40" version="1.1" viewBox="0 0 2.6458 10.583" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g transform="matrix(.8182 0 0 1 .3127 0)" stroke-width="1.2222">
   <rect transform="scale(-1,1)" x="-1.8814" y="2.1167" width="1.9402" height=".52917" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-1.8814" y="10.054" width="1.9403" height=".52917" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-1.8814" y="4.7626" width="1.9403" height=".52917" fill="#3096fa"/>
-  <rect transform="scale(-1,1)" x="-1.8814" y="7.4084" width="1.9403" height=".52917" fill="#2979ff"/>
+  <rect transform="scale(-1,1)" x="-1.8814" y="7.4084" width="1.9403" height=".52917" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_mdi_restore_button_background.svg b/dlls/light.msstyles/blue_window_mdi_restore_button_background.svg
index 098e8c98632..ffe87a4c4c3 100644
--- a/dlls/light.msstyles/blue_window_mdi_restore_button_background.svg
+++ b/dlls/light.msstyles/blue_window_mdi_restore_button_background.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:6-24" width="6" height="40" version="1.1" viewBox="0 0 1.5875 10.583" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,7 +15,7 @@
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="none" stroke-width=".26458">
   <rect x=".13228" y=".39694" width="1.0583" height="2.1166" stroke="#aeaeae"/>
   <rect x=".13228" y="3.0427" width="1.0583" height="2.1166" stroke="#3096fa"/>
-  <rect x=".13228" y="5.6886" width="1.0583" height="2.1166" stroke="#2979ff"/>
+  <rect x=".13228" y="5.6886" width="1.0583" height="2.1166" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="8.3344" width="1.0583" height="2.1166" fill="#aeaeae" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_mdi_restore_button_glyph.svg b/dlls/light.msstyles/blue_window_mdi_restore_button_glyph.svg
index 557f2e02588..1aa49f66c73 100644
--- a/dlls/light.msstyles/blue_window_mdi_restore_button_glyph.svg
+++ b/dlls/light.msstyles/blue_window_mdi_restore_button_glyph.svg
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:10-32" width="10" height="40" version="1.1" viewBox="0 0 2.6458 10.583" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g transform="matrix(.99998 0 0 .99998 1.3229 -.52926)" fill="none" stroke-width=".26458">
   <rect x="-.92607" y="1.7199" width="1.3229" height="1.3229" stroke="#aeaeae"/>
   <rect x="-.92607" y="4.3657" width="1.3229" height="1.3229" stroke="#3096fa"/>
-  <rect x="-.92607" y="7.0116" width="1.3229" height="1.3229" stroke="#2979ff"/>
+  <rect x="-.92607" y="7.0116" width="1.3229" height="1.3229" class="HighlightOutline" stroke="currentColor"/>
  </g>
  <rect transform="scale(-1,1)" x="-2.3812" y=".52913" width="1.5875" height=".26458" fill="#aeaeae" stroke-width=".23931"/>
  <rect transform="scale(-1,1)" x="-2.3812" y=".79371" width=".26459" height="1.3229" fill="#aeaeae" stroke-width=".23931"/>
@@ -14,8 +17,8 @@
   <g transform="matrix(.99998 0 0 .99998 1.3229 -.52926)">
    <rect transform="scale(-1,1)" x="-1.0583" y="3.7043" width="1.5875" height=".26459" fill="#3096fa"/>
    <rect transform="scale(-1,1)" x="-1.0583" y="3.9688" width=".26459" height="1.3229" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-1.0583" y="6.3501" width="1.5875" height=".26459" fill="#2979ff"/>
-   <rect transform="scale(-1,1)" x="-1.0583" y="6.6147" width=".26459" height="1.3229" fill="#2979ff"/>
+   <rect transform="scale(-1,1)" x="-1.0583" y="6.3501" width="1.5875" height=".26459" class="HighlightOutline" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-1.0583" y="6.6147" width=".26459" height="1.3229" class="HighlightOutline" fill="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_min_button_background.svg b/dlls/light.msstyles/blue_window_min_button_background.svg
index 9623c5e622e..bdb89fa53dd 100644
--- a/dlls/light.msstyles/blue_window_min_button_background.svg
+++ b/dlls/light.msstyles/blue_window_min_button_background.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:5-24" width="5" height="136" version="1.1" viewBox="0 0 1.3229 35.983" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,11 +15,11 @@
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="none" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
   <rect x=".13228" y="4.6303" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#3096fa"/>
-  <rect x=".13228" y="9.1282" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#2979ff"/>
+  <rect x=".13228" y="9.1282" width="1.0583" height="4.2334" rx=".52917" ry=".52917" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="13.626" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
   <rect x=".13228" y="18.124" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
   <rect x=".13228" y="22.622" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#3096fa"/>
-  <rect x=".13228" y="27.12" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#2979ff"/>
+  <rect x=".13228" y="27.12" width="1.0583" height="4.2334" rx=".52917" ry=".52917" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="31.618" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_min_button_glyph_13px.svg b/dlls/light.msstyles/blue_window_min_button_glyph_13px.svg
index 56aa764baa0..fa9e52df798 100644
--- a/dlls/light.msstyles/blue_window_min_button_glyph_13px.svg
+++ b/dlls/light.msstyles/blue_window_min_button_glyph_13px.svg
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:13-32" width="13" height="104" version="1.1" viewBox="0 0 3.4395 27.517" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g transform="matrix(.8182 0 0 1 .3127 0)" stroke-width="1.2222">
   <rect transform="scale(-1,1)" x="-3.1749" y="2.6458" width="2.9104" height=".26459" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-3.1749" y="12.965" width="2.9104" height=".26459" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-3.1749" y="6.0855" width="2.9104" height=".26459" fill="#3096fa"/>
-  <rect transform="scale(-1,1)" x="-3.1749" y="9.5251" width="2.9104" height=".26459" fill="#2979ff"/>
+  <rect transform="scale(-1,1)" x="-3.1749" y="9.5251" width="2.9104" height=".26459" class="HighlightOutline" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-3.1749" y="16.404" width="2.9104" height=".26459" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-3.1749" y="26.723" width="2.9104" height=".26459" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-3.1749" y="19.844" width="2.9104" height=".26459" fill="#3096fa"/>
-  <rect transform="scale(-1,1)" x="-3.1749" y="23.283" width="2.9104" height=".26459" fill="#2979ff"/>
+  <rect transform="scale(-1,1)" x="-3.1749" y="23.283" width="2.9104" height=".26459" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_min_button_glyph_19px.svg b/dlls/light.msstyles/blue_window_min_button_glyph_19px.svg
index 03586b4c139..925135aeace 100644
--- a/dlls/light.msstyles/blue_window_min_button_glyph_19px.svg
+++ b/dlls/light.msstyles/blue_window_min_button_glyph_19px.svg
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:19-32" width="19" height="152" version="1.1" viewBox="0 0 5.027 40.217" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g>
   <rect transform="scale(-1,1)" x="-4.2333" y="3.9688" width="3.4396" height=".26459" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-4.2333" y="19.05" width="3.4396" height=".26459" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-4.2333" y="8.9959" width="3.4396" height=".26459" fill="#3096fa"/>
-  <rect transform="scale(-1,1)" x="-4.2333" y="14.023" width="3.4396" height=".26459" fill="#2979ff"/>
+  <rect transform="scale(-1,1)" x="-4.2333" y="14.023" width="3.4396" height=".26459" class="HighlightOutline" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-4.2333" y="24.077" width="3.4396" height=".26459" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-4.2333" y="39.159" width="3.4396" height=".26459" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-4.2333" y="29.105" width="3.4396" height=".26459" fill="#3096fa"/>
-  <rect transform="scale(-1,1)" x="-4.2333" y="34.132" width="3.4396" height=".26459" fill="#2979ff"/>
+  <rect transform="scale(-1,1)" x="-4.2333" y="34.132" width="3.4396" height=".26459" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_min_button_glyph_23px.svg b/dlls/light.msstyles/blue_window_min_button_glyph_23px.svg
index 204b6ce4412..f096becfbce 100644
--- a/dlls/light.msstyles/blue_window_min_button_glyph_23px.svg
+++ b/dlls/light.msstyles/blue_window_min_button_glyph_23px.svg
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:23-32" width="23" height="184" version="1.1" viewBox="0 0 6.0853 48.684" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <rect transform="scale(-1,1)" x="-5.0271" y="4.7626" width="3.9688" height=".26459" fill="#aeaeae"/>
  <g transform="matrix(.88235 0 0 1 .35802 .79377)" stroke-width="1.1333">
   <rect transform="scale(-1,1)" x="-5.2916" y="22.225" width="4.498" height=".26459" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-5.2916" y="10.054" width="4.498" height=".26459" fill="#3096fa"/>
-  <rect transform="scale(-1,1)" x="-5.2916" y="16.14" width="4.498" height=".26459" fill="#2979ff"/>
+  <rect transform="scale(-1,1)" x="-5.2916" y="16.14" width="4.498" height=".26459" class="HighlightOutline" fill="currentColor"/>
  </g>
  <rect transform="scale(-1,1)" x="-5.0271" y="29.105" width="3.9688" height=".26459" fill="#aeaeae"/>
  <g transform="matrix(.88235 0 0 1 .35802 .79377)" stroke-width="1.1333">
   <rect transform="scale(-1,1)" x="-5.2916" y="46.567" width="4.498" height=".26459" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-5.2916" y="34.396" width="4.498" height=".26459" fill="#3096fa"/>
-  <rect transform="scale(-1,1)" x="-5.2916" y="40.482" width="4.498" height=".26459" fill="#2979ff"/>
+  <rect transform="scale(-1,1)" x="-5.2916" y="40.482" width="4.498" height=".26459" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_min_button_glyph_26px.svg b/dlls/light.msstyles/blue_window_min_button_glyph_26px.svg
index 8db4f0fcd20..e36cbbe1a44 100644
--- a/dlls/light.msstyles/blue_window_min_button_glyph_26px.svg
+++ b/dlls/light.msstyles/blue_window_min_button_glyph_26px.svg
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:26-32" width="26" height="208" version="1.1" viewBox="0 0 6.879 55.034" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <rect transform="scale(-1,1)" x="-5.8208" y="5.2917" width="4.7625" height=".52917" fill="#aeaeae"/>
  <g transform="matrix(1.0588 0 0 1 .43437 0)" stroke-width="1.0193">
   <rect transform="scale(-1,1)" x="-5.0872" y="25.93" width="4.498" height=".52917" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-5.0872" y="12.171" width="4.498" height=".52917" fill="#3096fa"/>
-  <rect transform="scale(-1,1)" x="-5.0872" y="19.05" width="4.498" height=".52917" fill="#2979ff"/>
+  <rect transform="scale(-1,1)" x="-5.0872" y="19.05" width="4.498" height=".52917" class="HighlightOutline" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-5.0872" y="32.809" width="4.498" height=".52917" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-5.0872" y="53.447" width="4.498" height=".52917" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-5.0872" y="39.688" width="4.498" height=".52917" fill="#3096fa"/>
-  <rect transform="scale(-1,1)" x="-5.0872" y="46.567" width="4.498" height=".52917" fill="#2979ff"/>
+  <rect transform="scale(-1,1)" x="-5.0872" y="46.567" width="4.498" height=".52917" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_min_button_glyph_32px.svg b/dlls/light.msstyles/blue_window_min_button_glyph_32px.svg
index 033a3c850c7..0a185586bc0 100644
--- a/dlls/light.msstyles/blue_window_min_button_glyph_32px.svg
+++ b/dlls/light.msstyles/blue_window_min_button_glyph_32px.svg
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:32-32" width="32" height="256" version="1.1" viewBox="0 0 8.4665 67.734" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <rect transform="scale(-1,1)" x="-6.8791" y="6.3501" width="5.2917" height=".52917" fill="#aeaeae"/>
  <g transform="matrix(1.1765 0 0 1 .89419 2.1167)">
   <g stroke-width=".96695">
    <rect transform="scale(-1,1)" x="-5.0872" y="29.634" width="4.498" height=".52917" fill="#aeaeae"/>
    <rect transform="scale(-1,1)" x="-5.0872" y="12.7" width="4.498" height=".52917" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-5.0872" y="21.167" width="4.498" height=".52917" fill="#2979ff"/>
+   <rect transform="scale(-1,1)" x="-5.0872" y="21.167" width="4.498" height=".52917" class="HighlightOutline" fill="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-5.0872" y="38.1" width="4.498" height=".52917" fill="#aeaeae" stroke-width=".92196"/>
   <g stroke-width=".96695">
    <rect transform="scale(-1,1)" x="-5.0872" y="63.501" width="4.498" height=".52917" fill="#aeaeae"/>
    <rect transform="scale(-1,1)" x="-5.0872" y="46.567" width="4.498" height=".52917" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-5.0872" y="55.034" width="4.498" height=".52917" fill="#2979ff"/>
+   <rect transform="scale(-1,1)" x="-5.0872" y="55.034" width="4.498" height=".52917" class="HighlightOutline" fill="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_min_button_glyph_39px.svg b/dlls/light.msstyles/blue_window_min_button_glyph_39px.svg
index b91489de16e..e91f2ad30ba 100644
--- a/dlls/light.msstyles/blue_window_min_button_glyph_39px.svg
+++ b/dlls/light.msstyles/blue_window_min_button_glyph_39px.svg
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:39-32" width="39" height="312" version="1.1" viewBox="0 0 10.318 82.551" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g transform="matrix(2.4546 0 0 1 -.12013 0)" stroke-width=".4074">
   <rect transform="scale(-1,1)" x="-3.606" y="7.9376" width="2.9104" height=".79376" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-3.606" y="38.894" width="2.9104" height=".79376" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-3.606" y="18.256" width="2.9104" height=".79376" fill="#3096fa"/>
-  <rect transform="scale(-1,1)" x="-3.606" y="28.575" width="2.9104" height=".79376" fill="#2979ff"/>
+  <rect transform="scale(-1,1)" x="-3.606" y="28.575" width="2.9104" height=".79376" class="HighlightOutline" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-3.606" y="49.213" width="2.9104" height=".79376" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-3.606" y="80.17" width="2.9104" height=".79376" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-3.606" y="59.532" width="2.9104" height=".79376" fill="#3096fa"/>
-  <rect transform="scale(-1,1)" x="-3.606" y="69.851" width="2.9104" height=".79376" fill="#2979ff"/>
+  <rect transform="scale(-1,1)" x="-3.606" y="69.851" width="2.9104" height=".79376" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_min_button_glyph_52px.svg b/dlls/light.msstyles/blue_window_min_button_glyph_52px.svg
index c35e2c816a8..eba48a6cc9a 100644
--- a/dlls/light.msstyles/blue_window_min_button_glyph_52px.svg
+++ b/dlls/light.msstyles/blue_window_min_button_glyph_52px.svg
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:52-32" width="52" height="416" version="1.1" viewBox="0 0 13.758 110.07" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <rect transform="scale(-1,1)" x="-11.641" y="10.583" width="9.5249" height="1.0583" fill="#aeaeae"/>
  <g transform="matrix(1.0588 0 0 1 -5.6513 4.2334)">
   <g stroke-width="1.0193">
    <rect transform="scale(-1,1)" x="-16.332" y="47.626" width="8.9959" height="1.0583" fill="#aeaeae"/>
    <rect transform="scale(-1,1)" x="-16.332" y="20.109" width="8.9959" height="1.0583" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-16.332" y="33.867" width="8.9959" height="1.0583" fill="#2979ff"/>
+   <rect transform="scale(-1,1)" x="-16.332" y="33.867" width="8.9959" height="1.0583" class="HighlightOutline" fill="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-16.332" y="61.384" width="8.996" height="1.0583" fill="#aeaeae" stroke-width=".97184"/>
   <g stroke-width="1.0193">
    <rect transform="scale(-1,1)" x="-16.332" y="102.66" width="8.9959" height="1.0583" fill="#aeaeae"/>
    <rect transform="scale(-1,1)" x="-16.332" y="75.143" width="8.9959" height="1.0583" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-16.332" y="88.901" width="8.9959" height="1.0583" fill="#2979ff"/>
+   <rect transform="scale(-1,1)" x="-16.332" y="88.901" width="8.9959" height="1.0583" class="HighlightOutline" fill="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_restore_button_background.svg b/dlls/light.msstyles/blue_window_restore_button_background.svg
index 9623c5e622e..bdb89fa53dd 100644
--- a/dlls/light.msstyles/blue_window_restore_button_background.svg
+++ b/dlls/light.msstyles/blue_window_restore_button_background.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:5-24" width="5" height="136" version="1.1" viewBox="0 0 1.3229 35.983" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,11 +15,11 @@
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="none" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
   <rect x=".13228" y="4.6303" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#3096fa"/>
-  <rect x=".13228" y="9.1282" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#2979ff"/>
+  <rect x=".13228" y="9.1282" width="1.0583" height="4.2334" rx=".52917" ry=".52917" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="13.626" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
   <rect x=".13228" y="18.124" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
   <rect x=".13228" y="22.622" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#3096fa"/>
-  <rect x=".13228" y="27.12" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#2979ff"/>
+  <rect x=".13228" y="27.12" width="1.0583" height="4.2334" rx=".52917" ry=".52917" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="31.618" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_restore_button_glyph_13px.svg b/dlls/light.msstyles/blue_window_restore_button_glyph_13px.svg
index e4093ea2cd3..c39e9e5a7f7 100644
--- a/dlls/light.msstyles/blue_window_restore_button_glyph_13px.svg
+++ b/dlls/light.msstyles/blue_window_restore_button_glyph_13px.svg
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:13-32" width="13" height="104" version="1.1" viewBox="0 0 3.4396 27.517" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g fill="none">
   <g stroke-width=".26458">
    <rect x=".66146" y="1.1906" width="1.5875" height="1.5875" stroke="#aeaeae"/>
    <rect x=".66146" y="4.6303" width="1.5875" height="1.5875" stroke="#3096fa"/>
-   <rect x=".66146" y="8.0699" width="1.5875" height="1.5875" stroke="#2979ff"/>
+   <rect x=".66146" y="8.0699" width="1.5875" height="1.5875" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-2.9104" y=".52917" width="1.8521" height=".26459" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-2.9104" y=".79376" width=".26459" height="1.5875" fill="#aeaeae" stroke-width=".23932"/>
@@ -14,13 +17,13 @@
   <g stroke-width=".23932">
    <rect transform="scale(-1,1)" x="-2.9104" y="3.9688" width="1.8521" height=".26459" fill="#3096fa"/>
    <rect transform="scale(-1,1)" x="-2.9104" y="4.2334" width=".26459" height="1.5875" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-2.9104" y="7.4084" width="1.8521" height=".26459" fill="#2979ff"/>
-   <rect transform="scale(-1,1)" x="-2.9104" y="7.673" width=".26459" height="1.5875" fill="#2979ff"/>
+   <rect transform="scale(-1,1)" x="-2.9104" y="7.4084" width="1.8521" height=".26459" class="HighlightOutline" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-2.9104" y="7.673" width=".26459" height="1.5875" class="HighlightOutline" fill="currentColor"/>
   </g>
   <g stroke-width=".26458">
    <rect x=".66146" y="14.949" width="1.5875" height="1.5875" stroke="#aeaeae"/>
    <rect x=".66146" y="18.389" width="1.5875" height="1.5875" stroke="#3096fa"/>
-   <rect x=".66146" y="21.828" width="1.5875" height="1.5875" stroke="#2979ff"/>
+   <rect x=".66146" y="21.828" width="1.5875" height="1.5875" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-2.9104" y="14.288" width="1.8521" height=".26459" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-2.9104" y="14.552" width=".26459" height="1.5875" fill="#aeaeae" stroke-width=".23932"/>
@@ -30,8 +33,8 @@
   <g stroke-width=".23932">
    <rect transform="scale(-1,1)" x="-2.9104" y="17.727" width="1.8521" height=".26459" fill="#3096fa"/>
    <rect transform="scale(-1,1)" x="-2.9104" y="17.992" width=".26459" height="1.5875" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-2.9104" y="21.167" width="1.8521" height=".26459" fill="#2979ff"/>
-   <rect transform="scale(-1,1)" x="-2.9104" y="21.432" width=".26459" height="1.5875" fill="#2979ff"/>
+   <rect transform="scale(-1,1)" x="-2.9104" y="21.167" width="1.8521" height=".26459" class="HighlightOutline" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-2.9104" y="21.432" width=".26459" height="1.5875" class="HighlightOutline" fill="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_restore_button_glyph_19px.svg b/dlls/light.msstyles/blue_window_restore_button_glyph_19px.svg
index 6fe0cda7036..c52bfc9fca4 100644
--- a/dlls/light.msstyles/blue_window_restore_button_glyph_19px.svg
+++ b/dlls/light.msstyles/blue_window_restore_button_glyph_19px.svg
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:19-32" width="19" height="152" version="1.1" viewBox="0 0 5.0271 40.217" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g fill="none">
   <g stroke-width=".26458">
    <rect x=".92603" y="1.7198" width="2.3813" height="2.3813" stroke="#aeaeae"/>
    <rect x=".92603" y="6.7469" width="2.3813" height="2.3813" stroke="#3096fa"/>
-   <rect x=".92603" y="11.774" width="2.3813" height="2.3813" stroke="#2979ff"/>
+   <rect x=".92603" y="11.774" width="2.3813" height="2.3813" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-4.2334" y=".79375" width="2.6459" height=".26459" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-4.2334" y="1.0583" width=".26459" height="2.3813" fill="#aeaeae" stroke-width=".23932"/>
@@ -14,13 +17,13 @@
    <rect transform="scale(-1,1)" x="-4.2334" y="16.14" width=".26459" height="2.3813" fill="#aeaeae"/>
    <rect transform="scale(-1,1)" x="-4.2334" y="5.8209" width="2.6459" height=".26459" fill="#3096fa"/>
    <rect transform="scale(-1,1)" x="-4.2334" y="6.0855" width=".26459" height="2.3813" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-4.2334" y="10.848" width="2.6459" height=".26459" fill="#2979ff"/>
-   <rect transform="scale(-1,1)" x="-4.2334" y="11.113" width=".26459" height="2.3813" fill="#2979ff"/>
+   <rect transform="scale(-1,1)" x="-4.2334" y="10.848" width="2.6459" height=".26459" class="HighlightOutline" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-4.2334" y="11.113" width=".26459" height="2.3813" class="HighlightOutline" fill="currentColor"/>
   </g>
   <g transform="translate(4.1044e-6 20.109)" stroke-width=".26458">
    <rect x=".92603" y="1.7198" width="2.3813" height="2.3813" stroke="#aeaeae"/>
    <rect x=".92603" y="6.7469" width="2.3813" height="2.3813" stroke="#3096fa"/>
-   <rect x=".92603" y="11.774" width="2.3813" height="2.3813" stroke="#2979ff"/>
+   <rect x=".92603" y="11.774" width="2.3813" height="2.3813" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-4.2334" y="20.902" width="2.6459" height=".26459" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-4.2334" y="21.167" width=".26459" height="2.3813" fill="#aeaeae" stroke-width=".23932"/>
@@ -31,8 +34,8 @@
    <g transform="translate(4.1044e-6 20.109)">
     <rect transform="scale(-1,1)" x="-4.2334" y="5.8209" width="2.6459" height=".26459" fill="#3096fa"/>
     <rect transform="scale(-1,1)" x="-4.2334" y="6.0855" width=".26459" height="2.3813" fill="#3096fa"/>
-    <rect transform="scale(-1,1)" x="-4.2334" y="10.848" width="2.6459" height=".26459" fill="#2979ff"/>
-    <rect transform="scale(-1,1)" x="-4.2334" y="11.113" width=".26459" height="2.3813" fill="#2979ff"/>
+    <rect transform="scale(-1,1)" x="-4.2334" y="10.848" width="2.6459" height=".26459" class="HighlightOutline" fill="currentColor"/>
+    <rect transform="scale(-1,1)" x="-4.2334" y="11.113" width=".26459" height="2.3813" class="HighlightOutline" fill="currentColor"/>
    </g>
   </g>
  </g>
diff --git a/dlls/light.msstyles/blue_window_restore_button_glyph_23px.svg b/dlls/light.msstyles/blue_window_restore_button_glyph_23px.svg
index e228d79f8aa..de430d6fc9f 100644
--- a/dlls/light.msstyles/blue_window_restore_button_glyph_23px.svg
+++ b/dlls/light.msstyles/blue_window_restore_button_glyph_23px.svg
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:23-32" width="23" height="184" version="1.1" viewBox="0 0 6.0854 48.684" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g fill="none">
   <g stroke-width=".26458">
    <rect x="1.1906" y="1.9844" width="2.9105" height="2.9105" stroke="#aeaeae"/>
    <rect x="1.1906" y="8.0699" width="2.9105" height="2.9105" stroke="#3096fa"/>
-   <rect x="1.1906" y="14.155" width="2.9105" height="2.9105" stroke="#2979ff"/>
+   <rect x="1.1906" y="14.155" width="2.9105" height="2.9105" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-5.0271" y="1.0583" width="3.175" height=".26459" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-5.0271" y="1.3229" width=".26459" height="2.9105" fill="#aeaeae" stroke-width=".23932"/>
@@ -14,13 +17,13 @@
   <g stroke-width=".23932">
    <rect transform="scale(-1,1)" x="-5.0271" y="7.1438" width="3.175" height=".26459" fill="#3096fa"/>
    <rect transform="scale(-1,1)" x="-5.0271" y="7.4084" width=".26459" height="2.9105" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-5.0271" y="13.229" width="3.175" height=".26459" fill="#2979ff"/>
-   <rect transform="scale(-1,1)" x="-5.0271" y="13.494" width=".26459" height="2.9105" fill="#2979ff"/>
+   <rect transform="scale(-1,1)" x="-5.0271" y="13.229" width="3.175" height=".26459" class="HighlightOutline" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-5.0271" y="13.494" width=".26459" height="2.9105" class="HighlightOutline" fill="currentColor"/>
   </g>
   <g stroke-width=".26458">
    <rect x="1.1906" y="26.326" width="2.9105" height="2.9105" stroke="#aeaeae"/>
    <rect x="1.1906" y="32.412" width="2.9105" height="2.9105" stroke="#3096fa"/>
-   <rect x="1.1906" y="38.497" width="2.9105" height="2.9105" stroke="#2979ff"/>
+   <rect x="1.1906" y="38.497" width="2.9105" height="2.9105" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-5.0271" y="25.4" width="3.175" height=".26459" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-5.0271" y="25.665" width=".26459" height="2.9105" fill="#aeaeae" stroke-width=".23932"/>
@@ -30,8 +33,8 @@
   <g stroke-width=".23932">
    <rect transform="scale(-1,1)" x="-5.0271" y="31.486" width="3.175" height=".26459" fill="#3096fa"/>
    <rect transform="scale(-1,1)" x="-5.0271" y="31.75" width=".26459" height="2.9105" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-5.0271" y="37.571" width="3.175" height=".26459" fill="#2979ff"/>
-   <rect transform="scale(-1,1)" x="-5.0271" y="37.836" width=".26459" height="2.9105" fill="#2979ff"/>
+   <rect transform="scale(-1,1)" x="-5.0271" y="37.571" width="3.175" height=".26459" class="HighlightOutline" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-5.0271" y="37.836" width=".26459" height="2.9105" class="HighlightOutline" fill="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_restore_button_glyph_26px.svg b/dlls/light.msstyles/blue_window_restore_button_glyph_26px.svg
index 43fed1338cd..7bba6dbb2d9 100644
--- a/dlls/light.msstyles/blue_window_restore_button_glyph_26px.svg
+++ b/dlls/light.msstyles/blue_window_restore_button_glyph_26px.svg
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:26-32" width="26" height="208" version="1.1" viewBox="0 0 6.8791 55.034" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g fill="none" stroke-width=".52917">
   <g stroke-width=".52917">
    <rect x="1.3229" y="2.3813" width="3.175" height="3.175" stroke="#aeaeae"/>
    <rect x="1.3228" y="9.2605" width="3.175" height="3.175" stroke="#3096fa"/>
-   <rect x="1.3229" y="16.14" width="3.175" height="3.175" stroke="#2979ff"/>
+   <rect x="1.3229" y="16.14" width="3.175" height="3.175" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-5.8208" y="1.0583" width="3.7042" height=".52917" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-5.8208" y="1.5875" width=".52917" height="3.175" fill="#aeaeae" stroke-width=".23932"/>
@@ -14,13 +17,13 @@
   <g>
    <rect transform="scale(-1,1)" x="-5.8208" y="7.9376" width="3.7042" height=".52917" fill="#3096fa" stroke-width=".23932"/>
    <rect transform="scale(-1,1)" x="-5.8208" y="8.4668" width=".52917" height="3.175" fill="#3096fa" stroke-width=".23932"/>
-   <rect transform="scale(-1,1)" x="-5.8208" y="14.817" width="3.7042" height=".52917" fill="#2979ff" stroke-width=".23932"/>
-   <rect transform="scale(-1,1)" x="-5.8208" y="15.346" width=".52917" height="3.175" fill="#2979ff" stroke-width=".23932"/>
+   <rect transform="scale(-1,1)" x="-5.8208" y="14.817" width="3.7042" height=".52917" class="HighlightOutline" fill="currentColor" stroke-width=".23932"/>
+   <rect transform="scale(-1,1)" x="-5.8208" y="15.346" width=".52917" height="3.175" class="HighlightOutline" fill="currentColor" stroke-width=".23932"/>
   </g>
   <g stroke-width=".52917">
    <rect x="1.3229" y="29.898" width="3.175" height="3.175" stroke="#aeaeae"/>
    <rect x="1.3229" y="36.778" width="3.175" height="3.175" stroke="#3096fa"/>
-   <rect x="1.3229" y="43.657" width="3.175" height="3.175" stroke="#2979ff"/>
+   <rect x="1.3229" y="43.657" width="3.175" height="3.175" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-5.8209" y="28.575" width="3.7042" height=".52917" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-5.8209" y="29.105" width=".52917" height="3.175" fill="#aeaeae" stroke-width=".23932"/>
@@ -30,8 +33,8 @@
   <g>
    <rect transform="scale(-1,1)" x="-5.8209" y="35.455" width="3.7042" height=".52917" fill="#3096fa" stroke-width=".23932"/>
    <rect transform="scale(-1,1)" x="-5.8209" y="35.984" width=".52917" height="3.175" fill="#3096fa" stroke-width=".23932"/>
-   <rect transform="scale(-1,1)" x="-5.8209" y="42.334" width="3.7042" height=".52917" fill="#2979ff" stroke-width=".23932"/>
-   <rect transform="scale(-1,1)" x="-5.8209" y="42.863" width=".52917" height="3.175" fill="#2979ff" stroke-width=".23932"/>
+   <rect transform="scale(-1,1)" x="-5.8209" y="42.334" width="3.7042" height=".52917" class="HighlightOutline" fill="currentColor" stroke-width=".23932"/>
+   <rect transform="scale(-1,1)" x="-5.8209" y="42.863" width=".52917" height="3.175" class="HighlightOutline" fill="currentColor" stroke-width=".23932"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_restore_button_glyph_32px.svg b/dlls/light.msstyles/blue_window_restore_button_glyph_32px.svg
index 63089bf2518..77cd3e97b2b 100644
--- a/dlls/light.msstyles/blue_window_restore_button_glyph_32px.svg
+++ b/dlls/light.msstyles/blue_window_restore_button_glyph_32px.svg
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:32-32" width="32" height="256" version="1.1" viewBox="0 0 8.4666 67.734" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g fill="none">
   <g stroke-width=".52917">
    <rect x="1.852" y="3.175" width="3.4396" height="3.4396" stroke="#aeaeae"/>
    <rect x="1.852" y="11.642" width="3.4396" height="3.4396" stroke="#3096fa"/>
-   <rect x="1.852" y="20.109" width="3.4396" height="3.4396" stroke="#2979ff"/>
+   <rect x="1.852" y="20.109" width="3.4396" height="3.4396" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-6.8792" y="1.5875" width="3.9688" height=".52917" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-6.8792" y="2.1167" width=".52917" height="3.4396" fill="#aeaeae" stroke-width=".23932"/>
   <g stroke-width=".23932">
    <rect transform="scale(-1,1)" x="-6.8792" y="10.054" width="3.9688" height=".52917" fill="#3096fa"/>
    <rect transform="scale(-1,1)" x="-6.8792" y="10.583" width=".52917" height="3.4396" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-6.8792" y="18.521" width="3.9688" height=".52917" fill="#2979ff"/>
-   <rect transform="scale(-1,1)" x="-6.8792" y="19.05" width=".52917" height="3.4396" fill="#2979ff"/>
+   <rect transform="scale(-1,1)" x="-6.8792" y="18.521" width="3.9688" height=".52917" class="HighlightOutline" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-6.8792" y="19.05" width=".52917" height="3.4396" class="HighlightOutline" fill="currentColor"/>
   </g>
   <rect x="1.852" y="28.575" width="3.4396" height="3.4396" stroke="#aeaeae" stroke-width=".52917"/>
   <rect transform="scale(-1,1)" x="-6.8792" y="26.988" width="3.9688" height=".52917" fill="#aeaeae" stroke-width=".23932"/>
@@ -20,15 +23,15 @@
   <g stroke-width=".52917">
    <rect x="1.852" y="37.042" width="3.4396" height="3.4396" stroke="#aeaeae"/>
    <rect x="1.852" y="45.509" width="3.4396" height="3.4396" stroke="#3096fa"/>
-   <rect x="1.852" y="53.976" width="3.4396" height="3.4396" stroke="#2979ff"/>
+   <rect x="1.852" y="53.976" width="3.4396" height="3.4396" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-6.8792" y="35.454" width="3.9688" height=".52917" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-6.8792" y="35.984" width=".52917" height="3.4396" fill="#aeaeae" stroke-width=".23932"/>
   <g stroke-width=".23932">
    <rect transform="scale(-1,1)" x="-6.8792" y="43.921" width="3.9688" height=".52917" fill="#3096fa"/>
    <rect transform="scale(-1,1)" x="-6.8792" y="44.45" width=".52917" height="3.4396" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-6.8792" y="52.388" width="3.9688" height=".52917" fill="#2979ff"/>
-   <rect transform="scale(-1,1)" x="-6.8792" y="52.917" width=".52917" height="3.4396" fill="#2979ff"/>
+   <rect transform="scale(-1,1)" x="-6.8792" y="52.388" width="3.9688" height=".52917" class="HighlightOutline" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-6.8792" y="52.917" width=".52917" height="3.4396" class="HighlightOutline" fill="currentColor"/>
   </g>
   <rect x="1.852" y="62.442" width="3.4396" height="3.4396" stroke="#aeaeae" stroke-width=".52917"/>
   <rect transform="scale(-1,1)" x="-6.8792" y="60.855" width="3.9688" height=".52917" fill="#aeaeae" stroke-width=".23932"/>
diff --git a/dlls/light.msstyles/blue_window_restore_button_glyph_39px.svg b/dlls/light.msstyles/blue_window_restore_button_glyph_39px.svg
index 810d4a2864e..288fb434c29 100644
--- a/dlls/light.msstyles/blue_window_restore_button_glyph_39px.svg
+++ b/dlls/light.msstyles/blue_window_restore_button_glyph_39px.svg
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:39-32" width="39" height="312" version="1.1" viewBox="0 0 10.319 82.551" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g fill="none">
   <g stroke-width=".79376">
    <rect x="1.9844" y="3.5719" width="4.7626" height="4.7626" stroke="#aeaeae"/>
    <rect x="1.9844" y="13.891" width="4.7626" height="4.7626" stroke="#3096fa"/>
-   <rect x="1.9844" y="24.21" width="4.7626" height="4.7626" stroke="#2979ff"/>
+   <rect x="1.9844" y="24.21" width="4.7626" height="4.7626" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-8.7315" y="1.5875" width="5.5564" height=".79377" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-8.7315" y="2.3812" width=".79377" height="4.7626" fill="#aeaeae" stroke-width=".23932"/>
@@ -14,13 +17,13 @@
   <g stroke-width=".23932">
    <rect transform="scale(-1,1)" x="-8.7315" y="11.906" width="5.5564" height=".79377" fill="#3096fa"/>
    <rect transform="scale(-1,1)" x="-8.7315" y="12.7" width=".79377" height="4.7626" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-8.7315" y="22.225" width="5.5564" height=".79377" fill="#2979ff"/>
-   <rect transform="scale(-1,1)" x="-8.7315" y="23.019" width=".79377" height="4.7626" fill="#2979ff"/>
+   <rect transform="scale(-1,1)" x="-8.7315" y="22.225" width="5.5564" height=".79377" class="HighlightOutline" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-8.7315" y="23.019" width=".79377" height="4.7626" class="HighlightOutline" fill="currentColor"/>
   </g>
   <g stroke-width=".79376">
    <rect x="1.9844" y="44.847" width="4.7626" height="4.7626" stroke="#aeaeae"/>
    <rect x="1.9844" y="55.166" width="4.7626" height="4.7626" stroke="#3096fa"/>
-   <rect x="1.9844" y="65.485" width="4.7626" height="4.7626" stroke="#2979ff"/>
+   <rect x="1.9844" y="65.485" width="4.7626" height="4.7626" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-8.7315" y="42.863" width="5.5564" height=".79377" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-8.7315" y="43.657" width=".79377" height="4.7626" fill="#aeaeae" stroke-width=".23932"/>
@@ -30,8 +33,8 @@
   <g stroke-width=".23932">
    <rect transform="scale(-1,1)" x="-8.7315" y="53.182" width="5.5564" height=".79377" fill="#3096fa"/>
    <rect transform="scale(-1,1)" x="-8.7315" y="53.976" width=".79377" height="4.7626" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-8.7315" y="63.501" width="5.5564" height=".79377" fill="#2979ff"/>
-   <rect transform="scale(-1,1)" x="-8.7315" y="64.295" width=".79377" height="4.7626" fill="#2979ff"/>
+   <rect transform="scale(-1,1)" x="-8.7315" y="63.501" width="5.5564" height=".79377" class="HighlightOutline" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-8.7315" y="64.295" width=".79377" height="4.7626" class="HighlightOutline" fill="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_restore_button_glyph_52px.svg b/dlls/light.msstyles/blue_window_restore_button_glyph_52px.svg
index 45efc4fdbef..d20f0997cd5 100644
--- a/dlls/light.msstyles/blue_window_restore_button_glyph_52px.svg
+++ b/dlls/light.msstyles/blue_window_restore_button_glyph_52px.svg
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:52-32" width="52" height="416" version="1.1" viewBox="0 0 13.759 110.07" xmlns="http://www.w3.org/2000/svg">
+ <style>
+  @import url(colors.css);
+ </style>
  <g fill="none">
   <g stroke-width="1.0584">
    <rect x="2.646" y="4.7626" width="6.3503" height="6.3503" stroke="#aeaeae"/>
    <rect x="2.646" y="18.521" width="6.3503" height="6.3503" stroke="#3096fa"/>
-   <rect x="2.646" y="32.28" width="6.3503" height="6.3503" stroke="#2979ff"/>
+   <rect x="2.646" y="32.28" width="6.3503" height="6.3503" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-11.642" y="2.1166" width="7.4087" height="1.0584" fill="#aeaeae" stroke-width=".23933"/>
   <rect transform="scale(-1,1)" x="-11.642" y="3.175" width="1.0584" height="6.3503" fill="#aeaeae" stroke-width=".23933"/>
@@ -14,13 +17,13 @@
   <g stroke-width=".23933">
    <rect transform="scale(-1,1)" x="-11.642" y="15.876" width="7.4087" height="1.0584" fill="#3096fa"/>
    <rect transform="scale(-1,1)" x="-11.642" y="16.934" width="1.0584" height="6.3503" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-11.642" y="29.634" width="7.4087" height="1.0584" fill="#2979ff"/>
-   <rect transform="scale(-1,1)" x="-11.642" y="30.693" width="1.0584" height="6.3503" fill="#2979ff"/>
+   <rect transform="scale(-1,1)" x="-11.642" y="29.634" width="7.4087" height="1.0584" class="HighlightOutline" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-11.642" y="30.693" width="1.0584" height="6.3503" class="HighlightOutline" fill="currentColor"/>
   </g>
   <g stroke-width="1.0584">
    <rect x="2.646" y="59.798" width="6.3503" height="6.3503" stroke="#aeaeae"/>
    <rect x="2.646" y="73.557" width="6.3503" height="6.3503" stroke="#3096fa"/>
-   <rect x="2.646" y="87.316" width="6.3503" height="6.3503" stroke="#2979ff"/>
+   <rect x="2.646" y="87.316" width="6.3503" height="6.3503" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-11.642" y="57.152" width="7.4087" height="1.0584" fill="#aeaeae" stroke-width=".23933"/>
   <rect transform="scale(-1,1)" x="-11.642" y="58.211" width="1.0584" height="6.3503" fill="#aeaeae" stroke-width=".23933"/>
@@ -30,8 +33,8 @@
   <g stroke-width=".23933">
    <rect transform="scale(-1,1)" x="-11.642" y="70.911" width="7.4087" height="1.0584" fill="#3096fa"/>
    <rect transform="scale(-1,1)" x="-11.642" y="71.969" width="1.0584" height="6.3503" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-11.642" y="84.67" width="7.4087" height="1.0584" fill="#2979ff"/>
-   <rect transform="scale(-1,1)" x="-11.642" y="85.728" width="1.0584" height="6.3503" fill="#2979ff"/>
+   <rect transform="scale(-1,1)" x="-11.642" y="84.67" width="7.4087" height="1.0584" class="HighlightOutline" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-11.642" y="85.728" width="1.0584" height="6.3503" class="HighlightOutline" fill="currentColor"/>
   </g>
  </g>
 </svg>
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/7590

[PATCH 3/3] light.msstyles: Extract the Highlight color into the css file.

[Stefan Dösinger]

From: Stefan Dösinger <stefan(a)codeweavers.com>

---
 dlls/light.msstyles/blue_button.svg           |  2 +-
 dlls/light.msstyles/blue_checkbox_13px.svg    | 18 +++++++++---------
 dlls/light.msstyles/blue_checkbox_16px.svg    | 18 +++++++++---------
 dlls/light.msstyles/blue_checkbox_20px.svg    | 18 +++++++++---------
 dlls/light.msstyles/blue_checkbox_26px.svg    | 18 +++++++++---------
 dlls/light.msstyles/blue_checkbox_32px.svg    | 18 +++++++++---------
 dlls/light.msstyles/blue_checkbox_40px.svg    | 18 +++++++++---------
 dlls/light.msstyles/blue_checkbox_52px.svg    | 18 +++++++++---------
 dlls/light.msstyles/blue_combobox_border.svg  |  2 +-
 .../blue_combobox_dropdownbutton.svg          |  2 +-
 ...lue_combobox_dropdownbutton_glyph_10px.svg |  7 +++++--
 ...lue_combobox_dropdownbutton_glyph_11px.svg |  7 +++++--
 ...lue_combobox_dropdownbutton_glyph_14px.svg |  7 +++++--
 ...lue_combobox_dropdownbutton_glyph_17px.svg |  7 +++++--
 ...lue_combobox_dropdownbutton_glyph_21px.svg |  7 +++++--
 ...lue_combobox_dropdownbutton_glyph_27px.svg |  7 +++++--
 ...blue_combobox_dropdownbutton_glyph_9px.svg |  7 +++++--
 .../blue_combobox_dropdownbutton_left.svg     |  2 +-
 ...ombobox_dropdownbutton_left_glyph_10px.svg |  7 +++++--
 ...ombobox_dropdownbutton_left_glyph_11px.svg |  7 +++++--
 ...ombobox_dropdownbutton_left_glyph_14px.svg |  7 +++++--
 ...ombobox_dropdownbutton_left_glyph_17px.svg |  7 +++++--
 ...ombobox_dropdownbutton_left_glyph_21px.svg |  7 +++++--
 ...ombobox_dropdownbutton_left_glyph_27px.svg |  7 +++++--
 ...combobox_dropdownbutton_left_glyph_9px.svg |  7 +++++--
 .../blue_combobox_dropdownbutton_right.svg    |  2 +-
 ...mbobox_dropdownbutton_right_glyph_10px.svg |  7 +++++--
 ...mbobox_dropdownbutton_right_glyph_11px.svg |  7 +++++--
 ...mbobox_dropdownbutton_right_glyph_14px.svg |  7 +++++--
 ...mbobox_dropdownbutton_right_glyph_17px.svg |  7 +++++--
 ...mbobox_dropdownbutton_right_glyph_21px.svg |  7 +++++--
 ...mbobox_dropdownbutton_right_glyph_27px.svg |  7 +++++--
 ...ombobox_dropdownbutton_right_glyph_9px.svg |  7 +++++--
 .../light.msstyles/blue_combobox_readonly.svg |  2 +-
 dlls/light.msstyles/blue_commandlink.svg      |  6 +++---
 .../blue_commandlink_glyph_30px.svg           |  6 +++---
 .../blue_commandlink_glyph_37px.svg           |  6 +++---
 .../blue_commandlink_glyph_45px.svg           |  6 +++---
 .../blue_commandlink_glyph_52px.svg           |  6 +++---
 .../blue_commandlink_glyph_60px.svg           |  6 +++---
 .../blue_commandlink_glyph_67px.svg           |  6 +++---
 .../blue_commandlink_glyph_75px.svg           |  6 +++---
 .../blue_edit_border_hscroll.svg              |  2 +-
 .../blue_edit_border_hvscroll.svg             |  2 +-
 .../blue_edit_border_noscroll.svg             |  2 +-
 .../blue_edit_border_vscroll.svg              |  2 +-
 .../blue_explorer_listview_item_hot.svg       |  5 ++++-
 ...ue_explorer_listview_item_hot_selected.svg |  5 ++++-
 .../blue_explorer_listview_item_selected.svg  |  5 ++++-
 .../blue_explorer_treeview_hot_glyph_16px.svg |  5 ++++-
 .../blue_explorer_treeview_hot_glyph_20px.svg |  5 ++++-
 .../blue_explorer_treeview_hot_glyph_24px.svg |  5 ++++-
 .../blue_explorer_treeview_hot_glyph_32px.svg |  5 ++++-
 .../blue_explorer_treeview_hot_glyph_40px.svg |  5 ++++-
 .../blue_explorer_treeview_hot_glyph_48px.svg |  5 ++++-
 .../blue_explorer_treeview_hot_glyph_64px.svg |  5 ++++-
 .../blue_explorer_treeview_item_hot.svg       |  5 ++++-
 ...ue_explorer_treeview_item_hot_selected.svg |  5 ++++-
 .../blue_explorer_treeview_item_selected.svg  |  5 ++++-
 .../blue_listview_collapse_button_15px.svg    |  4 ++--
 .../blue_listview_collapse_button_19px.svg    |  6 +++---
 .../blue_listview_collapse_button_23px.svg    |  6 +++---
 .../blue_listview_collapse_button_30px.svg    |  4 ++--
 .../blue_listview_collapse_button_37px.svg    |  6 +++---
 .../blue_listview_collapse_button_45px.svg    |  6 +++---
 .../blue_listview_collapse_button_60px.svg    |  4 ++--
 .../blue_listview_expand_button_15px.svg      |  4 ++--
 .../blue_listview_expand_button_19px.svg      |  6 +++---
 .../blue_listview_expand_button_23px.svg      |  6 +++---
 .../blue_listview_expand_button_30px.svg      |  4 ++--
 .../blue_listview_expand_button_37px.svg      |  6 +++---
 .../blue_listview_expand_button_45px.svg      |  6 +++---
 .../blue_listview_expand_button_60px.svg      |  4 ++--
 .../blue_listview_group_header_close_hot.svg  |  5 ++++-
 ...iew_group_header_close_mixed_selection.svg |  5 ++++-
 ...group_header_close_mixed_selection_hot.svg |  5 ++++-
 ...e_listview_group_header_close_selected.svg |  5 ++++-
 ...stview_group_header_close_selected_hot.svg |  7 +++++--
 ..._header_close_selected_not_focused_hot.svg |  7 +++++--
 .../blue_listview_group_header_open_hot.svg   |  5 ++++-
 ..._group_header_open_mixed_selection_hot.svg |  5 ++++-
 ...istview_group_header_open_selected_hot.svg |  5 ++++-
 ...p_header_open_selected_not_focused_hot.svg |  5 ++++-
 dlls/light.msstyles/blue_menu_bar_item.svg    |  2 +-
 .../blue_menu_popup_check_background.svg      |  5 ++++-
 dlls/light.msstyles/blue_menu_popup_item.svg  |  5 ++++-
 .../blue_navigation_back_button_120px.svg     |  2 +-
 .../blue_navigation_back_button_30px.svg      |  2 +-
 .../blue_navigation_back_button_38px.svg      |  2 +-
 .../blue_navigation_back_button_45px.svg      |  2 +-
 .../blue_navigation_back_button_60px.svg      |  2 +-
 .../blue_navigation_back_button_74px.svg      |  2 +-
 .../blue_navigation_back_button_90px.svg      |  2 +-
 .../blue_navigation_forward_button_120px.svg  |  2 +-
 .../blue_navigation_forward_button_30px.svg   |  2 +-
 .../blue_navigation_forward_button_38px.svg   |  2 +-
 .../blue_navigation_forward_button_45px.svg   |  2 +-
 .../blue_navigation_forward_button_60px.svg   |  2 +-
 .../blue_navigation_forward_button_74px.svg   |  2 +-
 .../blue_navigation_forward_button_90px.svg   |  2 +-
 .../blue_navigation_menu_button_13px.svg      |  4 ++--
 .../blue_navigation_menu_button_17px.svg      |  4 ++--
 .../blue_navigation_menu_button_19px.svg      |  4 ++--
 .../blue_navigation_menu_button_26px.svg      |  4 ++--
 .../blue_navigation_menu_button_32px.svg      |  4 ++--
 .../blue_navigation_menu_button_39px.svg      |  4 ++--
 .../blue_navigation_menu_button_52px.svg      |  4 ++--
 dlls/light.msstyles/blue_radiobutton_13px.svg |  6 +++---
 dlls/light.msstyles/blue_radiobutton_16px.svg |  6 +++---
 dlls/light.msstyles/blue_radiobutton_19px.svg |  6 +++---
 dlls/light.msstyles/blue_radiobutton_22px.svg |  6 +++---
 dlls/light.msstyles/blue_radiobutton_25px.svg |  6 +++---
 dlls/light.msstyles/blue_radiobutton_28px.svg |  6 +++---
 dlls/light.msstyles/blue_radiobutton_31px.svg |  6 +++---
 .../blue_rebar_chevron_background.svg         |  2 +-
 .../blue_rebar_chevron_glyph_10px.svg         |  2 +-
 .../blue_rebar_chevron_glyph_13px.svg         |  2 +-
 .../blue_rebar_chevron_glyph_15px.svg         |  2 +-
 .../blue_rebar_chevron_glyph_20px.svg         |  2 +-
 .../blue_rebar_chevron_glyph_25px.svg         |  2 +-
 .../blue_rebar_chevron_glyph_30px.svg         |  2 +-
 .../blue_rebar_chevron_glyph_40px.svg         |  2 +-
 ...blue_rebar_chevron_vertical_background.svg |  2 +-
 ...blue_rebar_chevron_vertical_glyph_10px.svg |  2 +-
 ...blue_rebar_chevron_vertical_glyph_13px.svg |  2 +-
 ...blue_rebar_chevron_vertical_glyph_15px.svg |  2 +-
 .../blue_scrollbar_arrow_glyphs_13px.svg      | 17 ++++++++++-------
 .../blue_scrollbar_arrow_glyphs_16px.svg      | 13 ++++++++-----
 .../blue_scrollbar_arrow_glyphs_20px.svg      | 13 ++++++++-----
 .../blue_scrollbar_arrow_glyphs_26px.svg      | 19 +++++++++++--------
 .../blue_scrollbar_arrow_glyphs_32px.svg      | 17 ++++++++++-------
 .../blue_scrollbar_arrow_glyphs_39px.svg      | 19 +++++++++++--------
 .../blue_scrollbar_arrow_glyphs_52px.svg      | 19 +++++++++++--------
 dlls/light.msstyles/blue_scrollbar_arrows.svg |  8 ++++----
 .../blue_scrollbar_thumb_horizontal.svg       |  4 ++--
 .../blue_scrollbar_thumb_vertical.svg         |  4 ++--
 .../blue_spin_background_down.svg             |  2 +-
 .../blue_spin_background_left.svg             |  2 +-
 .../blue_spin_background_right.svg            |  2 +-
 .../blue_spin_background_up.svg               |  2 +-
 .../blue_spin_glyph_down_11px.svg             |  7 +++++--
 .../blue_spin_glyph_down_14px.svg             |  7 +++++--
 .../blue_spin_glyph_down_18px.svg             |  7 +++++--
 .../blue_spin_glyph_down_21px.svg             |  7 +++++--
 .../blue_spin_glyph_down_28px.svg             |  7 +++++--
 .../blue_spin_glyph_down_7x16px.svg           |  7 +++++--
 .../blue_spin_glyph_down_7x24px.svg           |  7 +++++--
 .../blue_spin_glyph_left_12px.svg             |  7 +++++--
 .../blue_spin_glyph_left_15px.svg             |  7 +++++--
 .../blue_spin_glyph_left_18px.svg             |  7 +++++--
 .../blue_spin_glyph_left_24px.svg             |  7 +++++--
 .../blue_spin_glyph_left_4px.svg              |  7 +++++--
 .../blue_spin_glyph_left_6px.svg              |  7 +++++--
 .../blue_spin_glyph_left_9px.svg              |  7 +++++--
 .../blue_spin_glyph_right_12px.svg            |  7 +++++--
 .../blue_spin_glyph_right_15px.svg            |  7 +++++--
 .../blue_spin_glyph_right_18px.svg            |  7 +++++--
 .../blue_spin_glyph_right_24px.svg            |  7 +++++--
 .../blue_spin_glyph_right_4px.svg             |  7 +++++--
 .../blue_spin_glyph_right_6px.svg             |  7 +++++--
 .../blue_spin_glyph_right_9px.svg             |  7 +++++--
 .../blue_spin_glyph_up_11px.svg               |  7 +++++--
 .../blue_spin_glyph_up_14px.svg               |  7 +++++--
 .../blue_spin_glyph_up_18px.svg               |  7 +++++--
 .../blue_spin_glyph_up_21px.svg               |  7 +++++--
 .../blue_spin_glyph_up_28px.svg               |  7 +++++--
 .../blue_spin_glyph_up_7x20px.svg             |  7 +++++--
 .../blue_spin_glyph_up_7x24px.svg             |  7 +++++--
 dlls/light.msstyles/blue_tab_item.svg         | 10 +++++-----
 dlls/light.msstyles/blue_tab_item_left.svg    | 10 +++++-----
 dlls/light.msstyles/blue_tab_item_right.svg   | 10 +++++-----
 ...log_expando_button_expanded_hover_19px.svg |  9 ++++++---
 ...log_expando_button_expanded_hover_24px.svg |  9 ++++++---
 ...log_expando_button_expanded_hover_29px.svg |  9 ++++++---
 ...log_expando_button_expanded_hover_33px.svg |  9 ++++++---
 ...log_expando_button_expanded_hover_38px.svg |  9 ++++++---
 ...log_expando_button_expanded_hover_43px.svg |  9 ++++++---
 ...log_expando_button_expanded_hover_48px.svg |  9 ++++++---
 ...e_taskdialog_expando_button_hover_19px.svg |  9 ++++++---
 ...e_taskdialog_expando_button_hover_24px.svg |  9 ++++++---
 ...e_taskdialog_expando_button_hover_29px.svg |  9 ++++++---
 ...e_taskdialog_expando_button_hover_33px.svg |  9 ++++++---
 ...e_taskdialog_expando_button_hover_38px.svg |  9 ++++++---
 ...e_taskdialog_expando_button_hover_43px.svg |  9 ++++++---
 ...e_taskdialog_expando_button_hover_48px.svg |  9 ++++++---
 dlls/light.msstyles/blue_toolbar_buttons.svg  |  4 ++--
 .../blue_toolbar_buttons_split.svg            |  4 ++--
 .../blue_toolbar_buttons_split_dropdown.svg   |  4 ++--
 ...lbar_buttons_split_dropdown_glyph_11px.svg |  4 ++--
 ...lbar_buttons_split_dropdown_glyph_14px.svg |  4 ++--
 ...lbar_buttons_split_dropdown_glyph_17px.svg |  4 ++--
 ...lbar_buttons_split_dropdown_glyph_21px.svg |  4 ++--
 ...lbar_buttons_split_dropdown_glyph_28px.svg |  4 ++--
 ...olbar_buttons_split_dropdown_glyph_7px.svg |  2 +-
 ...olbar_buttons_split_dropdown_glyph_9px.svg |  4 ++--
 ...lue_toolbar_dropdown_button_glyph_11px.svg |  4 ++--
 ...lue_toolbar_dropdown_button_glyph_14px.svg |  4 ++--
 ...lue_toolbar_dropdown_button_glyph_17px.svg |  4 ++--
 ...blue_toolbar_dropdown_button_glyph_7px.svg |  2 +-
 ...blue_toolbar_dropdown_button_glyph_9px.svg |  4 ++--
 .../blue_tooltip_wrench_17px.svg              |  4 ++--
 .../blue_tooltip_wrench_21px.svg              |  4 ++--
 .../blue_tooltip_wrench_26px.svg              |  4 ++--
 .../blue_tooltip_wrench_34px.svg              |  4 ++--
 .../blue_tooltip_wrench_42px.svg              |  4 ++--
 .../blue_tooltip_wrench_51px.svg              |  4 ++--
 .../blue_tooltip_wrench_68px.svg              |  4 ++--
 .../blue_trackbar_thumb_down_11px.svg         |  4 ++--
 .../blue_trackbar_thumb_down_15px.svg         |  4 ++--
 .../blue_trackbar_thumb_down_17px.svg         |  4 ++--
 .../blue_trackbar_thumb_down_22px.svg         |  4 ++--
 .../blue_trackbar_thumb_down_28px.svg         |  4 ++--
 .../blue_trackbar_thumb_down_33px.svg         |  4 ++--
 .../blue_trackbar_thumb_down_44px.svg         |  4 ++--
 .../blue_trackbar_thumb_horizontal.svg        |  2 +-
 .../blue_trackbar_thumb_left_19px.svg         |  4 ++--
 .../blue_trackbar_thumb_left_25px.svg         |  4 ++--
 .../blue_trackbar_thumb_left_29px.svg         |  4 ++--
 .../blue_trackbar_thumb_left_38px.svg         |  4 ++--
 .../blue_trackbar_thumb_left_48px.svg         |  4 ++--
 .../blue_trackbar_thumb_left_57px.svg         |  4 ++--
 .../blue_trackbar_thumb_left_76px.svg         |  4 ++--
 .../blue_trackbar_thumb_right_19px.svg        |  4 ++--
 .../blue_trackbar_thumb_right_25px.svg        |  4 ++--
 .../blue_trackbar_thumb_right_29px.svg        |  4 ++--
 .../blue_trackbar_thumb_right_38px.svg        |  4 ++--
 .../blue_trackbar_thumb_right_48px.svg        |  4 ++--
 .../blue_trackbar_thumb_right_57px.svg        |  4 ++--
 .../blue_trackbar_thumb_right_76px.svg        |  4 ++--
 .../blue_trackbar_thumb_up_11px.svg           |  4 ++--
 .../blue_trackbar_thumb_up_15px.svg           |  4 ++--
 .../blue_trackbar_thumb_up_17px.svg           |  4 ++--
 .../blue_trackbar_thumb_up_22px.svg           |  4 ++--
 .../blue_trackbar_thumb_up_28px.svg           |  4 ++--
 .../blue_trackbar_thumb_up_33px.svg           |  4 ++--
 .../blue_trackbar_thumb_up_44px.svg           |  4 ++--
 .../blue_trackbar_thumb_vertical.svg          |  2 +-
 .../blue_window_help_button_background.svg    |  4 ++--
 .../blue_window_help_button_glyph_13px.svg    |  4 ++--
 .../blue_window_help_button_glyph_19px.svg    |  4 ++--
 .../blue_window_help_button_glyph_23px.svg    |  4 ++--
 .../blue_window_help_button_glyph_26px.svg    |  4 ++--
 .../blue_window_help_button_glyph_32px.svg    |  4 ++--
 .../blue_window_help_button_glyph_39px.svg    |  4 ++--
 .../blue_window_help_button_glyph_52px.svg    |  4 ++--
 .../blue_window_max_button_background.svg     |  4 ++--
 .../blue_window_max_button_glyph_13px.svg     |  4 ++--
 .../blue_window_max_button_glyph_19px.svg     |  4 ++--
 .../blue_window_max_button_glyph_23px.svg     |  4 ++--
 .../blue_window_max_button_glyph_26px.svg     |  4 ++--
 .../blue_window_max_button_glyph_32px.svg     |  4 ++--
 .../blue_window_max_button_glyph_39px.svg     |  4 ++--
 .../blue_window_max_button_glyph_52px.svg     |  4 ++--
 .../blue_window_mdi_min_button_background.svg |  2 +-
 .../blue_window_mdi_min_button_glyph.svg      |  2 +-
 ...e_window_mdi_restore_button_background.svg |  2 +-
 .../blue_window_mdi_restore_button_glyph.svg  |  6 +++---
 .../blue_window_min_button_background.svg     |  4 ++--
 .../blue_window_min_button_glyph_13px.svg     |  4 ++--
 .../blue_window_min_button_glyph_19px.svg     |  4 ++--
 .../blue_window_min_button_glyph_23px.svg     |  4 ++--
 .../blue_window_min_button_glyph_26px.svg     |  4 ++--
 .../blue_window_min_button_glyph_32px.svg     |  4 ++--
 .../blue_window_min_button_glyph_39px.svg     |  4 ++--
 .../blue_window_min_button_glyph_52px.svg     |  4 ++--
 .../blue_window_restore_button_background.svg |  4 ++--
 .../blue_window_restore_button_glyph_13px.svg | 12 ++++++------
 .../blue_window_restore_button_glyph_19px.svg | 12 ++++++------
 .../blue_window_restore_button_glyph_23px.svg | 12 ++++++------
 .../blue_window_restore_button_glyph_26px.svg | 12 ++++++------
 .../blue_window_restore_button_glyph_32px.svg | 12 ++++++------
 .../blue_window_restore_button_glyph_39px.svg | 12 ++++++------
 .../blue_window_restore_button_glyph_52px.svg | 12 ++++++------
 dlls/light.msstyles/colors.css                |  5 +++++
 274 files changed, 925 insertions(+), 635 deletions(-)

diff --git a/dlls/light.msstyles/blue_button.svg b/dlls/light.msstyles/blue_button.svg
index 0d0df4cfab2..520c15b4e8a 100644
--- a/dlls/light.msstyles/blue_button.svg
+++ b/dlls/light.msstyles/blue_button.svg
@@ -16,7 +16,7 @@
   <g fill="#fff">
    <rect x="40.849" y="1.3236" width="5.5563" height="5.8208" rx=".52917" ry=".52917" stroke="#aeaeae"/>
    <rect x="40.849" y="19.58" width="5.5563" height="5.8208" rx=".52917" ry=".52917" stroke="#aeaeae"/>
-   <g stroke="#3096fa">
+   <g class="Highlight" stroke="currentColor">
     <rect x="40.849" y="25.665" width="5.5563" height="5.8208" rx=".52917" ry=".52917"/>
     <rect x="40.849" y="31.751" width="5.5563" height="5.8208" rx=".52917" ry=".52917"/>
     <rect x="40.849" y="7.409" width="5.5563" height="5.8208" rx=".52917" ry=".52917"/>
diff --git a/dlls/light.msstyles/blue_checkbox_13px.svg b/dlls/light.msstyles/blue_checkbox_13px.svg
index 80d4c91bbe6..236cee2d318 100644
--- a/dlls/light.msstyles/blue_checkbox_13px.svg
+++ b/dlls/light.msstyles/blue_checkbox_13px.svg
@@ -15,51 +15,51 @@
  <g fill="none">
   <path d="m0 0h24v24h-24z"/>
   <rect x=".5" y=".5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
-  <rect x=".5" y="13.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/>
+  <rect x=".5" y="13.5" width="12" height="12" rx="2" ry="2" class="Highlight" stroke="currentColor"/>
   <path d="m0.5 25.5h24v24h-24z"/>
   <rect x=".5" y="26.5" width="12" height="12" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="39.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
   <path d="m4.1723e-7 52h24v24h-24z"/>
   <rect x=".5" y="52.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
-  <rect x=".5" y="65.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/>
+  <rect x=".5" y="65.5" width="12" height="12" rx="2" ry="2" class="Highlight" stroke="currentColor"/>
   <path d="m0.5 77.5h24v24h-24z"/>
   <rect x=".5" y="78.5" width="12" height="12" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="91.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
   <path d="m-1.9073e-6 104h24v24h-24z"/>
   <rect x=".5" y="104.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
-  <rect x=".5" y="117.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/>
+  <rect x=".5" y="117.5" width="12" height="12" rx="2" ry="2" class="Highlight" stroke="currentColor"/>
   <path d="m0.5 129.5h24v24h-24z"/>
   <rect x=".5" y="130.5" width="12" height="12" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="143.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
  </g>
  <path d="m4.8636 60.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z"/>
- <path d="m4.8636 73.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#3096fa"/>
+ <path d="m4.8636 73.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" class="Highlight" fill="currentColor"/>
  <path d="m4.8636 99.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#aeaeae"/>
  <path d="m4.8636 86.537-2.1477-2.194-0.71591 0.73135 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" class="HighlightOutline" fill="currentColor"/>
  <g fill="none">
   <rect x=".5" y="156.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
-  <rect x=".5" y="169.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/>
+  <rect x=".5" y="169.5" width="12" height="12" rx="2" ry="2" class="Highlight" stroke="currentColor"/>
   <rect x=".5" y="182.5" width="12" height="12" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="195.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
  </g>
  <path d="m4.8636 164.54-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z"/>
- <path d="m4.8636 177.54-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#3096fa"/>
+ <path d="m4.8636 177.54-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" class="Highlight" fill="currentColor"/>
  <path d="m4.8636 203.54-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#aeaeae"/>
  <g stroke-width="3.7795">
   <path d="m10 211.7-0.70498-0.705-2.795 2.795-2.795-2.795-0.70499 0.705 2.795 2.795-2.795 2.795 0.70499 0.705 2.795-2.795 2.795 2.795 0.70498-0.705-2.795-2.795z" fill="#000"/>
-  <path d="m10 224.7-0.70498-0.705-2.795 2.795-2.795-2.795-0.70499 0.705 2.795 2.795-2.795 2.795 0.70499 0.70499 2.795-2.795 2.795 2.795 0.70498-0.70499-2.795-2.795z" fill="#3096fa"/>
+  <path d="m10 224.7-0.70498-0.705-2.795 2.795-2.795-2.795-0.70499 0.705 2.795 2.795-2.795 2.795 0.70499 0.70499 2.795-2.795 2.795 2.795 0.70498-0.70499-2.795-2.795z" class="Highlight" fill="currentColor"/>
   <path d="m10 237.7-0.70498-0.705-2.795 2.795-2.795-2.795-0.70499 0.705 2.795 2.795-2.795 2.795 0.70499 0.705 2.795-2.795 2.795 2.795 0.70498-0.705-2.795-2.795z" class="HighlightOutline" fill="currentColor"/>
   <path d="m10 250.7-0.70498-0.705-2.795 2.795-2.795-2.795-0.70499 0.705 2.795 2.795-2.795 2.795 0.70499 0.70499 2.795-2.795 2.795 2.795 0.70498-0.70499-2.795-2.795z" fill="#aeaeae"/>
  </g>
  <path d="m4.8636 190.54-2.1477-2.194-0.71591 0.73135 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" class="HighlightOutline" fill="currentColor"/>
  <g fill="none">
   <rect x=".5" y="208.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
-  <rect x=".5" y="221.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/>
+  <rect x=".5" y="221.5" width="12" height="12" rx="2" ry="2" class="Highlight" stroke="currentColor"/>
   <rect x=".5" y="234.5" width="12" height="12" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="247.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
  </g>
  <path d="m2 110h9v1h-9z"/>
- <path d="m2 123h9v1h-9z" fill="#3096fa"/>
+ <path d="m2 123h9v1h-9z" class="Highlight" fill="currentColor"/>
  <path d="m2 136h9v1h-9z" class="HighlightOutline" fill="currentColor"/>
  <path d="m2 149h9v1h-9z" fill="#aeaeae"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_checkbox_16px.svg b/dlls/light.msstyles/blue_checkbox_16px.svg
index 8cf94874323..a6f99b594c9 100644
--- a/dlls/light.msstyles/blue_checkbox_16px.svg
+++ b/dlls/light.msstyles/blue_checkbox_16px.svg
@@ -14,44 +14,44 @@
  <rect width="16" height="320" fill="#fff" fill-opacity=".98444"/>
  <g fill="none">
   <rect x=".5" y=".5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
-  <rect x=".5" y="16.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/>
+  <rect x=".5" y="16.5" width="15" height="15" rx="2" ry="2" class="Highlight" stroke="currentColor"/>
   <rect x=".5" y="32.5" width="15" height="15" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="48.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x=".5" y="256.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
-  <rect x=".5" y="272.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/>
+  <rect x=".5" y="272.5" width="15" height="15" rx="2" ry="2" class="Highlight" stroke="currentColor"/>
   <rect x=".5" y="288.5" width="15" height="15" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="304.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
   <g stroke-width="3.7795">
    <path d="m13 260.01-1.0071-1.0072-3.9929 3.9929-3.9929-3.9929-1.0071 1.0072 3.9929 3.9928-3.9929 3.9929 1.0071 1.0071 3.9929-3.9928 3.9929 3.9928 1.0071-1.0071-3.9929-3.9929z" fill="#000"/>
-   <path d="m13 276.01-1.0071-1.0072-3.9929 3.9928-3.9929-3.9928-1.0071 1.0072 3.9929 3.9928-3.9929 3.9928 1.0071 1.0072 3.9929-3.9928 3.9929 3.9928 1.0071-1.0072-3.9929-3.9928z" fill="#3096fa"/>
+   <path d="m13 276.01-1.0071-1.0072-3.9929 3.9928-3.9929-3.9928-1.0071 1.0072 3.9929 3.9928-3.9929 3.9928 1.0071 1.0072 3.9929-3.9928 3.9929 3.9928 1.0071-1.0072-3.9929-3.9928z" class="Highlight" fill="currentColor"/>
    <path d="m13 292.01-1.0071-1.0072-3.9929 3.9928-3.9929-3.9928-1.0071 1.0072 3.9929 3.9928-3.9929 3.9928 1.0071 1.0072 3.9929-3.9928 3.9929 3.9928 1.0071-1.0072-3.9929-3.9928z" class="HighlightOutline" fill="currentColor"/>
    <path d="m13 308.01-1.0071-1.0072-3.9929 3.9928-3.9929-3.9928-1.0071 1.0072 3.9929 3.9928-3.9929 3.9928 1.0071 1.0072 3.9929-3.9928 3.9929 3.9928 1.0071-1.0072-3.9929-3.9928z" fill="#aeaeae"/>
   </g>
   <rect x=".5" y="64.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
-  <rect x=".5" y="80.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/>
+  <rect x=".5" y="80.5" width="15" height="15" rx="2" ry="2" class="Highlight" stroke="currentColor"/>
   <rect x=".5" y="96.5" width="15" height="15" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="112.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x=".5" y="128.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
-  <rect x=".5" y="144.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/>
+  <rect x=".5" y="144.5" width="15" height="15" rx="2" ry="2" class="Highlight" stroke="currentColor"/>
   <rect x=".5" y="160.5" width="15" height="15" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="176.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
  </g>
  <path d="m5.8182 74.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/>
- <path d="m5.8182 90.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#3096fa"/>
+ <path d="m5.8182 90.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" class="Highlight" fill="currentColor"/>
  <path d="m5.8182 106.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" class="HighlightOutline" fill="currentColor"/>
  <path d="m5.8182 122.91-2.8636-3.1343-0.95454 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/>
  <g fill="none">
   <rect x=".5" y="192.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
-  <rect x=".5" y="208.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/>
+  <rect x=".5" y="208.5" width="15" height="15" rx="2" ry="2" class="Highlight" stroke="currentColor"/>
   <rect x=".5" y="224.5" width="15" height="15" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".5" y="240.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
  </g>
  <path d="m5.8182 202.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/>
- <path d="m5.8182 218.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#3096fa"/>
+ <path d="m5.8182 218.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" class="Highlight" fill="currentColor"/>
  <path d="m5.8182 234.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" class="HighlightOutline" fill="currentColor"/>
  <path d="m5.8182 250.91-2.8636-3.1343-0.95454 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/>
  <path d="m2 135h12v2h-12z"/>
- <path d="m2 151h12v2h-12z" fill="#3096fa"/>
+ <path d="m2 151h12v2h-12z" class="Highlight" fill="currentColor"/>
  <path d="m2 167h12v2h-12z" class="HighlightOutline" fill="currentColor"/>
  <path d="m2 183h12v2h-12z"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_checkbox_20px.svg b/dlls/light.msstyles/blue_checkbox_20px.svg
index 91705c2adb1..aebb91eff60 100644
--- a/dlls/light.msstyles/blue_checkbox_20px.svg
+++ b/dlls/light.msstyles/blue_checkbox_20px.svg
@@ -15,19 +15,19 @@
  <g transform="matrix(.95 0 0 .9499 .051376 .05137)" fill="none" stroke-width="1.0527">
   <path d="m2.9e-6 0h36.923v36.965h-36.923z"/>
   <rect x=".47226" y=".47227" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae" stroke-width="1.0527"/>
-  <rect x=".47226" y="21.527" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#3096fa" stroke-width="1.0527"/>
+  <rect x=".47226" y="21.527" width="20" height="20.002" rx="2.1053" ry="2.1055" class="Highlight" stroke="currentColor" stroke-width="1.0527"/>
   <path d="m0.76923 39.275h36.923v36.965h-36.923z"/>
   <rect x=".47227" y="42.582" width="20" height="20.002" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor" stroke-width="1.0527"/>
   <rect x=".47227" y="63.637" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae" stroke-width="1.0527"/>
   <path d="m1.2564e-5 336.88h36.923v36.965h-36.923z"/>
   <rect x=".47227" y="337.35" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae" stroke-width="1.0527"/>
-  <rect x=".47227" y="358.4" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#3096fa" stroke-width="1.0527"/>
+  <rect x=".47227" y="358.4" width="20" height="20.002" rx="2.1053" ry="2.1055" class="Highlight" stroke="currentColor" stroke-width="1.0527"/>
   <path d="m0.76924 376.15h36.923v36.965h-36.923z"/>
   <g stroke-width="1.0527">
    <rect x=".47228" y="379.46" width="20" height="20.002" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor"/>
    <rect x=".47228" y="400.51" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x=".47227" y="253.13" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
-   <rect x=".47227" y="274.19" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
+   <rect x=".47227" y="274.19" width="20" height="20.002" rx="2.1053" ry="2.1055" class="Highlight" stroke="currentColor"/>
    <rect x=".47228" y="295.24" width="20" height="20.002" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor"/>
    <rect x=".47228" y="316.29" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
   </g>
@@ -37,38 +37,38 @@
   <path d="m0.76923 199.45h36.923v36.965h-36.923z"/>
   <path d="m4.1802e-6 80.009h36.923v36.965h-36.923z"/>
   <rect x=".47227" y="84.692" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae" stroke-width="1.0527"/>
-  <rect x=".47227" y="105.75" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#3096fa" stroke-width="1.0527"/>
+  <rect x=".47227" y="105.75" width="20" height="20.002" rx="2.1053" ry="2.1055" class="Highlight" stroke="currentColor" stroke-width="1.0527"/>
   <path d="m0.76923 119.28h36.923v36.965h-36.923z"/>
   <rect x=".47227" y="126.8" width="20" height="20.002" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor" stroke-width="1.0527"/>
   <rect x=".47227" y="147.86" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae" stroke-width="1.0527"/>
   <path d="m3.8669e-6 160.02h36.923v36.965h-36.923z"/>
   <rect x=".47227" y="168.91" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae" stroke-width="1.0527"/>
-  <rect x=".47227" y="189.97" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#3096fa" stroke-width="1.0527"/>
+  <rect x=".47227" y="189.97" width="20" height="20.002" rx="2.1053" ry="2.1055" class="Highlight" stroke="currentColor" stroke-width="1.0527"/>
   <path d="m0.76923 199.29h36.923v36.965h-36.923z"/>
   <rect x=".47227" y="211.02" width="20" height="20.002" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor" stroke-width="1.0527"/>
   <rect x=".47227" y="232.08" width="20" height="20.002" rx="2.1053" ry="2.1055" stroke="#aeaeae" stroke-width="1.0527"/>
   <g stroke-width="3.9787">
    <path d="m16.788 342.31-1.2721-1.2723-5.0436 5.0441-5.0436-5.0441-1.2722 1.2723 5.0436 5.0441-5.0436 5.0441 1.2722 1.2723 5.0436-5.0441 5.0436 5.0441 1.2721-1.2723-5.0436-5.0441z" fill="#000"/>
-   <path d="m16.788 363.36-1.2721-1.2723-5.0436 5.0441-5.0436-5.0441-1.2722 1.2723 5.0436 5.0441-5.0436 5.0441 1.2722 1.2723 5.0436-5.0441 5.0436 5.0441 1.2721-1.2723-5.0436-5.0441z" fill="#3096fa"/>
+   <path d="m16.788 363.36-1.2721-1.2723-5.0436 5.0441-5.0436-5.0441-1.2722 1.2723 5.0436 5.0441-5.0436 5.0441 1.2722 1.2723 5.0436-5.0441 5.0436 5.0441 1.2721-1.2723-5.0436-5.0441z" class="Highlight" fill="currentColor"/>
    <path d="m16.788 384.42-1.2721-1.2723-5.0436 5.0441-5.0436-5.0441-1.2722 1.2723 5.0436 5.0441-5.0436 5.0441 1.2722 1.2723 5.0436-5.0441 5.0436 5.0441 1.2721-1.2723-5.0436-5.0441z" class="HighlightOutline" fill="currentColor"/>
    <path d="m16.788 405.47-1.2721-1.2723-5.0436 5.0441-5.0436-5.0441-1.2722 1.2723 5.0436 5.0441-5.0436 5.0441 1.2722 1.2723 5.0436-5.0441 5.0436 5.0441 1.2721-1.2723-5.0436-5.0441z" fill="#aeaeae"/>
   </g>
  </g>
  <path d="m7.4546 92.91-3.3409-3.1343-1.1136 1.0447 4.4545 4.1791 9.5455-8.9553-1.1136-1.0447z" stroke-width=".99999"/>
  <g transform="matrix(1.4616 0 0 1.463 .91489 3.1433)" stroke-width=".46768">
-  <path d="m4.4744 75.029-2.2858-2.1423-0.76193 0.71411 3.0476 2.8565 6.5309-6.121-0.76193-0.71411z" fill="#3096fa"/>
+  <path d="m4.4744 75.029-2.2858-2.1423-0.76193 0.71411 3.0476 2.8565 6.5309-6.121-0.76193-0.71411z" class="Highlight" fill="currentColor"/>
   <path d="m4.4744 102.37-2.2858-2.1423-0.76193 0.71411 3.0476 2.8565 6.5309-6.121-0.76193-0.71411z" fill="#aeaeae"/>
   <path d="m4.4744 88.699-2.2858-2.1423-0.76193 0.71412 3.0476 2.8565 6.5309-6.121-0.76193-0.71411z" class="HighlightOutline" fill="currentColor"/>
  </g>
  <path d="m7.4546 252.91-3.3409-3.1343-1.1136 1.0447 4.4545 4.1791 9.5455-8.9553-1.1136-1.0447z" stroke-width=".99999"/>
  <g transform="matrix(1.4616 0 0 1.463 .91489 163.14)" stroke-width=".46768">
-  <path d="m4.4744 75.029-2.2858-2.1423-0.76193 0.71411 3.0476 2.8565 6.5309-6.121-0.76193-0.71411z" fill="#3096fa"/>
+  <path d="m4.4744 75.029-2.2858-2.1423-0.76193 0.71411 3.0476 2.8565 6.5309-6.121-0.76193-0.71411z" class="Highlight" fill="currentColor"/>
   <path d="m4.4744 102.37-2.2858-2.1423-0.76193 0.71411 3.0476 2.8565 6.5309-6.121-0.76193-0.71411z" fill="#aeaeae"/>
   <path d="m4.4744 88.699-2.2858-2.1423-0.76193 0.71412 3.0476 2.8565 6.5309-6.121-0.76193-0.71411z" class="HighlightOutline" fill="currentColor"/>
  </g>
  <path d="m3 169h14v2h-14z"/>
  <g transform="matrix(1.4616 0 0 1.463 .051167 .62675)" stroke-width=".46768">
-  <path d="m2.0175 128.76h9.5785v1.367h-9.5785z" fill="#3096fa"/>
+  <path d="m2.0175 128.76h9.5785v1.367h-9.5785z" class="Highlight" fill="currentColor"/>
   <path d="m2.0175 142.43h9.5785v1.3671h-9.5785z" class="HighlightOutline" fill="currentColor"/>
   <path d="m2.0175 156.1h9.5785v1.3671h-9.5785z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_checkbox_26px.svg b/dlls/light.msstyles/blue_checkbox_26px.svg
index 5798bfb04b7..6119542eaa6 100644
--- a/dlls/light.msstyles/blue_checkbox_26px.svg
+++ b/dlls/light.msstyles/blue_checkbox_26px.svg
@@ -16,39 +16,39 @@
  <path d="m9.7272 121.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z"/>
  <path d="m4 220h18v2h-18z"/>
  <g transform="matrix(1.0407 0 0 1.0001 -.040662 -.0030241)" fill="none" stroke-width="1.9604">
-  <rect x="1.0206" y="26.979" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#3096fa"/>
+  <rect x="1.0206" y="26.979" width="22.959" height="24.042" rx="1.9167" ry="2" class="Highlight" stroke="currentColor"/>
   <rect x="1.0206" y="52.979" width="22.959" height="24.042" rx="1.9167" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1.0206" y="78.979" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#aeaeae"/>
   <rect x="1.0193" y="312.95" width="23.061" height="23.997" rx="1.9217" ry="1.9998" fill="none" stroke="#aeaeae"/>
-  <rect x="1.0399" y="338.92" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#3096fa"/>
+  <rect x="1.0399" y="338.92" width="22.959" height="24.042" rx="1.9167" ry="2" class="Highlight" stroke="currentColor"/>
   <rect x="1.0399" y="364.92" width="22.959" height="24.042" rx="1.9167" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1.0399" y="390.92" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#aeaeae"/>
   <rect x="1.0193" y="416.94" width="23.061" height="23.997" rx="1.9217" ry="1.9998" fill="none" stroke="#aeaeae"/>
-  <rect x="1.0399" y="442.91" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#3096fa"/>
+  <rect x="1.0399" y="442.91" width="22.959" height="24.042" rx="1.9167" ry="2" class="Highlight" stroke="currentColor"/>
   <rect x="1.0399" y="468.91" width="22.959" height="24.042" rx="1.9167" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1.0399" y="494.91" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#aeaeae"/>
   <rect x="1.0206" y="104.98" width="22.959" height="24.042" rx="1.9132" ry="2.0035" fill="none" stroke="#aeaeae"/>
-  <rect x="1.0206" y="130.98" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#3096fa"/>
+  <rect x="1.0206" y="130.98" width="22.959" height="24.042" rx="1.9167" ry="2" class="Highlight" stroke="currentColor"/>
   <rect x="1.0412" y="156.96" width="22.959" height="24.042" rx="1.9167" ry="2" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1.0412" y="182.96" width="22.959" height="24.042" rx="1.9167" ry="2" stroke="#aeaeae"/>
   <rect x="1.0193" y="208.96" width="23.022" height="24.037" rx="1.9185" ry="2.0031" fill="none" stroke="#aeaeae"/>
-  <rect x="1.0407" y="234.94" width="22.979" height="24.039" rx="1.9184" ry="1.9998" stroke="#3096fa"/>
+  <rect x="1.0407" y="234.94" width="22.979" height="24.039" rx="1.9184" ry="1.9998" class="Highlight" stroke="currentColor"/>
   <rect x="1.0407" y="260.93" width="22.979" height="24.039" rx="1.9184" ry="1.9998" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1.0407" y="286.93" width="22.979" height="24.039" rx="1.9184" ry="1.9998" stroke="#aeaeae"/>
  </g>
- <path d="m9.7272 147.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z" fill="#3096fa"/>
+ <path d="m9.7272 147.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z" class="Highlight" fill="currentColor"/>
  <path d="m9.7272 173.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z" class="HighlightOutline" fill="currentColor"/>
  <path d="m9.7272 199.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z" fill="#aeaeae"/>
  <path d="m9.7272 329.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z"/>
- <path d="m9.7272 355.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z" fill="#3096fa"/>
+ <path d="m9.7272 355.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z" class="Highlight" fill="currentColor"/>
  <path d="m9.7272 381.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z" class="HighlightOutline" fill="currentColor"/>
  <path d="m9.7272 407.07-4.2954-4.388-1.4318 1.4627 5.7272 5.8507 12.273-12.537-1.4318-1.4627z" fill="#aeaeae"/>
- <path d="m4 246h18v2h-18z" fill="#3096fa"/>
+ <path d="m4 246h18v2h-18z" class="Highlight" fill="currentColor"/>
  <path d="m4 272h18v2h-18z" class="HighlightOutline" fill="currentColor"/>
  <path d="m4 298h18v2h-18z" fill="#aeaeae"/>
  <g transform="matrix(.88889 0 0 1 .44444 0)" stroke-width="4.2519">
   <path d="m23.125 422.61-1.8128-1.6115-7.1872 6.3885-7.1872-6.3885-1.8128 1.6115 7.1872 6.3885-7.1872 6.3885 1.8128 1.6115 7.1872-6.3885 7.1872 6.3885 1.8128-1.6115-7.1872-6.3885z" fill="#000"/>
-  <path d="m23.125 448.61-1.8128-1.6115-7.1872 6.3885-7.1872-6.3885-1.8128 1.6115 7.1872 6.3885-7.1872 6.3885 1.8128 1.6115 7.1872-6.3885 7.1872 6.3885 1.8128-1.6115-7.1872-6.3885z" fill="#3096fa"/>
+  <path d="m23.125 448.61-1.8128-1.6115-7.1872 6.3885-7.1872-6.3885-1.8128 1.6115 7.1872 6.3885-7.1872 6.3885 1.8128 1.6115 7.1872-6.3885 7.1872 6.3885 1.8128-1.6115-7.1872-6.3885z" class="Highlight" fill="currentColor"/>
   <path d="m23.125 474.61-1.8128-1.6115-7.1872 6.3885-7.1872-6.3885-1.8128 1.6115 7.1872 6.3885-7.1872 6.3885 1.8128 1.6115 7.1872-6.3885 7.1872 6.3885 1.8128-1.6115-7.1872-6.3885z" class="HighlightOutline" fill="currentColor"/>
   <path d="m23.125 500.71-1.8128-1.7122-7.1872 6.7878-7.1872-6.7878-1.8128 1.7122 7.1872 6.7878-7.1872 6.7878 1.8128 1.7122 7.1872-6.7878 7.1872 6.7878 1.8128-1.7122-7.1872-6.7878z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_checkbox_32px.svg b/dlls/light.msstyles/blue_checkbox_32px.svg
index 7a1260d5bf3..9196c217b3d 100644
--- a/dlls/light.msstyles/blue_checkbox_32px.svg
+++ b/dlls/light.msstyles/blue_checkbox_32px.svg
@@ -16,43 +16,43 @@
   <rect x="1" y="1" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x="1" y="97" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x="1" y="65" width="30" height="30" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
-  <rect x="1" y="33" width="30" height="30" rx="2" ry="2" stroke="#3096fa"/>
+  <rect x="1" y="33" width="30" height="30" rx="2" ry="2" class="Highlight" stroke="currentColor"/>
   <rect x="1" y="129" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x="1" y="225" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x="1" y="193" width="30" height="30" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
-  <rect x="1" y="161" width="30" height="30" rx="2" ry="2" stroke="#3096fa"/>
+  <rect x="1" y="161" width="30" height="30" rx="2" ry="2" class="Highlight" stroke="currentColor"/>
   <rect x="1" y="257" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x="1" y="353" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x="1" y="321" width="30" height="30" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
-  <rect x="1" y="289" width="30" height="30" rx="2" ry="2" stroke="#3096fa"/>
+  <rect x="1" y="289" width="30" height="30" rx="2" ry="2" class="Highlight" stroke="currentColor"/>
   <rect x="1" y="385" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x="1" y="481" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x="1" y="449" width="30" height="30" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
-  <rect x="1" y="417" width="30" height="30" rx="2" ry="2" stroke="#3096fa"/>
+  <rect x="1" y="417" width="30" height="30" rx="2" ry="2" class="Highlight" stroke="currentColor"/>
   <rect x="1" y="513" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x="1" y="609" width="30" height="30" rx="2" ry="2" stroke="#aeaeae"/>
   <rect x="1" y="577" width="30" height="30" rx="2" ry="2" class="HighlightOutline" stroke="currentColor"/>
-  <rect x="1" y="545" width="30" height="30" rx="2" ry="2" stroke="#3096fa"/>
+  <rect x="1" y="545" width="30" height="30" rx="2" ry="2" class="Highlight" stroke="currentColor"/>
  </g>
  <path d="m12 148.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z"/>
  <path d="m5 271h22v2h-22z"/>
  <g transform="translate(-79.273 -1)">
-  <path d="m91.273 181.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z" fill="#3096fa"/>
+  <path d="m91.273 181.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z" class="Highlight" fill="currentColor"/>
   <path d="m91.273 213.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z" class="HighlightOutline" fill="currentColor"/>
   <path d="m91.273 245.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z" fill="#aeaeae"/>
   <path d="m91.273 405.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z"/>
-  <path d="m91.273 437.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z" fill="#3096fa"/>
+  <path d="m91.273 437.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z" class="Highlight" fill="currentColor"/>
   <path d="m91.273 469.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z" class="HighlightOutline" fill="currentColor"/>
   <path d="m91.273 501.45-5.2499-5.3284-1.75 1.7762 6.9998 7.1046 15-15.224-1.75-1.7762z" fill="#aeaeae"/>
  </g>
  <g transform="matrix(1.2222 0 0 1 77.111 30)" stroke-width=".81818">
-  <path d="m-59 273h18v2h-18z" fill="#3096fa"/>
+  <path d="m-59 273h18v2h-18z" class="Highlight" fill="currentColor"/>
   <path d="m-59 305h18v2h-18z" class="HighlightOutline" fill="currentColor"/>
   <path d="m-59 337h18v2h-18z" fill="#aeaeae"/>
  </g>
  <g transform="translate(34.187 93.003)" stroke-width="3.7795">
   <path d="m-8.1872 427.01-2.0142-2.0143-7.9858 7.9857-7.9858-7.9857-2.0142 2.0143 7.9858 7.9857-7.9858 7.9857 2.0142 2.0143 7.9858-7.9857 7.9858 7.9857 2.0142-2.0143-7.9858-7.9857z" fill="#000"/>
-  <path d="m-8.1872 459.01-2.0142-2.0143-7.9858 7.9857-7.9858-7.9857-2.0142 2.0143 7.9858 7.9857-7.9858 7.9857 2.0142 2.0143 7.9858-7.9857 7.9858 7.9857 2.0142-2.0143-7.9858-7.9857z" fill="#3096fa"/>
+  <path d="m-8.1872 459.01-2.0142-2.0143-7.9858 7.9857-7.9858-7.9857-2.0142 2.0143 7.9858 7.9857-7.9858 7.9857 2.0142 2.0143 7.9858-7.9857 7.9858 7.9857 2.0142-2.0143-7.9858-7.9857z" class="Highlight" fill="currentColor"/>
   <path d="m-8.1872 491.01-2.0142-2.0143-7.9858 7.9857-7.9858-7.9857-2.0142 2.0143 7.9858 7.9857-7.9858 7.9857 2.0142 2.0143 7.9858-7.9857 7.9858 7.9857 2.0142-2.0143-7.9858-7.9857z" class="HighlightOutline" fill="currentColor"/>
   <path d="m-8.1872 523.01-2.0142-2.0143-7.9858 7.9857-7.9858-7.9857-2.0142 2.0143 7.9858 7.9857-7.9858 7.9857 2.0142 2.0143 7.9858-7.9857 7.9858 7.9857 2.0142-2.0143-7.9858-7.9857z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_checkbox_40px.svg b/dlls/light.msstyles/blue_checkbox_40px.svg
index a789d9791b3..bdb81c7c893 100644
--- a/dlls/light.msstyles/blue_checkbox_40px.svg
+++ b/dlls/light.msstyles/blue_checkbox_40px.svg
@@ -17,26 +17,26 @@
   <g stroke-width="3.1581">
    <rect x="1.525" y="1.525" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x="1.525" y="127.85" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
-   <rect x="1.525" y="43.635" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
+   <rect x="1.525" y="43.635" width="38.947" height="38.952" rx="2.1053" ry="2.1055" class="Highlight" stroke="currentColor"/>
   </g>
   <path d="m0.76923 39.275h36.923v36.965h-36.923z"/>
   <g stroke-width="3.1581">
    <rect x="1.525" y="85.744" width="38.947" height="38.952" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor"/>
    <rect x="1.525" y="169.96" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x="1.525" y="296.29" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
-   <rect x="1.525" y="212.07" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
+   <rect x="1.525" y="212.07" width="38.947" height="38.952" rx="2.1053" ry="2.1055" class="Highlight" stroke="currentColor"/>
    <rect x="1.525" y="254.18" width="38.947" height="38.952" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor"/>
    <rect x="1.525" y="338.4" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x="1.525" y="464.73" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
-   <rect x="1.525" y="380.51" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
+   <rect x="1.525" y="380.51" width="38.947" height="38.952" rx="2.1053" ry="2.1055" class="Highlight" stroke="currentColor"/>
    <rect x="1.525" y="422.62" width="38.947" height="38.952" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor"/>
    <rect x="1.525" y="506.84" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x="1.525" y="633.17" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
-   <rect x="1.525" y="548.95" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
+   <rect x="1.525" y="548.95" width="38.947" height="38.952" rx="2.1053" ry="2.1055" class="Highlight" stroke="currentColor"/>
    <rect x="1.525" y="591.06" width="38.947" height="38.952" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor"/>
    <rect x="1.525" y="675.28" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x="1.525" y="801.61" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
-   <rect x="1.525" y="717.39" width="38.947" height="38.952" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
+   <rect x="1.525" y="717.39" width="38.947" height="38.952" rx="2.1053" ry="2.1055" class="Highlight" stroke="currentColor"/>
    <rect x="1.525" y="759.5" width="38.947" height="38.952" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <path d="m1.2564e-5 336.88h36.923v36.965h-36.923z"/>
@@ -51,26 +51,26 @@
   <path d="m0.76923 199.29h36.923v36.965h-36.923z"/>
   <g transform="translate(119.78 21.052)" stroke-width="3.9787">
    <path d="m-86.15 663.62-2.5442-2.5446-10.087 10.088-10.087-10.088-2.5444 2.5446 10.087 10.088-10.087 10.088 2.5444 2.5446 10.087-10.088 10.087 10.088 2.5442-2.5446-10.087-10.088z" fill="#000"/>
-   <path d="m-86.15 705.73-2.5442-2.5446-10.087 10.088-10.087-10.088-2.5444 2.5446 10.087 10.088-10.087 10.088 2.5444 2.5446 10.087-10.088 10.087 10.088 2.5442-2.5446-10.087-10.088z" fill="#3096fa"/>
+   <path d="m-86.15 705.73-2.5442-2.5446-10.087 10.088-10.087-10.088-2.5444 2.5446 10.087 10.088-10.087 10.088 2.5444 2.5446 10.087-10.088 10.087 10.088 2.5442-2.5446-10.087-10.088z" class="Highlight" fill="currentColor"/>
    <path d="m-86.15 747.84-2.5442-2.5446-10.087 10.088-10.087-10.088-2.5444 2.5446 10.087 10.088-10.087 10.088 2.5444 2.5446 10.087-10.088 10.087 10.088 2.5442-2.5446-10.087-10.088z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-86.15 789.95-2.5442-2.5446-10.087 10.088-10.087-10.088-2.5444 2.5446 10.087 10.088-10.087 10.088 2.5444 2.5446 10.087-10.088 10.087 10.088 2.5442-2.5446-10.087-10.088z" fill="#aeaeae"/>
   </g>
  </g>
  <path d="M 14.909,185.821 8.2272,179.5524 6,181.6418 14.909,190 34,172.0894 31.7728,170 Z" stroke-width=".99999"/>
  <g transform="matrix(1.4616 0 0 1.463 88.915 17.099)" stroke-width=".46768">
-  <path d="m-50.633 142.67-4.5716-4.2847-1.5239 1.4282 6.0952 5.7131 13.062-12.242-1.5239-1.4283z" fill="#3096fa"/>
+  <path d="m-50.633 142.67-4.5716-4.2847-1.5239 1.4282 6.0952 5.7131 13.062-12.242-1.5239-1.4283z" class="Highlight" fill="currentColor"/>
   <path d="m-50.633 197.35-4.5716-4.2847-1.5239 1.4282 6.0952 5.7131 13.062-12.242-1.5239-1.4283z" fill="#aeaeae"/>
   <path d="m-50.633 170.01-4.5716-4.2847-1.5239 1.4283 6.0952 5.7131 13.062-12.242-1.5239-1.4282z" class="HighlightOutline" fill="currentColor"/>
  </g>
  <path d="m14.909 505.82-6.6818-6.2686-2.2272 2.0894 8.909 8.3582 19.091-17.911-2.2272-2.0894z" stroke-width=".99999"/>
  <g transform="matrix(1.4616 0 0 1.463 88.915 337.1)" stroke-width=".46768">
-  <path d="m-50.633 142.67-4.5716-4.2847-1.5239 1.4282 6.0952 5.7131 13.062-12.242-1.5239-1.4283z" fill="#3096fa"/>
+  <path d="m-50.633 142.67-4.5716-4.2847-1.5239 1.4282 6.0952 5.7131 13.062-12.242-1.5239-1.4283z" class="Highlight" fill="currentColor"/>
   <path d="m-50.633 197.35-4.5716-4.2847-1.5239 1.4282 6.0952 5.7131 13.062-12.242-1.5239-1.4283z" fill="#aeaeae"/>
   <path d="m-50.633 170.01-4.5716-4.2847-1.5239 1.4283 6.0952 5.7131 13.062-12.242-1.5239-1.4282z" class="HighlightOutline" fill="currentColor"/>
  </g>
  <path d="m6 338h28v4h-28z"/>
  <g transform="matrix(1.4616 0 0 1.463 128.05 33.624)" stroke-width=".46768">
-  <path d="m-83.505 235.39h19.157v2.7341h-19.157z" fill="#3096fa"/>
+  <path d="m-83.505 235.39h19.157v2.7341h-19.157z" class="Highlight" fill="currentColor"/>
   <path d="m-83.505 262.73h19.157v2.7341h-19.157z" class="HighlightOutline" fill="currentColor"/>
   <path d="m-83.505 290.07h19.157v2.7341h-19.157z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_checkbox_52px.svg b/dlls/light.msstyles/blue_checkbox_52px.svg
index 8cf40d132ba..ff2d6768c85 100644
--- a/dlls/light.msstyles/blue_checkbox_52px.svg
+++ b/dlls/light.msstyles/blue_checkbox_52px.svg
@@ -17,7 +17,7 @@
   <g stroke-width="4.2108">
    <rect x="2.0513" y="2.0513" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x="2.0512" y="166.28" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
-   <rect x="2.0513" y="56.794" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
+   <rect x="2.0513" y="56.794" width="50.526" height="50.532" rx="2.1053" ry="2.1055" class="Highlight" stroke="currentColor"/>
   </g>
   <path d="m0.76923 39.275h36.923v36.965h-36.923z"/>
   <rect x="2.0512" y="111.54" width="50.526" height="50.532" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor" stroke-width="4.2108"/>
@@ -34,7 +34,7 @@
   <g stroke-width="4.2108">
    <rect x="2.0514" y="221.02" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x="2.0513" y="385.25" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
-   <rect x="2.0514" y="275.76" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
+   <rect x="2.0514" y="275.76" width="50.526" height="50.532" rx="2.1053" ry="2.1055" class="Highlight" stroke="currentColor"/>
   </g>
   <path d="m0.76934 258.25h36.923v36.965h-36.923z"/>
   <rect x="2.0513" y="330.51" width="50.526" height="50.532" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor" stroke-width="4.2108"/>
@@ -48,7 +48,7 @@
   <g stroke-width="4.2108">
    <rect x="2.0512" y="439.99" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x="2.0511" y="604.22" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
-   <rect x="2.0512" y="494.73" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
+   <rect x="2.0512" y="494.73" width="50.526" height="50.532" rx="2.1053" ry="2.1055" class="Highlight" stroke="currentColor"/>
   </g>
   <path d="m0.76912 477.22h36.923v36.965h-36.923z"/>
   <rect x="2.0511" y="549.48" width="50.526" height="50.532" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor" stroke-width="4.2108"/>
@@ -62,7 +62,7 @@
   <g stroke-width="4.2108">
    <rect x="2.0513" y="658.96" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x="2.0512" y="823.19" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
-   <rect x="2.0513" y="713.71" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
+   <rect x="2.0513" y="713.71" width="50.526" height="50.532" rx="2.1053" ry="2.1055" class="Highlight" stroke="currentColor"/>
   </g>
   <path d="m0.76923 696.19h36.923v36.965h-36.923z"/>
   <rect x="2.0512" y="768.45" width="50.526" height="50.532" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor" stroke-width="4.2108"/>
@@ -76,7 +76,7 @@
   <g stroke-width="4.2108">
    <rect x="2.0514" y="877.93" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
    <rect x="2.0513" y="1042.2" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>
-   <rect x="2.0514" y="932.68" width="50.526" height="50.532" rx="2.1053" ry="2.1055" stroke="#3096fa"/>
+   <rect x="2.0514" y="932.68" width="50.526" height="50.532" rx="2.1053" ry="2.1055" class="Highlight" stroke="currentColor"/>
   </g>
   <path d="m0.76934 915.16h36.923v36.965h-36.923z"/>
   <rect x="2.0513" y="987.42" width="50.526" height="50.532" rx="2.1053" ry="2.1055" class="HighlightOutline" stroke="currentColor" stroke-width="4.2108"/>
@@ -90,7 +90,7 @@
   <g transform="matrix(1.1667 0 0 1 141.51 239.58)">
    <path d="m-83.444 650.16-2.9077-3.3928-11.528 13.451-11.528-13.451-2.9079 3.3928 11.528 13.451-11.528 13.451 2.9079 3.3928 11.528-13.451 11.528 13.451 2.9077-3.3928-11.528-13.451z" fill="#000" stroke-width="3.6836"/>
    <g stroke-width="3.6836">
-    <path d="m-83.444 704.91-2.9077-3.3928-11.528 13.451-11.528-13.451-2.9079 3.3928 11.528 13.451-11.528 13.451 2.9079 3.3928 11.528-13.451 11.528 13.451 2.9077-3.3928-11.528-13.451z" fill="#3096fa"/>
+    <path d="m-83.444 704.91-2.9077-3.3928-11.528 13.451-11.528-13.451-2.9079 3.3928 11.528 13.451-11.528 13.451 2.9079 3.3928 11.528-13.451 11.528 13.451 2.9077-3.3928-11.528-13.451z" class="Highlight" fill="currentColor"/>
     <path d="m-83.444 759.65-2.9077-3.3928-11.528 13.451-11.528-13.451-2.9079 3.3928 11.528 13.451-11.528 13.451 2.9079 3.3928 11.528-13.451 11.528 13.451 2.9077-3.3928-11.528-13.451z" class="HighlightOutline" fill="currentColor"/>
     <path d="m-83.444 814.39-2.9077-3.3928-11.528 13.451-11.528-13.451-2.9079 3.3928 11.528 13.451-11.528 13.451 2.9079 3.3928 11.528-13.451 11.528 13.451 2.9077-3.3928-11.528-13.451z" fill="#aeaeae"/>
    </g>
@@ -98,19 +98,19 @@
  </g>
  <path d="m19.454 242.15-8.5909-8.776-2.8635 2.9252 11.454 11.701 24.546-25.075-2.8635-2.9252z" stroke-width=".99999"/>
  <g transform="matrix(1.8792 0 0 1.463 114.6 79.099)" stroke-width=".41246">
-  <path d="m-50.633 146.99-4.5716-5.9986-1.5239 1.9996 6.0952 7.9984 13.062-17.139-1.5239-1.9996z" fill="#3096fa"/>
+  <path d="m-50.633 146.99-4.5716-5.9986-1.5239 1.9996 6.0952 7.9984 13.062-17.139-1.5239-1.9996z" class="Highlight" fill="currentColor"/>
   <path d="m-50.633 218.08-4.5716-5.9986-1.5239 1.9996 6.0952 7.9984 13.062-17.139-1.5239-1.9996z" fill="#aeaeae"/>
   <path d="m-50.633 182.54-4.5716-5.9986-1.5239 1.9996 6.0952 7.9984 13.062-17.139-1.5239-1.9996z" class="HighlightOutline" fill="currentColor"/>
  </g>
  <path d="m19.454 658.22-8.5909-8.776-2.8635 2.9252 11.454 11.701 24.546-25.075-2.8635-2.9252z" stroke-width=".99999"/>
  <g transform="matrix(1.8792 0 0 1.463 114.6 495.17)" stroke-width=".41246">
-  <path d="m-50.633 146.99-4.5716-5.9986-1.5239 1.9996 6.0952 7.9984 13.062-17.139-1.5239-1.9996z" fill="#3096fa"/>
+  <path d="m-50.633 146.99-4.5716-5.9986-1.5239 1.9996 6.0952 7.9984 13.062-17.139-1.5239-1.9996z" class="Highlight" fill="currentColor"/>
   <path d="m-50.633 218.08-4.5716-5.9986-1.5239 1.9996 6.0952 7.9984 13.062-17.139-1.5239-1.9996z" fill="#aeaeae"/>
   <path d="m-50.633 182.54-4.5716-5.9986-1.5239 1.9996 6.0952 7.9984 13.062-17.139-1.5239-1.9996z" class="HighlightOutline" fill="currentColor"/>
  </g>
  <path d="m8 440h36v4h-36z"/>
  <g transform="matrix(1.8792 0 0 1.463 164.92 146.62)" stroke-width=".41246">
-  <path d="m-83.505 236.07h19.157v2.7341h-19.157z" fill="#3096fa"/>
+  <path d="m-83.505 236.07h19.157v2.7341h-19.157z" class="Highlight" fill="currentColor"/>
   <path d="m-83.505 271.62h19.157v2.7341h-19.157z" class="HighlightOutline" fill="currentColor"/>
   <path d="m-83.505 307.16h19.157v2.7341h-19.157z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_combobox_border.svg b/dlls/light.msstyles/blue_combobox_border.svg
index 71dd2393f05..b8592dac192 100644
--- a/dlls/light.msstyles/blue_combobox_border.svg
+++ b/dlls/light.msstyles/blue_combobox_border.svg
@@ -13,7 +13,7 @@
  </metadata>
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="#fff" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.0583" height="1.0583" stroke="#aeaeae"/>
-  <rect x=".13228" y="1.4553" width="1.0583" height="1.0583" stroke="#3096fa"/>
+  <rect x=".13228" y="1.4553" width="1.0583" height="1.0583" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="2.7782" width="1.0583" height="1.0583" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="4.1011" width="1.0583" height="1.0583" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton.svg
index 9f741857974..83d6c0bf508 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton.svg
@@ -14,7 +14,7 @@
  <rect y="-7e-5" width="1.8521" height="22.225" fill="#fff" stroke-width=".26458"/>
  <g transform="translate(5.0184e-6,-6.4982e-5)" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.5875" height="5.2917" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae"/>
-  <rect x=".13228" y="5.6886" width="1.5875" height="5.2917" rx=".52917" ry=".52917" fill="none" stroke="#3096fa"/>
+  <rect x=".13228" y="5.6886" width="1.5875" height="5.2917" rx=".52917" ry=".52917" fill="none" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="11.245" width="1.5875" height="5.2917" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <rect x=".13228" y="16.801" width="1.5875" height="5.2917" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_10px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_10px.svg
index 953e075017e..ea67c8e1811 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_10px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_10px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:10-32" width="10" height="76" version="1.1" viewBox="0 0 2.6458 20.108" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -16,8 +19,8 @@
  </g>
  <g transform="matrix(1 0 0 1 .36378 0)">
   <g stroke-width=".26458">
-   <path d="m0.16538 7.2842 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#3096fa"/>
-   <path d="m1.8858 7.1437-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#3096fa"/>
+   <path d="m0.16538 7.2842 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" class="Highlight" fill="currentColor"/>
+   <path d="m1.8858 7.1437-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" class="Highlight" fill="currentColor"/>
    <path d="m0.16538 12.311 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#fff"/>
    <path d="m1.8858 12.171-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#fff"/>
   </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_11px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_11px.svg
index 209c4a12869..a7411540439 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_11px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_11px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:11-32" width="11" height="24" version="1.1" viewBox="0 0 2.9104 6.3499" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -16,8 +19,8 @@
  </g>
  <g transform="matrix(1.5714 0 0 1 .063486 0)">
   <g stroke-width=".18614">
-   <path d="m-0.0404 1.7982 0.92136 1.3768 0.13162-0.19668-0.92136-1.3768z" fill="#3096fa"/>
-   <path d="m1.68 1.5875-0.92136 1.3768 0.13162 0.19668 0.92136-1.3768z" fill="#3096fa"/>
+   <path d="m-0.0404 1.7982 0.92136 1.3768 0.13162-0.19668-0.92136-1.3768z" class="Highlight" fill="currentColor"/>
+   <path d="m1.68 1.5875-0.92136 1.3768 0.13162 0.19668 0.92136-1.3768z" class="Highlight" fill="currentColor"/>
    <path d="m-0.0404 3.3851 0.92136 1.3774 0.13162-0.19678-0.92136-1.3774z" fill="#fff"/>
    <path d="m1.68 3.175-0.92136 1.3774 0.13162 0.19678 0.92136-1.3774z" fill="#fff"/>
   </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_14px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_14px.svg
index 7a9917a2ae8..8a07ae7713f 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_14px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_14px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:14-32" width="14" height="40" version="1.1" viewBox="0 0 3.7041 10.583" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -16,8 +19,8 @@
  </g>
  <g transform="matrix(1.8572 0 0 1 .17855 1.5687)">
   <g transform="translate(.086725 .018767)" stroke-width=".1575">
-   <path d="m-0.0404 1.8333 0.92136 1.6063 0.13162-0.22946-0.92136-1.6063z" fill="#3096fa"/>
-   <path d="m1.68 1.5875-0.92136 1.6063 0.13162 0.22946 0.92136-1.6063z" fill="#3096fa"/>
+   <path d="m-0.0404 1.8333 0.92136 1.6063 0.13162-0.22946-0.92136-1.6063z" class="Highlight" fill="currentColor"/>
+   <path d="m1.68 1.5875-0.92136 1.6063 0.13162 0.22946 0.92136-1.6063z" class="Highlight" fill="currentColor"/>
    <path d="m-0.0404 4.4784 0.92136 1.607 0.13162-0.22958-0.92136-1.607z" fill="#fff"/>
    <path d="m1.68 4.2333-0.92136 1.607 0.13162 0.22958 0.92136-1.607z" fill="#fff"/>
   </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_17px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_17px.svg
index 961f9ee7a5e..a4dec468033 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_17px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_17px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:17-32" width="17" height="52" version="1.1" viewBox="0 0 4.4978 13.758" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -16,8 +19,8 @@
  </g>
  <g transform="matrix(2.4286 0 0 1 .15208 1.5687)">
   <g transform="translate(.086725 .018767)" stroke-width=".12044">
-   <path d="m-0.14935 2.6972 0.92136 2.0652 0.13162-0.29501-0.92136-2.0652z" fill="#3096fa"/>
-   <path d="m1.5711 2.3812-0.92136 2.0652 0.13162 0.29501 0.92136-2.0652z" fill="#3096fa"/>
+   <path d="m-0.14935 2.6972 0.92136 2.0652 0.13162-0.29501-0.92136-2.0652z" class="Highlight" fill="currentColor"/>
+   <path d="m1.5711 2.3812-0.92136 2.0652 0.13162 0.29501 0.92136-2.0652z" class="Highlight" fill="currentColor"/>
    <path d="m-0.14935 6.1358 0.92136 2.0661 0.13162-0.29517-0.92136-2.0661z" fill="#fff"/>
    <path d="m1.5711 5.8207-0.92136 2.0661 0.13162 0.29517 0.92136-2.0661z" fill="#fff"/>
   </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_21px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_21px.svg
index e206bca4d2f..dfd1483c6b5 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_21px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_21px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:21-32" width="21" height="60" version="1.1" viewBox="0 0 5.5561 15.875" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -16,8 +19,8 @@
  </g>
  <g transform="matrix(2.9999 0 0 1 .18786 1.5687)">
   <g transform="translate(.086725 .018767)" stroke-width=".097502">
-   <path d="m-0.14935 3.2966 0.92136 2.5241 0.13162-0.36057-0.92136-2.5241z" fill="#3096fa"/>
-   <path d="m1.5711 2.9103-0.92136 2.5241 0.13162 0.36057 0.92136-2.5241z" fill="#3096fa"/>
+   <path d="m-0.14935 3.2966 0.92136 2.5241 0.13162-0.36057-0.92136-2.5241z" class="Highlight" fill="currentColor"/>
+   <path d="m1.5711 2.9103-0.92136 2.5241 0.13162 0.36057 0.92136-2.5241z" class="Highlight" fill="currentColor"/>
    <path d="m-0.14935 7.2641 0.92136 2.5252 0.13162-0.36076-0.92136-2.5252z" fill="#fff"/>
    <path d="m1.5711 6.879-0.92136 2.5252 0.13162 0.36076 0.92136-2.5252z" fill="#fff"/>
   </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_27px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_27px.svg
index 0b9f9627a87..b4030c05a53 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_27px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_27px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:27-32" width="27" height="80" version="1.1" viewBox="0 0 7.1436 21.167" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -18,8 +21,8 @@
  </g>
  <g transform="matrix(3.5715 0 0 1 .22365 1.5687)">
   <g transform="translate(.086725 .018767)" stroke-width=".081898">
-   <path d="m-0.075292 5.2191 0.92136 2.983 0.13162-0.42613-0.92136-2.983z" fill="#3096fa"/>
-   <path d="m1.6452 4.7625-0.92136 2.983 0.13162 0.42613 0.92136-2.983z" fill="#3096fa"/>
+   <path d="m-0.075292 5.2191 0.92136 2.983 0.13162-0.42613-0.92136-2.983z" class="Highlight" fill="currentColor"/>
+   <path d="m1.6452 4.7625-0.92136 2.983 0.13162 0.42613 0.92136-2.983z" class="Highlight" fill="currentColor"/>
    <path d="m-0.075292 10.509 0.92136 2.9844 0.13162-0.42637-0.92136-2.9844z" fill="#fff"/>
    <path d="m1.6452 10.054-0.92136 2.9844 0.13162 0.42637 0.92136-2.9844z" fill="#fff"/>
   </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_9px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_9px.svg
index 313b90bfd40..082742fe7ac 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_9px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_glyph_9px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:9-32" width="9" height="20" version="1.1" viewBox="0 0 2.3812 5.2916" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -15,8 +18,8 @@
   <path d="m2.212-2.65e-6 -1.1846 1.1474 0.16922 0.16392 1.1846-1.1474z" stroke-width=".26458"/>
  </g>
  <g transform="matrix(1.2857 0 0 1 .051943 0)" stroke-width=".94282">
-  <path d="m-0.0404 1.4985 0.92136 1.1473 0.13162-0.1639-0.92136-1.1473z" fill="#3096fa" stroke-width=".20578"/>
-  <path d="m1.68 1.3229-0.92136 1.1473 0.13162 0.1639 0.92136-1.1473z" fill="#3096fa" stroke-width=".20578"/>
+  <path d="m-0.0404 1.4985 0.92136 1.1473 0.13162-0.1639-0.92136-1.1473z" class="Highlight" fill="currentColor" stroke-width=".20578"/>
+  <path d="m1.68 1.3229-0.92136 1.1473 0.13162 0.1639 0.92136-1.1473z" class="Highlight" fill="currentColor" stroke-width=".20578"/>
   <path d="m-0.0404 2.8209 0.92136 1.1478 0.13162-0.16398-0.92136-1.1478z" fill="#fff" stroke-width=".20578"/>
   <path d="m1.68 2.6458-0.92136 1.1478 0.13162 0.16398 0.92136-1.1478z" fill="#fff" stroke-width=".20578"/>
   <path d="m-0.0404 4.1438 0.92136 1.1478 0.13162-0.16398-0.92136-1.1478z" fill="#aeaeae" stroke-width=".82495"/>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_left.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_left.svg
index 331fc87c382..c0558a95d5b 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_left.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_left.svg
@@ -12,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <g transform="matrix(1.2501 0 0 1 -.033073 -6.4982e-5)" stroke-width=".21165">
-  <rect x=".13228" y="6.2177" width="1.0583" height="5.8209" rx=".42332" ry=".52917" fill="#fff" stroke="#3096fa"/>
+  <rect x=".13228" y="6.2177" width="1.0583" height="5.8209" rx=".42332" ry=".52917" fill="#fff" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="12.303" width="1.0583" height="5.8209" rx=".42332" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_10px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_10px.svg
index 953e075017e..ea67c8e1811 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_10px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_10px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:10-32" width="10" height="76" version="1.1" viewBox="0 0 2.6458 20.108" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -16,8 +19,8 @@
  </g>
  <g transform="matrix(1 0 0 1 .36378 0)">
   <g stroke-width=".26458">
-   <path d="m0.16538 7.2842 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#3096fa"/>
-   <path d="m1.8858 7.1437-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#3096fa"/>
+   <path d="m0.16538 7.2842 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" class="Highlight" fill="currentColor"/>
+   <path d="m1.8858 7.1437-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" class="Highlight" fill="currentColor"/>
    <path d="m0.16538 12.311 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#fff"/>
    <path d="m1.8858 12.171-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#fff"/>
   </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_11px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_11px.svg
index 209c4a12869..a7411540439 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_11px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_11px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:11-32" width="11" height="24" version="1.1" viewBox="0 0 2.9104 6.3499" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -16,8 +19,8 @@
  </g>
  <g transform="matrix(1.5714 0 0 1 .063486 0)">
   <g stroke-width=".18614">
-   <path d="m-0.0404 1.7982 0.92136 1.3768 0.13162-0.19668-0.92136-1.3768z" fill="#3096fa"/>
-   <path d="m1.68 1.5875-0.92136 1.3768 0.13162 0.19668 0.92136-1.3768z" fill="#3096fa"/>
+   <path d="m-0.0404 1.7982 0.92136 1.3768 0.13162-0.19668-0.92136-1.3768z" class="Highlight" fill="currentColor"/>
+   <path d="m1.68 1.5875-0.92136 1.3768 0.13162 0.19668 0.92136-1.3768z" class="Highlight" fill="currentColor"/>
    <path d="m-0.0404 3.3851 0.92136 1.3774 0.13162-0.19678-0.92136-1.3774z" fill="#fff"/>
    <path d="m1.68 3.175-0.92136 1.3774 0.13162 0.19678 0.92136-1.3774z" fill="#fff"/>
   </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_14px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_14px.svg
index 7a9917a2ae8..8a07ae7713f 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_14px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_14px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:14-32" width="14" height="40" version="1.1" viewBox="0 0 3.7041 10.583" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -16,8 +19,8 @@
  </g>
  <g transform="matrix(1.8572 0 0 1 .17855 1.5687)">
   <g transform="translate(.086725 .018767)" stroke-width=".1575">
-   <path d="m-0.0404 1.8333 0.92136 1.6063 0.13162-0.22946-0.92136-1.6063z" fill="#3096fa"/>
-   <path d="m1.68 1.5875-0.92136 1.6063 0.13162 0.22946 0.92136-1.6063z" fill="#3096fa"/>
+   <path d="m-0.0404 1.8333 0.92136 1.6063 0.13162-0.22946-0.92136-1.6063z" class="Highlight" fill="currentColor"/>
+   <path d="m1.68 1.5875-0.92136 1.6063 0.13162 0.22946 0.92136-1.6063z" class="Highlight" fill="currentColor"/>
    <path d="m-0.0404 4.4784 0.92136 1.607 0.13162-0.22958-0.92136-1.607z" fill="#fff"/>
    <path d="m1.68 4.2333-0.92136 1.607 0.13162 0.22958 0.92136-1.607z" fill="#fff"/>
   </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_17px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_17px.svg
index 961f9ee7a5e..a4dec468033 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_17px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_17px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:17-32" width="17" height="52" version="1.1" viewBox="0 0 4.4978 13.758" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -16,8 +19,8 @@
  </g>
  <g transform="matrix(2.4286 0 0 1 .15208 1.5687)">
   <g transform="translate(.086725 .018767)" stroke-width=".12044">
-   <path d="m-0.14935 2.6972 0.92136 2.0652 0.13162-0.29501-0.92136-2.0652z" fill="#3096fa"/>
-   <path d="m1.5711 2.3812-0.92136 2.0652 0.13162 0.29501 0.92136-2.0652z" fill="#3096fa"/>
+   <path d="m-0.14935 2.6972 0.92136 2.0652 0.13162-0.29501-0.92136-2.0652z" class="Highlight" fill="currentColor"/>
+   <path d="m1.5711 2.3812-0.92136 2.0652 0.13162 0.29501 0.92136-2.0652z" class="Highlight" fill="currentColor"/>
    <path d="m-0.14935 6.1358 0.92136 2.0661 0.13162-0.29517-0.92136-2.0661z" fill="#fff"/>
    <path d="m1.5711 5.8207-0.92136 2.0661 0.13162 0.29517 0.92136-2.0661z" fill="#fff"/>
   </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_21px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_21px.svg
index e206bca4d2f..dfd1483c6b5 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_21px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_21px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:21-32" width="21" height="60" version="1.1" viewBox="0 0 5.5561 15.875" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -16,8 +19,8 @@
  </g>
  <g transform="matrix(2.9999 0 0 1 .18786 1.5687)">
   <g transform="translate(.086725 .018767)" stroke-width=".097502">
-   <path d="m-0.14935 3.2966 0.92136 2.5241 0.13162-0.36057-0.92136-2.5241z" fill="#3096fa"/>
-   <path d="m1.5711 2.9103-0.92136 2.5241 0.13162 0.36057 0.92136-2.5241z" fill="#3096fa"/>
+   <path d="m-0.14935 3.2966 0.92136 2.5241 0.13162-0.36057-0.92136-2.5241z" class="Highlight" fill="currentColor"/>
+   <path d="m1.5711 2.9103-0.92136 2.5241 0.13162 0.36057 0.92136-2.5241z" class="Highlight" fill="currentColor"/>
    <path d="m-0.14935 7.2641 0.92136 2.5252 0.13162-0.36076-0.92136-2.5252z" fill="#fff"/>
    <path d="m1.5711 6.879-0.92136 2.5252 0.13162 0.36076 0.92136-2.5252z" fill="#fff"/>
   </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_27px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_27px.svg
index 0b9f9627a87..b4030c05a53 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_27px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_27px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:27-32" width="27" height="80" version="1.1" viewBox="0 0 7.1436 21.167" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -18,8 +21,8 @@
  </g>
  <g transform="matrix(3.5715 0 0 1 .22365 1.5687)">
   <g transform="translate(.086725 .018767)" stroke-width=".081898">
-   <path d="m-0.075292 5.2191 0.92136 2.983 0.13162-0.42613-0.92136-2.983z" fill="#3096fa"/>
-   <path d="m1.6452 4.7625-0.92136 2.983 0.13162 0.42613 0.92136-2.983z" fill="#3096fa"/>
+   <path d="m-0.075292 5.2191 0.92136 2.983 0.13162-0.42613-0.92136-2.983z" class="Highlight" fill="currentColor"/>
+   <path d="m1.6452 4.7625-0.92136 2.983 0.13162 0.42613 0.92136-2.983z" class="Highlight" fill="currentColor"/>
    <path d="m-0.075292 10.509 0.92136 2.9844 0.13162-0.42637-0.92136-2.9844z" fill="#fff"/>
    <path d="m1.6452 10.054-0.92136 2.9844 0.13162 0.42637 0.92136-2.9844z" fill="#fff"/>
   </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_9px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_9px.svg
index 313b90bfd40..082742fe7ac 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_9px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_left_glyph_9px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:9-32" width="9" height="20" version="1.1" viewBox="0 0 2.3812 5.2916" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -15,8 +18,8 @@
   <path d="m2.212-2.65e-6 -1.1846 1.1474 0.16922 0.16392 1.1846-1.1474z" stroke-width=".26458"/>
  </g>
  <g transform="matrix(1.2857 0 0 1 .051943 0)" stroke-width=".94282">
-  <path d="m-0.0404 1.4985 0.92136 1.1473 0.13162-0.1639-0.92136-1.1473z" fill="#3096fa" stroke-width=".20578"/>
-  <path d="m1.68 1.3229-0.92136 1.1473 0.13162 0.1639 0.92136-1.1473z" fill="#3096fa" stroke-width=".20578"/>
+  <path d="m-0.0404 1.4985 0.92136 1.1473 0.13162-0.1639-0.92136-1.1473z" class="Highlight" fill="currentColor" stroke-width=".20578"/>
+  <path d="m1.68 1.3229-0.92136 1.1473 0.13162 0.1639 0.92136-1.1473z" class="Highlight" fill="currentColor" stroke-width=".20578"/>
   <path d="m-0.0404 2.8209 0.92136 1.1478 0.13162-0.16398-0.92136-1.1478z" fill="#fff" stroke-width=".20578"/>
   <path d="m1.68 2.6458-0.92136 1.1478 0.13162 0.16398 0.92136-1.1478z" fill="#fff" stroke-width=".20578"/>
   <path d="m-0.0404 4.1438 0.92136 1.1478 0.13162-0.16398-0.92136-1.1478z" fill="#aeaeae" stroke-width=".82495"/>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_right.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_right.svg
index dc3c43439b9..73c02628b3d 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_right.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_right.svg
@@ -12,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <g transform="translate(5.0184e-6,-6.4982e-5)" stroke-width=".26458">
-  <rect x=".13228" y="6.2177" width="1.0583" height="5.8209" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/>
+  <rect x=".13228" y="6.2177" width="1.0583" height="5.8209" rx=".52917" ry=".52917" fill="#fff" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="12.303" width="1.0583" height="5.8209" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_10px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_10px.svg
index 953e075017e..ea67c8e1811 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_10px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_10px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:10-32" width="10" height="76" version="1.1" viewBox="0 0 2.6458 20.108" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -16,8 +19,8 @@
  </g>
  <g transform="matrix(1 0 0 1 .36378 0)">
   <g stroke-width=".26458">
-   <path d="m0.16538 7.2842 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#3096fa"/>
-   <path d="m1.8858 7.1437-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#3096fa"/>
+   <path d="m0.16538 7.2842 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" class="Highlight" fill="currentColor"/>
+   <path d="m1.8858 7.1437-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" class="Highlight" fill="currentColor"/>
    <path d="m0.16538 12.311 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#fff"/>
    <path d="m1.8858 12.171-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#fff"/>
   </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_11px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_11px.svg
index 209c4a12869..a7411540439 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_11px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_11px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:11-32" width="11" height="24" version="1.1" viewBox="0 0 2.9104 6.3499" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -16,8 +19,8 @@
  </g>
  <g transform="matrix(1.5714 0 0 1 .063486 0)">
   <g stroke-width=".18614">
-   <path d="m-0.0404 1.7982 0.92136 1.3768 0.13162-0.19668-0.92136-1.3768z" fill="#3096fa"/>
-   <path d="m1.68 1.5875-0.92136 1.3768 0.13162 0.19668 0.92136-1.3768z" fill="#3096fa"/>
+   <path d="m-0.0404 1.7982 0.92136 1.3768 0.13162-0.19668-0.92136-1.3768z" class="Highlight" fill="currentColor"/>
+   <path d="m1.68 1.5875-0.92136 1.3768 0.13162 0.19668 0.92136-1.3768z" class="Highlight" fill="currentColor"/>
    <path d="m-0.0404 3.3851 0.92136 1.3774 0.13162-0.19678-0.92136-1.3774z" fill="#fff"/>
    <path d="m1.68 3.175-0.92136 1.3774 0.13162 0.19678 0.92136-1.3774z" fill="#fff"/>
   </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_14px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_14px.svg
index 7a9917a2ae8..8a07ae7713f 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_14px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_14px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:14-32" width="14" height="40" version="1.1" viewBox="0 0 3.7041 10.583" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -16,8 +19,8 @@
  </g>
  <g transform="matrix(1.8572 0 0 1 .17855 1.5687)">
   <g transform="translate(.086725 .018767)" stroke-width=".1575">
-   <path d="m-0.0404 1.8333 0.92136 1.6063 0.13162-0.22946-0.92136-1.6063z" fill="#3096fa"/>
-   <path d="m1.68 1.5875-0.92136 1.6063 0.13162 0.22946 0.92136-1.6063z" fill="#3096fa"/>
+   <path d="m-0.0404 1.8333 0.92136 1.6063 0.13162-0.22946-0.92136-1.6063z" class="Highlight" fill="currentColor"/>
+   <path d="m1.68 1.5875-0.92136 1.6063 0.13162 0.22946 0.92136-1.6063z" class="Highlight" fill="currentColor"/>
    <path d="m-0.0404 4.4784 0.92136 1.607 0.13162-0.22958-0.92136-1.607z" fill="#fff"/>
    <path d="m1.68 4.2333-0.92136 1.607 0.13162 0.22958 0.92136-1.607z" fill="#fff"/>
   </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_17px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_17px.svg
index 961f9ee7a5e..a4dec468033 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_17px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_17px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:17-32" width="17" height="52" version="1.1" viewBox="0 0 4.4978 13.758" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -16,8 +19,8 @@
  </g>
  <g transform="matrix(2.4286 0 0 1 .15208 1.5687)">
   <g transform="translate(.086725 .018767)" stroke-width=".12044">
-   <path d="m-0.14935 2.6972 0.92136 2.0652 0.13162-0.29501-0.92136-2.0652z" fill="#3096fa"/>
-   <path d="m1.5711 2.3812-0.92136 2.0652 0.13162 0.29501 0.92136-2.0652z" fill="#3096fa"/>
+   <path d="m-0.14935 2.6972 0.92136 2.0652 0.13162-0.29501-0.92136-2.0652z" class="Highlight" fill="currentColor"/>
+   <path d="m1.5711 2.3812-0.92136 2.0652 0.13162 0.29501 0.92136-2.0652z" class="Highlight" fill="currentColor"/>
    <path d="m-0.14935 6.1358 0.92136 2.0661 0.13162-0.29517-0.92136-2.0661z" fill="#fff"/>
    <path d="m1.5711 5.8207-0.92136 2.0661 0.13162 0.29517 0.92136-2.0661z" fill="#fff"/>
   </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_21px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_21px.svg
index e206bca4d2f..dfd1483c6b5 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_21px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_21px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:21-32" width="21" height="60" version="1.1" viewBox="0 0 5.5561 15.875" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -16,8 +19,8 @@
  </g>
  <g transform="matrix(2.9999 0 0 1 .18786 1.5687)">
   <g transform="translate(.086725 .018767)" stroke-width=".097502">
-   <path d="m-0.14935 3.2966 0.92136 2.5241 0.13162-0.36057-0.92136-2.5241z" fill="#3096fa"/>
-   <path d="m1.5711 2.9103-0.92136 2.5241 0.13162 0.36057 0.92136-2.5241z" fill="#3096fa"/>
+   <path d="m-0.14935 3.2966 0.92136 2.5241 0.13162-0.36057-0.92136-2.5241z" class="Highlight" fill="currentColor"/>
+   <path d="m1.5711 2.9103-0.92136 2.5241 0.13162 0.36057 0.92136-2.5241z" class="Highlight" fill="currentColor"/>
    <path d="m-0.14935 7.2641 0.92136 2.5252 0.13162-0.36076-0.92136-2.5252z" fill="#fff"/>
    <path d="m1.5711 6.879-0.92136 2.5252 0.13162 0.36076 0.92136-2.5252z" fill="#fff"/>
   </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_27px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_27px.svg
index 0b9f9627a87..b4030c05a53 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_27px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_27px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:27-32" width="27" height="80" version="1.1" viewBox="0 0 7.1436 21.167" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -18,8 +21,8 @@
  </g>
  <g transform="matrix(3.5715 0 0 1 .22365 1.5687)">
   <g transform="translate(.086725 .018767)" stroke-width=".081898">
-   <path d="m-0.075292 5.2191 0.92136 2.983 0.13162-0.42613-0.92136-2.983z" fill="#3096fa"/>
-   <path d="m1.6452 4.7625-0.92136 2.983 0.13162 0.42613 0.92136-2.983z" fill="#3096fa"/>
+   <path d="m-0.075292 5.2191 0.92136 2.983 0.13162-0.42613-0.92136-2.983z" class="Highlight" fill="currentColor"/>
+   <path d="m1.6452 4.7625-0.92136 2.983 0.13162 0.42613 0.92136-2.983z" class="Highlight" fill="currentColor"/>
    <path d="m-0.075292 10.509 0.92136 2.9844 0.13162-0.42637-0.92136-2.9844z" fill="#fff"/>
    <path d="m1.6452 10.054-0.92136 2.9844 0.13162 0.42637 0.92136-2.9844z" fill="#fff"/>
   </g>
diff --git a/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_9px.svg b/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_9px.svg
index 313b90bfd40..082742fe7ac 100644
--- a/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_9px.svg
+++ b/dlls/light.msstyles/blue_combobox_dropdownbutton_right_glyph_9px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:9-32" width="9" height="20" version="1.1" viewBox="0 0 2.3812 5.2916" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -15,8 +18,8 @@
   <path d="m2.212-2.65e-6 -1.1846 1.1474 0.16922 0.16392 1.1846-1.1474z" stroke-width=".26458"/>
  </g>
  <g transform="matrix(1.2857 0 0 1 .051943 0)" stroke-width=".94282">
-  <path d="m-0.0404 1.4985 0.92136 1.1473 0.13162-0.1639-0.92136-1.1473z" fill="#3096fa" stroke-width=".20578"/>
-  <path d="m1.68 1.3229-0.92136 1.1473 0.13162 0.1639 0.92136-1.1473z" fill="#3096fa" stroke-width=".20578"/>
+  <path d="m-0.0404 1.4985 0.92136 1.1473 0.13162-0.1639-0.92136-1.1473z" class="Highlight" fill="currentColor" stroke-width=".20578"/>
+  <path d="m1.68 1.3229-0.92136 1.1473 0.13162 0.1639 0.92136-1.1473z" class="Highlight" fill="currentColor" stroke-width=".20578"/>
   <path d="m-0.0404 2.8209 0.92136 1.1478 0.13162-0.16398-0.92136-1.1478z" fill="#fff" stroke-width=".20578"/>
   <path d="m1.68 2.6458-0.92136 1.1478 0.13162 0.16398 0.92136-1.1478z" fill="#fff" stroke-width=".20578"/>
   <path d="m-0.0404 4.1438 0.92136 1.1478 0.13162-0.16398-0.92136-1.1478z" fill="#aeaeae" stroke-width=".82495"/>
diff --git a/dlls/light.msstyles/blue_combobox_readonly.svg b/dlls/light.msstyles/blue_combobox_readonly.svg
index 12c7468e5eb..fe06c6f1f77 100644
--- a/dlls/light.msstyles/blue_combobox_readonly.svg
+++ b/dlls/light.msstyles/blue_combobox_readonly.svg
@@ -14,7 +14,7 @@
  <rect y="-7e-5" width="1.8521" height="22.225" fill="#f5f5f5" stroke-width=".26458"/>
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="none" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.5875" height="5.2917" rx=".52917" ry=".52917" stroke="#aeaeae"/>
-  <rect x=".13228" y="5.6886" width="1.5875" height="5.2917" rx=".52917" ry=".52917" stroke="#3096fa"/>
+  <rect x=".13228" y="5.6886" width="1.5875" height="5.2917" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="11.245" width="1.5875" height="5.2917" rx=".52917" ry=".52917" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="16.801" width="1.5875" height="5.2917" rx=".52917" ry=".52917" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_commandlink.svg b/dlls/light.msstyles/blue_commandlink.svg
index a0e9a296a32..e9699d63ae2 100644
--- a/dlls/light.msstyles/blue_commandlink.svg
+++ b/dlls/light.msstyles/blue_commandlink.svg
@@ -13,9 +13,9 @@
   </rdf:RDF>
  </metadata>
  <g fill="none" stroke-linecap="round" stroke-width=".26458">
-  <rect x=".13229" y="13.097" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#3096fa"/>
+  <rect x=".13229" y="13.097" width="2.6456" height="12.7" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
   <rect x=".13229" y="26.061" width="2.6456" height="12.7" rx=".52917" ry=".52917" class="HighlightOutline" stroke="currentColor"/>
-  <rect x=".13229" y="51.991" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#3096fa"/>
-  <rect x=".13229" y="64.955" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#3096fa"/>
+  <rect x=".13229" y="51.991" width="2.6456" height="12.7" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
+  <rect x=".13229" y="64.955" width="2.6456" height="12.7" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_commandlink_glyph_30px.svg b/dlls/light.msstyles/blue_commandlink_glyph_30px.svg
index 0d030b8d06e..a0e30de8cbd 100644
--- a/dlls/light.msstyles/blue_commandlink_glyph_30px.svg
+++ b/dlls/light.msstyles/blue_commandlink_glyph_30px.svg
@@ -13,10 +13,10 @@
   </rdf:RDF>
  </metadata>
  <g stroke-width=".26458">
-  <path d="m4.7625 2.1167-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/>
-  <path d="m4.7625 10.054-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/>
+  <path d="m4.7625 2.1167-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" class="Highlight" fill="currentColor"/>
+  <path d="m4.7625 10.054-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" class="Highlight" fill="currentColor"/>
   <path d="m4.7625 17.992-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.7625 25.929-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#aeaeae"/>
-  <path d="m4.7625 33.867-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/>
+  <path d="m4.7625 33.867-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" class="Highlight" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_commandlink_glyph_37px.svg b/dlls/light.msstyles/blue_commandlink_glyph_37px.svg
index a5603331b9d..9981d91bca3 100644
--- a/dlls/light.msstyles/blue_commandlink_glyph_37px.svg
+++ b/dlls/light.msstyles/blue_commandlink_glyph_37px.svg
@@ -13,10 +13,10 @@
   </rdf:RDF>
  </metadata>
  <g transform="matrix(1.25 0 0 1.25 -.066217 -1.3229)" stroke-width=".16933">
-  <path d="m4.7625 2.9633-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#3096fa"/>
-  <path d="m4.7625 10.795-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#3096fa"/>
+  <path d="m4.7625 2.9633-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" class="Highlight" fill="currentColor"/>
+  <path d="m4.7625 10.795-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" class="Highlight" fill="currentColor"/>
   <path d="m4.7625 18.627-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.7625 26.459-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#aeaeae"/>
-  <path d="m4.7625 34.29-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#3096fa"/>
+  <path d="m4.7625 34.29-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" class="Highlight" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_commandlink_glyph_45px.svg b/dlls/light.msstyles/blue_commandlink_glyph_45px.svg
index 5a3957a892d..17f885f0d44 100644
--- a/dlls/light.msstyles/blue_commandlink_glyph_45px.svg
+++ b/dlls/light.msstyles/blue_commandlink_glyph_45px.svg
@@ -13,10 +13,10 @@
   </rdf:RDF>
  </metadata>
  <g stroke-width=".26458">
-  <path d="m7.1834 3.175-0.57825 0.55959 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#3096fa"/>
-  <path d="m7.1834 15.081-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#3096fa"/>
+  <path d="m7.1834 3.175-0.57825 0.55959 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" class="Highlight" fill="currentColor"/>
+  <path d="m7.1834 15.081-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" class="Highlight" fill="currentColor"/>
   <path d="m7.1834 26.988-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" class="HighlightOutline" fill="currentColor"/>
-  <path d="m7.1834 50.8-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#3096fa"/>
+  <path d="m7.1834 50.8-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" class="Highlight" fill="currentColor"/>
   <path d="m7.1834 38.894-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_commandlink_glyph_52px.svg b/dlls/light.msstyles/blue_commandlink_glyph_52px.svg
index 311a9b5a1fb..067381b01db 100644
--- a/dlls/light.msstyles/blue_commandlink_glyph_52px.svg
+++ b/dlls/light.msstyles/blue_commandlink_glyph_52px.svg
@@ -13,10 +13,10 @@
   </rdf:RDF>
  </metadata>
  <g transform="matrix(1.73 0 0 1.73 -.17208 .042322)" stroke-width=".088403">
-  <path d="m4.8558 2.1167-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#3096fa"/>
-  <path d="m4.8558 10.07-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#3096fa"/>
+  <path d="m4.8558 2.1167-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" class="Highlight" fill="currentColor"/>
+  <path d="m4.8558 10.07-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" class="Highlight" fill="currentColor"/>
   <path d="m4.8558 18.022-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.8558 25.975-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#aeaeae"/>
-  <path d="m4.8558 33.928-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#3096fa"/>
+  <path d="m4.8558 33.928-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" class="Highlight" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_commandlink_glyph_60px.svg b/dlls/light.msstyles/blue_commandlink_glyph_60px.svg
index 1aa81e4784c..c4b5ad337ce 100644
--- a/dlls/light.msstyles/blue_commandlink_glyph_60px.svg
+++ b/dlls/light.msstyles/blue_commandlink_glyph_60px.svg
@@ -13,10 +13,10 @@
   </rdf:RDF>
  </metadata>
  <g transform="matrix(2 0 0 2 -.00011333 -1.3333e-5)" stroke-width=".066145">
-  <path d="m4.7625 2.1167-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/>
-  <path d="m4.7625 10.054-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/>
+  <path d="m4.7625 2.1167-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" class="Highlight" fill="currentColor"/>
+  <path d="m4.7625 10.054-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" class="Highlight" fill="currentColor"/>
   <path d="m4.7625 17.992-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.7625 25.929-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#aeaeae"/>
-  <path d="m4.7625 33.867-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/>
+  <path d="m4.7625 33.867-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" class="Highlight" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_commandlink_glyph_67px.svg b/dlls/light.msstyles/blue_commandlink_glyph_67px.svg
index acfcbc47644..8690430b0db 100644
--- a/dlls/light.msstyles/blue_commandlink_glyph_67px.svg
+++ b/dlls/light.msstyles/blue_commandlink_glyph_67px.svg
@@ -13,10 +13,10 @@
   </rdf:RDF>
  </metadata>
  <g transform="matrix(2.3333 0 0 2.3333 -.17651 -.1764)" stroke-width=".048596">
-  <path d="m4.6737 2.0033-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#3096fa"/>
-  <path d="m4.6737 9.6007-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#3096fa"/>
+  <path d="m4.6737 2.0033-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" class="Highlight" fill="currentColor"/>
+  <path d="m4.6737 9.6007-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" class="Highlight" fill="currentColor"/>
   <path d="m4.6737 17.198-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.6737 24.796-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#aeaeae"/>
-  <path d="m4.6738 32.393-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#3096fa"/>
+  <path d="m4.6738 32.393-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" class="Highlight" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_commandlink_glyph_75px.svg b/dlls/light.msstyles/blue_commandlink_glyph_75px.svg
index 5934e77a0ef..d1db8462479 100644
--- a/dlls/light.msstyles/blue_commandlink_glyph_75px.svg
+++ b/dlls/light.msstyles/blue_commandlink_glyph_75px.svg
@@ -13,10 +13,10 @@
   </rdf:RDF>
  </metadata>
  <g transform="matrix(2.5 0 0 2.5 .13215 -5e-5)" stroke-width=".042333">
-  <path d="m4.7625 2.1167-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#3096fa"/>
-  <path d="m4.7625 10.054-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#3096fa"/>
+  <path d="m4.7625 2.1167-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" class="Highlight" fill="currentColor"/>
+  <path d="m4.7625 10.054-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" class="Highlight" fill="currentColor"/>
   <path d="m4.7625 17.992-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.7625 25.929-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#aeaeae"/>
-  <path d="m4.7625 33.867-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#3096fa"/>
+  <path d="m4.7625 33.867-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" class="Highlight" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_edit_border_hscroll.svg b/dlls/light.msstyles/blue_edit_border_hscroll.svg
index 71dd2393f05..b8592dac192 100644
--- a/dlls/light.msstyles/blue_edit_border_hscroll.svg
+++ b/dlls/light.msstyles/blue_edit_border_hscroll.svg
@@ -13,7 +13,7 @@
  </metadata>
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="#fff" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.0583" height="1.0583" stroke="#aeaeae"/>
-  <rect x=".13228" y="1.4553" width="1.0583" height="1.0583" stroke="#3096fa"/>
+  <rect x=".13228" y="1.4553" width="1.0583" height="1.0583" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="2.7782" width="1.0583" height="1.0583" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="4.1011" width="1.0583" height="1.0583" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_edit_border_hvscroll.svg b/dlls/light.msstyles/blue_edit_border_hvscroll.svg
index 71dd2393f05..b8592dac192 100644
--- a/dlls/light.msstyles/blue_edit_border_hvscroll.svg
+++ b/dlls/light.msstyles/blue_edit_border_hvscroll.svg
@@ -13,7 +13,7 @@
  </metadata>
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="#fff" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.0583" height="1.0583" stroke="#aeaeae"/>
-  <rect x=".13228" y="1.4553" width="1.0583" height="1.0583" stroke="#3096fa"/>
+  <rect x=".13228" y="1.4553" width="1.0583" height="1.0583" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="2.7782" width="1.0583" height="1.0583" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="4.1011" width="1.0583" height="1.0583" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_edit_border_noscroll.svg b/dlls/light.msstyles/blue_edit_border_noscroll.svg
index 71dd2393f05..b8592dac192 100644
--- a/dlls/light.msstyles/blue_edit_border_noscroll.svg
+++ b/dlls/light.msstyles/blue_edit_border_noscroll.svg
@@ -13,7 +13,7 @@
  </metadata>
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="#fff" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.0583" height="1.0583" stroke="#aeaeae"/>
-  <rect x=".13228" y="1.4553" width="1.0583" height="1.0583" stroke="#3096fa"/>
+  <rect x=".13228" y="1.4553" width="1.0583" height="1.0583" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="2.7782" width="1.0583" height="1.0583" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="4.1011" width="1.0583" height="1.0583" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_edit_border_vscroll.svg b/dlls/light.msstyles/blue_edit_border_vscroll.svg
index 71dd2393f05..b8592dac192 100644
--- a/dlls/light.msstyles/blue_edit_border_vscroll.svg
+++ b/dlls/light.msstyles/blue_edit_border_vscroll.svg
@@ -13,7 +13,7 @@
  </metadata>
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="#fff" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.0583" height="1.0583" stroke="#aeaeae"/>
-  <rect x=".13228" y="1.4553" width="1.0583" height="1.0583" stroke="#3096fa"/>
+  <rect x=".13228" y="1.4553" width="1.0583" height="1.0583" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="2.7782" width="1.0583" height="1.0583" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="4.1011" width="1.0583" height="1.0583" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_explorer_listview_item_hot.svg b/dlls/light.msstyles/blue_explorer_listview_item_hot.svg
index 6681bbc5463..aba9fb45433 100644
--- a/dlls/light.msstyles/blue_explorer_listview_item_hot.svg
+++ b/dlls/light.msstyles/blue_explorer_listview_item_hot.svg
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="7" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg">
- <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".15686"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <rect width="1.8521" height="1.8521" class="Highlight" fill="currentColor" fill-opacity=".15686"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_explorer_listview_item_hot_selected.svg b/dlls/light.msstyles/blue_explorer_listview_item_hot_selected.svg
index 7e6c2570723..757eb406f9d 100644
--- a/dlls/light.msstyles/blue_explorer_listview_item_hot_selected.svg
+++ b/dlls/light.msstyles/blue_explorer_listview_item_hot_selected.svg
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="7" d="bitmap:7-32" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg">
- <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".62745"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <rect width="1.8521" height="1.8521" class="Highlight" fill="currentColor" fill-opacity=".62745"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_explorer_listview_item_selected.svg b/dlls/light.msstyles/blue_explorer_listview_item_selected.svg
index 67e7733b084..1bfcba8f3f9 100644
--- a/dlls/light.msstyles/blue_explorer_listview_item_selected.svg
+++ b/dlls/light.msstyles/blue_explorer_listview_item_selected.svg
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="7" d="bitmap:7-32" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg">
- <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".31373"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <rect width="1.8521" height="1.8521" class="Highlight" fill="currentColor" fill-opacity=".31373"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_16px.svg b/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_16px.svg
index 5e2d2ff86f9..9a97ae01622 100644
--- a/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_16px.svg
+++ b/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_16px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:16-32" width="16" height="32" version="1.1" viewBox="0 0 4.2334 8.4666" xmlns="http://www.w3.org/2000/svg">
- <g fill="#3096fa">
+ <style>
+  @import url(colors.css);
+ </style>
+ <g class="Highlight" fill="currentColor">
   <path d="m3.1751 5.7668-1.1816 1.3769-0.1688-0.1967 1.1816-1.3769z"/>
   <path d="m0.96257 5.5562 1.1816 1.3769-0.1688 0.1967-1.1816-1.3769z"/>
   <path d="m2.7138 2.4087-1.3769-1.1816 0.1967-0.1688 1.3769 1.1816z"/>
diff --git a/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_20px.svg b/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_20px.svg
index 2f353a1f3df..78860dd15ed 100644
--- a/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_20px.svg
+++ b/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_20px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:20-32" width="20" height="40" version="1.1" viewBox="0 0 5.2918 10.583" xmlns="http://www.w3.org/2000/svg">
- <g fill="#3096fa">
+ <style>
+  @import url(colors.css);
+ </style>
+ <g class="Highlight" fill="currentColor">
   <path d="m3.9688 7.3894-1.4442 1.6064-0.20631-0.22949 1.4442-1.6064z"/>
   <path d="m1.2647 7.1437 1.4442 1.6064-0.20631 0.22949-1.4442-1.6064z"/>
   <path d="m3.4748 2.9734-1.6063-1.4442 0.22947-0.20632 1.6063 1.4442z"/>
diff --git a/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_24px.svg b/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_24px.svg
index 6a6622e24e6..0f947310e11 100644
--- a/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_24px.svg
+++ b/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_24px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:24-32" width="24" height="48" version="1.1" viewBox="0 0 6.3502 12.7" xmlns="http://www.w3.org/2000/svg">
- <g fill="#3096fa">
+ <style>
+  @import url(colors.css);
+ </style>
+ <g class="Highlight" fill="currentColor">
   <path d="m5.0272 8.5529-1.9694 2.2949-0.28134-0.32785 1.9694-2.2949z"/>
   <path d="m1.3397 8.2019 1.9694 2.2949-0.28134 0.32785-1.9694-2.2949z"/>
   <path d="m4.1702 3.5737-2.2947-1.9695 0.32781-0.28136 2.2947 1.9695z"/>
diff --git a/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_32px.svg b/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_32px.svg
index d34ed5343a8..8442057f3dd 100644
--- a/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_32px.svg
+++ b/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_32px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:32-32" width="32" height="64" version="1.1" viewBox="0 0 8.4669 16.933" xmlns="http://www.w3.org/2000/svg">
- <g fill="#3096fa">
+ <style>
+  @import url(colors.css);
+ </style>
+ <g class="Highlight" fill="currentColor">
   <path d="m6.6148 11.798-2.3633 2.7539-0.33761-0.39342 2.3633-2.7539z"/>
   <path d="m2.1898 11.377 2.3633 2.7539-0.33761 0.39342-2.3633-2.7539z"/>
   <path d="m5.6922 4.5528-2.7536-2.3633 0.39337-0.33762 2.7536 2.3633z"/>
diff --git a/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_40px.svg b/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_40px.svg
index 7927aaf9c76..20e4d1b7e04 100644
--- a/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_40px.svg
+++ b/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_40px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:40-32" width="40" height="80" version="1.1" viewBox="0 0 10.584 21.166" xmlns="http://www.w3.org/2000/svg">
- <g fill="#3096fa">
+ <style>
+  @import url(colors.css);
+ </style>
+ <g class="Highlight" fill="currentColor">
   <path d="m8.4669 14.584-3.1511 3.6721-0.45015-0.52459 3.1511-3.6721z"/>
   <path d="m2.5669 14.023 3.1511 3.6721-0.45015 0.52459-3.1511-3.6721z"/>
   <path d="m7.1486 5.7175-3.6715-3.1511 0.5245-0.45016 3.6715 3.1511z"/>
diff --git a/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_48px.svg b/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_48px.svg
index 465782f7e99..6861e02b015 100644
--- a/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_48px.svg
+++ b/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_48px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:48-32" width="48" height="96" version="1.1" viewBox="0 0 12.701 25.399" xmlns="http://www.w3.org/2000/svg">
- <g fill="#3096fa">
+ <style>
+  @import url(colors.css);
+ </style>
+ <g class="Highlight" fill="currentColor">
   <path d="m10.055 17.599-3.6764 4.3611-0.5252-0.62302 3.6764-4.3611z"/>
   <path d="m3.1712 16.933 3.6764 4.3611-0.5252 0.62302-3.6764-4.3611z"/>
   <path d="m8.3735 7.111-4.3601-3.6764 0.62287-0.52521 4.3601 3.6764z"/>
diff --git a/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_64px.svg b/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_64px.svg
index a4b6d23bca2..e1c974bff8a 100644
--- a/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_64px.svg
+++ b/dlls/light.msstyles/blue_explorer_treeview_hot_glyph_64px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:64-32" width="64" height="128" version="1.1" viewBox="0 0 16.935 33.865" xmlns="http://www.w3.org/2000/svg">
- <g fill="#3096fa">
+ <style>
+  @import url(colors.css);
+ </style>
+ <g class="Highlight" fill="currentColor">
   <path d="m13.495 23.101-4.9893 5.7387-0.71276-0.81982 4.9893-5.7387z"/>
   <path d="m4.1526 22.225 4.9893 5.7387-0.71276 0.81982-4.9893-5.7387z"/>
   <path d="m11.088 9.1401-5.7371-4.9895 0.81959-0.7128 5.7371 4.9895z"/>
diff --git a/dlls/light.msstyles/blue_explorer_treeview_item_hot.svg b/dlls/light.msstyles/blue_explorer_treeview_item_hot.svg
index 6681bbc5463..aba9fb45433 100644
--- a/dlls/light.msstyles/blue_explorer_treeview_item_hot.svg
+++ b/dlls/light.msstyles/blue_explorer_treeview_item_hot.svg
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="7" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg">
- <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".15686"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <rect width="1.8521" height="1.8521" class="Highlight" fill="currentColor" fill-opacity=".15686"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_explorer_treeview_item_hot_selected.svg b/dlls/light.msstyles/blue_explorer_treeview_item_hot_selected.svg
index 7e6c2570723..757eb406f9d 100644
--- a/dlls/light.msstyles/blue_explorer_treeview_item_hot_selected.svg
+++ b/dlls/light.msstyles/blue_explorer_treeview_item_hot_selected.svg
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="7" d="bitmap:7-32" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg">
- <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".62745"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <rect width="1.8521" height="1.8521" class="Highlight" fill="currentColor" fill-opacity=".62745"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_explorer_treeview_item_selected.svg b/dlls/light.msstyles/blue_explorer_treeview_item_selected.svg
index 67e7733b084..1bfcba8f3f9 100644
--- a/dlls/light.msstyles/blue_explorer_treeview_item_selected.svg
+++ b/dlls/light.msstyles/blue_explorer_treeview_item_selected.svg
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="7" d="bitmap:7-32" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg">
- <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".31373"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <rect width="1.8521" height="1.8521" class="Highlight" fill="currentColor" fill-opacity=".31373"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_collapse_button_15px.svg b/dlls/light.msstyles/blue_listview_collapse_button_15px.svg
index 36f01bf4015..9f102df0fcf 100644
--- a/dlls/light.msstyles/blue_listview_collapse_button_15px.svg
+++ b/dlls/light.msstyles/blue_listview_collapse_button_15px.svg
@@ -3,12 +3,12 @@
  <style>
   @import url(colors.css);
  </style>
- <circle cx="1.9844" cy="5.9532" r="1.8521" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
+ <circle cx="1.9844" cy="5.9532" r="1.8521" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
  <g transform="matrix(.8 0 0 -.80002 -.026461 4.3393)" stroke-width=".66146">
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
- <g transform="matrix(.8 0 0 -.80002 -.026461 8.3081)" fill="#3096fa" stroke-width=".66146">
+ <g transform="matrix(.8 0 0 -.80002 -.026461 8.3081)" class="Highlight" fill="currentColor" stroke-width=".66146">
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
diff --git a/dlls/light.msstyles/blue_listview_collapse_button_19px.svg b/dlls/light.msstyles/blue_listview_collapse_button_19px.svg
index 9f05d682b54..1cebb8fe04c 100644
--- a/dlls/light.msstyles/blue_listview_collapse_button_19px.svg
+++ b/dlls/light.msstyles/blue_listview_collapse_button_19px.svg
@@ -3,10 +3,10 @@
  <style>
   @import url(colors.css);
  </style>
- <ellipse cx="2.5136" cy="7.5407" rx="2.3813" ry="2.3813" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
+ <ellipse cx="2.5136" cy="7.5407" rx="2.3813" ry="2.3813" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
  <g stroke-width=".99996">
-  <path d="m3.8367 8.0267-1.3131-1.1474-0.18757 0.16391 1.3131 1.1474z" fill="#3096fa"/>
-  <path d="m1.3781 8.2022 1.3131-1.1474-0.18758-0.16391-1.3131 1.1474z" fill="#3096fa"/>
+  <path d="m3.8367 8.0267-1.3131-1.1474-0.18757 0.16391 1.3131 1.1474z" class="Highlight" fill="currentColor"/>
+  <path d="m1.3781 8.2022 1.3131-1.1474-0.18758-0.16391-1.3131 1.1474z" class="Highlight" fill="currentColor"/>
   <path d="m3.8368 2.9993-1.3131-1.1474-0.18757 0.16391 1.3131 1.1474z"/>
   <path d="m1.3782 3.1748 1.3131-1.1474-0.18758-0.16391-1.3131 1.1474z"/>
  </g>
diff --git a/dlls/light.msstyles/blue_listview_collapse_button_23px.svg b/dlls/light.msstyles/blue_listview_collapse_button_23px.svg
index 34f819093aa..c4d360ef694 100644
--- a/dlls/light.msstyles/blue_listview_collapse_button_23px.svg
+++ b/dlls/light.msstyles/blue_listview_collapse_button_23px.svg
@@ -5,9 +5,9 @@
  </style>
  <path d="m4.7625 3.7581-1.7068-1.3769-0.24381 0.1967 1.7068 1.3769z" stroke-width=".99996"/>
  <path d="m1.5667 3.9687 1.7068-1.3769-0.24383-0.1967-1.7068 1.3769z" stroke-width=".99996"/>
- <circle cx="3.0427" cy="9.1281" r="2.9104" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
- <path d="m4.7625 9.8435-1.7068-1.3769-0.24381 0.1967 1.7068 1.3769z" fill="#3096fa" stroke-width=".99996"/>
- <path d="m1.5667 10.054 1.7068-1.3769-0.24383-0.1967-1.7068 1.3769z" fill="#3096fa" stroke-width=".99996"/>
+ <circle cx="3.0427" cy="9.1281" r="2.9104" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m4.7625 9.8435-1.7068-1.3769-0.24381 0.1967 1.7068 1.3769z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
+ <path d="m1.5667 10.054 1.7068-1.3769-0.24383-0.1967-1.7068 1.3769z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
  <circle cx="3.0427" cy="15.214" r="2.9104" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
  <path d="m4.7625 15.929-1.7068-1.3769-0.24381 0.1967 1.7068 1.3769z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
  <path d="m1.5667 16.14 1.7068-1.3769-0.24383-0.1967-1.7068 1.3769z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
diff --git a/dlls/light.msstyles/blue_listview_collapse_button_30px.svg b/dlls/light.msstyles/blue_listview_collapse_button_30px.svg
index 9213983632f..4caf01f8926 100644
--- a/dlls/light.msstyles/blue_listview_collapse_button_30px.svg
+++ b/dlls/light.msstyles/blue_listview_collapse_button_30px.svg
@@ -3,12 +3,12 @@
  <style>
   @import url(colors.css);
  </style>
- <circle cx="3.9688" cy="11.906" r="3.8365" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
+ <circle cx="3.9688" cy="11.906" r="3.8365" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
  <g transform="matrix(1.6 0 0 -1.6 -.052922 8.4133)" stroke-width=".33073">
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
- <g transform="matrix(1.6 0 0 -1.6 -.052922 16.351)" fill="#3096fa" stroke-width=".33073">
+ <g transform="matrix(1.6 0 0 -1.6 -.052922 16.351)" class="Highlight" fill="currentColor" stroke-width=".33073">
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
diff --git a/dlls/light.msstyles/blue_listview_collapse_button_37px.svg b/dlls/light.msstyles/blue_listview_collapse_button_37px.svg
index 30104b4c340..60224b04039 100644
--- a/dlls/light.msstyles/blue_listview_collapse_button_37px.svg
+++ b/dlls/light.msstyles/blue_listview_collapse_button_37px.svg
@@ -3,10 +3,10 @@
  <style>
   @import url(colors.css);
  </style>
- <ellipse cx="4.8946" cy="14.684" rx="4.7623" ry="4.7623" fill="#fff" stroke="#3096fa" stroke-width=".26459"/>
+ <ellipse cx="4.8946" cy="14.684" rx="4.7623" ry="4.7623" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26459"/>
  <g stroke-width=".99993">
-  <path d="m7.5403 15.524-2.6258-2.2947-0.37508 0.32782 2.6258 2.2947z" fill="#3096fa"/>
-  <path d="m2.624 15.875 2.6258-2.2947-0.3751-0.32782-2.6258 2.2947z" fill="#3096fa"/>
+  <path d="m7.5403 15.524-2.6258-2.2947-0.37508 0.32782 2.6258 2.2947z" class="Highlight" fill="currentColor"/>
+  <path d="m2.624 15.875 2.6258-2.2947-0.3751-0.32782-2.6258 2.2947z" class="Highlight" fill="currentColor"/>
   <path d="m7.5404 5.7342-2.6258-2.2947-0.37508 0.32782 2.6258 2.2947z"/>
   <path d="m2.6241 6.0851 2.6258-2.2947-0.3751-0.32782-2.6258 2.2947z"/>
  </g>
diff --git a/dlls/light.msstyles/blue_listview_collapse_button_45px.svg b/dlls/light.msstyles/blue_listview_collapse_button_45px.svg
index 320c9d7b745..0b297269a49 100644
--- a/dlls/light.msstyles/blue_listview_collapse_button_45px.svg
+++ b/dlls/light.msstyles/blue_listview_collapse_button_45px.svg
@@ -5,9 +5,9 @@
  </style>
  <path d="m9.2605 7.2167-3.2824-2.9835-0.46889 0.42622 3.2824 2.9835z" stroke-width=".99992"/>
  <path d="m3.1148 7.6728 3.2824-2.9835-0.46891-0.42622-3.2824 2.9835z" stroke-width=".99992"/>
- <ellipse cx="5.9532" cy="17.859" rx="5.8209" ry="5.8209" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
- <path d="m9.2605 19.123-3.2824-2.9834-0.46889 0.42622 3.2824 2.9834z" fill="#3096fa" stroke-width=".99992"/>
- <path d="m3.1148 19.579 3.2824-2.9835-0.46891-0.42622-3.2824 2.9834z" fill="#3096fa" stroke-width=".99992"/>
+ <ellipse cx="5.9532" cy="17.859" rx="5.8209" ry="5.8209" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m9.2605 19.123-3.2824-2.9834-0.46889 0.42622 3.2824 2.9834z" class="Highlight" fill="currentColor" stroke-width=".99992"/>
+ <path d="m3.1148 19.579 3.2824-2.9835-0.46891-0.42622-3.2824 2.9834z" class="Highlight" fill="currentColor" stroke-width=".99992"/>
  <ellipse cx="5.9532" cy="29.766" rx="5.8209" ry="5.8209" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
  <path d="m9.2605 31.029-3.2824-2.9834-0.46889 0.42622 3.2824 2.9834z" class="HighlightOutline" fill="currentColor" stroke-width=".99992"/>
  <path d="m3.1148 31.485 3.2824-2.9835-0.46891-0.42622-3.2824 2.9834z" class="HighlightOutline" fill="currentColor" stroke-width=".99992"/>
diff --git a/dlls/light.msstyles/blue_listview_collapse_button_60px.svg b/dlls/light.msstyles/blue_listview_collapse_button_60px.svg
index 1e080887895..77f8f31f4c9 100644
--- a/dlls/light.msstyles/blue_listview_collapse_button_60px.svg
+++ b/dlls/light.msstyles/blue_listview_collapse_button_60px.svg
@@ -3,12 +3,12 @@
  <style>
   @import url(colors.css);
  </style>
- <circle cx="7.9376" cy="23.812" r="7.8053" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
+ <circle cx="7.9376" cy="23.812" r="7.8053" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
  <g transform="matrix(3.2 0 0 -3.2001 -.10584 16.827)" stroke-width=".16536">
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
- <g transform="matrix(3.2 0 0 -3.2001 -.10584 32.703)" fill="#3096fa" stroke-width=".16536">
+ <g transform="matrix(3.2 0 0 -3.2001 -.10584 32.703)" class="Highlight" fill="currentColor" stroke-width=".16536">
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
diff --git a/dlls/light.msstyles/blue_listview_expand_button_15px.svg b/dlls/light.msstyles/blue_listview_expand_button_15px.svg
index e61ed7a28cc..7d37acebe9f 100644
--- a/dlls/light.msstyles/blue_listview_expand_button_15px.svg
+++ b/dlls/light.msstyles/blue_listview_expand_button_15px.svg
@@ -3,12 +3,12 @@
  <style>
   @import url(colors.css);
  </style>
- <circle cx="1.9844" cy="5.9532" r="1.8521" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
+ <circle cx="1.9844" cy="5.9532" r="1.8521" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
  <g transform="matrix(.8 0 0 .80002 -.026461 -.10588)" stroke-width=".66146">
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
- <g transform="matrix(.8 0 0 .80002 -.026461 3.8629)" fill="#3096fa" stroke-width=".66146">
+ <g transform="matrix(.8 0 0 .80002 -.026461 3.8629)" class="Highlight" fill="currentColor" stroke-width=".66146">
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
diff --git a/dlls/light.msstyles/blue_listview_expand_button_19px.svg b/dlls/light.msstyles/blue_listview_expand_button_19px.svg
index b00bca1053c..c605cd5a46d 100644
--- a/dlls/light.msstyles/blue_listview_expand_button_19px.svg
+++ b/dlls/light.msstyles/blue_listview_expand_button_19px.svg
@@ -3,10 +3,10 @@
  <style>
   @import url(colors.css);
  </style>
- <ellipse cx="2.5136" cy="7.5407" rx="2.3813" ry="2.3813" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
+ <ellipse cx="2.5136" cy="7.5407" rx="2.3813" ry="2.3813" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
  <g stroke-width=".99996">
-  <path d="m3.8367 7.0548-1.3131 1.1474-0.18757-0.16391 1.3131-1.1474z" fill="#3096fa"/>
-  <path d="m1.3781 6.8793 1.3131 1.1474-0.18758 0.16391-1.3131-1.1474z" fill="#3096fa"/>
+  <path d="m3.8367 7.0548-1.3131 1.1474-0.18757-0.16391 1.3131-1.1474z" class="Highlight" fill="currentColor"/>
+  <path d="m1.3781 6.8793 1.3131 1.1474-0.18758 0.16391-1.3131-1.1474z" class="Highlight" fill="currentColor"/>
   <path d="m3.8368 2.0274-1.3131 1.1474-0.18757-0.16391 1.3131-1.1474z"/>
   <path d="m1.3782 1.8519 1.3131 1.1474-0.18758 0.16391-1.3131-1.1474z"/>
  </g>
diff --git a/dlls/light.msstyles/blue_listview_expand_button_23px.svg b/dlls/light.msstyles/blue_listview_expand_button_23px.svg
index c45d3eda474..c92a4602525 100644
--- a/dlls/light.msstyles/blue_listview_expand_button_23px.svg
+++ b/dlls/light.msstyles/blue_listview_expand_button_23px.svg
@@ -5,9 +5,9 @@
  </style>
  <path d="m4.7625 2.5918-1.7068 1.3769-0.24381-0.1967 1.7068-1.3769z" stroke-width=".99996"/>
  <path d="m1.5667 2.3812 1.7068 1.3769-0.24383 0.1967-1.7068-1.3769z" stroke-width=".99996"/>
- <circle cx="3.0427" cy="9.1281" r="2.9104" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
- <path d="m4.7625 8.6772-1.7068 1.3769-0.24381-0.1967 1.7068-1.3769z" fill="#3096fa" stroke-width=".99996"/>
- <path d="m1.5667 8.4666 1.7068 1.3769-0.24383 0.1967-1.7068-1.3769z" fill="#3096fa" stroke-width=".99996"/>
+ <circle cx="3.0427" cy="9.1281" r="2.9104" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m4.7625 8.6772-1.7068 1.3769-0.24381-0.1967 1.7068-1.3769z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
+ <path d="m1.5667 8.4666 1.7068 1.3769-0.24383 0.1967-1.7068-1.3769z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
  <circle cx="3.0427" cy="15.214" r="2.9104" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
  <path d="m4.7625 14.763-1.7068 1.3769-0.24381-0.1967 1.7068-1.3769z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
  <path d="m1.5667 14.552 1.7068 1.3769-0.24383 0.1967-1.7068-1.3769z" class="HighlightOutline" fill="currentColor" stroke-width=".99996"/>
diff --git a/dlls/light.msstyles/blue_listview_expand_button_30px.svg b/dlls/light.msstyles/blue_listview_expand_button_30px.svg
index 3d731bbc241..e88e6656762 100644
--- a/dlls/light.msstyles/blue_listview_expand_button_30px.svg
+++ b/dlls/light.msstyles/blue_listview_expand_button_30px.svg
@@ -3,12 +3,12 @@
  <style>
   @import url(colors.css);
  </style>
- <circle cx="3.9688" cy="11.906" r="3.8365" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
+ <circle cx="3.9688" cy="11.906" r="3.8365" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
  <g transform="matrix(1.6 0 0 1.6 -.052922 -.47675)" stroke-width=".33073">
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
- <g transform="matrix(1.6 0 0 1.6 -.052922 7.4608)" fill="#3096fa" stroke-width=".33073">
+ <g transform="matrix(1.6 0 0 1.6 -.052922 7.4608)" class="Highlight" fill="currentColor" stroke-width=".33073">
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
diff --git a/dlls/light.msstyles/blue_listview_expand_button_37px.svg b/dlls/light.msstyles/blue_listview_expand_button_37px.svg
index 79c3dd07809..ff6dda3ec49 100644
--- a/dlls/light.msstyles/blue_listview_expand_button_37px.svg
+++ b/dlls/light.msstyles/blue_listview_expand_button_37px.svg
@@ -3,10 +3,10 @@
  <style>
   @import url(colors.css);
  </style>
- <ellipse cx="4.8946" cy="14.684" rx="4.7623" ry="4.7623" fill="#fff" stroke="#3096fa" stroke-width=".26459"/>
+ <ellipse cx="4.8946" cy="14.684" rx="4.7623" ry="4.7623" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26459"/>
  <g stroke-width=".99993">
-  <path d="m7.5403 13.58-2.6258 2.2947-0.37508-0.32782 2.6258-2.2947z" fill="#3096fa"/>
-  <path d="m2.624 13.229 2.6258 2.2947-0.3751 0.32782-2.6258-2.2947z" fill="#3096fa"/>
+  <path d="m7.5403 13.58-2.6258 2.2947-0.37508-0.32782 2.6258-2.2947z" class="Highlight" fill="currentColor"/>
+  <path d="m2.624 13.229 2.6258 2.2947-0.3751 0.32782-2.6258-2.2947z" class="Highlight" fill="currentColor"/>
   <path d="m7.5404 3.7904-2.6258 2.2947-0.37508-0.32782 2.6258-2.2947z"/>
   <path d="m2.6241 3.4395 2.6258 2.2947-0.3751 0.32782-2.6258-2.2947z"/>
  </g>
diff --git a/dlls/light.msstyles/blue_listview_expand_button_45px.svg b/dlls/light.msstyles/blue_listview_expand_button_45px.svg
index 92cd5768c37..eb9de036a69 100644
--- a/dlls/light.msstyles/blue_listview_expand_button_45px.svg
+++ b/dlls/light.msstyles/blue_listview_expand_button_45px.svg
@@ -5,9 +5,9 @@
  </style>
  <path d="m9.2605 4.6893-3.2824 2.9835-0.46889-0.42622 3.2824-2.9835z" stroke-width=".99992"/>
  <path d="m3.1148 4.2332 3.2824 2.9835-0.46891 0.42622-3.2824-2.9835z" stroke-width=".99992"/>
- <ellipse cx="5.9532" cy="17.859" rx="5.8209" ry="5.8209" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
- <path d="m9.2605 16.596-3.2824 2.9834-0.46889-0.42622 3.2824-2.9834z" fill="#3096fa" stroke-width=".99992"/>
- <path d="m3.1148 16.14 3.2824 2.9835-0.46891 0.42622-3.2824-2.9834z" fill="#3096fa" stroke-width=".99992"/>
+ <ellipse cx="5.9532" cy="17.859" rx="5.8209" ry="5.8209" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m9.2605 16.596-3.2824 2.9834-0.46889-0.42622 3.2824-2.9834z" class="Highlight" fill="currentColor" stroke-width=".99992"/>
+ <path d="m3.1148 16.14 3.2824 2.9835-0.46891 0.42622-3.2824-2.9834z" class="Highlight" fill="currentColor" stroke-width=".99992"/>
  <ellipse cx="5.9532" cy="29.766" rx="5.8209" ry="5.8209" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
  <path d="m9.2605 28.502-3.2824 2.9834-0.46889-0.42622 3.2824-2.9834z" class="HighlightOutline" fill="currentColor" stroke-width=".99992"/>
  <path d="m3.1148 28.046 3.2824 2.9835-0.46891 0.42622-3.2824-2.9834z" class="HighlightOutline" fill="currentColor" stroke-width=".99992"/>
diff --git a/dlls/light.msstyles/blue_listview_expand_button_60px.svg b/dlls/light.msstyles/blue_listview_expand_button_60px.svg
index 6564b2f877c..216aca78545 100644
--- a/dlls/light.msstyles/blue_listview_expand_button_60px.svg
+++ b/dlls/light.msstyles/blue_listview_expand_button_60px.svg
@@ -3,12 +3,12 @@
  <style>
   @import url(colors.css);
  </style>
- <circle cx="7.9376" cy="23.812" r="7.8053" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
+ <circle cx="7.9376" cy="23.812" r="7.8053" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
  <g transform="matrix(3.2 0 0 3.2001 -.10584 -.9535)" stroke-width=".16536">
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
- <g transform="matrix(3.2 0 0 3.2001 -.10584 14.922)" fill="#3096fa" stroke-width=".16536">
+ <g transform="matrix(3.2 0 0 3.2001 -.10584 14.922)" class="Highlight" fill="currentColor" stroke-width=".16536">
   <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z"/>
   <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z"/>
  </g>
diff --git a/dlls/light.msstyles/blue_listview_group_header_close_hot.svg b/dlls/light.msstyles/blue_listview_group_header_close_hot.svg
index 6681bbc5463..aba9fb45433 100644
--- a/dlls/light.msstyles/blue_listview_group_header_close_hot.svg
+++ b/dlls/light.msstyles/blue_listview_group_header_close_hot.svg
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="7" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg">
- <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".15686"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <rect width="1.8521" height="1.8521" class="Highlight" fill="currentColor" fill-opacity=".15686"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_group_header_close_mixed_selection.svg b/dlls/light.msstyles/blue_listview_group_header_close_mixed_selection.svg
index 7e6c2570723..757eb406f9d 100644
--- a/dlls/light.msstyles/blue_listview_group_header_close_mixed_selection.svg
+++ b/dlls/light.msstyles/blue_listview_group_header_close_mixed_selection.svg
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="7" d="bitmap:7-32" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg">
- <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".62745"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <rect width="1.8521" height="1.8521" class="Highlight" fill="currentColor" fill-opacity=".62745"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_group_header_close_mixed_selection_hot.svg b/dlls/light.msstyles/blue_listview_group_header_close_mixed_selection_hot.svg
index 7e6c2570723..757eb406f9d 100644
--- a/dlls/light.msstyles/blue_listview_group_header_close_mixed_selection_hot.svg
+++ b/dlls/light.msstyles/blue_listview_group_header_close_mixed_selection_hot.svg
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="7" d="bitmap:7-32" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg">
- <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".62745"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <rect width="1.8521" height="1.8521" class="Highlight" fill="currentColor" fill-opacity=".62745"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_group_header_close_selected.svg b/dlls/light.msstyles/blue_listview_group_header_close_selected.svg
index 7e6c2570723..757eb406f9d 100644
--- a/dlls/light.msstyles/blue_listview_group_header_close_selected.svg
+++ b/dlls/light.msstyles/blue_listview_group_header_close_selected.svg
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="7" d="bitmap:7-32" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg">
- <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".62745"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <rect width="1.8521" height="1.8521" class="Highlight" fill="currentColor" fill-opacity=".62745"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_group_header_close_selected_hot.svg b/dlls/light.msstyles/blue_listview_group_header_close_selected_hot.svg
index 4c1f7a75c8a..4d44b816777 100644
--- a/dlls/light.msstyles/blue_listview_group_header_close_selected_hot.svg
+++ b/dlls/light.msstyles/blue_listview_group_header_close_selected_hot.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="7" d="bitmap:7-32" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg">
- <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".62745"/>
- <rect x=".13229" y=".13229" width="1.5875" height="1.5875" fill="none" stroke="#3096fa" stroke-opacity=".50484" stroke-width=".26459"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <rect width="1.8521" height="1.8521" class="Highlight" fill="currentColor" fill-opacity=".62745"/>
+ <rect x=".13229" y=".13229" width="1.5875" height="1.5875" fill="none" class="Highlight" stroke="currentColor" stroke-opacity=".50484" stroke-width=".26459"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_group_header_close_selected_not_focused_hot.svg b/dlls/light.msstyles/blue_listview_group_header_close_selected_not_focused_hot.svg
index 4c1f7a75c8a..4d44b816777 100644
--- a/dlls/light.msstyles/blue_listview_group_header_close_selected_not_focused_hot.svg
+++ b/dlls/light.msstyles/blue_listview_group_header_close_selected_not_focused_hot.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="7" d="bitmap:7-32" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg">
- <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".62745"/>
- <rect x=".13229" y=".13229" width="1.5875" height="1.5875" fill="none" stroke="#3096fa" stroke-opacity=".50484" stroke-width=".26459"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <rect width="1.8521" height="1.8521" class="Highlight" fill="currentColor" fill-opacity=".62745"/>
+ <rect x=".13229" y=".13229" width="1.5875" height="1.5875" fill="none" class="Highlight" stroke="currentColor" stroke-opacity=".50484" stroke-width=".26459"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_group_header_open_hot.svg b/dlls/light.msstyles/blue_listview_group_header_open_hot.svg
index 6681bbc5463..aba9fb45433 100644
--- a/dlls/light.msstyles/blue_listview_group_header_open_hot.svg
+++ b/dlls/light.msstyles/blue_listview_group_header_open_hot.svg
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="7" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg">
- <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".15686"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <rect width="1.8521" height="1.8521" class="Highlight" fill="currentColor" fill-opacity=".15686"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_group_header_open_mixed_selection_hot.svg b/dlls/light.msstyles/blue_listview_group_header_open_mixed_selection_hot.svg
index 6681bbc5463..aba9fb45433 100644
--- a/dlls/light.msstyles/blue_listview_group_header_open_mixed_selection_hot.svg
+++ b/dlls/light.msstyles/blue_listview_group_header_open_mixed_selection_hot.svg
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="7" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg">
- <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".15686"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <rect width="1.8521" height="1.8521" class="Highlight" fill="currentColor" fill-opacity=".15686"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_group_header_open_selected_hot.svg b/dlls/light.msstyles/blue_listview_group_header_open_selected_hot.svg
index 6681bbc5463..aba9fb45433 100644
--- a/dlls/light.msstyles/blue_listview_group_header_open_selected_hot.svg
+++ b/dlls/light.msstyles/blue_listview_group_header_open_selected_hot.svg
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="7" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg">
- <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".15686"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <rect width="1.8521" height="1.8521" class="Highlight" fill="currentColor" fill-opacity=".15686"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_listview_group_header_open_selected_not_focused_hot.svg b/dlls/light.msstyles/blue_listview_group_header_open_selected_not_focused_hot.svg
index 6681bbc5463..aba9fb45433 100644
--- a/dlls/light.msstyles/blue_listview_group_header_open_selected_not_focused_hot.svg
+++ b/dlls/light.msstyles/blue_listview_group_header_open_selected_not_focused_hot.svg
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="7" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg">
- <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".15686"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <rect width="1.8521" height="1.8521" class="Highlight" fill="currentColor" fill-opacity=".15686"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_menu_bar_item.svg b/dlls/light.msstyles/blue_menu_bar_item.svg
index de69b454b41..04434b14239 100644
--- a/dlls/light.msstyles/blue_menu_bar_item.svg
+++ b/dlls/light.msstyles/blue_menu_bar_item.svg
@@ -12,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="none" stroke-width=".26458">
-  <rect x=".13228" y="2.5136" width="2.1167" height="2.1167" stroke="#3096fa"/>
+  <rect x=".13228" y="2.5136" width="2.1167" height="2.1167" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="4.8949" width="2.1167" height="2.1167" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_menu_popup_check_background.svg b/dlls/light.msstyles/blue_menu_popup_check_background.svg
index 2027f871a0c..a037e5f8821 100644
--- a/dlls/light.msstyles/blue_menu_popup_check_background.svg
+++ b/dlls/light.msstyles/blue_menu_popup_check_background.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="21" version="1.1" viewBox="0 0 1.8521 5.5563" xmlns="http://www.w3.org/2000/svg">
- <rect y="1.8521" width="1.8521" height="3.7042" fill="#3096fa" fill-opacity=".99923"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <rect y="1.8521" width="1.8521" height="3.7042" class="Highlight" fill="currentColor" fill-opacity=".99923"/>
  <rect x="1.1102e-16" width="1.8521" height="1.8521" fill-opacity=".05"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_menu_popup_item.svg b/dlls/light.msstyles/blue_menu_popup_item.svg
index e760babb19c..173fbd3f215 100644
--- a/dlls/light.msstyles/blue_menu_popup_item.svg
+++ b/dlls/light.msstyles/blue_menu_popup_item.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="28" version="1.1" viewBox="0 0 1.8521 7.4084" xmlns="http://www.w3.org/2000/svg">
- <rect y="1.8521" width="1.8521" height="1.8521" fill="#3096fa"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <rect y="1.8521" width="1.8521" height="1.8521" class="Highlight" fill="currentColor"/>
  <rect x="-2.9373e-8" y="5.5563" width="1.8521" height="1.8521" fill-opacity=".05"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_navigation_back_button_120px.svg b/dlls/light.msstyles/blue_navigation_back_button_120px.svg
index 32135998ba6..dd82e604887 100644
--- a/dlls/light.msstyles/blue_navigation_back_button_120px.svg
+++ b/dlls/light.msstyles/blue_navigation_back_button_120px.svg
@@ -13,7 +13,7 @@
  </metadata>
  <path d="m14.049 10.848 0.85803 1.0126-2.7871 3.2963h9.8401v1.4364h-9.8401l2.7933 3.2963-0.86413 1.0126-4.2598-5.0269z" fill="#aeaeae" stroke-width=".26458"/>
  <g transform="matrix(1.4839 0 0 1 -2.9586 0)" stroke-width=".17831">
-  <path d="m11.462 42.598 0.57824 1.0126-1.8783 3.2963h6.6314v1.4364h-6.6314l1.8824 3.2963-0.58235 1.0126-2.8708-5.0269z" fill="#3096fa"/>
+  <path d="m11.462 42.598 0.57824 1.0126-1.8783 3.2963h6.6314v1.4364h-6.6314l1.8824 3.2963-0.58235 1.0126-2.8708-5.0269z" class="Highlight" fill="currentColor"/>
   <path d="m11.462 74.348 0.57824 1.0126-1.8783 3.2963h6.6314v1.4364h-6.6314l1.8824 3.2963-0.58235 1.0126-2.8708-5.0269z" class="HighlightOutline" fill="currentColor"/>
   <path d="m11.462 106.1 0.57824 1.0126-1.8783 3.2963h6.6314v1.4364h-6.6314l1.8824 3.2963-0.58235 1.0126-2.8708-5.0269z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_navigation_back_button_30px.svg b/dlls/light.msstyles/blue_navigation_back_button_30px.svg
index 47f47185ddd..29f131b5425 100644
--- a/dlls/light.msstyles/blue_navigation_back_button_30px.svg
+++ b/dlls/light.msstyles/blue_navigation_back_button_30px.svg
@@ -13,7 +13,7 @@
  </metadata>
  <g stroke-width=".26458">
   <path d="m3.3206 2.3812 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" fill="#aeaeae"/>
-  <path d="m3.3206 10.319 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" fill="#3096fa"/>
+  <path d="m3.3206 10.319 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" class="Highlight" fill="currentColor"/>
   <path d="m3.3206 18.256 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" class="HighlightOutline" fill="currentColor"/>
   <path d="m3.3206 26.194 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_navigation_back_button_38px.svg b/dlls/light.msstyles/blue_navigation_back_button_38px.svg
index 0e742a6730a..85fd84c08de 100644
--- a/dlls/light.msstyles/blue_navigation_back_button_38px.svg
+++ b/dlls/light.msstyles/blue_navigation_back_button_38px.svg
@@ -13,7 +13,7 @@
  </metadata>
  <g stroke-width=".26458">
   <path d="m4.1276 3.4396 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" fill="#aeaeae"/>
-  <path d="m4.1276 13.494 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" fill="#3096fa"/>
+  <path d="m4.1276 13.494 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" class="Highlight" fill="currentColor"/>
   <path d="m4.1276 23.548 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.1276 33.602 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_navigation_back_button_45px.svg b/dlls/light.msstyles/blue_navigation_back_button_45px.svg
index 2fde237bcbb..f81a586fdd8 100644
--- a/dlls/light.msstyles/blue_navigation_back_button_45px.svg
+++ b/dlls/light.msstyles/blue_navigation_back_button_45px.svg
@@ -13,7 +13,7 @@
  </metadata>
  <g stroke-width=".26458">
   <path d="m5.0271 3.7042 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" fill="#aeaeae"/>
-  <path d="m5.0271 15.611 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" fill="#3096fa"/>
+  <path d="m5.0271 15.611 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" class="Highlight" fill="currentColor"/>
   <path d="m5.0271 27.517 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" class="HighlightOutline" fill="currentColor"/>
   <path d="m5.0271 39.423 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_navigation_back_button_60px.svg b/dlls/light.msstyles/blue_navigation_back_button_60px.svg
index 05f33a1f276..69fdb23dbc9 100644
--- a/dlls/light.msstyles/blue_navigation_back_button_60px.svg
+++ b/dlls/light.msstyles/blue_navigation_back_button_60px.svg
@@ -13,7 +13,7 @@
  </metadata>
  <g stroke-width=".26458">
   <path d="m7.1569 5.2917 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" fill="#aeaeae"/>
-  <path d="m7.1569 21.167 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" fill="#3096fa"/>
+  <path d="m7.1569 21.167 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" class="Highlight" fill="currentColor"/>
   <path d="m7.1569 37.042 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" class="HighlightOutline" fill="currentColor"/>
   <path d="m7.1569 52.917 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_navigation_back_button_74px.svg b/dlls/light.msstyles/blue_navigation_back_button_74px.svg
index 69b80499923..90ce556283f 100644
--- a/dlls/light.msstyles/blue_navigation_back_button_74px.svg
+++ b/dlls/light.msstyles/blue_navigation_back_button_74px.svg
@@ -13,7 +13,7 @@
  </metadata>
  <path d="m8.6917 6.6146 0.57824 0.66619-1.8783 2.1686h6.6314v0.94496h-6.6314l1.8824 2.1686-0.58235 0.66619-2.8708-3.3072z" fill="#aeaeae" stroke-width=".26458"/>
  <g stroke-width=".26458">
-  <path d="m8.6917 25.929 0.57824 0.66619-1.8783 2.1686h6.6314v0.94496h-6.6314l1.8824 2.1686-0.58235 0.66619-2.8708-3.3072z" fill="#3096fa"/>
+  <path d="m8.6917 25.929 0.57824 0.66619-1.8783 2.1686h6.6314v0.94496h-6.6314l1.8824 2.1686-0.58235 0.66619-2.8708-3.3072z" class="Highlight" fill="currentColor"/>
   <path d="m8.6917 45.508 0.57824 0.66619-1.8783 2.1686h6.6314v0.94496h-6.6314l1.8824 2.1686-0.58235 0.66619-2.8708-3.3072z" class="HighlightOutline" fill="currentColor"/>
   <path d="m8.6917 65.088 0.57824 0.66619-1.8783 2.1686h6.6314v0.94496h-6.6314l1.8824 2.1686-0.58235 0.66619-2.8708-3.3072z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_navigation_back_button_90px.svg b/dlls/light.msstyles/blue_navigation_back_button_90px.svg
index 0b1f19bccb0..7dabc344641 100644
--- a/dlls/light.msstyles/blue_navigation_back_button_90px.svg
+++ b/dlls/light.msstyles/blue_navigation_back_button_90px.svg
@@ -13,7 +13,7 @@
  </metadata>
  <path d="m10.226 7.4084 0.72746 0.90603-2.363 2.9493h8.3427v1.2852h-8.3427l2.3682 2.9493-0.73263 0.90603-3.6116-4.4978z" fill="#aeaeae" stroke-width=".26458"/>
  <g transform="matrix(1.2581 0 0 1 -1.5021 0)" stroke-width=".21031">
-  <path d="m9.3225 31.221 0.57824 0.90603-1.8783 2.9493h6.6314v1.2852h-6.6314l1.8824 2.9493-0.58235 0.90603-2.8708-4.4978z" fill="#3096fa"/>
+  <path d="m9.3225 31.221 0.57824 0.90603-1.8783 2.9493h6.6314v1.2852h-6.6314l1.8824 2.9493-0.58235 0.90603-2.8708-4.4978z" class="Highlight" fill="currentColor"/>
   <path d="m9.3225 55.034 0.57824 0.90603-1.8783 2.9493h6.6314v1.2852h-6.6314l1.8824 2.9493-0.58235 0.90603-2.8708-4.4978z" class="HighlightOutline" fill="currentColor"/>
   <path d="m9.3225 78.846 0.57824 0.90603-1.8783 2.9493h6.6314v1.2852h-6.6314l1.8824 2.9493-0.58235 0.90603-2.8708-4.4978z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_navigation_forward_button_120px.svg b/dlls/light.msstyles/blue_navigation_forward_button_120px.svg
index 94299277aa5..837eb0105ed 100644
--- a/dlls/light.msstyles/blue_navigation_forward_button_120px.svg
+++ b/dlls/light.msstyles/blue_navigation_forward_button_120px.svg
@@ -13,7 +13,7 @@
  </metadata>
  <path d="m17.701 10.848-0.85803 1.0126 2.7871 3.2963h-9.8401v1.4364h9.8401l-2.7933 3.2963 0.86413 1.0126 4.2598-5.0269z" fill="#aeaeae" stroke-width=".26458"/>
  <g transform="matrix(-1.4839 0 0 1 34.709 0)" stroke-width=".17831">
-  <path d="m11.462 42.598 0.57824 1.0126-1.8783 3.2963h6.6314v1.4364h-6.6314l1.8824 3.2963-0.58235 1.0126-2.8708-5.0269z" fill="#3096fa"/>
+  <path d="m11.462 42.598 0.57824 1.0126-1.8783 3.2963h6.6314v1.4364h-6.6314l1.8824 3.2963-0.58235 1.0126-2.8708-5.0269z" class="Highlight" fill="currentColor"/>
   <path d="m11.462 74.348 0.57824 1.0126-1.8783 3.2963h6.6314v1.4364h-6.6314l1.8824 3.2963-0.58235 1.0126-2.8708-5.0269z" class="HighlightOutline" fill="currentColor"/>
   <path d="m11.462 106.1 0.57824 1.0126-1.8783 3.2963h6.6314v1.4364h-6.6314l1.8824 3.2963-0.58235 1.0126-2.8708-5.0269z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_navigation_forward_button_30px.svg b/dlls/light.msstyles/blue_navigation_forward_button_30px.svg
index 31f71e68ea5..16c1ca4ffaa 100644
--- a/dlls/light.msstyles/blue_navigation_forward_button_30px.svg
+++ b/dlls/light.msstyles/blue_navigation_forward_button_30px.svg
@@ -13,7 +13,7 @@
  </metadata>
  <g transform="matrix(-1,0,0,1,7.673,0)" stroke-width=".26458">
   <path d="m3.3206 2.3812 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" fill="#aeaeae"/>
-  <path d="m3.3206 10.319 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" fill="#3096fa"/>
+  <path d="m3.3206 10.319 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" class="Highlight" fill="currentColor"/>
   <path d="m3.3206 18.256 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" class="HighlightOutline" fill="currentColor"/>
   <path d="m3.3206 26.194 0.24249 0.31977-0.78766 1.0409h2.7809v0.45358h-2.7809l0.78935 1.0409-0.24421 0.31977-1.2039-1.5875z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_navigation_forward_button_38px.svg b/dlls/light.msstyles/blue_navigation_forward_button_38px.svg
index 774ed38e0c5..d9251724b74 100644
--- a/dlls/light.msstyles/blue_navigation_forward_button_38px.svg
+++ b/dlls/light.msstyles/blue_navigation_forward_button_38px.svg
@@ -13,7 +13,7 @@
  </metadata>
  <g transform="matrix(-1 0 0 1 9.5251 0)" stroke-width=".26458">
   <path d="m4.1276 3.4396 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" fill="#aeaeae"/>
-  <path d="m4.1276 13.494 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" fill="#3096fa"/>
+  <path d="m4.1276 13.494 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" class="Highlight" fill="currentColor"/>
   <path d="m4.1276 23.548 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.1276 33.602 0.29844 0.31977-0.96941 1.0409h3.4226v0.45358h-3.4226l0.97149 1.0409-0.30056 0.31977-1.4817-1.5875z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_navigation_forward_button_45px.svg b/dlls/light.msstyles/blue_navigation_forward_button_45px.svg
index 4a25e841223..bd63ef4d318 100644
--- a/dlls/light.msstyles/blue_navigation_forward_button_45px.svg
+++ b/dlls/light.msstyles/blue_navigation_forward_button_45px.svg
@@ -13,7 +13,7 @@
  </metadata>
  <g transform="matrix(-1 0 0 1 11.642 0)" stroke-width=".26458">
   <path d="m5.0271 3.7042 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" fill="#aeaeae"/>
-  <path d="m5.0271 15.611 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" fill="#3096fa"/>
+  <path d="m5.0271 15.611 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" class="Highlight" fill="currentColor"/>
   <path d="m5.0271 27.517 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" class="HighlightOutline" fill="currentColor"/>
   <path d="m5.0271 39.423 0.37305 0.45302-1.2118 1.4747h4.2782v0.64259h-4.2782l1.2144 1.4747-0.3757 0.45302-1.8521-2.249z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_navigation_forward_button_60px.svg b/dlls/light.msstyles/blue_navigation_forward_button_60px.svg
index e1711a3d38b..731b8180024 100644
--- a/dlls/light.msstyles/blue_navigation_forward_button_60px.svg
+++ b/dlls/light.msstyles/blue_navigation_forward_button_60px.svg
@@ -13,7 +13,7 @@
  </metadata>
  <g transform="matrix(-1 0 0 1 16.139 0)" stroke-width=".26458">
   <path d="m7.1569 5.2917 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" fill="#aeaeae"/>
-  <path d="m7.1569 21.167 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" fill="#3096fa"/>
+  <path d="m7.1569 21.167 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" class="Highlight" fill="currentColor"/>
   <path d="m7.1569 37.042 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" class="HighlightOutline" fill="currentColor"/>
   <path d="m7.1569 52.917 0.42901 0.53295-1.3936 1.7349h4.92v0.75597h-4.92l1.3966 1.7349-0.43206 0.53295-2.1299-2.6458z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_navigation_forward_button_74px.svg b/dlls/light.msstyles/blue_navigation_forward_button_74px.svg
index 8d90c583bf1..72fb3087d27 100644
--- a/dlls/light.msstyles/blue_navigation_forward_button_74px.svg
+++ b/dlls/light.msstyles/blue_navigation_forward_button_74px.svg
@@ -13,7 +13,7 @@
  </metadata>
  <path d="m11.152 6.6146-0.57824 0.66619 1.8783 2.1686h-6.6314v0.94496h6.6314l-1.8824 2.1686 0.58235 0.66619 2.8708-3.3072z" fill="#aeaeae" stroke-width=".26458"/>
  <g transform="matrix(-1 0 0 1 19.844 0)" stroke-width=".26458">
-  <path d="m8.6917 25.929 0.57824 0.66619-1.8783 2.1686h6.6314v0.94496h-6.6314l1.8824 2.1686-0.58235 0.66619-2.8708-3.3072z" fill="#3096fa"/>
+  <path d="m8.6917 25.929 0.57824 0.66619-1.8783 2.1686h6.6314v0.94496h-6.6314l1.8824 2.1686-0.58235 0.66619-2.8708-3.3072z" class="Highlight" fill="currentColor"/>
   <path d="m8.6917 45.508 0.57824 0.66619-1.8783 2.1686h6.6314v0.94496h-6.6314l1.8824 2.1686-0.58235 0.66619-2.8708-3.3072z" class="HighlightOutline" fill="currentColor"/>
   <path d="m8.6917 65.088 0.57824 0.66619-1.8783 2.1686h6.6314v0.94496h-6.6314l1.8824 2.1686-0.58235 0.66619-2.8708-3.3072z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_navigation_forward_button_90px.svg b/dlls/light.msstyles/blue_navigation_forward_button_90px.svg
index 0ee8b1c73b4..53614645223 100644
--- a/dlls/light.msstyles/blue_navigation_forward_button_90px.svg
+++ b/dlls/light.msstyles/blue_navigation_forward_button_90px.svg
@@ -13,7 +13,7 @@
  </metadata>
  <path d="m13.322 7.4084-0.72746 0.90603 2.363 2.9493h-8.3427v1.2852h8.3427l-2.3682 2.9493 0.73263 0.90603 3.6116-4.4978z" fill="#aeaeae" stroke-width=".26458"/>
  <g transform="matrix(-1.2581 0 0 1 25.05 0)" stroke-width=".21031">
-  <path d="m9.3225 31.221 0.57824 0.90603-1.8783 2.9493h6.6314v1.2852h-6.6314l1.8824 2.9493-0.58235 0.90603-2.8708-4.4978z" fill="#3096fa"/>
+  <path d="m9.3225 31.221 0.57824 0.90603-1.8783 2.9493h6.6314v1.2852h-6.6314l1.8824 2.9493-0.58235 0.90603-2.8708-4.4978z" class="Highlight" fill="currentColor"/>
   <path d="m9.3225 55.034 0.57824 0.90603-1.8783 2.9493h6.6314v1.2852h-6.6314l1.8824 2.9493-0.58235 0.90603-2.8708-4.4978z" class="HighlightOutline" fill="currentColor"/>
   <path d="m9.3225 78.846 0.57824 0.90603-1.8783 2.9493h6.6314v1.2852h-6.6314l1.8824 2.9493-0.58235 0.90603-2.8708-4.4978z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_navigation_menu_button_13px.svg b/dlls/light.msstyles/blue_navigation_menu_button_13px.svg
index a016426281f..ecfab8f17dd 100644
--- a/dlls/light.msstyles/blue_navigation_menu_button_13px.svg
+++ b/dlls/light.msstyles/blue_navigation_menu_button_13px.svg
@@ -16,8 +16,8 @@
   <path d="m-0.11368 2.1167 1.0504 0.91854-0.15005 0.13122-1.0504-0.91854z" stroke-width=".26458"/>
   <g transform="matrix(1.1443 0 0 1 10.306 -10.039)" stroke-width=".23122">
    <g stroke-width=".23122">
-    <path d="m-7.3868 19.44-0.91792 0.91767-0.13113-0.1311 0.91792-0.91767z" fill="#3096fa"/>
-    <path d="m-9.1055 19.299 0.91792 0.91767-0.13113 0.1311-0.91792-0.91767z" fill="#3096fa"/>
+    <path d="m-7.3868 19.44-0.91792 0.91767-0.13113-0.1311 0.91792-0.91767z" class="Highlight" fill="currentColor"/>
+    <path d="m-9.1055 19.299 0.91792 0.91767-0.13113 0.1311-0.91792-0.91767z" class="Highlight" fill="currentColor"/>
     <path d="m-7.3868 26.583-0.91792 0.91854-0.13113-0.13122 0.91792-0.91854z" class="HighlightOutline" fill="currentColor"/>
     <path d="m-9.1055 26.443 0.91792 0.91854-0.13113 0.13122-0.91792-0.91854z" class="HighlightOutline" fill="currentColor"/>
    </g>
diff --git a/dlls/light.msstyles/blue_navigation_menu_button_17px.svg b/dlls/light.msstyles/blue_navigation_menu_button_17px.svg
index 5be256a6fdb..497dfc774fd 100644
--- a/dlls/light.msstyles/blue_navigation_menu_button_17px.svg
+++ b/dlls/light.msstyles/blue_navigation_menu_button_17px.svg
@@ -15,8 +15,8 @@
   <path d="m2.0646 3.0852-1.0504 1.1482-0.15005-0.16402 1.0504-1.1482z" stroke-width=".23667"/>
   <path d="m0.098023 2.9104 1.0504 1.1482-0.15005 0.16402-1.0504-1.1482z" stroke-width=".23667"/>
   <g transform="matrix(1.1443,0,0,1,10.306,-10.039)" stroke-width=".18501">
-   <path d="m-7.202 22.121-0.91792 1.1467-0.13113-0.16382 0.91792-1.1467z" fill="#3096fa"/>
-   <path d="m-8.9207 21.945 0.91792 1.1467-0.13113 0.16382-0.91792-1.1467z" fill="#3096fa"/>
+   <path d="m-7.202 22.121-0.91792 1.1467-0.13113-0.16382 0.91792-1.1467z" class="Highlight" fill="currentColor"/>
+   <path d="m-8.9207 21.945 0.91792 1.1467-0.13113 0.16382-0.91792-1.1467z" class="Highlight" fill="currentColor"/>
    <path d="m-7.202 31.116-0.91792 1.148-0.13113-0.16399 0.91792-1.148z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-8.9207 30.941 0.91792 1.148-0.13113 0.16399-0.91792-1.148z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-7.202 40.112-0.91792 1.148-0.13113-0.16399 0.91792-1.148z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_navigation_menu_button_19px.svg b/dlls/light.msstyles/blue_navigation_menu_button_19px.svg
index 664441762ab..97eea0133d7 100644
--- a/dlls/light.msstyles/blue_navigation_menu_button_19px.svg
+++ b/dlls/light.msstyles/blue_navigation_menu_button_19px.svg
@@ -15,8 +15,8 @@
   <path d="m2.0646 3.6493-1.0504 1.3777-0.15005-0.19681 1.0504-1.3777z" stroke-width=".21604"/>
   <path d="m0.098023 3.4396 1.0504 1.3777-0.15005 0.19681-1.0504-1.3777z" stroke-width=".21604"/>
   <g transform="matrix(1.1443,0,0,1,10.306,-10.039)" stroke-width=".15416">
-   <path d="m-7.202 24.273-0.91792 1.3763-0.13113-0.19662 0.91792-1.3763z" fill="#3096fa"/>
-   <path d="m-8.9207 24.062 0.91792 1.3763-0.13113 0.19662-0.91792-1.3763z" fill="#3096fa"/>
+   <path d="m-7.202 24.273-0.91792 1.3763-0.13113-0.19662 0.91792-1.3763z" class="Highlight" fill="currentColor"/>
+   <path d="m-8.9207 24.062 0.91792 1.3763-0.13113 0.19662-0.91792-1.3763z" class="Highlight" fill="currentColor"/>
    <path d="m-7.202 34.855-0.91792 1.3775-0.13113-0.19678 0.91792-1.3775z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-8.9207 34.645 0.91792 1.3775-0.13113 0.19678-0.91792-1.3775z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-7.202 45.438-0.91792 1.3775-0.13113-0.19677 0.91792-1.3775z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_navigation_menu_button_26px.svg b/dlls/light.msstyles/blue_navigation_menu_button_26px.svg
index fced0115c7d..97d35d680c4 100644
--- a/dlls/light.msstyles/blue_navigation_menu_button_26px.svg
+++ b/dlls/light.msstyles/blue_navigation_menu_button_26px.svg
@@ -15,8 +15,8 @@
   <path d="m2.263 5.3067-1.0504 1.8371-0.15005-0.26243 1.0504-1.8371z" stroke-width=".1871"/>
   <path d="m0.29646 5.0271 1.0504 1.8371-0.15005 0.26243-1.0504-1.8371z" stroke-width=".1871"/>
   <g transform="matrix(1.1443,0,0,1,10.306,-10.039)" stroke-width=".11562">
-   <path d="m-7.0286 29.635-0.91792 1.8353-0.13113-0.26219 0.91792-1.8353z" fill="#3096fa"/>
-   <path d="m-8.7473 29.354 0.91792 1.8353-0.13113 0.26219-0.91792-1.8353z" fill="#3096fa"/>
+   <path d="m-7.0286 29.635-0.91792 1.8353-0.13113-0.26219 0.91792-1.8353z" class="Highlight" fill="currentColor"/>
+   <path d="m-8.7473 29.354 0.91792 1.8353-0.13113 0.26219-0.91792-1.8353z" class="Highlight" fill="currentColor"/>
    <path d="m-7.0286 43.921-0.91792 1.8367-0.13113-0.26237 0.91792-1.8367z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-8.7473 43.641 0.91792 1.8367-0.13113 0.26237-0.91792-1.8367z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-7.0286 58.208-0.91792 1.8367-0.13113-0.26236 0.91792-1.8367z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_navigation_menu_button_32px.svg b/dlls/light.msstyles/blue_navigation_menu_button_32px.svg
index fc7ec589e78..55034144df6 100644
--- a/dlls/light.msstyles/blue_navigation_menu_button_32px.svg
+++ b/dlls/light.msstyles/blue_navigation_menu_button_32px.svg
@@ -15,8 +15,8 @@
   <path d="m2.3688 6.9641-1.0504 2.2964-0.15005-0.32803 1.0504-2.2964z" stroke-width=".16735"/>
   <path d="m0.40231 6.6146 1.0504 2.2964-0.15005 0.32803-1.0504-2.2964z" stroke-width=".16735"/>
   <g transform="matrix(1.1443,0,0,1,10.306,-10.039)" stroke-width=".092495">
-   <path d="m-6.9361 34.732-0.91792 2.2945-0.13113-0.3278 0.91792-2.2945z" fill="#3096fa"/>
-   <path d="m-8.6548 34.381 0.91792 2.2945-0.13113 0.3278-0.91792-2.2945z" fill="#3096fa"/>
+   <path d="m-6.9361 34.732-0.91792 2.2945-0.13113-0.3278 0.91792-2.2945z" class="Highlight" fill="currentColor"/>
+   <path d="m-8.6548 34.381 0.91792 2.2945-0.13113 0.3278-0.91792-2.2945z" class="Highlight" fill="currentColor"/>
    <path d="m-6.9361 52.458-0.91792 2.2958-0.13113-0.32796 0.91792-2.2958z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-8.6548 52.108 0.91792 2.2959-0.13113 0.32796-0.91792-2.2958z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-6.9361 70.185-0.91792 2.2958-0.13113-0.32795 0.91792-2.2958z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_navigation_menu_button_39px.svg b/dlls/light.msstyles/blue_navigation_menu_button_39px.svg
index 2b6390c7d67..d9316bea418 100644
--- a/dlls/light.msstyles/blue_navigation_menu_button_39px.svg
+++ b/dlls/light.msstyles/blue_navigation_menu_button_39px.svg
@@ -15,8 +15,8 @@
   <path d="m2.5011 8.6215-1.0504 2.7556-0.15005-0.39363 1.0504-2.7556z" stroke-width=".15277"/>
   <path d="m0.5346 8.2021 1.0504 2.7556-0.15005 0.39363-1.0504-2.7556z" stroke-width=".15277"/>
   <g transform="matrix(1.1443,0,0,1,10.306,-10.039)" stroke-width=".077079">
-   <path d="m-6.8205 40.094-0.91792 2.7538-0.13113-0.39341 0.91792-2.7538z" fill="#3096fa"/>
-   <path d="m-8.5392 39.672 0.91792 2.7538-0.13113 0.39341-0.91792-2.7538z" fill="#3096fa"/>
+   <path d="m-6.8205 40.094-0.91792 2.7538-0.13113-0.39341 0.91792-2.7538z" class="Highlight" fill="currentColor"/>
+   <path d="m-8.5392 39.672 0.91792 2.7538-0.13113 0.39341-0.91792-2.7538z" class="Highlight" fill="currentColor"/>
    <path d="m-6.8205 61.524-0.91792 2.755-0.13113-0.39356 0.91792-2.755z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-8.5392 61.104 0.91792 2.7551-0.13113 0.39356-0.91792-2.755z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-6.8205 82.955-0.91792 2.755-0.13113-0.39355 0.91792-2.755z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_navigation_menu_button_52px.svg b/dlls/light.msstyles/blue_navigation_menu_button_52px.svg
index 680145812e5..10a8b7a196c 100644
--- a/dlls/light.msstyles/blue_navigation_menu_button_52px.svg
+++ b/dlls/light.msstyles/blue_navigation_menu_button_52px.svg
@@ -15,8 +15,8 @@
   <path d="m2.6665 11.672-1.0504 3.6742-0.15005-0.52485 1.0504-3.6742z" stroke-width=".1323"/>
   <path d="m0.69998 11.112 1.0504 3.6742-0.15005 0.52485-1.0504-3.6742z" stroke-width=".1323"/>
   <g transform="matrix(1.1443,0,0,1,10.306,-10.039)" stroke-width=".057808">
-   <path d="m-6.676 50.289-0.91792 3.6709-0.13113-0.52443 0.91792-3.6709z" fill="#3096fa"/>
-   <path d="m-8.3947 49.727 0.91792 3.6709-0.13113 0.52443-0.91792-3.6709z" fill="#3096fa"/>
+   <path d="m-6.676 50.289-0.91792 3.6709-0.13113-0.52443 0.91792-3.6709z" class="Highlight" fill="currentColor"/>
+   <path d="m-8.3947 49.727 0.91792 3.6709-0.13113 0.52443-0.91792-3.6709z" class="Highlight" fill="currentColor"/>
    <path d="m-6.676 78.862-0.91792 3.6734-0.13113-0.52476 0.91792-3.6734z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-8.3947 78.302 0.91792 3.6736-0.13113 0.52476-0.91792-3.6734z" class="HighlightOutline" fill="currentColor"/>
    <path d="m-6.676 107.44-0.91792 3.6734-0.13113-0.52475 0.91792-3.6734z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_radiobutton_13px.svg b/dlls/light.msstyles/blue_radiobutton_13px.svg
index aa277cb0d49..f90e1613eb7 100644
--- a/dlls/light.msstyles/blue_radiobutton_13px.svg
+++ b/dlls/light.msstyles/blue_radiobutton_13px.svg
@@ -14,19 +14,19 @@
  <g fill="none">
   <g fill="#fff">
    <ellipse cx="6.5" cy="6.5" rx="6" ry="6" stroke="#aeaeae"/>
-   <ellipse cx="6.5" cy="19.5" rx="6" ry="6" stroke="#3096fa"/>
+   <ellipse cx="6.5" cy="19.5" rx="6" ry="6" class="Highlight" stroke="currentColor"/>
    <ellipse cx="6.5" cy="32.5" rx="6" ry="6" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <ellipse cx="6.5" cy="45.5" rx="6" ry="6" stroke="#aeaeae"/>
   <g fill="#fff">
    <ellipse cx="6.5" cy="58.5" rx="6" ry="6" stroke="#aeaeae"/>
-   <ellipse cx="6.5" cy="71.5" rx="6" ry="6" stroke="#3096fa"/>
+   <ellipse cx="6.5" cy="71.5" rx="6" ry="6" class="Highlight" stroke="currentColor"/>
    <ellipse cx="6.5" cy="84.5" rx="6" ry="6" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <ellipse cx="6.5" cy="97.5" rx="6" ry="6" stroke="#aeaeae"/>
  </g>
  <path d="m10 58.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z"/>
- <path d="m10 71.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#3096fa"/>
+ <path d="m10 71.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" class="Highlight" fill="currentColor"/>
  <path d="m10 84.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" class="HighlightOutline" fill="currentColor"/>
  <path d="m10 97.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#aeaeae"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_radiobutton_16px.svg b/dlls/light.msstyles/blue_radiobutton_16px.svg
index b60955e2ee8..5281dbdcd7c 100644
--- a/dlls/light.msstyles/blue_radiobutton_16px.svg
+++ b/dlls/light.msstyles/blue_radiobutton_16px.svg
@@ -14,19 +14,19 @@
  <g fill="none">
   <g fill="#fff">
    <circle cx="8" cy="8" r="7.5" stroke="#aeaeae"/>
-   <circle cx="8" cy="24" r="7.5" stroke="#3096fa"/>
+   <circle cx="8" cy="24" r="7.5" class="Highlight" stroke="currentColor"/>
    <circle cx="8" cy="40" r="7.5" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <circle cx="8" cy="56" r="7.5" stroke="#aeaeae"/>
   <g fill="#fff">
    <circle cx="8" cy="72" r="7.5" stroke="#aeaeae"/>
-   <circle cx="8" cy="88" r="7.5" stroke="#3096fa"/>
+   <circle cx="8" cy="88" r="7.5" class="Highlight" stroke="currentColor"/>
    <circle cx="8" cy="104" r="7.5" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <circle cx="8" cy="120" r="7.5" stroke="#aeaeae"/>
  </g>
  <path d="m13 72a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z"/>
- <path d="m12.5 88a4.5 4.5 0 0 1-4.5 4.5 4.5 4.5 0 0 1-4.5-4.5 4.5 4.5 0 0 1 4.5-4.5 4.5 4.5 0 0 1 4.5 4.5z" fill="#3096fa" stroke="#3096fa"/>
+ <path d="m12.5 88a4.5 4.5 0 0 1-4.5 4.5 4.5 4.5 0 0 1-4.5-4.5 4.5 4.5 0 0 1 4.5-4.5 4.5 4.5 0 0 1 4.5 4.5z" class="Highlight" fill="currentColor" stroke="currentColor"/>
  <path d="m13 104a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" class="HighlightOutline" fill="currentColor"/>
  <path d="m13 120a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#aeaeae"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_radiobutton_19px.svg b/dlls/light.msstyles/blue_radiobutton_19px.svg
index 15e0effa0ec..b1af35e5802 100644
--- a/dlls/light.msstyles/blue_radiobutton_19px.svg
+++ b/dlls/light.msstyles/blue_radiobutton_19px.svg
@@ -14,20 +14,20 @@
  <g transform="matrix(1.2106 0 0 1.189 -.18477 -.17782)" fill="none" stroke-width=".83352">
   <g>
    <ellipse cx="8" cy="8.1396" rx="7.4306" ry="7.5733" fill="#fffff9" stroke="#aeaeae"/>
-   <ellipse cx="8" cy="24.12" rx="7.4306" ry="7.5733" fill="#fff" stroke="#3096fa"/>
+   <ellipse cx="8" cy="24.12" rx="7.4306" ry="7.5733" fill="#fff" class="Highlight" stroke="currentColor"/>
    <ellipse cx="8" cy="40.1" rx="7.4306" ry="7.5733" fill="#fff" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <ellipse cx="8" cy="56.08" rx="7.4306" ry="7.5733" stroke="#aeaeae"/>
   <g fill="#fff">
    <ellipse cx="8" cy="72.06" rx="7.4306" ry="7.5733" stroke="#aeaeae"/>
-   <ellipse cx="8" cy="88.04" rx="7.4306" ry="7.5733" stroke="#3096fa"/>
+   <ellipse cx="8" cy="88.04" rx="7.4306" ry="7.5733" class="Highlight" stroke="currentColor"/>
    <ellipse cx="8" cy="104.02" rx="7.4306" ry="7.5733" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <ellipse cx="8" cy="120" rx="7.4306" ry="7.5733" stroke="#aeaeae"/>
  </g>
  <path d="m15 85.5a5.5 5.5 0 0 1-5.5 5.5 5.5 5.5 0 0 1-5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" stroke-width=".99999"/>
  <g transform="matrix(1.0159 0 0 1.1881 1.3728 -.10631)">
-  <path d="m12.967 88.044a5 4.2482 0 0 1-5 4.2482 5 4.2482 0 0 1-5-4.2482 5 4.2482 0 0 1 5-4.2482 5 4.2482 0 0 1 5 4.2482z" fill="#3096fa" stroke="#3096fa" stroke-width=".76202"/>
+  <path d="m12.967 88.044a5 4.2482 0 0 1-5 4.2482 5 4.2482 0 0 1-5-4.2482 5 4.2482 0 0 1 5-4.2482 5 4.2482 0 0 1 5 4.2482z" class="Highlight" fill="currentColor" stroke="currentColor" stroke-width=".76202"/>
   <path d="m13.414 104.04a5.414 4.6292 0 0 1-5.414 4.6292 5.414 4.6292 0 0 1-5.414-4.6292 5.414 4.6292 0 0 1 5.414-4.6292 5.414 4.6292 0 0 1 5.414 4.6292z" class="HighlightOutline" fill="currentColor" stroke-width=".76202"/>
   <path d="m13.414 120.03a5.414 4.6292 0 0 1-5.414 4.6292 5.414 4.6292 0 0 1-5.414-4.6292 5.414 4.6292 0 0 1 5.414-4.6292 5.414 4.6292 0 0 1 5.414 4.6292z" fill="#aeaeae" stroke-width=".76203"/>
  </g>
diff --git a/dlls/light.msstyles/blue_radiobutton_22px.svg b/dlls/light.msstyles/blue_radiobutton_22px.svg
index fb9b083975c..e692bb0ee1a 100644
--- a/dlls/light.msstyles/blue_radiobutton_22px.svg
+++ b/dlls/light.msstyles/blue_radiobutton_22px.svg
@@ -14,20 +14,20 @@
  <g fill="none" stroke-width="2">
   <g fill="#fff">
    <circle cx="11" cy="11" r="10" stroke="#aeaeae"/>
-   <circle cx="11" cy="33" r="10" stroke="#3096fa"/>
+   <circle cx="11" cy="33" r="10" class="Highlight" stroke="currentColor"/>
    <circle cx="11" cy="55" r="10" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <circle cx="11" cy="77" r="10" stroke="#aeaeae"/>
   <g fill="#fff">
    <circle cx="11" cy="99" r="10" stroke="#aeaeae"/>
-   <circle cx="11" cy="121" r="10" stroke="#3096fa"/>
+   <circle cx="11" cy="121" r="10" class="Highlight" stroke="currentColor"/>
    <circle cx="11.055" cy="143" r="10" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <circle cx="11" cy="165" r="10" stroke="#aeaeae"/>
  </g>
  <path d="m17 99a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z"/>
  <g transform="translate(0 -16)">
-  <path d="m17 137a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z" fill="#3096fa"/>
+  <path d="m17 137a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z" class="Highlight" fill="currentColor"/>
   <path d="m17 159a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z" class="HighlightOutline" fill="currentColor"/>
   <path d="m17 181a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_radiobutton_25px.svg b/dlls/light.msstyles/blue_radiobutton_25px.svg
index 6121c484d8b..eeb3215c2a8 100644
--- a/dlls/light.msstyles/blue_radiobutton_25px.svg
+++ b/dlls/light.msstyles/blue_radiobutton_25px.svg
@@ -14,19 +14,19 @@
  <g fill="none" stroke-width="2">
   <g>
    <ellipse cx="12.5" cy="12.5" rx="11.5" ry="11.5" fill="#fffff9" stroke="#aeaeae"/>
-   <ellipse cx="12.5" cy="37.5" rx="11.5" ry="11.5" fill="#fff" stroke="#3096fa"/>
+   <ellipse cx="12.5" cy="37.5" rx="11.5" ry="11.5" fill="#fff" class="Highlight" stroke="currentColor"/>
    <ellipse cx="12.5" cy="62.5" rx="11.5" ry="11.5" fill="#fff" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <ellipse cx="12.5" cy="87.5" rx="11.5" ry="11.5" stroke="#aeaeae"/>
   <g fill="#fff">
    <ellipse cx="12.5" cy="112.5" rx="11.5" ry="11.5" stroke="#aeaeae"/>
-   <ellipse cx="12.5" cy="137.5" rx="11.5" ry="11.5" stroke="#3096fa"/>
+   <ellipse cx="12.5" cy="137.5" rx="11.5" ry="11.5" class="Highlight" stroke="currentColor"/>
    <ellipse cx="12.5" cy="162.5" rx="11.5" ry="11.5" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <ellipse cx="12.5" cy="187.5" rx="11.5" ry="11.5" stroke="#aeaeae"/>
  </g>
  <path d="m20 112.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z"/>
- <path d="m20 137.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#3096fa"/>
+ <path d="m20 137.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" class="Highlight" fill="currentColor"/>
  <path d="m20 162.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" class="HighlightOutline" fill="currentColor"/>
  <path d="m20 187.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#aeaeae"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_radiobutton_28px.svg b/dlls/light.msstyles/blue_radiobutton_28px.svg
index cafe3be7eeb..61a217187d9 100644
--- a/dlls/light.msstyles/blue_radiobutton_28px.svg
+++ b/dlls/light.msstyles/blue_radiobutton_28px.svg
@@ -14,20 +14,20 @@
  <g fill="none" stroke-width="2">
   <g fill="#fff">
    <circle cx="14" cy="14" r="13" stroke="#aeaeae"/>
-   <circle cx="14" cy="42" r="13" stroke="#3096fa"/>
+   <circle cx="14" cy="42" r="13" class="Highlight" stroke="currentColor"/>
    <circle cx="14" cy="70" r="13" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <circle cx="14" cy="98" r="13" stroke="#aeaeae"/>
   <g fill="#fff">
    <circle cx="14" cy="126" r="13" stroke="#aeaeae"/>
-   <circle cx="14" cy="154" r="13" stroke="#3096fa"/>
+   <circle cx="14" cy="154" r="13" class="Highlight" stroke="currentColor"/>
    <circle cx="14" cy="182" r="13" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <circle cx="14" cy="210" r="13" stroke="#aeaeae"/>
  </g>
  <path d="m22 126a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z"/>
  <g transform="matrix(1.0667 0 0 1 1.6667 20.5)" stroke-width=".9375">
-  <path d="m19.062 133.5a7.5 8 0 0 1-7.5 8 7.5 8 0 0 1-7.5-8 7.5 8 0 0 1 7.5-8 7.5 8 0 0 1 7.5 8z" fill="#3096fa"/>
+  <path d="m19.062 133.5a7.5 8 0 0 1-7.5 8 7.5 8 0 0 1-7.5-8 7.5 8 0 0 1 7.5-8 7.5 8 0 0 1 7.5 8z" class="Highlight" fill="currentColor"/>
   <path d="m19.062 161.5a7.5 8 0 0 1-7.5 8 7.5 8 0 0 1-7.5-8 7.5 8 0 0 1 7.5-8 7.5 8 0 0 1 7.5 8z" class="HighlightOutline" fill="currentColor"/>
   <path d="m19.062 189.5a7.5 8 0 0 1-7.5 8 7.5 8 0 0 1-7.5-8 7.5 8 0 0 1 7.5-8 7.5 8 0 0 1 7.5 8z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_radiobutton_31px.svg b/dlls/light.msstyles/blue_radiobutton_31px.svg
index 6a5e6aed1b5..310957e19ce 100644
--- a/dlls/light.msstyles/blue_radiobutton_31px.svg
+++ b/dlls/light.msstyles/blue_radiobutton_31px.svg
@@ -14,20 +14,20 @@
  <g fill="none" stroke-width="2">
   <g fill="#fff">
    <circle cx="15.5" cy="15.5" r="14.5" stroke="#aeaeae"/>
-   <circle cx="15.5" cy="46.5" r="14.5" stroke="#3096fa"/>
+   <circle cx="15.5" cy="46.5" r="14.5" class="Highlight" stroke="currentColor"/>
    <circle cx="15.5" cy="77.5" r="14.5" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <circle cx="15.5" cy="108.5" r="14.5" stroke="#aeaeae"/>
   <g fill="#fff">
    <circle cx="15.5" cy="139.5" r="14.5" stroke="#aeaeae"/>
-   <circle cx="15.5" cy="170.5" r="14.5" stroke="#3096fa"/>
+   <circle cx="15.5" cy="170.5" r="14.5" class="Highlight" stroke="currentColor"/>
    <circle cx="15.5" cy="201.5" r="14.5" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <circle cx="15.5" cy="232.5" r="14.5" stroke="#aeaeae"/>
  </g>
  <path d="m25 139.5a9.5 9.5 0 0 1-9.5 9.5 9.5 9.5 0 0 1-9.5-9.5 9.5 9.5 0 0 1 9.5-9.5 9.5 9.5 0 0 1 9.5 9.5z"/>
  <g transform="matrix(1.0667 0 0 1 3.6666 40.5)" stroke-width=".9375">
-  <path d="m19.999 130a8.906 9.5 0 0 1-8.906 9.5 8.906 9.5 0 0 1-8.906-9.5 8.906 9.5 0 0 1 8.906-9.5 8.906 9.5 0 0 1 8.906 9.5z" fill="#3096fa"/>
+  <path d="m19.999 130a8.906 9.5 0 0 1-8.906 9.5 8.906 9.5 0 0 1-8.906-9.5 8.906 9.5 0 0 1 8.906-9.5 8.906 9.5 0 0 1 8.906 9.5z" class="Highlight" fill="currentColor"/>
   <path d="m19.999 161a8.906 9.5 0 0 1-8.906 9.5 8.906 9.5 0 0 1-8.906-9.5 8.906 9.5 0 0 1 8.906-9.5 8.906 9.5 0 0 1 8.906 9.5z" class="HighlightOutline" fill="currentColor"/>
   <path d="m19.999 192a8.906 9.5 0 0 1-8.906 9.5 8.906 9.5 0 0 1-8.906-9.5 8.906 9.5 0 0 1 8.906-9.5 8.906 9.5 0 0 1 8.906 9.5z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_background.svg b/dlls/light.msstyles/blue_rebar_chevron_background.svg
index 92a4d216716..f4ea08414a0 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_background.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_background.svg
@@ -12,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <g fill="#fffffe" stroke-linejoin="bevel" stroke-width=".26458">
-  <rect x=".13229" y="6.4823" width="4.7625" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/>
+  <rect x=".13229" y="6.4823" width="4.7625" height="5.5563" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
   <rect x=".13224" y="12.568" width="4.7625" height="5.5563" rx=".52917" ry=".52917" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_glyph_10px.svg b/dlls/light.msstyles/blue_rebar_chevron_glyph_10px.svg
index 6a7f165038f..50beff2cb88 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_glyph_10px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_glyph_10px.svg
@@ -17,7 +17,7 @@
   <path d="m1.4891 1.6941-0.6885-0.78776 0.098356-0.11254 0.6885 0.78776z"/>
   <path d="m1.5806 1.5936-0.6885 0.78776-0.098356-0.11254 0.6885-0.78776z"/>
  </g>
- <g transform="matrix(1 0 0 .75003 0 .6614)" fill="#3096fa" stroke-width=".3055">
+ <g transform="matrix(1 0 0 .75003 0 .6614)" class="Highlight" fill="currentColor" stroke-width=".3055">
   <path d="m2.5475 4.5518-0.6885-1.0503 0.098356-0.15005 0.6885 1.0503z"/>
   <path d="m2.6389 4.4178-0.6885 1.0503-0.098356-0.15005 0.6885-1.0503z"/>
   <path d="m1.4891 4.5518-0.6885-1.0503 0.098356-0.15005 0.6885 1.0503z"/>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_glyph_13px.svg b/dlls/light.msstyles/blue_rebar_chevron_glyph_13px.svg
index e83f1836a2a..c95a7051667 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_glyph_13px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_glyph_13px.svg
@@ -18,7 +18,7 @@
    <path d="m1.9854 1.9942-0.91792-1.0504 0.13113-0.15006 0.91792 1.0504z"/>
    <path d="m2.1073 1.8602-0.91792 1.0504-0.13113-0.15006 0.91792-1.0504z"/>
   </g>
-  <g transform="translate(.66966 1.2004)" fill="#3096fa">
+  <g transform="translate(.66966 1.2004)" class="Highlight" fill="currentColor">
    <path d="m2.6387 3.7042-0.91792-1.0503 0.13113-0.15005 0.91792 1.0503z"/>
    <path d="m2.7606 3.5702-0.91792 1.0503-0.13113-0.15005 0.91792-1.0503z"/>
    <path d="m1.3158 3.7042-0.91792-1.0503 0.13113-0.15005 0.91792 1.0503z"/>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_glyph_15px.svg b/dlls/light.msstyles/blue_rebar_chevron_glyph_15px.svg
index 2c3377a36cb..aa5bcc68c7f 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_glyph_15px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_glyph_15px.svg
@@ -17,7 +17,7 @@
   <path d="m2.4819 2.5589-1.1475-1.3129 0.16393-0.18757 1.1475 1.3129z"/>
   <path d="m2.6343 2.3914-1.1475 1.3129-0.16393-0.18757 1.1475-1.3129z"/>
  </g>
- <g transform="matrix(1 0 0 1.2501 .66966 .57429)" fill="#3096fa" stroke-width=".23664">
+ <g transform="matrix(1 0 0 1.2501 .66966 .57429)" class="Highlight" fill="currentColor" stroke-width=".23664">
   <path d="m3.1352 4.5509-1.1475-1.0503 0.16393-0.15005 1.1475 1.0503z"/>
   <path d="m3.2876 4.4169-1.1475 1.0503-0.16393-0.15005 1.1475-1.0503z"/>
   <path d="m1.8122 4.5509-1.1475-1.0503 0.16393-0.15005 1.1475 1.0503z"/>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_glyph_20px.svg b/dlls/light.msstyles/blue_rebar_chevron_glyph_20px.svg
index 3ad4b7255f7..ff133cd290a 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_glyph_20px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_glyph_20px.svg
@@ -17,7 +17,7 @@
   <path d="m3.2429 3.3882-1.377-1.5755 0.19672-0.22509 1.377 1.5755z"/>
   <path d="m3.4257 3.1872-1.377 1.5755-0.19672-0.22509 1.377-1.5755z"/>
  </g>
- <g transform="matrix(1 0 0 1.5001 .66966 -.26328)" fill="#3096fa" stroke-width=".21602">
+ <g transform="matrix(1 0 0 1.5001 .66966 -.26328)" class="Highlight" fill="currentColor" stroke-width=".21602">
   <path d="m4.4254 5.6092-1.377-1.0503 0.19672-0.15005 1.377 1.0503z"/>
   <path d="m4.6083 5.4752-1.377 1.0503-0.19672-0.15005 1.377-1.0503z"/>
   <path d="m2.5732 5.6092-1.377-1.0503 0.19672-0.15005 1.377 1.0503z"/>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_glyph_25px.svg b/dlls/light.msstyles/blue_rebar_chevron_glyph_25px.svg
index f7505da0266..03df3c985c5 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_glyph_25px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_glyph_25px.svg
@@ -17,7 +17,7 @@
   <path d="m3.7041 4.2335-1.6064-1.8381 0.22949-0.26261 1.6064 1.8381z"/>
   <path d="m3.9174 3.999-1.6064 1.8381-0.22949-0.26261 1.6064-1.8381z"/>
  </g>
- <g transform="matrix(1 0 0 1.7501 1.709 .20592)" fill="#3096fa" stroke-width=".2">
+ <g transform="matrix(1 0 0 1.7501 1.709 .20592)" class="Highlight" fill="currentColor" stroke-width=".2">
   <path d="m4.6762 5.6184-1.6065-1.0503 0.22951-0.15005 1.6065 1.0503z"/>
   <path d="m4.8896 5.4844-1.6065 1.0503-0.22951-0.15005 1.6065-1.0503z"/>
   <path d="m2.0303 5.6184-1.6065-1.0503 0.22951-0.15005 1.6065 1.0503z"/>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_glyph_30px.svg b/dlls/light.msstyles/blue_rebar_chevron_glyph_30px.svg
index f787006bec6..d242ba21765 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_glyph_30px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_glyph_30px.svg
@@ -17,7 +17,7 @@
   <path d="m4.5164 5.3308-1.8359-2.1007 0.26228-0.30012 1.8359 2.1007z"/>
   <path d="m4.7602 5.0628-1.8359 2.1007-0.26228-0.30012 1.8359-2.1007z"/>
  </g>
- <g transform="matrix(1 0 0 2.0001 2.7834 1.2375)" fill="#3096fa" stroke-width=".18708">
+ <g transform="matrix(1 0 0 2.0001 2.7834 1.2375)" class="Highlight" fill="currentColor" stroke-width=".18708">
   <path d="m4.8919 5.6087-1.836-1.0503 0.2623-0.15005 1.836 1.0503z"/>
   <path d="m5.1358 5.4747-1.836 1.0503-0.2623-0.15005 1.836-1.0503z"/>
   <path d="m1.7168 5.6087-1.8359-1.0503 0.26229-0.15005 1.8359 1.0503z"/>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_glyph_40px.svg b/dlls/light.msstyles/blue_rebar_chevron_glyph_40px.svg
index e278b0cef48..e41fcefca17 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_glyph_40px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_glyph_40px.svg
@@ -17,7 +17,7 @@
   <path d="m6.0221 7.325-2.295-2.6259 0.32786-0.37515 2.295 2.6259z" stroke-width=".26458"/>
   <path d="m6.3269 6.99-2.295 2.6259-0.32786-0.37515 2.295-2.6259z" stroke-width=".26458"/>
  </g>
- <g transform="matrix(1 0 0 2.5001 2.7834 -.96671)" fill="#3096fa" stroke-width=".16733">
+ <g transform="matrix(1 0 0 2.5001 2.7834 -.96671)" class="Highlight" fill="currentColor" stroke-width=".16733">
   <path d="m7.4722 7.0903-2.295-1.0503 0.32788-0.15005 2.295 1.0503z"/>
   <path d="m7.7771 6.9563-2.295 1.0503-0.32788-0.15005 2.295-1.0503z"/>
   <path d="m3.2387 7.0903-2.2949-1.0503 0.32787-0.15005 2.2949 1.0503z"/>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_vertical_background.svg b/dlls/light.msstyles/blue_rebar_chevron_vertical_background.svg
index 92a4d216716..f4ea08414a0 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_vertical_background.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_vertical_background.svg
@@ -12,7 +12,7 @@
   </rdf:RDF>
  </metadata>
  <g fill="#fffffe" stroke-linejoin="bevel" stroke-width=".26458">
-  <rect x=".13229" y="6.4823" width="4.7625" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/>
+  <rect x=".13229" y="6.4823" width="4.7625" height="5.5563" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
   <rect x=".13224" y="12.568" width="4.7625" height="5.5563" rx=".52917" ry=".52917" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_10px.svg b/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_10px.svg
index 6a7f165038f..50beff2cb88 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_10px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_10px.svg
@@ -17,7 +17,7 @@
   <path d="m1.4891 1.6941-0.6885-0.78776 0.098356-0.11254 0.6885 0.78776z"/>
   <path d="m1.5806 1.5936-0.6885 0.78776-0.098356-0.11254 0.6885-0.78776z"/>
  </g>
- <g transform="matrix(1 0 0 .75003 0 .6614)" fill="#3096fa" stroke-width=".3055">
+ <g transform="matrix(1 0 0 .75003 0 .6614)" class="Highlight" fill="currentColor" stroke-width=".3055">
   <path d="m2.5475 4.5518-0.6885-1.0503 0.098356-0.15005 0.6885 1.0503z"/>
   <path d="m2.6389 4.4178-0.6885 1.0503-0.098356-0.15005 0.6885-1.0503z"/>
   <path d="m1.4891 4.5518-0.6885-1.0503 0.098356-0.15005 0.6885 1.0503z"/>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_13px.svg b/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_13px.svg
index e83f1836a2a..c95a7051667 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_13px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_13px.svg
@@ -18,7 +18,7 @@
    <path d="m1.9854 1.9942-0.91792-1.0504 0.13113-0.15006 0.91792 1.0504z"/>
    <path d="m2.1073 1.8602-0.91792 1.0504-0.13113-0.15006 0.91792-1.0504z"/>
   </g>
-  <g transform="translate(.66966 1.2004)" fill="#3096fa">
+  <g transform="translate(.66966 1.2004)" class="Highlight" fill="currentColor">
    <path d="m2.6387 3.7042-0.91792-1.0503 0.13113-0.15005 0.91792 1.0503z"/>
    <path d="m2.7606 3.5702-0.91792 1.0503-0.13113-0.15005 0.91792-1.0503z"/>
    <path d="m1.3158 3.7042-0.91792-1.0503 0.13113-0.15005 0.91792 1.0503z"/>
diff --git a/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_15px.svg b/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_15px.svg
index 2c3377a36cb..aa5bcc68c7f 100644
--- a/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_15px.svg
+++ b/dlls/light.msstyles/blue_rebar_chevron_vertical_glyph_15px.svg
@@ -17,7 +17,7 @@
   <path d="m2.4819 2.5589-1.1475-1.3129 0.16393-0.18757 1.1475 1.3129z"/>
   <path d="m2.6343 2.3914-1.1475 1.3129-0.16393-0.18757 1.1475-1.3129z"/>
  </g>
- <g transform="matrix(1 0 0 1.2501 .66966 .57429)" fill="#3096fa" stroke-width=".23664">
+ <g transform="matrix(1 0 0 1.2501 .66966 .57429)" class="Highlight" fill="currentColor" stroke-width=".23664">
   <path d="m3.1352 4.5509-1.1475-1.0503 0.16393-0.15005 1.1475 1.0503z"/>
   <path d="m3.2876 4.4169-1.1475 1.0503-0.16393-0.15005 1.1475-1.0503z"/>
   <path d="m1.8122 4.5509-1.1475-1.0503 0.16393-0.15005 1.1475 1.0503z"/>
diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_13px.svg b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_13px.svg
index 36af9411386..560d6e7d37d 100644
--- a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_13px.svg
+++ b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_13px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:13-32" width="13" height="260" version="1.1" viewBox="0 0 3.4396 68.791" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,8 +15,8 @@
   <path d="m0.80168 0.14157 1.0513 0.91792-0.15018 0.13113-1.0513-0.91792z" stroke-width=".26458"/>
   <path d="m-0.26372 1.0502 1.0513-0.91792 0.15018 0.13113-1.0513 0.91792z" stroke-width=".26458"/>
   <g transform="matrix(1.1429 0 0 1 -.26372 0)" stroke-width=".2315">
-   <path d="m0.93222 3.5812 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#3096fa"/>
-   <path d="m0 4.4898 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#3096fa"/>
+   <path d="m0.93222 3.5812 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" class="Highlight" fill="currentColor"/>
+   <path d="m0 4.4898 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" class="Highlight" fill="currentColor"/>
    <path d="m0.93222 7.0207 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#fff"/>
    <path d="m0 7.9294 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#fff"/>
    <path d="m0.93222 10.46 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#aeaeae"/>
@@ -22,8 +25,8 @@
   <path d="m1.853 14.031-1.0504 0.91986-0.15005-0.13141 1.0504-0.91986z" stroke-width=".26458"/>
   <path d="m-0.11367 13.891 1.0504 0.91986-0.15005 0.13141-1.0504-0.91986z" stroke-width=".26458"/>
   <g transform="matrix(1.1443 0 0 1 9.5215 2.1262)" stroke-width=".23122">
-   <path d="m-6.7017 15.345-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#3096fa"/>
-   <path d="m-8.4204 15.204 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#3096fa"/>
+   <path d="m-6.7017 15.345-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" class="Highlight" fill="currentColor"/>
+   <path d="m-8.4204 15.204 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" class="Highlight" fill="currentColor"/>
    <path d="m-6.7017 18.784-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#fff"/>
    <path d="m-8.4204 18.644 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#fff"/>
    <path d="m-6.7017 22.223-0.91792 0.91854-0.13113-0.13122 0.91792-0.91854z" fill="#aeaeae"/>
@@ -32,7 +35,7 @@
   <path d="m1.3238 27.27-0.9179 1.0515-0.13113-0.15022 0.9179-1.0515z" stroke-width=".26458"/>
   <path d="m0.39658 28.035 0.9179 1.0515-0.13113 0.15022-0.9179-1.0515z" stroke-width=".26458"/>
   <g transform="translate(9.5229 2.1262)">
-   <g fill="#3096fa">
+   <g class="Highlight" fill="currentColor">
     <path d="m-8.1991 28.583-0.9179 1.051-0.13113-0.15014 0.9179-1.051z" stroke-width=".26458"/>
     <path d="m-9.1263 29.349 0.9179 1.051-0.13113 0.15013-0.9179-1.051z" stroke-width=".26458"/>
     <g stroke-width=".24749">
@@ -55,8 +58,8 @@
     <path d="m-9.1263 36.228 0.9179 1.051-0.13113 0.15013-0.9179-1.051z" fill="#aeaeae"/>
     <path d="m-9.2574 38.902 0.9179 1.0515 0.13113-0.15022-0.9179-1.0515z"/>
     <path d="m-8.3302 39.667-0.9179 1.0515 0.13113 0.15022 0.9179-1.0515z"/>
-    <path d="m-9.2574 42.342 0.9179 1.051 0.13113-0.15014-0.9179-1.051z" fill="#3096fa"/>
-    <path d="m-8.3302 43.107-0.9179 1.051 0.13113 0.15013 0.9179-1.051z" fill="#3096fa"/>
+    <path d="m-9.2574 42.342 0.9179 1.051 0.13113-0.15014-0.9179-1.051z" class="Highlight" fill="currentColor"/>
+    <path d="m-8.3302 43.107-0.9179 1.051 0.13113 0.15013 0.9179-1.051z" class="Highlight" fill="currentColor"/>
     <path d="m-9.2574 45.781 0.9179 1.051 0.13113-0.15014-0.9179-1.051z" fill="#fff"/>
     <path d="m-8.3302 46.547-0.9179 1.051 0.13113 0.15013 0.9179-1.051z" fill="#fff"/>
     <path d="m-9.2574 49.221 0.9179 1.051 0.13113-0.15013-0.9179-1.051z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_16px.svg b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_16px.svg
index 95dd641cd06..04c55b57a8b 100644
--- a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_16px.svg
+++ b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_16px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:16-32" width="16" height="320" version="1.1" viewBox="0 0 4.2334 84.666" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,7 +15,7 @@
   <path d="m1.2003 0.4085 1.3141 1.1474-0.18772 0.16391-1.3141-1.1474z" stroke-width=".26458"/>
   <path d="m-0.13144 1.5443 1.3141-1.1474 0.18772 0.16391-1.3141 1.1474z" stroke-width=".26458"/>
   <g transform="matrix(1.1429 0 0 1 -.26372 0)" stroke-width=".2315">
-   <g fill="#3096fa">
+   <g class="Highlight" fill="currentColor">
     <path d="m1.281 4.6419 1.1498 1.1474-0.16426 0.16391-1.1498-1.1474z"/>
     <path d="m0.11574 5.7776 1.1498-1.1474 0.16426 0.16391-1.1498 1.1474z"/>
     <path d="m1.281 68.142 1.1498 1.1474-0.16426 0.16391-1.1498-1.1474z"/>
@@ -26,7 +29,7 @@
   <path d="m1.2003 18.642 1.3141-1.1474-0.18772-0.16391-1.3141 1.1474z" stroke-width=".26458"/>
   <path d="m-0.13144 17.506 1.3141 1.1474 0.18772-0.16391-1.3141-1.1474z" stroke-width=".26458"/>
   <g transform="matrix(1.1429 0 0 1 -.26372 16.933)" stroke-width=".2315">
-   <g fill="#3096fa">
+   <g class="Highlight" fill="currentColor">
     <path d="m1.281 5.9415 1.1498-1.1474-0.16426-0.16391-1.1498 1.1474z"/>
     <path d="m0.11574 4.8058 1.1498 1.1474 0.16426-0.16391-1.1498-1.1474z"/>
     <path d="m1.281 56.741 1.1498-1.1474-0.16426-0.16391-1.1498 1.1474z"/>
@@ -40,11 +43,11 @@
   <path d="m1.8529 33.79-1.1474 1.3142-0.16391-0.18775 1.1474-1.3142z" stroke-width=".26458"/>
   <path d="m0.69394 34.746 1.1474 1.3142-0.16391 0.18775-1.1474-1.3142z" stroke-width=".26458"/>
   <g transform="translate(15.865 4.7619)" stroke-width=".26458">
-   <g fill="#3096fa">
+   <g class="Highlight" fill="currentColor">
     <path d="m-14.012 33.261-1.1474 1.3134-0.16391-0.18762 1.1474-1.3134z"/>
     <path d="m-15.171 34.218 1.1474 1.3134-0.16391 0.18761-1.1474-1.3134z"/>
    </g>
-   <g transform="translate(3.6875e-7 38.1)" fill="#3096fa">
+   <g transform="translate(3.6875e-7 38.1)" class="Highlight" fill="currentColor">
     <path d="m-14.012 33.261-1.1474 1.3134-0.16391-0.18762 1.1474-1.3134z"/>
     <path d="m-15.171 34.218 1.1474 1.3134-0.16391 0.18761-1.1474-1.3134z"/>
    </g>
@@ -54,7 +57,7 @@
    <path d="m-15.171 42.685 1.1474 1.3134-0.16391 0.18761-1.1474-1.3134z" fill="#aeaeae"/>
    <path d="m-15.335 45.961 1.1474 1.3142 0.16391-0.18775-1.1474-1.3142z"/>
    <path d="m-14.176 46.917-1.1474 1.3142 0.16391 0.18775 1.1474-1.3142z"/>
-   <g fill="#3096fa">
+   <g class="Highlight" fill="currentColor">
     <path d="m-15.335 50.194 1.1474 1.3134 0.16391-0.18762-1.1474-1.3134z"/>
     <path d="m-14.176 51.152-1.1474 1.3134 0.16391 0.18761 1.1474-1.3134z"/>
     <path d="m-15.335 75.594 1.1474 1.3134 0.16391-0.18762-1.1474-1.3134z"/>
diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_20px.svg b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_20px.svg
index d4e132a481e..748dd327e13 100644
--- a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_20px.svg
+++ b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_20px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:20-32" width="20" height="400" version="1.1" viewBox="0 0 5.2918 105.83" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,7 +15,7 @@
   <path d="m1.7313 0.80767 1.5769 1.3769-0.22527 0.1967-1.5769-1.3769z" stroke-width=".26458"/>
   <path d="m0.13316 2.1707 1.5769-1.3769 0.22527 0.1967-1.5769 1.3769z" stroke-width=".26458"/>
   <g transform="matrix(1.1429 0 0 1 -.26372 0)">
-   <g fill="#3096fa" stroke-width=".2315">
+   <g class="Highlight" fill="currentColor" stroke-width=".2315">
     <path d="m1.7456 6.0995 1.3798 1.3768-0.19711 0.19668-1.3798-1.3768z"/>
     <path d="m0.34726 7.4622 1.3798-1.3768 0.19711 0.19668-1.3798 1.3768z"/>
     <g transform="translate(0 79.375)">
@@ -33,8 +36,8 @@
    <path d="m1.7456 23.534 1.3798-1.3769-0.1971-0.1967-1.3798 1.3769z" stroke-width=".24749"/>
    <path d="m0.34726 22.171 1.3798 1.3769 0.1971-0.1967-1.3798-1.3769z" stroke-width=".24749"/>
    <g stroke-width=".2315">
-    <path d="m1.7456 28.825 1.3798-1.3768-0.19711-0.19668-1.3798 1.3768z" fill="#3096fa"/>
-    <path d="m0.34726 27.463 1.3798 1.3768 0.19711-0.19668-1.3798-1.3768z" fill="#3096fa"/>
+    <path d="m1.7456 28.825 1.3798-1.3768-0.19711-0.19668-1.3798 1.3768z" class="Highlight" fill="currentColor"/>
+    <path d="m0.34726 27.463 1.3798 1.3768 0.19711-0.19668-1.3798-1.3768z" class="Highlight" fill="currentColor"/>
     <path d="m1.7456 34.117 1.3798-1.3769-0.19711-0.19669-1.3798 1.3769z" fill="#fff"/>
     <path d="m0.34726 32.754 1.3798 1.3769 0.19711-0.19669-1.3798-1.3769z" fill="#fff"/>
     <path d="m1.7456 39.41 1.3798-1.3777-0.19711-0.19682-1.3798 1.3777z" fill="#aeaeae"/>
@@ -45,7 +48,7 @@
    <path d="m2.5144 42.559-1.377 1.5771-0.1967-0.22532 1.377-1.5771z"/>
    <path d="m1.1236 43.706 1.377 1.5771-0.1967 0.22532-1.377-1.5771z"/>
    <g transform="translate(25.358 6.2634)">
-    <g fill="#3096fa" stroke-width=".22047">
+    <g class="Highlight" fill="currentColor" stroke-width=".22047">
      <g transform="matrix(1.2 0 0 1.2001 -6.0293 1.67)">
       <path d="m-14.012 33.261-1.1474 1.3134-0.16391-0.18762 1.1474-1.3134z"/>
       <path d="m-15.171 34.218 1.1474 1.3134-0.16391 0.18761-1.1474-1.3134z"/>
@@ -69,7 +72,7 @@
    <path d="m0.92692 63.725 1.377 1.5771 0.1967-0.22531-1.377-1.5771z"/>
    <path d="m2.3177 64.873-1.3769 1.5771 0.1967 0.22531 1.377-1.5771z"/>
    <g transform="matrix(-1 0 0 1 -21.917 27.43)">
-    <g transform="matrix(1.2 0 0 1.2001 -6.0293 1.67)" fill="#3096fa" stroke-width=".22047">
+    <g transform="matrix(1.2 0 0 1.2001 -6.0293 1.67)" class="Highlight" fill="currentColor" stroke-width=".22047">
      <path d="m-14.012 33.261-1.1474 1.3134-0.16391-0.18762 1.1474-1.3134z"/>
      <path d="m-15.171 34.218 1.1474 1.3134-0.16391 0.18761-1.1474-1.3134z"/>
     </g>
diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_26px.svg b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_26px.svg
index 2a4f6f0112a..d54515297fa 100644
--- a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_26px.svg
+++ b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_26px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:26-32" width="26" height="520" version="1.1" viewBox="0 0 6.8792 137.58" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,8 +15,8 @@
   <path d="m2.5285 1.3415 2.1026 1.8358-0.30036 0.26226-2.1026-1.8358z" stroke-width=".26458"/>
   <path d="m0.39773 3.1587 2.1026-1.8358 0.30036 0.26226-2.1026 1.8358z" stroke-width=".26458"/>
   <g transform="matrix(1.1429 0 0 1 -.26372 0)" stroke-width=".2315">
-   <path d="m2.4431 8.2208 1.8397 1.8358-0.26281 0.26225-1.8397-1.8358z" fill="#3096fa"/>
-   <path d="m0.57875 10.038 1.8397-1.8358 0.26281 0.26225-1.8397 1.8358z" fill="#3096fa"/>
+   <path d="m2.4431 8.2208 1.8397 1.8358-0.26281 0.26225-1.8397-1.8358z" class="Highlight" fill="currentColor"/>
+   <path d="m0.57875 10.038 1.8397-1.8358 0.26281 0.26225-1.8397 1.8358z" class="Highlight" fill="currentColor"/>
    <path d="m2.4431 15.1 1.8397 1.836-0.26281 0.26228-1.8397-1.836z" fill="#fff"/>
    <path d="m0.57875 16.917 1.8397-1.836 0.26281 0.26228-1.8397 1.836z" fill="#fff"/>
    <path d="m2.4431 21.978 1.8397 1.8365-0.26281 0.26235-1.8397-1.8365z" fill="#aeaeae"/>
@@ -22,8 +25,8 @@
   <path d="m2.5285 30.938 2.1026-1.8358-0.30036-0.26226-2.1026 1.8358z" stroke-width=".26458"/>
   <path d="m0.39773 29.12 2.1026 1.8358 0.30036-0.26226-2.1026-1.8358z" stroke-width=".26458"/>
   <g transform="matrix(1.1429 0 0 1 -.26372 27.517)" stroke-width=".2315">
-   <path d="m2.4431 10.3 1.8397-1.8358-0.26281-0.26225-1.8397 1.8358z" fill="#3096fa"/>
-   <path d="m0.57875 8.483 1.8397 1.8358 0.26281-0.26225-1.8397-1.8358z" fill="#3096fa"/>
+   <path d="m2.4431 10.3 1.8397-1.8358-0.26281-0.26225-1.8397 1.8358z" class="Highlight" fill="currentColor"/>
+   <path d="m0.57875 8.483 1.8397 1.8358 0.26281-0.26225-1.8397-1.8358z" class="Highlight" fill="currentColor"/>
    <path d="m2.4431 17.179 1.8397-1.836-0.26281-0.26228-1.8397 1.836z" fill="#fff"/>
    <path d="m0.57875 15.362 1.8397 1.836 0.26281-0.26228-1.8397-1.836z" fill="#fff"/>
    <path d="m2.4431 24.059 1.8397-1.8365-0.26281-0.26235-1.8397 1.8365z" fill="#aeaeae"/>
@@ -32,9 +35,9 @@
   <path d="m3.5727 55.598-1.8358 2.1027-0.26226-0.3004 1.8358-2.1027z" stroke-width=".26458"/>
   <path d="m1.7183 57.128 1.8358 2.1027-0.26226 0.3004-1.8358-2.1027z" stroke-width=".26458"/>
   <g transform="translate(9.5229,2.1262)">
-   <g fill="#3096fa">
+   <g class="Highlight" fill="currentColor">
     <path d="m-5.9502 60.351-1.8358 2.1014-0.26226-0.3002 1.8358-2.1014z" stroke-width=".26458"/>
-    <path d="m-7.8046 61.883 1.8358 2.1014-0.26226 0.30018-1.8358-2.1014z" fill="#3096fa" stroke-width=".26458"/>
+    <path d="m-7.8046 61.883 1.8358 2.1014-0.26226 0.30018-1.8358-2.1014z" class="Highlight" fill="currentColor" stroke-width=".26458"/>
     <path d="m-6.9944 109.28 2.1026 1.8348-0.30036 0.2621-2.1026-1.8348z" stroke-width=".24749"/>
     <path d="m-9.1252 111.1 2.1026-1.8348 0.30036 0.26211-2.1026 1.8347z" stroke-width=".24749"/>
     <path d="m-6.9944 118.24 2.1026-1.8365-0.30036-0.26235-2.1026 1.8365z" stroke-width=".24749"/>
@@ -54,8 +57,8 @@
    </g>
    <path d="m-8.0668 80.989 1.8358 2.1027 0.26226-0.3004-1.8358-2.1027z" stroke-width=".26458"/>
    <path d="m-6.2124 82.518-1.8358 2.1027 0.26226 0.3004 1.8358-2.1027z" stroke-width=".26458"/>
-   <path d="m-8.0668 87.868 1.8358 2.1014 0.26226-0.3002-1.8358-2.1014z" fill="#3096fa" stroke-width=".26458"/>
-   <path d="m-6.2124 89.399-1.8358 2.1014 0.26226 0.30018 1.8358-2.1014z" fill="#3096fa" stroke-width=".26458"/>
+   <path d="m-8.0668 87.868 1.8358 2.1014 0.26226-0.3002-1.8358-2.1014z" class="Highlight" fill="currentColor" stroke-width=".26458"/>
+   <path d="m-6.2124 89.399-1.8358 2.1014 0.26226 0.30018 1.8358-2.1014z" class="Highlight" fill="currentColor" stroke-width=".26458"/>
    <g transform="matrix(-1 0 0 1 -14.017 27.517)" stroke-width=".26458">
     <path d="m-5.9502 67.23-1.8358 2.1024-0.26226-0.30034 1.8358-2.1024z" fill="#fff"/>
     <path d="m-7.8046 68.761 1.8358 2.1024-0.26226 0.30032-1.8358-2.1024z" fill="#fff"/>
diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_32px.svg b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_32px.svg
index fe3529a4c63..f3ca77a8c26 100644
--- a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_32px.svg
+++ b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_32px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:32-32" width="32" height="640" version="1.1" viewBox="0 0 8.4668 169.33" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,7 +15,7 @@
   <path d="m3.3259 1.8753 2.6282 2.2948-0.37544 0.32783-2.6282-2.2948z" stroke-width=".26458"/>
   <path d="m0.66234 4.1469 2.6282-2.2948 0.37544 0.32783-2.6282 2.2948z" stroke-width=".26458"/>
   <g transform="matrix(1.1429 0 0 1 -.26372 0)">
-   <g fill="#3096fa" stroke-width=".2315">
+   <g class="Highlight" fill="currentColor" stroke-width=".2315">
     <path d="m3.1408 10.342 2.2996 2.2947-0.32852 0.3278-2.2996-2.2947z"/>
     <path d="m0.81027 12.614 2.2996-2.2947 0.32852 0.3278-2.2996 2.2947z"/>
     <path d="m3.1408 137.34 2.2996 2.2935-0.32852 0.32763-2.2996-2.2935z"/>
@@ -29,8 +32,8 @@
    <path d="m3.1408 38.342 2.2996-2.2948-0.3285-0.32783-2.2996 2.2948z" stroke-width=".24749"/>
    <path d="m0.81027 36.07 2.2996 2.2948 0.3285-0.32783-2.2996-2.2948z" stroke-width=".24749"/>
    <g stroke-width=".2315">
-    <path d="m3.1408 46.808 2.2996-2.2947-0.32852-0.3278-2.2996 2.2947z" fill="#3096fa"/>
-    <path d="m0.81027 44.537 2.2996 2.2947 0.32852-0.3278-2.2996-2.2947z" fill="#3096fa"/>
+    <path d="m3.1408 46.808 2.2996-2.2947-0.32852-0.3278-2.2996 2.2947z" class="Highlight" fill="currentColor"/>
+    <path d="m0.81027 44.537 2.2996 2.2947 0.32852-0.3278-2.2996-2.2947z" class="Highlight" fill="currentColor"/>
     <path d="m3.1408 55.275 2.2996-2.2949-0.32852-0.32782-2.2996 2.2949z" fill="#fff"/>
     <path d="m0.81027 53.003 2.2996 2.2949 0.32852-0.32782-2.2996-2.2949z" fill="#fff"/>
     <path d="m3.1408 63.743 2.2996-2.2962-0.32852-0.32803-2.2996 2.2962z" fill="#aeaeae"/>
@@ -40,11 +43,11 @@
   <path d="m4.6311 68.638-2.2949 2.6286-0.32784-0.37552 2.2949-2.6286z" stroke-width=".26458"/>
   <path d="m2.3131 70.55 2.2949 2.6286-0.32784 0.37552-2.2949-2.6286z" stroke-width=".26458"/>
   <g transform="translate(15.865,4.7619)">
-   <g transform="matrix(2 0 0 2.0002 16.791 5.8147)" fill="#3096fa" stroke-width=".13228">
+   <g transform="matrix(2 0 0 2.0002 16.791 5.8147)" class="Highlight" fill="currentColor" stroke-width=".13228">
     <path d="m-14.012 33.261-1.1474 1.3134-0.16391-0.18762 1.1474-1.3134z"/>
     <path d="m-15.171 34.218 1.1474 1.3134-0.16391 0.18761-1.1474-1.3134z"/>
    </g>
-   <g transform="matrix(2 0 0 2.0002 16.791 82.015)" fill="#3096fa" stroke-width=".13228">
+   <g transform="matrix(2 0 0 2.0002 16.791 82.015)" class="Highlight" fill="currentColor" stroke-width=".13228">
     <path d="m-14.012 33.261-1.1474 1.3134-0.16391-0.18762 1.1474-1.3134z"/>
     <path d="m-15.171 34.218 1.1474 1.3134-0.16391 0.18761-1.1474-1.3134z"/>
    </g>
@@ -56,7 +59,7 @@
    </g>
    <path d="m-13.88 97.743 2.2949 2.6286 0.32784-0.37552-2.2949-2.6286z" stroke-width=".26458"/>
    <path d="m-11.562 99.655-2.2949 2.6286 0.32784 0.37552 2.2949-2.6286z" stroke-width=".26458"/>
-   <g transform="matrix(-2 0 0 2.0002 -41.904 39.682)" fill="#3096fa" stroke-width=".13228">
+   <g transform="matrix(-2 0 0 2.0002 -41.904 39.682)" class="Highlight" fill="currentColor" stroke-width=".13228">
     <path d="m-14.012 33.261-1.1474 1.3134-0.16391-0.18762 1.1474-1.3134z"/>
     <path d="m-15.171 34.218 1.1474 1.3134-0.16391 0.18761-1.1474-1.3134z"/>
    </g>
@@ -66,7 +69,7 @@
     <path d="m-13.88 123.14 2.2948 2.627 0.32783-0.37525-2.2948-2.6271z" fill="#aeaeae"/>
     <path d="m-11.562 125.06-2.2948 2.627 0.32783 0.37525 2.2948-2.627z" fill="#aeaeae"/>
    </g>
-   <g transform="matrix(2 0 0 1.9994 16.791 5.8649)" fill="#3096fa" stroke-width=".13231">
+   <g transform="matrix(2 0 0 1.9994 16.791 5.8649)" class="Highlight" fill="currentColor" stroke-width=".13231">
     <path d="m-15.335 75.594 1.1474 1.3134 0.16391-0.18762-1.1474-1.3134z"/>
     <path d="m-14.176 76.552-1.1474 1.3134 0.16391 0.18761 1.1474-1.3134z"/>
    </g>
diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_39px.svg b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_39px.svg
index 6b92760b4f3..c1693f5da4e 100644
--- a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_39px.svg
+++ b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_39px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:39-32" width="39" height="780" version="1.1" viewBox="0 0 10.319 206.37" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,8 +15,8 @@
   <path d="m4.2554 2.5414 3.1539 2.7538-0.45054 0.39339-3.1539-2.7538z" stroke-width=".26458"/>
   <path d="m1.0592 5.2673 3.1539-2.7538 0.45054 0.39339-3.1539 2.7538z" stroke-width=".26458"/>
   <g transform="matrix(1.1429 0 0 1 -.26372 0)" stroke-width=".2315">
-   <path d="m3.9541 12.86 2.7595 2.7537-0.39422 0.39338-2.7595-2.7537z" fill="#3096fa"/>
-   <path d="m1.1575 15.586 2.7595-2.7537 0.39422 0.39338-2.7595 2.7537z" fill="#3096fa"/>
+   <path d="m3.9541 12.86 2.7595 2.7537-0.39422 0.39338-2.7595-2.7537z" class="Highlight" fill="currentColor"/>
+   <path d="m1.1575 15.586 2.7595-2.7537 0.39422 0.39338-2.7595 2.7537z" class="Highlight" fill="currentColor"/>
    <path d="m3.9541 23.179 2.7595 2.7539-0.39422 0.39342-2.7595-2.7539z" fill="#fff"/>
    <path d="m1.1575 25.905 2.7595-2.7539 0.39422 0.39342-2.7595 2.7539z" fill="#fff"/>
    <path d="m3.9541 33.497 2.7595 2.7547-0.39422 0.39353-2.7595-2.7547z" fill="#aeaeae"/>
@@ -23,8 +26,8 @@
   <path d="m4.5421 46.936 2.7595-2.7538-0.3942-0.39339-2.7595 2.7538z" stroke-width=".24749"/>
   <path d="m1.7455 44.21 2.7595 2.7538 0.3942-0.39339-2.7595-2.7538z" stroke-width=".24749"/>
   <g stroke-width=".2315">
-   <path d="m4.5421 57.254 2.7595-2.7537-0.39422-0.39338-2.7595 2.7537z" fill="#3096fa"/>
-   <path d="m1.7455 54.529 2.7595 2.7537 0.39422-0.39338-2.7595-2.7537z" fill="#3096fa"/>
+   <path d="m4.5421 57.254 2.7595-2.7537-0.39422-0.39338-2.7595 2.7537z" class="Highlight" fill="currentColor"/>
+   <path d="m1.7455 54.529 2.7595 2.7537 0.39422-0.39338-2.7595-2.7537z" class="Highlight" fill="currentColor"/>
    <path d="m4.5421 67.573 2.7595-2.7539-0.39422-0.39342-2.7595 2.7539z" fill="#fff"/>
    <path d="m1.7455 64.847 2.7595 2.7539 0.39422-0.39342-2.7595-2.7539z" fill="#fff"/>
    <path d="m4.5421 77.893 2.7595-2.7547-0.39422-0.39353-2.7595 2.7547z" fill="#aeaeae"/>
@@ -32,9 +35,9 @@
   </g>
   <path d="m3.0401 86.221 2.7537 3.1541-0.39339 0.4506-2.7537-3.1541z" stroke-width=".26458"/>
   <g transform="translate(9.5229,2.1262)">
-   <g fill="#3096fa">
+   <g class="Highlight" fill="currentColor">
     <path d="m-3.7012 92.119-2.7537 3.1521-0.39339-0.45029 2.7537-3.1521z" stroke-width=".26458"/>
-    <path d="m-6.4828 94.416 2.7537 3.1521-0.39339 0.45026-2.7537-3.1521z" fill="#3096fa" stroke-width=".26458"/>
+    <path d="m-6.4828 94.416 2.7537 3.1521-0.39339 0.45026-2.7537-3.1521z" class="Highlight" fill="currentColor" stroke-width=".26458"/>
     <path d="m-5.2675 165.52 3.1539 2.7521-0.45054 0.39315-3.1539-2.7521z" stroke-width=".24749"/>
     <path d="m-8.4637 168.24 3.1539-2.7521 0.45054 0.39315-3.1539 2.7521z" stroke-width=".24749"/>
     <path d="m-5.2675 178.95 3.1539-2.7547-0.45054-0.39353-3.1539 2.7547z" stroke-width=".24749"/>
@@ -53,8 +56,8 @@
     <path d="m-6.4828 115.05 2.7537 3.1521-0.39339 0.45026-2.7537-3.1521z" fill="#aeaeae" stroke-width=".26458"/>
     <path d="m-6.8762 123.08 2.7537 3.1541 0.39339-0.45061-2.7537-3.1541z"/>
     <path d="m-4.0946 125.37-2.7537 3.1541 0.39339 0.45061 2.7537-3.1541z"/>
-    <path d="m-6.8762 133.39 2.7537 3.1521 0.39339-0.45029-2.7537-3.1521z" fill="#3096fa"/>
-    <path d="m-4.0946 135.69-2.7537 3.1521 0.39339 0.45026 2.7537-3.1521z" fill="#3096fa"/>
+    <path d="m-6.8762 133.39 2.7537 3.1521 0.39339-0.45029-2.7537-3.1521z" class="Highlight" fill="currentColor"/>
+    <path d="m-4.0946 135.69-2.7537 3.1521 0.39339 0.45026 2.7537-3.1521z" class="Highlight" fill="currentColor"/>
     <g transform="matrix(-1 0 0 1 -10.577 41.275)">
      <path d="m-3.7012 102.44-2.7537 3.1536-0.39339-0.45051 2.7537-3.1536z" fill="#fff" stroke-width=".26458"/>
      <path d="m-6.4828 104.73 2.7537 3.1536-0.39339 0.45048-2.7537-3.1536z" fill="#fff" stroke-width=".26458"/>
diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_52px.svg b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_52px.svg
index 36a2559677b..00769ed9ea5 100644
--- a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_52px.svg
+++ b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_52px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:52-32" width="52" height="1040" version="1.1" viewBox="0 0 13.758 275.16" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,8 +15,8 @@
   <path d="m5.9822 3.7412 4.2052 3.6716-0.60072 0.52452-4.2052-3.6716z" stroke-width=".26458"/>
   <path d="m1.7207 7.3757 4.2052-3.6716 0.60072 0.52452-4.2052 3.6716z" stroke-width=".26458"/>
   <g transform="matrix(1.1429 0 0 1 -.26372 0)">
-   <path d="m5.465 17.5 3.6794 3.6716-0.52562 0.52451-3.6794-3.6716z" fill="#3096fa" stroke-width=".2315"/>
-   <path d="m1.7363 21.134 3.6794-3.6716 0.52562 0.52451-3.6794 3.6716z" fill="#3096fa" stroke-width=".2315"/>
+   <path d="m5.465 17.5 3.6794 3.6716-0.52562 0.52451-3.6794-3.6716z" class="Highlight" fill="currentColor" stroke-width=".2315"/>
+   <path d="m1.7363 21.134 3.6794-3.6716 0.52562 0.52451-3.6794 3.6716z" class="Highlight" fill="currentColor" stroke-width=".2315"/>
    <g stroke-width=".2315">
     <path d="m5.465 31.259 3.6794 3.671-0.52562 0.52441-3.6794-3.671z" fill="#fff"/>
     <path d="m1.7363 34.892 3.6794-3.671 0.52562 0.52441-3.6794 3.671z" fill="#fff"/>
@@ -22,8 +25,8 @@
    </g>
    <path d="m5.465 62.933 3.6794-3.6716-0.52561-0.52452-3.6794 3.6716z" stroke-width=".24749"/>
    <path d="m1.7363 59.299 3.6794 3.6716 0.52561-0.52452-3.6794-3.6716z" stroke-width=".24749"/>
-   <path d="m5.465 76.692 3.6794-3.6716-0.52562-0.52451-3.6794 3.6716z" fill="#3096fa" stroke-width=".2315"/>
-   <path d="m1.7363 73.057 3.6794 3.6716 0.52562-0.52451-3.6794-3.6716z" fill="#3096fa" stroke-width=".2315"/>
+   <path d="m5.465 76.692 3.6794-3.6716-0.52562-0.52451-3.6794 3.6716z" class="Highlight" fill="currentColor" stroke-width=".2315"/>
+   <path d="m1.7363 73.057 3.6794 3.6716 0.52562-0.52451-3.6794-3.6716z" class="Highlight" fill="currentColor" stroke-width=".2315"/>
    <g stroke-width=".2315">
     <path d="m5.465 90.449 3.6794-3.671-0.52562-0.52441-3.6794 3.671z" fill="#fff"/>
     <path d="m1.7363 86.816 3.6794 3.671 0.52562-0.52441-3.6794-3.671z" fill="#fff"/>
@@ -34,9 +37,9 @@
   <path d="m8.0707 112.25-3.6716 4.2052-0.52452-0.60078 3.6716-4.2052z" stroke-width=".26458"/>
   <path d="m4.3619 115.31 3.6716 4.2052-0.52452 0.60078-3.6716-4.2052z" stroke-width=".26458"/>
   <g transform="translate(9.5229,2.1262)">
-   <g fill="#3096fa">
+   <g class="Highlight" fill="currentColor">
     <path d="m-1.4522 123.89-3.6716 4.2024-0.52452-0.60034 3.6716-4.2024z" stroke-width=".26458"/>
-    <path d="m-5.161 126.95 3.6716 4.2024-0.52452 0.6003-3.6716-4.2024z" fill="#3096fa" stroke-width=".26458"/>
+    <path d="m-5.161 126.95 3.6716 4.2024-0.52452 0.6003-3.6716-4.2024z" class="Highlight" fill="currentColor" stroke-width=".26458"/>
     <g stroke-width=".24749">
      <path d="m-3.5407 221.74 4.2052 3.6782-0.60071 0.52543-4.2052-3.6782z"/>
      <path d="m-7.8022 225.39 4.2052-3.6782 0.60071 0.52546-4.2052 3.678z"/>
@@ -55,8 +58,8 @@
    <path d="m-5.6856 165.16 3.6716 4.2052 0.52452-0.60078-3.6716-4.2052z" stroke-width=".26458"/>
    <path d="m-1.9767 168.22-3.6716 4.2052 0.52452 0.60078 3.6716-4.2052z" stroke-width=".26458"/>
    <g stroke-width=".26458">
-    <path d="m-5.6856 178.92 3.6716 4.2024 0.52452-0.60034-3.6716-4.2024z" fill="#3096fa"/>
-    <path d="m-1.9767 181.98-3.6716 4.2024 0.52452 0.6003 3.6716-4.2024z" fill="#3096fa"/>
+    <path d="m-5.6856 178.92 3.6716 4.2024 0.52452-0.60034-3.6716-4.2024z" class="Highlight" fill="currentColor"/>
+    <path d="m-1.9767 181.98-3.6716 4.2024 0.52452 0.6003 3.6716-4.2024z" class="Highlight" fill="currentColor"/>
     <g transform="matrix(-1 0 0 1 -7.1378 55.033)">
      <path d="m-1.4522 137.64-3.6716 4.2041-0.52452-0.60058 3.6716-4.2041z" fill="#fff" stroke-width=".26458"/>
      <path d="m-5.161 140.71 3.6716 4.2041-0.52452 0.60054-3.6716-4.2041z" fill="#fff" stroke-width=".26458"/>
diff --git a/dlls/light.msstyles/blue_scrollbar_arrows.svg b/dlls/light.msstyles/blue_scrollbar_arrows.svg
index 0dc49da9c8b..20f95e111d9 100644
--- a/dlls/light.msstyles/blue_scrollbar_arrows.svg
+++ b/dlls/light.msstyles/blue_scrollbar_arrows.svg
@@ -15,7 +15,7 @@
  <g stroke-width=".26458">
   <g fill="#fefefe">
    <rect x=".13229" y=".13229" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/>
-   <g stroke="#3096fa">
+   <g class="Highlight" stroke="currentColor">
     <rect x=".13229" y="4.6302" width="4.2334" height="4.2333" rx=".52917" ry=".52917"/>
     <rect x=".13227" y="72.099" width="4.2334" height="4.2333" rx=".52917" ry=".52917"/>
     <rect x=".13227" y="76.597" width="4.2334" height="4.2333" rx=".52917" ry=".52917"/>
@@ -27,19 +27,19 @@
   <g fill="#fefefe">
    <rect x=".13229" y="13.626" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/>
    <rect x=".13229" y="18.124" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/>
-   <rect x=".13229" y="22.622" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#3096fa"/>
+   <rect x=".13229" y="22.622" width="4.2333" height="4.2333" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
   </g>
   <rect x=".13229" y="27.12" width="4.2333" height="4.2333" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <g fill="#fefefe">
    <rect x=".13229" y="31.618" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/>
    <rect x=".13229" y="36.116" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/>
-   <rect x=".13229" y="40.614" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#3096fa"/>
+   <rect x=".13229" y="40.614" width="4.2333" height="4.2333" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
   </g>
   <rect x=".13229" y="45.111" width="4.2333" height="4.2333" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <g fill="#fefefe">
    <rect x=".13229" y="49.609" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/>
    <rect x=".13229" y="54.107" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/>
-   <rect x=".13229" y="58.605" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#3096fa"/>
+   <rect x=".13229" y="58.605" width="4.2333" height="4.2333" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
   </g>
   <rect x=".13229" y="63.103" width="4.2333" height="4.2333" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <rect x=".13229" y="67.601" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#fefefe" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg b/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg
index f16f526740d..d41e67bc495 100644
--- a/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg
+++ b/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg
@@ -15,8 +15,8 @@
   <rect x="-7.0588e-5" width="5.2918" height="22.49" fill="#fefefe" stroke-width=".070005"/>
   <g stroke-width=".26458">
    <rect x=".13229" y=".13229" width="5.0272" height="4.2333" rx=".52918" ry=".52918" stroke="#aeaeae"/>
-   <rect x=".13229" y="4.6302" width="5.0272" height="4.2333" rx=".52918" ry=".52918" stroke="#3096fa"/>
-   <rect x=".13223" y="18.124" width="5.0272" height="4.2333" rx=".52918" ry=".52918" stroke="#3096fa"/>
+   <rect x=".13229" y="4.6302" width="5.0272" height="4.2333" rx=".52918" ry=".52918" class="Highlight" stroke="currentColor"/>
+   <rect x=".13223" y="18.124" width="5.0272" height="4.2333" rx=".52918" ry=".52918" class="Highlight" stroke="currentColor"/>
    <rect x=".13229" y="9.1281" width="5.0272" height="4.2333" rx=".52918" ry=".52918" class="HighlightOutline" stroke="currentColor"/>
    <rect x=".13229" y="13.626" width="5.0272" height="4.2333" rx=".52918" ry=".52918" stroke="#aeaeae"/>
   </g>
diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg b/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg
index a5aa8b89651..901e876eaac 100644
--- a/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg
+++ b/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg
@@ -14,8 +14,8 @@
  <rect y="-.00012353" width="4.4979" height="14.552" fill="#fefefe" stroke-width=".26458"/>
  <g fill="#fefefe" stroke-width=".26458">
   <rect transform="rotate(90)" x=".13229" y="-4.3656" width="2.6458" height="4.2333" rx=".52916" ry=".52916" stroke="#aeaeae"/>
-  <rect transform="rotate(90)" x="3.0426" y="-4.3656" width="2.6458" height="4.2333" rx=".52916" ry=".52916" stroke="#3096fa"/>
-  <rect transform="rotate(90)" x="11.774" y="-4.3656" width="2.6458" height="4.2333" rx=".52916" ry=".52916" stroke="#3096fa"/>
+  <rect transform="rotate(90)" x="3.0426" y="-4.3656" width="2.6458" height="4.2333" rx=".52916" ry=".52916" class="Highlight" stroke="currentColor"/>
+  <rect transform="rotate(90)" x="11.774" y="-4.3656" width="2.6458" height="4.2333" rx=".52916" ry=".52916" class="Highlight" stroke="currentColor"/>
   <rect transform="rotate(90)" x="5.953" y="-4.3656" width="2.6458" height="4.2333" rx=".52916" ry=".52916" class="HighlightOutline" stroke="currentColor"/>
   <rect transform="rotate(90)" x="8.8634" y="-4.3656" width="2.6458" height="4.2333" rx=".52916" ry=".52916" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_spin_background_down.svg b/dlls/light.msstyles/blue_spin_background_down.svg
index a22f7cad681..066d57335ab 100644
--- a/dlls/light.msstyles/blue_spin_background_down.svg
+++ b/dlls/light.msstyles/blue_spin_background_down.svg
@@ -15,7 +15,7 @@
  <rect y="-3e-4" width="2.1167" height="16.934" fill="#fff" stroke-width=".26459"/>
  <g stroke-width=".265">
   <rect x=".39708" y=".1325" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
-  <rect x=".39708" y="4.3658" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/>
+  <rect x=".39708" y="4.3658" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" class="Highlight" stroke="currentColor"/>
   <rect x=".39708" y="8.5992" width="1.3229" height="3.7042" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <rect x=".39708" y="12.832" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_spin_background_left.svg b/dlls/light.msstyles/blue_spin_background_left.svg
index 3fc32f3f61c..05c6f42f883 100644
--- a/dlls/light.msstyles/blue_spin_background_left.svg
+++ b/dlls/light.msstyles/blue_spin_background_left.svg
@@ -15,7 +15,7 @@
  <rect x="1.7764e-15" y="-.00024286" width="1.8521" height="16.933" fill="#fff" stroke-width=".26459"/>
  <g stroke-width=".265">
   <rect x=".39708" y=".39708" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
-  <rect x=".39708" y="4.6305" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/>
+  <rect x=".39708" y="4.6305" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" class="Highlight" stroke="currentColor"/>
   <rect x=".39708" y="8.8636" width="1.3229" height="3.7042" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <rect x=".39708" y="13.097" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_spin_background_right.svg b/dlls/light.msstyles/blue_spin_background_right.svg
index 6c4cb4ba2a0..0ece389d211 100644
--- a/dlls/light.msstyles/blue_spin_background_right.svg
+++ b/dlls/light.msstyles/blue_spin_background_right.svg
@@ -15,7 +15,7 @@
  <rect y="-.00024286" width="1.8521" height="16.933" fill="#fff" stroke-width=".26459"/>
  <g stroke-width=".265">
   <rect x=".1325" y=".39708" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
-  <rect x=".1325" y="4.6305" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/>
+  <rect x=".1325" y="4.6305" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" class="Highlight" stroke="currentColor"/>
   <rect x=".1325" y="8.8636" width="1.3229" height="3.7042" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <rect x=".1325" y="13.097" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_spin_background_up.svg b/dlls/light.msstyles/blue_spin_background_up.svg
index 3c0ce6a5550..ce217af180c 100644
--- a/dlls/light.msstyles/blue_spin_background_up.svg
+++ b/dlls/light.msstyles/blue_spin_background_up.svg
@@ -15,7 +15,7 @@
  <rect y="-3e-4" width="2.1167" height="16.934" fill="#fff" stroke-width=".26459"/>
  <g stroke-width=".265">
   <rect x=".39708" y=".39708" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
-  <rect x=".39708" y="4.6304" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/>
+  <rect x=".39708" y="4.6304" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" class="Highlight" stroke="currentColor"/>
   <rect x=".39708" y="8.8637" width="1.3229" height="3.7042" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <rect x=".39708" y="13.097" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_spin_glyph_down_11px.svg b/dlls/light.msstyles/blue_spin_glyph_down_11px.svg
index 427aa93ea58..8267cbb23f4 100644
--- a/dlls/light.msstyles/blue_spin_glyph_down_11px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_down_11px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:11-32" width="11" height="36" version="1.1" viewBox="0 0 2.9104 9.525" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <g stroke-width=".26458">
   <path d="m1.4632 1.5759 1.1827-1.1474-0.16896-0.16391-1.1827 1.1474z"/>
   <path d="m0.26459 0.4401 1.1827 1.1474 0.16896-0.16391-1.1827-1.1474z"/>
-  <path d="m1.4632 3.9572 1.1827-1.1475-0.16896-0.16392-1.1827 1.1475z" fill="#3096fa"/>
-  <path d="m0.26459 2.8213 1.1827 1.1475 0.16896-0.16392-1.1827-1.1475z" fill="#3096fa"/>
+  <path d="m1.4632 3.9572 1.1827-1.1475-0.16896-0.16392-1.1827 1.1475z" class="Highlight" fill="currentColor"/>
+  <path d="m0.26459 2.8213 1.1827 1.1475 0.16896-0.16392-1.1827-1.1475z" class="Highlight" fill="currentColor"/>
   <path d="m1.4632 6.3385 1.1827-1.1475-0.16896-0.16392-1.1827 1.1475z" fill="#fff"/>
   <path d="m0.26459 5.2025 1.1827 1.1475 0.16896-0.16392-1.1827-1.1475z" fill="#fff"/>
   <path d="m1.4632 8.7197 1.1827-1.1475-0.16896-0.16392-1.1827 1.1475z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_down_14px.svg b/dlls/light.msstyles/blue_spin_glyph_down_14px.svg
index 6634ba4d372..cdc1bd4c126 100644
--- a/dlls/light.msstyles/blue_spin_glyph_down_14px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_down_14px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:14-32" width="14" height="48" version="1.1" viewBox="0 0 3.7041 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <g stroke-width=".26458">
   <path d="m1.8609 2.3673 1.3141-1.3769-0.18773-0.19669-1.3141 1.3769z"/>
   <path d="m0.52916 1.0044 1.3141 1.3769 0.18773-0.19669-1.3141-1.3769z"/>
-  <path d="m1.8609 5.5423 1.3141-1.3769-0.18773-0.19669-1.3141 1.3769z" fill="#3096fa"/>
-  <path d="m0.52916 4.1794 1.3141 1.3769 0.18773-0.19669-1.3141-1.3769z" fill="#3096fa"/>
+  <path d="m1.8609 5.5423 1.3141-1.3769-0.18773-0.19669-1.3141 1.3769z" class="Highlight" fill="currentColor"/>
+  <path d="m0.52916 4.1794 1.3141 1.3769 0.18773-0.19669-1.3141-1.3769z" class="Highlight" fill="currentColor"/>
   <path d="m1.8609 8.7174 1.3141-1.377-0.18773-0.1967-1.3141 1.377z" fill="#fff"/>
   <path d="m0.52916 7.3542 1.3141 1.377 0.18773-0.1967-1.3141-1.377z" fill="#fff"/>
   <path d="m1.8609 11.893 1.3141-1.3769-0.18773-0.19669-1.3141 1.3769z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_down_18px.svg b/dlls/light.msstyles/blue_spin_glyph_down_18px.svg
index 32a4b64d5ec..4052f464e81 100644
--- a/dlls/light.msstyles/blue_spin_glyph_down_18px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_down_18px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:18-32" width="18" height="60" version="1.1" viewBox="0 0 4.7624 15.875" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <g stroke-width=".26458">
   <path d="m2.3918 2.8942 1.5769-1.6063-0.22528-0.22946-1.5769 1.6063z"/>
   <path d="m0.79371 1.3041 1.5769 1.6063 0.22528-0.22946-1.5769-1.6063z"/>
-  <path d="m2.3918 6.8629 1.5769-1.6063-0.22528-0.22946-1.5769 1.6063z" fill="#3096fa"/>
-  <path d="m0.79371 5.2729 1.5769 1.6063 0.22528-0.22946-1.5769-1.6063z" fill="#3096fa"/>
+  <path d="m2.3918 6.8629 1.5769-1.6063-0.22528-0.22946-1.5769 1.6063z" class="Highlight" fill="currentColor"/>
+  <path d="m0.79371 5.2729 1.5769 1.6063 0.22528-0.22946-1.5769-1.6063z" class="Highlight" fill="currentColor"/>
   <path d="m2.3918 10.831 1.5769-1.6065-0.22528-0.22948-1.5769 1.6065z" fill="#fff"/>
   <path d="m0.79371 9.2414 1.5769 1.6065 0.22528-0.22948-1.5769-1.6065z" fill="#fff"/>
   <path d="m2.3918 14.8 1.5769-1.6064-0.22528-0.22947-1.5769 1.6064z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_down_21px.svg b/dlls/light.msstyles/blue_spin_glyph_down_21px.svg
index ae35ad5580c..5ec5560029d 100644
--- a/dlls/light.msstyles/blue_spin_glyph_down_21px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_down_21px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:21-32" width="21" height="72" version="1.1" viewBox="0 0 5.5561 19.05" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <g transform="translate(0 -.26457)" stroke-width=".26458">
   <path d="m2.7913 3.6833 1.9711-2.0654-0.2816-0.29504-1.9711 2.0654z"/>
   <path d="m0.79369 1.6387 1.9711 2.0654 0.2816-0.29504-1.9711-2.0654z"/>
-  <path d="m2.7913 8.4457 1.9711-2.0653-0.2816-0.29502-1.9711 2.0653z" fill="#3096fa"/>
-  <path d="m0.79369 6.4014 1.9711 2.0653 0.2816-0.29502-1.9711-2.0653z" fill="#3096fa"/>
+  <path d="m2.7913 8.4457 1.9711-2.0653-0.2816-0.29502-1.9711 2.0653z" class="Highlight" fill="currentColor"/>
+  <path d="m0.79369 6.4014 1.9711 2.0653 0.2816-0.29502-1.9711-2.0653z" class="Highlight" fill="currentColor"/>
   <path d="m2.7913 13.208 1.9711-2.0652-0.2816-0.295-1.9711 2.0652z" fill="#fff"/>
   <path d="m0.79369 11.164 1.9711 2.0652 0.2816-0.295-1.9711-2.0652z" fill="#fff"/>
   <path d="m2.7913 17.971 1.9711-2.0652-0.2816-0.295-1.9711 2.0652z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_down_28px.svg b/dlls/light.msstyles/blue_spin_glyph_down_28px.svg
index 8349e43368c..9cc0fdbcb5d 100644
--- a/dlls/light.msstyles/blue_spin_glyph_down_28px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_down_28px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:28-32" width="28" height="96" version="1.1" viewBox="0 0 7.4081 25.4" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -12,8 +15,8 @@
   <path d="m3.7217 4.4725 2.6282-2.5244-0.37547-0.36061-2.6282 2.5244z"/>
   <path d="m1.0582 1.9735 2.6282 2.5244 0.37547-0.36061-2.6282-2.5244z"/>
   <g transform="translate(0 -.2646)">
-   <path d="m3.7217 11.087 2.6282-2.5242-0.37547-0.36057-2.6282 2.5242z" fill="#3096fa"/>
-   <path d="m1.0582 8.5883 2.6282 2.5242 0.37547-0.36057-2.6282-2.5242z" fill="#3096fa"/>
+   <path d="m3.7217 11.087 2.6282-2.5242-0.37547-0.36057-2.6282 2.5242z" class="Highlight" fill="currentColor"/>
+   <path d="m1.0582 8.5883 2.6282 2.5242 0.37547-0.36057-2.6282-2.5242z" class="Highlight" fill="currentColor"/>
    <path d="m3.7217 17.437 2.6282-2.524-0.37547-0.36053-2.6282 2.524z" fill="#fff"/>
    <path d="m1.0582 14.939 2.6282 2.524 0.37547-0.36053-2.6282-2.524z" fill="#fff"/>
    <path d="m3.7217 23.787 2.6282-2.524-0.37547-0.36053-2.6282 2.524z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_down_7x16px.svg b/dlls/light.msstyles/blue_spin_glyph_down_7x16px.svg
index 675a6912045..a144233ffc8 100644
--- a/dlls/light.msstyles/blue_spin_glyph_down_7x16px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_down_7x16px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="16" version="1.1" viewBox="0 0 1.8521 4.2333" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <g stroke-width=".26458">
   <path d="m0.93223 1.049 0.91987-0.91787-0.13141-0.13112-0.91987 0.91787z"/>
   <path d="m0 0.1405 0.91987 0.91787 0.13141-0.13112-0.91987-0.91787z"/>
-  <path d="m0.93223 2.1074 0.91987-0.91792-0.13141-0.13113-0.91987 0.91792z" fill="#3096fa"/>
-  <path d="m0 1.1988 0.91987 0.91792 0.13141-0.13113-0.91987-0.91792z" fill="#3096fa"/>
+  <path d="m0.93223 2.1074 0.91987-0.91792-0.13141-0.13113-0.91987 0.91792z" class="Highlight" fill="currentColor"/>
+  <path d="m0 1.1988 0.91987 0.91792 0.13141-0.13113-0.91987-0.91792z" class="Highlight" fill="currentColor"/>
   <path d="m0.93223 3.1657 0.91987-0.91792-0.13141-0.13113-0.91987 0.91792z" fill="#fff"/>
   <path d="m0 2.2571 0.91987 0.91792 0.13141-0.13113-0.91987-0.91792z" fill="#fff"/>
   <path d="m0.93223 4.2242 0.91987-0.91802-0.13141-0.13115-0.91987 0.91802z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_down_7x24px.svg b/dlls/light.msstyles/blue_spin_glyph_down_7x24px.svg
index 4d5d0ed56f4..eea7ed72344 100644
--- a/dlls/light.msstyles/blue_spin_glyph_down_7x24px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_down_7x24px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="24" version="1.1" viewBox="0 0 1.8521 6.35" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <g stroke-width=".26458">
   <path d="m0.93047 1.0513 0.65705-0.68844-0.093866-0.098348-0.65705 0.68844z"/>
   <path d="m0.26459 0.36988 0.65705 0.68844 0.093866-0.098348-0.65705-0.68844z"/>
-  <path d="m0.93047 2.6388 0.65705-0.68842-0.093866-0.098345-0.65705 0.68842z" fill="#3096fa"/>
-  <path d="m0.26459 1.9573 0.65705 0.68842 0.093866-0.098345-0.65705-0.68842z" fill="#3096fa"/>
+  <path d="m0.93047 2.6388 0.65705-0.68842-0.093866-0.098345-0.65705 0.68842z" class="Highlight" fill="currentColor"/>
+  <path d="m0.26459 1.9573 0.65705 0.68842 0.093866-0.098345-0.65705-0.68842z" class="Highlight" fill="currentColor"/>
   <path d="m0.93047 4.2263 0.65705-0.68842-0.093866-0.098345-0.65705 0.68842z" fill="#fff"/>
   <path d="m0.26459 3.5448 0.65705 0.68842 0.093866-0.098345-0.65705-0.68842z" fill="#fff"/>
   <path d="m0.93047 5.8138 0.65705-0.68842-0.093866-0.098345-0.65705 0.68842z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_left_12px.svg b/dlls/light.msstyles/blue_spin_glyph_left_12px.svg
index fcb2a41c277..5bb10e6f351 100644
--- a/dlls/light.msstyles/blue_spin_glyph_left_12px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_left_12px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:12-32" width="12" height="56" version="1.1" viewBox="0 0 3.1749 14.817" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <path d="m0.9904 2.0297 1.3768-1.313-0.19668-0.18756-1.3768 1.313z" stroke-width=".26458"/>
  <path d="m0.8078 1.8621 1.3768 1.313 0.19668-0.18756-1.3768-1.313z" stroke-width=".26458"/>
  <g transform="matrix(-1.1975 0 0 1 3.2272 0)" stroke-width=".19134">
-  <path d="m1.8679 5.734-1.1498-1.3129 0.16426-0.18758 1.1498 1.3129z" fill="#3096fa"/>
-  <path d="m2.0205 5.5664-1.1498 1.3129-0.16426-0.18758 1.1498-1.3129z" fill="#3096fa"/>
+  <path d="m1.8679 5.734-1.1498-1.3129 0.16426-0.18758 1.1498 1.3129z" class="Highlight" fill="currentColor"/>
+  <path d="m2.0205 5.5664-1.1498 1.3129-0.16426-0.18758 1.1498-1.3129z" class="Highlight" fill="currentColor"/>
   <path d="m1.8679 9.4383-1.1498-1.3129 0.16426-0.18758 1.1498 1.3129z" fill="#fff"/>
   <path d="m2.0205 9.2707-1.1498 1.3129-0.16426-0.18758 1.1498-1.3129z" fill="#fff"/>
   <path d="m1.8679 13.142-1.1498-1.3125 0.16426-0.18751 1.1498 1.3125z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_left_15px.svg b/dlls/light.msstyles/blue_spin_glyph_left_15px.svg
index 41b979e4a85..5b8bdeea07f 100644
--- a/dlls/light.msstyles/blue_spin_glyph_left_15px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_left_15px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:15-32" width="15" height="64" version="1.1" viewBox="0 0 3.9686 16.934" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <path d="m1.5195 2.3298 1.3768-1.5756-0.19668-0.22507-1.3768 1.5756z" stroke-width=".26458"/>
  <path d="m1.3369 2.1287 1.3768 1.5756 0.19668-0.22507-1.3768-1.5756z" stroke-width=".26458"/>
  <g transform="matrix(-1.1975 0 0 1 4.0209 0)" stroke-width=".19134">
-  <path d="m2.0888 6.5633-1.1498-1.5755 0.16426-0.22511 1.1498 1.5755z" fill="#3096fa"/>
-  <path d="m2.2414 6.3621-1.1498 1.5755-0.16426-0.22511 1.1498-1.5755z" fill="#3096fa"/>
+  <path d="m2.0888 6.5633-1.1498-1.5755 0.16426-0.22511 1.1498 1.5755z" class="Highlight" fill="currentColor"/>
+  <path d="m2.2414 6.3621-1.1498 1.5755-0.16426-0.22511 1.1498-1.5755z" class="Highlight" fill="currentColor"/>
   <path d="m2.0888 10.797-1.1498-1.5755 0.16426-0.22511 1.1498 1.5755z" fill="#fff"/>
   <path d="m2.2414 10.596-1.1498 1.5755-0.16426-0.2251 1.1498-1.5755z" fill="#fff"/>
   <path d="m2.0888 15.03-1.1498-1.5752 0.16426-0.22504 1.1498 1.5752z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_left_18px.svg b/dlls/light.msstyles/blue_spin_glyph_left_18px.svg
index 2af6a7110d5..c443fc5f712 100644
--- a/dlls/light.msstyles/blue_spin_glyph_left_18px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_left_18px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:18-32" width="18" height="84" version="1.1" viewBox="0 0 4.7623 22.226" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <path d="m1.6178 3.0446 2.0652-1.9695-0.29502-0.28133-2.0652 1.9695z" stroke-width=".26458"/>
  <path d="m1.3439 2.7932 2.0652 1.9695 0.29502-0.28133-2.0652-1.9695z" stroke-width=".26458"/>
  <g transform="matrix(-1.7963 0 0 1 5.1053 0)" stroke-width=".12756">
-  <path d="m1.9415 8.6012-1.1498-1.9695 0.16426-0.28141 1.1498 1.9695z" fill="#3096fa"/>
-  <path d="m2.0941 8.3496-1.1498 1.9695-0.16426-0.28141 1.1498-1.9695z" fill="#3096fa"/>
+  <path d="m1.9415 8.6012-1.1498-1.9695 0.16426-0.28141 1.1498 1.9695z" class="Highlight" fill="currentColor"/>
+  <path d="m2.0941 8.3496-1.1498 1.9695-0.16426-0.28141 1.1498-1.9695z" class="Highlight" fill="currentColor"/>
   <path d="m1.9415 14.157-1.1498-1.9694 0.16426-0.28139 1.1498 1.9694z" fill="#fff"/>
   <path d="m2.0941 13.906-1.1498 1.9694-0.16426-0.28138 1.1498-1.9694z" fill="#fff"/>
   <path d="m1.9415 19.714-1.1498-1.9694 0.16426-0.28136 1.1498 1.9694z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_left_24px.svg b/dlls/light.msstyles/blue_spin_glyph_left_24px.svg
index d0fe2eae71c..3a1d1ebe34d 100644
--- a/dlls/light.msstyles/blue_spin_glyph_left_24px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_left_24px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:24-32" width="24" height="112" version="1.1" viewBox="0 0 6.3498 29.634" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <path d="m2.2125 4.0594 2.5241-2.626-0.36058-0.37511-2.5241 2.626z" stroke-width=".26458"/>
  <path d="m1.8778 3.7243 2.5241 2.626 0.36058-0.37511-2.5241-2.626z" stroke-width=".26458"/>
  <g transform="matrix(-2.1954 0 0 1 7.3275 0)" stroke-width=".10437">
-  <path d="m2.3298 11.468-1.1498-2.626 0.16426-0.37521 1.1498 2.626z" fill="#3096fa"/>
-  <path d="m2.4824 11.133-1.1498 2.626-0.16426-0.37521 1.1498-2.626z" fill="#3096fa"/>
+  <path d="m2.3298 11.468-1.1498-2.626 0.16426-0.37521 1.1498 2.626z" class="Highlight" fill="currentColor"/>
+  <path d="m2.4824 11.133-1.1498 2.626-0.16426-0.37521 1.1498-2.626z" class="Highlight" fill="currentColor"/>
   <path d="m2.3298 18.877-1.1498-2.6258 0.16426-0.37518 1.1498 2.6258z" fill="#fff"/>
   <path d="m2.4824 18.542-1.1498 2.6258-0.16426-0.37517 1.1498-2.6258z" fill="#fff"/>
   <path d="m2.3298 26.285-1.1498-2.6259 0.16426-0.37515 1.1498 2.6259z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_left_4px.svg b/dlls/light.msstyles/blue_spin_glyph_left_4px.svg
index 4e636f0254f..99b7253e45b 100644
--- a/dlls/light.msstyles/blue_spin_glyph_left_4px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_left_4px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:4-32" width="4" height="28" version="1.1" viewBox="0 0 1.0583 7.4083" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <path d="m0.13109 1.0503 0.91792-0.91902-0.13113-0.13129-0.91792 0.91902z" stroke-width=".26458"/>
  <path d="m0.0092782 0.93305 0.91792 0.91902 0.13113-0.13129-0.91792-0.91902z" stroke-width=".26458"/>
  <g transform="matrix(-.99786 0 0 1 1.0577 0)" stroke-width=".22962">
-  <path d="m0.92862 2.9024-0.91988-0.91906 0.13141-0.1313 0.91988 0.91906z" fill="#3096fa"/>
-  <path d="m1.0507 2.7851-0.91988 0.91906-0.13141-0.1313 0.91988-0.91906z" fill="#3096fa"/>
+  <path d="m0.92862 2.9024-0.91988-0.91906 0.13141-0.1313 0.91988 0.91906z" class="Highlight" fill="currentColor"/>
+  <path d="m1.0507 2.7851-0.91988 0.91906-0.13141-0.1313 0.91988-0.91906z" class="Highlight" fill="currentColor"/>
   <path d="m0.92862 4.7545-0.91988-0.91906 0.13141-0.1313 0.91988 0.91906z" fill="#fff"/>
   <path d="m1.0507 4.6372-0.91988 0.91906-0.13141-0.1313 0.91988-0.91906z" fill="#fff"/>
   <path d="m0.92862 6.6064-0.91988-0.91899 0.13141-0.13129 0.91988 0.91899z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_left_6px.svg b/dlls/light.msstyles/blue_spin_glyph_left_6px.svg
index b184dc2dc71..97d3c5ccfa9 100644
--- a/dlls/light.msstyles/blue_spin_glyph_left_6px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_left_6px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:6-32" width="6" height="28" version="1.1" viewBox="0 0 1.5875 7.4083" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <path d="m0.62752 1.0148 0.68844-0.65643-0.098347-0.093776-0.68844 0.65643z" stroke-width=".26458"/>
  <path d="m0.53613 0.93106 0.68844 0.65643 0.098347-0.093776-0.68844-0.65643z" stroke-width=".26458"/>
  <g transform="matrix(-.7484 0 0 1 1.521 0)" stroke-width=".30616">
-  <path d="m1.1938 2.8669-0.91988-0.65644 0.13141-0.093778 0.91988 0.65644z" fill="#3096fa"/>
-  <path d="m1.3159 2.7831-0.91988 0.65644-0.13141-0.093778 0.91988-0.65644z" fill="#3096fa"/>
+  <path d="m1.1938 2.8669-0.91988-0.65644 0.13141-0.093778 0.91988 0.65644z" class="Highlight" fill="currentColor"/>
+  <path d="m1.3159 2.7831-0.91988 0.65644-0.13141-0.093778 0.91988-0.65644z" class="Highlight" fill="currentColor"/>
   <path d="m1.1938 4.719-0.91988-0.65644 0.13141-0.093778 0.91988 0.65644z" fill="#fff"/>
   <path d="m1.3159 4.6352-0.91988 0.65644-0.13141-0.093778 0.91988-0.65644z" fill="#fff"/>
   <path d="m1.1938 6.571-0.91988-0.65644 0.13141-0.093778 0.91988 0.65644z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_left_9px.svg b/dlls/light.msstyles/blue_spin_glyph_left_9px.svg
index e97f58f46a7..1290c1b33ef 100644
--- a/dlls/light.msstyles/blue_spin_glyph_left_9px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_left_9px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:9-32" width="9" height="44" version="1.1" viewBox="0 0 2.3812 11.642" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <path d="m0.95762 1.615 1.1474-1.1816-0.16391-0.1688-1.1474 1.1816z" stroke-width=".26458"/>
  <path d="m0.80542 1.4642 1.1474 1.1816 0.16391-0.1688-1.1474-1.1816z" stroke-width=".26458"/>
  <g transform="matrix(-.99786 0 0 1 2.3807 0)" stroke-width=".22962">
-  <path d="m1.426 4.5254-1.1498-1.1816 0.16426-0.16881 1.1498 1.1816z" fill="#3096fa"/>
-  <path d="m1.5786 4.3746-1.1498 1.1816-0.16426-0.16881 1.1498-1.1816z" fill="#3096fa"/>
+  <path d="m1.426 4.5254-1.1498-1.1816 0.16426-0.16881 1.1498 1.1816z" class="Highlight" fill="currentColor"/>
+  <path d="m1.5786 4.3746-1.1498 1.1816-0.16426-0.16881 1.1498-1.1816z" class="Highlight" fill="currentColor"/>
   <path d="m1.426 7.4358-1.1498-1.1816 0.16426-0.16881 1.1498 1.1816z" fill="#fff"/>
   <path d="m1.5786 7.285-1.1498 1.1816-0.16426-0.16881 1.1498-1.1816z" fill="#fff"/>
   <path d="m1.426 10.346-1.1498-1.1815 0.16426-0.16879 1.1498 1.1815z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_right_12px.svg b/dlls/light.msstyles/blue_spin_glyph_right_12px.svg
index 8cc6dc068bd..48aff9861e5 100644
--- a/dlls/light.msstyles/blue_spin_glyph_right_12px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_right_12px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:12-32" width="12" height="56" version="1.1" viewBox="0 0 3.1749 14.817" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <path d="m2.1846 2.0297-1.3768-1.313 0.19668-0.18756 1.3768 1.313z" stroke-width=".26458"/>
  <path d="m2.3672 1.8621-1.3768 1.313-0.19668-0.18756 1.3768-1.313z" stroke-width=".26458"/>
  <g transform="matrix(1.1975 0 0 1 -.052245 0)" stroke-width=".19134">
-  <path d="m1.8679 5.734-1.1498-1.3129 0.16426-0.18758 1.1498 1.3129z" fill="#3096fa"/>
-  <path d="m2.0205 5.5664-1.1498 1.3129-0.16426-0.18758 1.1498-1.3129z" fill="#3096fa"/>
+  <path d="m1.8679 5.734-1.1498-1.3129 0.16426-0.18758 1.1498 1.3129z" class="Highlight" fill="currentColor"/>
+  <path d="m2.0205 5.5664-1.1498 1.3129-0.16426-0.18758 1.1498-1.3129z" class="Highlight" fill="currentColor"/>
   <path d="m1.8679 9.4383-1.1498-1.3129 0.16426-0.18758 1.1498 1.3129z" fill="#fff"/>
   <path d="m2.0205 9.2707-1.1498 1.3129-0.16426-0.18758 1.1498-1.3129z" fill="#fff"/>
   <path d="m1.8679 13.142-1.1498-1.3125 0.16426-0.18751 1.1498 1.3125z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_right_15px.svg b/dlls/light.msstyles/blue_spin_glyph_right_15px.svg
index 37da3383424..395f2ea2867 100644
--- a/dlls/light.msstyles/blue_spin_glyph_right_15px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_right_15px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:15-32" width="15" height="64" version="1.1" viewBox="0 0 3.9686 16.934" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <path d="m2.4491 2.3298-1.3768-1.5756 0.19668-0.22507 1.3768 1.5756z" stroke-width=".26458"/>
  <path d="m2.6317 2.1287-1.3768 1.5756-0.19668-0.22507 1.3768-1.5756z" stroke-width=".26458"/>
  <g transform="matrix(1.1975 0 0 1 -.052245 0)" stroke-width=".19134">
-  <path d="m2.0888 6.5633-1.1498-1.5755 0.16426-0.22511 1.1498 1.5755z" fill="#3096fa"/>
-  <path d="m2.2414 6.3621-1.1498 1.5755-0.16426-0.22511 1.1498-1.5755z" fill="#3096fa"/>
+  <path d="m2.0888 6.5633-1.1498-1.5755 0.16426-0.22511 1.1498 1.5755z" class="Highlight" fill="currentColor"/>
+  <path d="m2.2414 6.3621-1.1498 1.5755-0.16426-0.22511 1.1498-1.5755z" class="Highlight" fill="currentColor"/>
   <path d="m2.0888 10.797-1.1498-1.5755 0.16426-0.22511 1.1498 1.5755z" fill="#fff"/>
   <path d="m2.2414 10.596-1.1498 1.5755-0.16426-0.2251 1.1498-1.5755z" fill="#fff"/>
   <path d="m2.0888 15.03-1.1498-1.5752 0.16426-0.22504 1.1498 1.5752z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_right_18px.svg b/dlls/light.msstyles/blue_spin_glyph_right_18px.svg
index de2f4aa3b84..066deaaf5e0 100644
--- a/dlls/light.msstyles/blue_spin_glyph_right_18px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_right_18px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:18-32" width="18" height="84" version="1.1" viewBox="0 0 4.7623 22.226" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <path d="m3.1445 3.0446-2.0652-1.9695 0.29502-0.28133 2.0652 1.9695z" stroke-width=".26458"/>
  <path d="m3.4184 2.7932-2.0652 1.9695-0.29502-0.28133 2.0652-1.9695z" stroke-width=".26458"/>
  <g transform="matrix(1.7963 0 0 1 -.34301 0)" stroke-width=".12756">
-  <path d="m1.9415 8.6012-1.1498-1.9695 0.16426-0.28141 1.1498 1.9695z" fill="#3096fa"/>
-  <path d="m2.0941 8.3496-1.1498 1.9695-0.16426-0.28141 1.1498-1.9695z" fill="#3096fa"/>
+  <path d="m1.9415 8.6012-1.1498-1.9695 0.16426-0.28141 1.1498 1.9695z" class="Highlight" fill="currentColor"/>
+  <path d="m2.0941 8.3496-1.1498 1.9695-0.16426-0.28141 1.1498-1.9695z" class="Highlight" fill="currentColor"/>
   <path d="m1.9415 14.157-1.1498-1.9694 0.16426-0.28139 1.1498 1.9694z" fill="#fff"/>
   <path d="m2.0941 13.906-1.1498 1.9694-0.16426-0.28138 1.1498-1.9694z" fill="#fff"/>
   <path d="m1.9415 19.714-1.1498-1.9694 0.16426-0.28136 1.1498 1.9694z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_right_24px.svg b/dlls/light.msstyles/blue_spin_glyph_right_24px.svg
index a2b89b84b1e..925fec98b6b 100644
--- a/dlls/light.msstyles/blue_spin_glyph_right_24px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_right_24px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:24-32" width="24" height="112" version="1.1" viewBox="0 0 6.3498 29.634" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <path d="m4.1373 4.0594-2.5241-2.626 0.36058-0.37511 2.5241 2.626z" stroke-width=".26458"/>
  <path d="m4.472 3.7243-2.5241 2.626-0.36058-0.37511 2.5241-2.626z" stroke-width=".26458"/>
  <g transform="matrix(2.1954 0 0 1 -.97767 0)" stroke-width=".10437">
-  <path d="m2.3298 11.468-1.1498-2.626 0.16426-0.37521 1.1498 2.626z" fill="#3096fa"/>
-  <path d="m2.4824 11.133-1.1498 2.626-0.16426-0.37521 1.1498-2.626z" fill="#3096fa"/>
+  <path d="m2.3298 11.468-1.1498-2.626 0.16426-0.37521 1.1498 2.626z" class="Highlight" fill="currentColor"/>
+  <path d="m2.4824 11.133-1.1498 2.626-0.16426-0.37521 1.1498-2.626z" class="Highlight" fill="currentColor"/>
   <path d="m2.3298 18.877-1.1498-2.6258 0.16426-0.37518 1.1498 2.6258z" fill="#fff"/>
   <path d="m2.4824 18.542-1.1498 2.6258-0.16426-0.37517 1.1498-2.6258z" fill="#fff"/>
   <path d="m2.3298 26.285-1.1498-2.6259 0.16426-0.37515 1.1498 2.6259z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_right_4px.svg b/dlls/light.msstyles/blue_spin_glyph_right_4px.svg
index 4582a349906..39b62526e30 100644
--- a/dlls/light.msstyles/blue_spin_glyph_right_4px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_right_4px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:4-32" width="4" height="28" version="1.1" viewBox="0 0 1.0583 7.4083" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <path d="m0.92719 1.0503-0.91792-0.91902 0.13113-0.13129 0.91792 0.91902z" stroke-width=".26458"/>
  <path d="m1.049 0.93305-0.91792 0.91902-0.13113-0.13129 0.91792-0.91902z" stroke-width=".26458"/>
  <g transform="matrix(.99786 0 0 1 .00056664 0)" stroke-width=".22962">
-  <path d="m0.92862 2.9024-0.91988-0.91906 0.13141-0.1313 0.91988 0.91906z" fill="#3096fa"/>
-  <path d="m1.0507 2.7851-0.91988 0.91906-0.13141-0.1313 0.91988-0.91906z" fill="#3096fa"/>
+  <path d="m0.92862 2.9024-0.91988-0.91906 0.13141-0.1313 0.91988 0.91906z" class="Highlight" fill="currentColor"/>
+  <path d="m1.0507 2.7851-0.91988 0.91906-0.13141-0.1313 0.91988-0.91906z" class="Highlight" fill="currentColor"/>
   <path d="m0.92862 4.7545-0.91988-0.91906 0.13141-0.1313 0.91988 0.91906z" fill="#fff"/>
   <path d="m1.0507 4.6372-0.91988 0.91906-0.13141-0.1313 0.91988-0.91906z" fill="#fff"/>
   <path d="m0.92862 6.6064-0.91988-0.91899 0.13141-0.13129 0.91988 0.91899z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_right_6px.svg b/dlls/light.msstyles/blue_spin_glyph_right_6px.svg
index 545a12904a0..630f95f45a8 100644
--- a/dlls/light.msstyles/blue_spin_glyph_right_6px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_right_6px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:6-32" width="6" height="28" version="1.1" viewBox="0 0 1.5875 7.4083" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <path d="m0.96001 1.0148-0.68844-0.65643 0.098347-0.093776 0.68844 0.65643z" stroke-width=".26458"/>
  <path d="m1.0514 0.93106-0.68844 0.65643-0.098347-0.093776 0.68844-0.65643z" stroke-width=".26458"/>
  <g transform="matrix(.7484 0 0 1 .066577 0)" stroke-width=".30616">
-  <path d="m1.1938 2.8669-0.91988-0.65644 0.13141-0.093778 0.91988 0.65644z" fill="#3096fa"/>
-  <path d="m1.3159 2.7831-0.91988 0.65644-0.13141-0.093778 0.91988-0.65644z" fill="#3096fa"/>
+  <path d="m1.1938 2.8669-0.91988-0.65644 0.13141-0.093778 0.91988 0.65644z" class="Highlight" fill="currentColor"/>
+  <path d="m1.3159 2.7831-0.91988 0.65644-0.13141-0.093778 0.91988-0.65644z" class="Highlight" fill="currentColor"/>
   <path d="m1.1938 4.719-0.91988-0.65644 0.13141-0.093778 0.91988 0.65644z" fill="#fff"/>
   <path d="m1.3159 4.6352-0.91988 0.65644-0.13141-0.093778 0.91988-0.65644z" fill="#fff"/>
   <path d="m1.1938 6.571-0.91988-0.65644 0.13141-0.093778 0.91988 0.65644z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_right_9px.svg b/dlls/light.msstyles/blue_spin_glyph_right_9px.svg
index 902b70ffec0..d2586abae91 100644
--- a/dlls/light.msstyles/blue_spin_glyph_right_9px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_right_9px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:9-32" width="9" height="44" version="1.1" viewBox="0 0 2.3812 11.642" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <path d="m1.4236 1.615-1.1474-1.1816 0.16391-0.1688 1.1474 1.1816z" stroke-width=".26458"/>
  <path d="m1.5758 1.4642-1.1474 1.1816-0.16391-0.1688 1.1474-1.1816z" stroke-width=".26458"/>
  <g transform="matrix(.99786 0 0 1 .00056664 0)" stroke-width=".22962">
-  <path d="m1.426 4.5254-1.1498-1.1816 0.16426-0.16881 1.1498 1.1816z" fill="#3096fa"/>
-  <path d="m1.5786 4.3746-1.1498 1.1816-0.16426-0.16881 1.1498-1.1816z" fill="#3096fa"/>
+  <path d="m1.426 4.5254-1.1498-1.1816 0.16426-0.16881 1.1498 1.1816z" class="Highlight" fill="currentColor"/>
+  <path d="m1.5786 4.3746-1.1498 1.1816-0.16426-0.16881 1.1498-1.1816z" class="Highlight" fill="currentColor"/>
   <path d="m1.426 7.4358-1.1498-1.1816 0.16426-0.16881 1.1498 1.1816z" fill="#fff"/>
   <path d="m1.5786 7.285-1.1498 1.1816-0.16426-0.16881 1.1498-1.1816z" fill="#fff"/>
   <path d="m1.426 10.346-1.1498-1.1815 0.16426-0.16879 1.1498 1.1815z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_up_11px.svg b/dlls/light.msstyles/blue_spin_glyph_up_11px.svg
index d3244a4254f..8dfa01471ff 100644
--- a/dlls/light.msstyles/blue_spin_glyph_up_11px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_up_11px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:11-32" width="11" height="36" version="1.1" viewBox="0 0 2.9104 9.525" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <g stroke-width=".26458">
   <path d="m1.4632 0.27619 1.1827 1.1474-0.16896 0.16391-1.1827-1.1474z"/>
   <path d="m0.26459 1.412 1.1827-1.1474 0.16896 0.16391-1.1827 1.1474z"/>
-  <path d="m1.4632 2.6574 1.1827 1.1475-0.16896 0.16392-1.1827-1.1475z" fill="#3096fa"/>
-  <path d="m0.26459 3.7933 1.1827-1.1475 0.16896 0.16392-1.1827 1.1475z" fill="#3096fa"/>
+  <path d="m1.4632 2.6574 1.1827 1.1475-0.16896 0.16392-1.1827-1.1475z" class="Highlight" fill="currentColor"/>
+  <path d="m0.26459 3.7933 1.1827-1.1475 0.16896 0.16392-1.1827 1.1475z" class="Highlight" fill="currentColor"/>
   <path d="m1.4632 5.0386 1.1827 1.1475-0.16896 0.16392-1.1827-1.1475z" fill="#fff"/>
   <path d="m0.26459 6.1746 1.1827-1.1475 0.16896 0.16392-1.1827 1.1475z" fill="#fff"/>
   <path d="m1.4632 7.4199 1.1827 1.1475-0.16896 0.16392-1.1827-1.1475z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_up_14px.svg b/dlls/light.msstyles/blue_spin_glyph_up_14px.svg
index 4b32f47516d..e8c35cc456f 100644
--- a/dlls/light.msstyles/blue_spin_glyph_up_14px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_up_14px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:14-32" width="14" height="48" version="1.1" viewBox="0 0 3.7041 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <g stroke-width=".26458">
   <path d="m1.8609 0.80766 1.3141 1.3769-0.18773 0.19669-1.3141-1.3769z"/>
   <path d="m0.52916 2.1706 1.3141-1.3769 0.18773 0.19669-1.3141 1.3769z"/>
-  <path d="m1.8609 3.9827 1.3141 1.3769-0.18773 0.19669-1.3141-1.3769z" fill="#3096fa"/>
-  <path d="m0.52916 5.3456 1.3141-1.3769 0.18773 0.19669-1.3141 1.3769z" fill="#3096fa"/>
+  <path d="m1.8609 3.9827 1.3141 1.3769-0.18773 0.19669-1.3141-1.3769z" class="Highlight" fill="currentColor"/>
+  <path d="m0.52916 5.3456 1.3141-1.3769 0.18773 0.19669-1.3141 1.3769z" class="Highlight" fill="currentColor"/>
   <path d="m1.8609 7.1575 1.3141 1.377-0.18773 0.1967-1.3141-1.377z" fill="#fff"/>
   <path d="m0.52916 8.5207 1.3141-1.377 0.18773 0.1967-1.3141 1.377z" fill="#fff"/>
   <path d="m1.8609 10.333 1.3141 1.3769-0.18773 0.19669-1.3141-1.3769z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_up_18px.svg b/dlls/light.msstyles/blue_spin_glyph_up_18px.svg
index a5f2d9c2762..c7ce22ee704 100644
--- a/dlls/light.msstyles/blue_spin_glyph_up_18px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_up_18px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:18-32" width="18" height="60" version="1.1" viewBox="0 0 4.7624 15.875" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <g stroke-width=".26458">
   <path d="m2.3918 1.0746 1.5769 1.6063-0.22528 0.22946-1.5769-1.6063z"/>
   <path d="m0.79371 2.6647 1.5769-1.6063 0.22528 0.22946-1.5769 1.6063z"/>
-  <path d="m2.3918 5.0434 1.5769 1.6063-0.22528 0.22946-1.5769-1.6063z" fill="#3096fa"/>
-  <path d="m0.79371 6.6334 1.5769-1.6063 0.22528 0.22946-1.5769 1.6063z" fill="#3096fa"/>
+  <path d="m2.3918 5.0434 1.5769 1.6063-0.22528 0.22946-1.5769-1.6063z" class="Highlight" fill="currentColor"/>
+  <path d="m0.79371 6.6334 1.5769-1.6063 0.22528 0.22946-1.5769 1.6063z" class="Highlight" fill="currentColor"/>
   <path d="m2.3918 9.0119 1.5769 1.6065-0.22528 0.22948-1.5769-1.6065z" fill="#fff"/>
   <path d="m0.79371 10.602 1.5769-1.6065 0.22528 0.22948-1.5769 1.6065z" fill="#fff"/>
   <path d="m2.3918 12.981 1.5769 1.6064-0.22528 0.22947-1.5769-1.6064z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_up_21px.svg b/dlls/light.msstyles/blue_spin_glyph_up_21px.svg
index 8fee9a189b5..e0e7bdfa0ac 100644
--- a/dlls/light.msstyles/blue_spin_glyph_up_21px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_up_21px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:21-32" width="21" height="72" version="1.1" viewBox="0 0 5.5561 19.05" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <g stroke-width=".26458">
   <path d="m2.7913 1.3437 1.9711 2.0654-0.2816 0.29504-1.9711-2.0654z"/>
   <path d="m0.79369 3.3883 1.9711-2.0654 0.2816 0.29504-1.9711 2.0654z"/>
-  <path d="m2.7913 6.1064 1.9711 2.0653-0.2816 0.29502-1.9711-2.0653z" fill="#3096fa"/>
-  <path d="m0.79369 8.1507 1.9711-2.0653 0.2816 0.29502-1.9711 2.0653z" fill="#3096fa"/>
+  <path d="m2.7913 6.1064 1.9711 2.0653-0.2816 0.29502-1.9711-2.0653z" class="Highlight" fill="currentColor"/>
+  <path d="m0.79369 8.1507 1.9711-2.0653 0.2816 0.29502-1.9711 2.0653z" class="Highlight" fill="currentColor"/>
   <path d="m2.7913 10.869 1.9711 2.0652-0.2816 0.295-1.9711-2.0652z" fill="#fff"/>
   <path d="m0.79369 12.913 1.9711-2.0652 0.2816 0.295-1.9711 2.0652z" fill="#fff"/>
   <path d="m2.7913 15.632 1.9711 2.0652-0.2816 0.295-1.9711-2.0652z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_up_28px.svg b/dlls/light.msstyles/blue_spin_glyph_up_28px.svg
index 04d1a5bf220..3232fcc1325 100644
--- a/dlls/light.msstyles/blue_spin_glyph_up_28px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_up_28px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:28-32" width="28" height="96" version="1.1" viewBox="0 0 7.4081 25.4" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <path d="m3.7217 1.8775 2.6282 2.5244-0.37547 0.36061-2.6282-2.5244z" stroke-width=".26458"/>
  <path d="m1.0582 4.3765 2.6282-2.5244 0.37547 0.36061-2.6282 2.5244z" stroke-width=".26458"/>
  <g stroke-width=".26458">
-  <path d="m3.7217 8.2277 2.6282 2.5242-0.37547 0.36057-2.6282-2.5242z" fill="#3096fa"/>
-  <path d="m1.0582 10.726 2.6282-2.5242 0.37547 0.36057-2.6282 2.5242z" fill="#3096fa"/>
+  <path d="m3.7217 8.2277 2.6282 2.5242-0.37547 0.36057-2.6282-2.5242z" class="Highlight" fill="currentColor"/>
+  <path d="m1.0582 10.726 2.6282-2.5242 0.37547 0.36057-2.6282 2.5242z" class="Highlight" fill="currentColor"/>
   <path d="m3.7217 14.578 2.6282 2.524-0.37547 0.36053-2.6282-2.524z" fill="#fff"/>
   <path d="m1.0582 17.076 2.6282-2.524 0.37547 0.36053-2.6282 2.524z" fill="#fff"/>
   <path d="m3.7217 20.928 2.6282 2.524-0.37547 0.36053-2.6282-2.524z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_up_7x20px.svg b/dlls/light.msstyles/blue_spin_glyph_up_7x20px.svg
index cf4bb46d66a..8714a5283bc 100644
--- a/dlls/light.msstyles/blue_spin_glyph_up_7x20px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_up_7x20px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="20" version="1.1" viewBox="0 0 1.8521 5.2916" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <g stroke-width=".26458">
   <path d="m0.93223 0.27392 0.91987 0.91787-0.13141 0.13112-0.91987-0.91787z"/>
   <path d="m0 1.1824 0.91987-0.91787 0.13141 0.13112-0.91987 0.91787z"/>
-  <path d="m0.93223 1.5968 0.91987 0.91792-0.13141 0.13113-0.91987-0.91792z" fill="#3096fa"/>
-  <path d="m0 2.5054 0.91987-0.91792 0.13141 0.13113-0.91987 0.91792z" fill="#3096fa"/>
+  <path d="m0.93223 1.5968 0.91987 0.91792-0.13141 0.13113-0.91987-0.91792z" class="Highlight" fill="currentColor"/>
+  <path d="m0 2.5054 0.91987-0.91792 0.13141 0.13113-0.91987 0.91792z" class="Highlight" fill="currentColor"/>
   <path d="m0.93223 2.9197 0.91987 0.91792-0.13141 0.13113-0.91987-0.91792z" fill="#fff"/>
   <path d="m0 3.8283 0.91987-0.91792 0.13141 0.13113-0.91987 0.91792z" fill="#fff"/>
   <path d="m0.93223 4.2425 0.91987 0.91802-0.13141 0.13115-0.91987-0.91802z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_spin_glyph_up_7x24px.svg b/dlls/light.msstyles/blue_spin_glyph_up_7x24px.svg
index 3f2b0e9e71d..86ef13e429b 100644
--- a/dlls/light.msstyles/blue_spin_glyph_up_7x24px.svg
+++ b/dlls/light.msstyles/blue_spin_glyph_up_7x24px.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:7-32" width="7" height="24" version="1.1" viewBox="0 0 1.8521 6.35" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <style>
+  @import url(colors.css);
+ </style>
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
@@ -11,8 +14,8 @@
  <g stroke-width=".26458">
   <path d="m0.93047 0.53613 0.65705 0.68844-0.093866 0.098348-0.65705-0.68844z"/>
   <path d="m0.26459 1.2176 0.65705-0.68844 0.093866 0.098348-0.65705 0.68844z"/>
-  <path d="m0.93047 2.1236 0.65705 0.68842-0.093866 0.098345-0.65705-0.68842z" fill="#3096fa"/>
-  <path d="m0.26459 2.8051 0.65705-0.68842 0.093866 0.098345-0.65705 0.68842z" fill="#3096fa"/>
+  <path d="m0.93047 2.1236 0.65705 0.68842-0.093866 0.098345-0.65705-0.68842z" class="Highlight" fill="currentColor"/>
+  <path d="m0.26459 2.8051 0.65705-0.68842 0.093866 0.098345-0.65705 0.68842z" class="Highlight" fill="currentColor"/>
   <path d="m0.93047 3.7111 0.65705 0.68842-0.093866 0.098345-0.65705-0.68842z" fill="#fff"/>
   <path d="m0.26459 4.3926 0.65705-0.68842 0.093866 0.098345-0.65705 0.68842z" fill="#fff"/>
   <path d="m0.93047 5.2986 0.65705 0.68842-0.093866 0.098345-0.65705-0.68842z" fill="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_tab_item.svg b/dlls/light.msstyles/blue_tab_item.svg
index c810cff31a0..ad5c30301a9 100644
--- a/dlls/light.msstyles/blue_tab_item.svg
+++ b/dlls/light.msstyles/blue_tab_item.svg
@@ -30,7 +30,7 @@
   </g>
  </g>
  <g fill="#fff">
-  <rect x=".13229" y="5.1594" width="1.0583" height="4.7625" rx=".52917" ry=".52916" stroke="#3096fa" stroke-width=".26458"/>
+  <rect x=".13229" y="5.1594" width="1.0583" height="4.7625" rx=".52917" ry=".52916" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
   <rect transform="rotate(90)" x="9.7896" y="-1.0583" width=".26458" height=".79375" stroke-width="0"/>
   <rect transform="rotate(90)" x="9.525" y="-.52917" width=".26458" height=".26458" stroke-width="0"/>
  </g>
@@ -43,7 +43,7 @@
    <rect transform="rotate(90)" x="9.2604" y="-1.0583" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/>
   </g>
-  <g fill="#3096fa">
+  <g class="Highlight" fill="currentColor">
    <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="9.525" y="-.26458" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="9.525" y="-1.3229" width=".26458" height=".26458"/>
@@ -80,7 +80,7 @@
    <rect transform="rotate(90)" x="24.342" y="-1.0583" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/>
   </g>
-  <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/>
+  <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458" class="Highlight" fill="currentColor"/>
   <g class="HighlightOutline" fill="currentColor">
    <rect transform="rotate(90)" x="24.606" y="-1.3229" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/>
@@ -88,8 +88,8 @@
    <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="24.342" y="-1.3229" width=".26458" height=".26458"/>
   </g>
-  <rect transform="rotate(90)" x="9.2604" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/>
-  <rect transform="rotate(90)" x="9.2604" y="-.26458" width=".26458" height=".26458" fill="#3096fa"/>
+  <rect transform="rotate(90)" x="9.2604" y="-1.3229" width=".26458" height=".26458" class="Highlight" fill="currentColor"/>
+  <rect transform="rotate(90)" x="9.2604" y="-.26458" width=".26458" height=".26458" class="Highlight" fill="currentColor"/>
   <rect transform="rotate(90)" x="14.287" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/>
   <rect transform="rotate(90)" x="14.288" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/>
   <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458" class="HighlightOutline" fill="currentColor"/>
diff --git a/dlls/light.msstyles/blue_tab_item_left.svg b/dlls/light.msstyles/blue_tab_item_left.svg
index 2530f7c0918..8ff31a66b16 100644
--- a/dlls/light.msstyles/blue_tab_item_left.svg
+++ b/dlls/light.msstyles/blue_tab_item_left.svg
@@ -14,7 +14,7 @@
  </metadata>
  <rect y="-5e-5" width="1.3229" height="25.135" fill="#fff" stroke-width=".26458"/>
  <g fill="#fff">
-  <rect x=".13229" y="5.1594" width="1.0583" height="4.7625" rx=".52917" ry=".52916" stroke="#3096fa" stroke-width=".26458"/>
+  <rect x=".13229" y="5.1594" width="1.0583" height="4.7625" rx=".52917" ry=".52916" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
   <rect transform="rotate(90)" x="9.7896" y="-1.0583" width=".26458" height=".79375" stroke-width="0"/>
   <rect transform="rotate(90)" x="9.525" y="-.52917" width=".26458" height=".26458" stroke-width="0"/>
  </g>
@@ -27,7 +27,7 @@
    <rect transform="rotate(90)" x="9.2604" y="-1.0583" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/>
   </g>
-  <g fill="#3096fa">
+  <g class="Highlight" fill="currentColor">
    <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="9.525" y="-.26458" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="9.525" y="-1.3229" width=".26458" height=".26458"/>
@@ -64,7 +64,7 @@
    <rect transform="rotate(90)" x="24.342" y="-1.0583" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/>
   </g>
-  <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/>
+  <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458" class="Highlight" fill="currentColor"/>
   <g class="HighlightOutline" fill="currentColor">
    <rect transform="rotate(90)" x="24.606" y="-1.3229" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/>
@@ -72,8 +72,8 @@
    <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="24.342" y="-1.3229" width=".26458" height=".26458"/>
   </g>
-  <rect transform="rotate(90)" x="9.2604" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/>
-  <rect transform="rotate(90)" x="9.2604" y="-.26458" width=".26458" height=".26458" fill="#3096fa"/>
+  <rect transform="rotate(90)" x="9.2604" y="-1.3229" width=".26458" height=".26458" class="Highlight" fill="currentColor"/>
+  <rect transform="rotate(90)" x="9.2604" y="-.26458" width=".26458" height=".26458" class="Highlight" fill="currentColor"/>
   <rect transform="rotate(90)" x="14.288" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/>
   <rect transform="rotate(90)" x="14.288" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/>
   <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458" class="HighlightOutline" fill="currentColor"/>
diff --git a/dlls/light.msstyles/blue_tab_item_right.svg b/dlls/light.msstyles/blue_tab_item_right.svg
index 3d69116ceda..0df98360c40 100644
--- a/dlls/light.msstyles/blue_tab_item_right.svg
+++ b/dlls/light.msstyles/blue_tab_item_right.svg
@@ -42,7 +42,7 @@
   <rect transform="rotate(90)" x="4.2333" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/>
  </g>
  <g fill="#fff">
-  <rect x=".13229" y="5.1594" width="1.0583" height="4.7625" rx=".52917" ry=".52916" stroke="#3096fa" stroke-width=".26458"/>
+  <rect x=".13229" y="5.1594" width="1.0583" height="4.7625" rx=".52917" ry=".52916" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
   <rect transform="rotate(90)" x="9.7896" y="-1.0583" width=".26458" height=".79375" stroke-width="0"/>
   <rect transform="rotate(90)" x="9.525" y="-.52917" width=".26458" height=".26458" stroke-width="0"/>
  </g>
@@ -55,7 +55,7 @@
    <rect transform="rotate(90)" x="9.2604" y="-1.0583" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/>
   </g>
-  <g fill="#3096fa">
+  <g class="Highlight" fill="currentColor">
    <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="9.525" y="-.26458" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="9.525" y="-1.3229" width=".26458" height=".26458"/>
@@ -92,7 +92,7 @@
    <rect transform="rotate(90)" x="24.342" y="-1.0583" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/>
   </g>
-  <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/>
+  <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458" class="Highlight" fill="currentColor"/>
   <g class="HighlightOutline" fill="currentColor">
    <rect transform="rotate(90)" x="24.606" y="-1.3229" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/>
@@ -100,8 +100,8 @@
    <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458"/>
    <rect transform="rotate(90)" x="24.342" y="-1.3229" width=".26458" height=".26458"/>
   </g>
-  <rect transform="rotate(90)" x="9.2604" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/>
-  <rect transform="rotate(90)" x="9.2604" y="-.26458" width=".26458" height=".26458" fill="#3096fa"/>
+  <rect transform="rotate(90)" x="9.2604" y="-1.3229" width=".26458" height=".26458" class="Highlight" fill="currentColor"/>
+  <rect transform="rotate(90)" x="9.2604" y="-.26458" width=".26458" height=".26458" class="Highlight" fill="currentColor"/>
   <rect transform="rotate(90)" x="14.288" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/>
   <rect transform="rotate(90)" x="14.288" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/>
   <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458" class="HighlightOutline" fill="currentColor"/>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_19px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_19px.svg
index e8e27a45292..83f61a2ce2e 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_19px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_19px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:19-32" width="19" height="21" version="1.1" viewBox="0 0 5.0271 5.5563" xmlns="http://www.w3.org/2000/svg">
- <ellipse cx="2.5135" cy="2.7781" rx="2.381" ry="2.3813" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
- <path d="m3.8365 3.2641-1.3129-1.1474-0.18755 0.16391 1.3129 1.1474z" fill="#3096fa" stroke-width=".99996"/>
- <path d="m1.3782 3.4396 1.3129-1.1474-0.18756-0.16391-1.3129 1.1474z" fill="#3096fa" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <ellipse cx="2.5135" cy="2.7781" rx="2.381" ry="2.3813" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m3.8365 3.2641-1.3129-1.1474-0.18755 0.16391 1.3129 1.1474z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
+ <path d="m1.3782 3.4396 1.3129-1.1474-0.18756-0.16391-1.3129 1.1474z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_24px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_24px.svg
index 69341b15082..2691886262c 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_24px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_24px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:24-32" width="24" height="26" version="1.1" viewBox="0 0 6.35 6.8792" xmlns="http://www.w3.org/2000/svg">
- <ellipse cx="3.1752" cy="3.4395" rx="3.0427" ry="3.0427" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
- <path d="m4.8948 4.0227-1.7068-1.3769-0.24381 0.1967 1.7068 1.3769z" fill="#3096fa" stroke-width=".99996"/>
- <path d="m1.699 4.2333 1.7068-1.3769-0.24383-0.1967-1.7068 1.3769z" fill="#3096fa" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <ellipse cx="3.1752" cy="3.4395" rx="3.0427" ry="3.0427" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m4.8948 4.0227-1.7068-1.3769-0.24381 0.1967 1.7068 1.3769z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
+ <path d="m1.699 4.2333 1.7068-1.3769-0.24383-0.1967-1.7068 1.3769z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_29px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_29px.svg
index 807d857c183..c8b1af91e65 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_29px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_29px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:29-32" width="29" height="32" version="1.1" viewBox="0 0 7.6729 8.4667" xmlns="http://www.w3.org/2000/svg">
- <circle cx="3.8367" cy="4.101" r="3.7042" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
- <path d="m5.8208 4.7814-1.9694-1.6064-0.28132 0.22948 1.9694 1.6064z" fill="#3096fa" stroke-width=".99996"/>
- <path d="m2.1334 5.0271 1.9694-1.6064-0.28134-0.22948-1.9694 1.6064z" fill="#3096fa" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <circle cx="3.8367" cy="4.101" r="3.7042" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m5.8208 4.7814-1.9694-1.6064-0.28132 0.22948 1.9694 1.6064z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
+ <path d="m2.1334 5.0271 1.9694-1.6064-0.28134-0.22948-1.9694 1.6064z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_33px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_33px.svg
index e98e87ee752..cfce4d821ca 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_33px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_33px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:33-32" width="33" height="37" version="1.1" viewBox="0 0 8.7312 9.7896" xmlns="http://www.w3.org/2000/svg">
- <ellipse cx="4.3659" cy="4.8948" rx="4.2334" ry="4.2334" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
- <path d="m6.7469 5.7696-2.3633-2.0654-0.33759 0.29504 2.3633 2.0654z" fill="#3096fa" stroke-width=".99996"/>
- <path d="m2.322 6.0855 2.3633-2.0654-0.33761-0.29504-2.3633 2.0654z" fill="#3096fa" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <ellipse cx="4.3659" cy="4.8948" rx="4.2334" ry="4.2334" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m6.7469 5.7696-2.3633-2.0654-0.33759 0.29504 2.3633 2.0654z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
+ <path d="m2.322 6.0855 2.3633-2.0654-0.33761-0.29504-2.3633 2.0654z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_38px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_38px.svg
index d8e59a60377..f73af878ca1 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_38px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_38px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:38-32" width="38" height="42" version="1.1" viewBox="0 0 10.054 11.113" xmlns="http://www.w3.org/2000/svg">
- <circle cx="5.0271" cy="5.5563" r="4.7625" fill="#fff" stroke="#3096fa" stroke-width=".52917"/>
- <path d="m7.6729 6.5282-2.6259-2.2948-0.3751 0.32783 2.6259 2.2948z" fill="#3096fa" stroke-width=".99996"/>
- <path d="m2.7564 6.8791 2.6259-2.2948-0.37512-0.32783-2.6259 2.2948z" fill="#3096fa" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <circle cx="5.0271" cy="5.5563" r="4.7625" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".52917"/>
+ <path d="m7.6729 6.5282-2.6259-2.2948-0.3751 0.32783 2.6259 2.2948z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
+ <path d="m2.7564 6.8791 2.6259-2.2948-0.37512-0.32783-2.6259 2.2948z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_43px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_43px.svg
index 4d8ced25e4f..f73b14985bc 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_43px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_43px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:43-32" width="43" height="47" version="1.1" viewBox="0 0 11.377 12.436" xmlns="http://www.w3.org/2000/svg">
- <circle cx="5.6888" cy="6.218" r="5.4242" fill="#fff" stroke="#3096fa" stroke-width=".52917"/>
- <path d="m8.599 7.2872-2.8886-2.5245-0.41263 0.36065 2.8886 2.5245z" fill="#3096fa" stroke-width=".99996"/>
- <path d="m3.1906 7.6732 2.8886-2.5245-0.41265-0.36065-2.8886 2.5245z" fill="#3096fa" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <circle cx="5.6888" cy="6.218" r="5.4242" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".52917"/>
+ <path d="m8.599 7.2872-2.8886-2.5245-0.41263 0.36065 2.8886 2.5245z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
+ <path d="m3.1906 7.6732 2.8886-2.5245-0.41265-0.36065-2.8886 2.5245z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_48px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_48px.svg
index 14712e34454..21a7a49ff1f 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_48px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_expanded_hover_48px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:48-32" width="48" height="53" version="1.1" viewBox="0 0 12.7 14.024" xmlns="http://www.w3.org/2000/svg">
- <circle cx="6.3503" cy="6.8795" r="6.0857" fill="#fff" stroke="#3096fa" stroke-width=".52917"/>
- <path d="m9.6573 8.0459-3.2826-2.754-0.4689 0.39343 3.2826 2.754z" fill="#3096fa" stroke-width=".99996"/>
- <path d="m3.5114 8.467 3.2826-2.754-0.46893-0.39343-3.2826 2.754z" fill="#3096fa" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <circle cx="6.3503" cy="6.8795" r="6.0857" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".52917"/>
+ <path d="m9.6573 8.0459-3.2826-2.754-0.4689 0.39343 3.2826 2.754z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
+ <path d="m3.5114 8.467 3.2826-2.754-0.46893-0.39343-3.2826 2.754z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_hover_19px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_hover_19px.svg
index 57849f2b180..1a092e16a29 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_hover_19px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_hover_19px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:19-32" width="19" height="21" version="1.1" viewBox="0 0 5.0271 5.5563" xmlns="http://www.w3.org/2000/svg">
- <ellipse cx="2.5135" cy="2.7781" rx="2.381" ry="2.3813" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
- <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z" fill="#3096fa" stroke-width=".99996"/>
- <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z" fill="#3096fa" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <ellipse cx="2.5135" cy="2.7781" rx="2.381" ry="2.3813" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m3.8365 2.2922-1.3129 1.1474-0.18755-0.16391 1.3129-1.1474z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
+ <path d="m1.3782 2.1167 1.3129 1.1474-0.18756 0.16391-1.3129-1.1474z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_hover_24px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_hover_24px.svg
index 8475e49901c..3597f99a36c 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_hover_24px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_hover_24px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:24-32" width="24" height="26" version="1.1" viewBox="0 0 6.35 6.8792" xmlns="http://www.w3.org/2000/svg">
- <ellipse cx="3.1752" cy="3.4395" rx="3.0427" ry="3.0427" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
- <path d="m4.8948 2.8564-1.7068 1.3769-0.24381-0.1967 1.7068-1.3769z" fill="#3096fa" stroke-width=".99996"/>
- <path d="m1.699 2.6458 1.7068 1.3769-0.24383 0.1967-1.7068-1.3769z" fill="#3096fa" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <ellipse cx="3.1752" cy="3.4395" rx="3.0427" ry="3.0427" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m4.8948 2.8564-1.7068 1.3769-0.24381-0.1967 1.7068-1.3769z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
+ <path d="m1.699 2.6458 1.7068 1.3769-0.24383 0.1967-1.7068-1.3769z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_hover_29px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_hover_29px.svg
index 74fe64c03e0..58e0eaf0d2f 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_hover_29px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_hover_29px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:29-32" width="29" height="32" version="1.1" viewBox="0 0 7.6729 8.4667" xmlns="http://www.w3.org/2000/svg">
- <circle cx="3.8367" cy="4.101" r="3.7042" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
- <path d="m5.8208 3.4207-1.9694 1.6064-0.28132-0.22948 1.9694-1.6064z" fill="#3096fa" stroke-width=".99996"/>
- <path d="m2.1334 3.175 1.9694 1.6064-0.28134 0.22948-1.9694-1.6064z" fill="#3096fa" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <circle cx="3.8367" cy="4.101" r="3.7042" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m5.8208 3.4207-1.9694 1.6064-0.28132-0.22948 1.9694-1.6064z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
+ <path d="m2.1334 3.175 1.9694 1.6064-0.28134 0.22948-1.9694-1.6064z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_hover_33px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_hover_33px.svg
index e8c69c12b56..4f37a038d48 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_hover_33px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_hover_33px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:33-32" width="33" height="37" version="1.1" viewBox="0 0 8.7312 9.7896" xmlns="http://www.w3.org/2000/svg">
- <ellipse cx="4.3659" cy="4.8948" rx="4.2334" ry="4.2334" fill="#fff" stroke="#3096fa" stroke-width=".26458"/>
- <path d="m6.7469 4.0201-2.3633 2.0654-0.33759-0.29504 2.3633-2.0654z" fill="#3096fa" stroke-width=".99996"/>
- <path d="m2.322 3.7042 2.3633 2.0654-0.33761 0.29504-2.3633-2.0654z" fill="#3096fa" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <ellipse cx="4.3659" cy="4.8948" rx="4.2334" ry="4.2334" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
+ <path d="m6.7469 4.0201-2.3633 2.0654-0.33759-0.29504 2.3633-2.0654z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
+ <path d="m2.322 3.7042 2.3633 2.0654-0.33761 0.29504-2.3633-2.0654z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_hover_38px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_hover_38px.svg
index 6806c3a0bc0..46a302c1985 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_hover_38px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_hover_38px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:38-32" width="38" height="42" version="1.1" viewBox="0 0 10.054 11.113" xmlns="http://www.w3.org/2000/svg">
- <circle cx="5.0271" cy="5.5563" r="4.7625" fill="#fff" stroke="#3096fa" stroke-width=".52917"/>
- <path d="m7.6729 4.5843-2.6259 2.2948-0.3751-0.32783 2.6259-2.2948z" fill="#3096fa" stroke-width=".99996"/>
- <path d="m2.7564 4.2334 2.6259 2.2948-0.37512 0.32783-2.6259-2.2948z" fill="#3096fa" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <circle cx="5.0271" cy="5.5563" r="4.7625" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".52917"/>
+ <path d="m7.6729 4.5843-2.6259 2.2948-0.3751-0.32783 2.6259-2.2948z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
+ <path d="m2.7564 4.2334 2.6259 2.2948-0.37512 0.32783-2.6259-2.2948z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_hover_43px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_hover_43px.svg
index 1951cf8e68f..61f278cb3d6 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_hover_43px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_hover_43px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:43-32" width="43" height="47" version="1.1" viewBox="0 0 11.377 12.436" xmlns="http://www.w3.org/2000/svg">
- <circle cx="5.6888" cy="6.218" r="5.4242" fill="#fff" stroke="#3096fa" stroke-width=".52917"/>
- <path d="m8.599 5.1487-2.8886 2.5245-0.41263-0.36065 2.8886-2.5245z" fill="#3096fa" stroke-width=".99996"/>
- <path d="m3.1906 4.7627 2.8886 2.5245-0.41265 0.36065-2.8886-2.5245z" fill="#3096fa" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <circle cx="5.6888" cy="6.218" r="5.4242" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".52917"/>
+ <path d="m8.599 5.1487-2.8886 2.5245-0.41263-0.36065 2.8886-2.5245z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
+ <path d="m3.1906 4.7627 2.8886 2.5245-0.41265 0.36065-2.8886-2.5245z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_taskdialog_expando_button_hover_48px.svg b/dlls/light.msstyles/blue_taskdialog_expando_button_hover_48px.svg
index 3d9fd02770c..a6a999af257 100644
--- a/dlls/light.msstyles/blue_taskdialog_expando_button_hover_48px.svg
+++ b/dlls/light.msstyles/blue_taskdialog_expando_button_hover_48px.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bitmap:48-32" width="48" height="53" version="1.1" viewBox="0 0 12.7 14.024" xmlns="http://www.w3.org/2000/svg">
- <circle cx="6.3503" cy="6.8795" r="6.0857" fill="#fff" stroke="#3096fa" stroke-width=".52917"/>
- <path d="m9.6573 5.713-3.2826 2.754-0.4689-0.39343 3.2826-2.754z" fill="#3096fa" stroke-width=".99996"/>
- <path d="m3.5114 5.2919 3.2826 2.754-0.46893 0.39343-3.2826-2.754z" fill="#3096fa" stroke-width=".99996"/>
+ <style>
+  @import url(colors.css);
+ </style>
+ <circle cx="6.3503" cy="6.8795" r="6.0857" fill="#fff" class="Highlight" stroke="currentColor" stroke-width=".52917"/>
+ <path d="m9.6573 5.713-3.2826 2.754-0.4689-0.39343 3.2826-2.754z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
+ <path d="m3.5114 5.2919 3.2826 2.754-0.46893 0.39343-3.2826-2.754z" class="Highlight" fill="currentColor" stroke-width=".99996"/>
 </svg>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons.svg b/dlls/light.msstyles/blue_toolbar_buttons.svg
index 892bd18c14d..5892e861169 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons.svg
@@ -12,8 +12,8 @@
   </rdf:RDF>
  </metadata>
  <g stroke-linejoin="bevel" stroke-width=".26458">
-  <rect x=".13229" y="4.8948" width="1.5875" height="4.4979" rx=".52917" ry=".52917" fill="#fffffe" stroke="#3096fa" stroke-width=".26458"/>
-  <rect x=".13227" y="33.47" width="1.5875" height="4.4979" rx=".52917" ry=".52917" fill="#fffffe" stroke="#3096fa" stroke-width=".26458"/>
+  <rect x=".13229" y="4.8948" width="1.5875" height="4.4979" rx=".52917" ry=".52917" fill="#fffffe" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
+  <rect x=".13227" y="33.47" width="1.5875" height="4.4979" rx=".52917" ry=".52917" fill="#fffffe" class="Highlight" stroke="currentColor" stroke-width=".26458"/>
   <g fill="#fff">
    <g transform="translate(0 -2.1167)">
     <rect x=".13229" y="11.774" width="1.5875" height="4.4979" rx=".52917" ry=".42836" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split.svg b/dlls/light.msstyles/blue_toolbar_buttons_split.svg
index 334b534f96d..68cf64f49e1 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons_split.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons_split.svg
@@ -12,8 +12,8 @@
   </rdf:RDF>
  </metadata>
  <g fill="#fff" stroke-linejoin="bevel" stroke-width=".26458">
-  <rect x=".13229" y="4.8948" width="1.3229" height="4.4979" rx=".52917" ry=".52917" stroke="#3096fa"/>
-  <rect x=".13229" y="33.47" width="1.3229" height="4.4979" rx=".52917" ry=".52917" stroke="#3096fa"/>
+  <rect x=".13229" y="4.8948" width="1.3229" height="4.4979" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
+  <rect x=".13229" y="33.47" width="1.3229" height="4.4979" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
   <g class="HighlightOutline" stroke="currentColor">
    <rect x=".13229" y="9.6573" width="1.3229" height="4.4979" rx=".52917" ry=".52917"/>
    <rect x=".13229" y="19.182" width="1.3229" height="4.4979" rx=".52917" ry=".52917"/>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg
index 58b81f8a634..3552f174124 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg
@@ -12,8 +12,8 @@
   </rdf:RDF>
  </metadata>
  <g fill="#fff" stroke-linejoin="bevel" stroke-width=".26458">
-  <rect x=".13229" y="4.8948" width="1.0583" height="4.4979" rx=".52917" ry=".52917" stroke="#3096fa"/>
-  <rect x=".13228" y="33.47" width="1.0583" height="4.4979" rx=".52917" ry=".52917" stroke="#3096fa"/>
+  <rect x=".13229" y="4.8948" width="1.0583" height="4.4979" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
+  <rect x=".13228" y="33.47" width="1.0583" height="4.4979" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
   <g class="HighlightOutline" stroke="currentColor">
    <rect x=".13229" y="9.6573" width="1.0583" height="4.4979" rx=".52917" ry=".52917"/>
    <rect x=".13228" y="19.182" width="1.0583" height="4.4979" rx=".52917" ry=".52917"/>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_11px.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_11px.svg
index 24306bc8fee..deeedf44552 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_11px.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_11px.svg
@@ -14,11 +14,11 @@
  <g transform="matrix(1.2857,0,0,1,1.4284e-5,0)">
   <path d="m2.2637 0.47514-1.1233 1.3769-0.16047-0.1967 1.1233-1.3769z" stroke-width=".23334"/>
   <path d="m0.16046 0.26453 1.1233 1.3769-0.16047 0.1967-1.1233-1.3769z" stroke-width=".23334"/>
-  <g transform="matrix(1.2222 0 0 1.5 3.2438 -.18641)" fill="#3096fa" stroke-width=".17234">
+  <g transform="matrix(1.2222 0 0 1.5 3.2438 -.18641)" class="Highlight" fill="currentColor" stroke-width=".17234">
    <path d="m-0.80196 2.0285-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m-2.5228 1.8881 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2222 0 0 1.5 5e-5 14.155)" fill="#3096fa" stroke-width=".17234">
+  <g transform="matrix(1.2222 0 0 1.5 5e-5 14.155)" class="Highlight" fill="currentColor" stroke-width=".17234">
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_14px.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_14px.svg
index 7589867375d..88c841ea693 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_14px.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_14px.svg
@@ -14,11 +14,11 @@
  <g transform="matrix(1.6364 0 0 1 2.4382e-5 0)">
   <path d="m2.2637 0.80987-1.1233 1.8359-0.16047-0.26227 1.1233-1.8359z" stroke-width=".20683"/>
   <path d="m0.16046 0.52905 1.1233 1.8359-0.16047 0.26227-1.1233-1.8359z" stroke-width=".20683"/>
-  <g transform="matrix(1.2222 0 0 2 3.2537 -.072269)" fill="#3096fa" stroke-width=".13229">
+  <g transform="matrix(1.2222 0 0 2 3.2537 -.072269)" class="Highlight" fill="currentColor" stroke-width=".13229">
    <path d="m-0.80196 2.0285-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m-2.5228 1.8881 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2222 0 0 2 4.621e-5 19.05)" fill="#3096fa" stroke-width=".13229">
+  <g transform="matrix(1.2222 0 0 2 4.621e-5 19.05)" class="Highlight" fill="currentColor" stroke-width=".13229">
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_17px.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_17px.svg
index 592d354fc4b..ea086cd7c55 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_17px.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_17px.svg
@@ -14,11 +14,11 @@
  <g transform="matrix(1.9784 0 0 1 3.1223e-5 0)">
   <path d="m2.2736 1.1096-1.1282 2.0654-0.16117-0.29506 1.1282-2.0654z" stroke-width=".1881"/>
   <path d="m0.16116 0.79363 1.1282 2.0654-0.16117 0.29506-1.1282-2.0654z" stroke-width=".1881"/>
-  <g transform="matrix(1.2275 0 0 2.2501 3.258 .51402)" fill="#3096fa" stroke-width=".11318">
+  <g transform="matrix(1.2275 0 0 2.2501 3.258 .51402)" class="Highlight" fill="currentColor" stroke-width=".11318">
    <path d="m-0.80196 2.0285-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m-2.5228 1.8881 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2275 0 0 2.2501 4.5595e-5 24.407)" fill="#3096fa" stroke-width=".11318">
+  <g transform="matrix(1.2275 0 0 2.2501 4.5595e-5 24.407)" class="Highlight" fill="currentColor" stroke-width=".11318">
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_21px.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_21px.svg
index f06f37be6dc..0a4e1b9f19e 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_21px.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_21px.svg
@@ -14,11 +14,11 @@
  <g transform="matrix(2.4439 0 0 1 4.0533e-5 0)">
   <path d="m2.2736 0.9152-1.1282 2.5244-0.16117-0.36063 1.1282-2.5244z" stroke-width=".16924"/>
   <path d="m0.16116 0.52902 1.1282 2.5244-0.16117 0.36063-1.1282-2.5244z" stroke-width=".16924"/>
-  <g transform="matrix(1.2276 0 0 2.7501 3.2581 .099084)" fill="#3096fa" stroke-width=".092108">
+  <g transform="matrix(1.2276 0 0 2.7501 3.2581 .099084)" class="Highlight" fill="currentColor" stroke-width=".092108">
    <path d="m-0.80196 2.0285-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m-2.5228 1.8881 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2276 0 0 2.7501 4.4792e-5 28.773)" fill="#3096fa" stroke-width=".092109">
+  <g transform="matrix(1.2276 0 0 2.7501 4.4792e-5 28.773)" class="Highlight" fill="currentColor" stroke-width=".092109">
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_28px.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_28px.svg
index 1246f58021d..610445f92dc 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_28px.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_28px.svg
@@ -14,11 +14,11 @@
  <g transform="matrix(3.2584 0 0 1 9.012e-5 0)">
   <path d="m2.2737 1.2851-1.1283 3.2128-0.16118-0.45898 1.1283-3.2128z" stroke-width=".14657"/>
   <path d="m0.16117 0.79356 1.1283 3.2128-0.16118 0.45898-1.1283-3.2128z" stroke-width=".14657"/>
-  <g transform="matrix(1.2276 0 0 3.5001 3.2582 .53501)" fill="#3096fa" stroke-width=".070707">
+  <g transform="matrix(1.2276 0 0 3.5001 3.2582 .53501)" class="Highlight" fill="currentColor" stroke-width=".070707">
    <path d="m-0.80196 2.0285-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m-2.5228 1.8881 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2276 0 0 3.5001 3.3723e-5 38.761)" fill="#3096fa" stroke-width=".070709">
+  <g transform="matrix(1.2276 0 0 3.5001 3.3723e-5 38.761)" class="Highlight" fill="currentColor" stroke-width=".070709">
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_7px.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_7px.svg
index a944c64858b..7ed26dfd98a 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_7px.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_7px.svg
@@ -14,7 +14,7 @@
  <g stroke-width=".26458">
   <path d="m1.8521 0.40499-0.91903 0.91793-0.13129-0.13113 0.91903-0.91794z"/>
   <path d="m0.13124 0.26459 0.91903 0.91794-0.13129 0.13113-0.91903-0.91794z"/>
-  <g fill="#3096fa">
+  <g class="Highlight" fill="currentColor">
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
    <path d="m1.8521 11.518-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_9px.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_9px.svg
index cd64d324020..a4b2a6bab13 100644
--- a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_9px.svg
+++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph_9px.svg
@@ -14,11 +14,11 @@
  <g transform="matrix(1.2857 0 0 1 1.4284e-5 0)">
   <path d="m1.8521 0.1755-0.91903 1.1474-0.13129-0.16391 0.91903-1.1474z" stroke-width=".23334"/>
   <path d="m0.13128-5.9278e-6 0.91903 1.1474-0.13129 0.16391-0.91903-1.1474z" stroke-width=".23334"/>
-  <g transform="matrix(1 0 0 1.25 0 -.99221)" fill="#3096fa" stroke-width=".20871">
+  <g transform="matrix(1 0 0 1.25 0 -.99221)" class="Highlight" fill="currentColor" stroke-width=".20871">
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1 0 0 1.25 3.889e-5 6.9453)" fill="#3096fa" stroke-width=".20871">
+  <g transform="matrix(1 0 0 1.25 3.889e-5 6.9453)" class="Highlight" fill="currentColor" stroke-width=".20871">
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_11px.svg b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_11px.svg
index 24306bc8fee..deeedf44552 100644
--- a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_11px.svg
+++ b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_11px.svg
@@ -14,11 +14,11 @@
  <g transform="matrix(1.2857,0,0,1,1.4284e-5,0)">
   <path d="m2.2637 0.47514-1.1233 1.3769-0.16047-0.1967 1.1233-1.3769z" stroke-width=".23334"/>
   <path d="m0.16046 0.26453 1.1233 1.3769-0.16047 0.1967-1.1233-1.3769z" stroke-width=".23334"/>
-  <g transform="matrix(1.2222 0 0 1.5 3.2438 -.18641)" fill="#3096fa" stroke-width=".17234">
+  <g transform="matrix(1.2222 0 0 1.5 3.2438 -.18641)" class="Highlight" fill="currentColor" stroke-width=".17234">
    <path d="m-0.80196 2.0285-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m-2.5228 1.8881 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2222 0 0 1.5 5e-5 14.155)" fill="#3096fa" stroke-width=".17234">
+  <g transform="matrix(1.2222 0 0 1.5 5e-5 14.155)" class="Highlight" fill="currentColor" stroke-width=".17234">
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_14px.svg b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_14px.svg
index 7589867375d..88c841ea693 100644
--- a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_14px.svg
+++ b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_14px.svg
@@ -14,11 +14,11 @@
  <g transform="matrix(1.6364 0 0 1 2.4382e-5 0)">
   <path d="m2.2637 0.80987-1.1233 1.8359-0.16047-0.26227 1.1233-1.8359z" stroke-width=".20683"/>
   <path d="m0.16046 0.52905 1.1233 1.8359-0.16047 0.26227-1.1233-1.8359z" stroke-width=".20683"/>
-  <g transform="matrix(1.2222 0 0 2 3.2537 -.072269)" fill="#3096fa" stroke-width=".13229">
+  <g transform="matrix(1.2222 0 0 2 3.2537 -.072269)" class="Highlight" fill="currentColor" stroke-width=".13229">
    <path d="m-0.80196 2.0285-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m-2.5228 1.8881 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2222 0 0 2 4.621e-5 19.05)" fill="#3096fa" stroke-width=".13229">
+  <g transform="matrix(1.2222 0 0 2 4.621e-5 19.05)" class="Highlight" fill="currentColor" stroke-width=".13229">
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_17px.svg b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_17px.svg
index 592d354fc4b..ea086cd7c55 100644
--- a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_17px.svg
+++ b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_17px.svg
@@ -14,11 +14,11 @@
  <g transform="matrix(1.9784 0 0 1 3.1223e-5 0)">
   <path d="m2.2736 1.1096-1.1282 2.0654-0.16117-0.29506 1.1282-2.0654z" stroke-width=".1881"/>
   <path d="m0.16116 0.79363 1.1282 2.0654-0.16117 0.29506-1.1282-2.0654z" stroke-width=".1881"/>
-  <g transform="matrix(1.2275 0 0 2.2501 3.258 .51402)" fill="#3096fa" stroke-width=".11318">
+  <g transform="matrix(1.2275 0 0 2.2501 3.258 .51402)" class="Highlight" fill="currentColor" stroke-width=".11318">
    <path d="m-0.80196 2.0285-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m-2.5228 1.8881 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1.2275 0 0 2.2501 4.5595e-5 24.407)" fill="#3096fa" stroke-width=".11318">
+  <g transform="matrix(1.2275 0 0 2.2501 4.5595e-5 24.407)" class="Highlight" fill="currentColor" stroke-width=".11318">
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_7px.svg b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_7px.svg
index a944c64858b..7ed26dfd98a 100644
--- a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_7px.svg
+++ b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_7px.svg
@@ -14,7 +14,7 @@
  <g stroke-width=".26458">
   <path d="m1.8521 0.40499-0.91903 0.91793-0.13129-0.13113 0.91903-0.91794z"/>
   <path d="m0.13124 0.26459 0.91903 0.91794-0.13129 0.13113-0.91903-0.91794z"/>
-  <g fill="#3096fa">
+  <g class="Highlight" fill="currentColor">
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
    <path d="m1.8521 11.518-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
diff --git a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_9px.svg b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_9px.svg
index cd64d324020..a4b2a6bab13 100644
--- a/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_9px.svg
+++ b/dlls/light.msstyles/blue_toolbar_dropdown_button_glyph_9px.svg
@@ -14,11 +14,11 @@
  <g transform="matrix(1.2857 0 0 1 1.4284e-5 0)">
   <path d="m1.8521 0.1755-0.91903 1.1474-0.13129-0.16391 0.91903-1.1474z" stroke-width=".23334"/>
   <path d="m0.13128-5.9278e-6 0.91903 1.1474-0.13129 0.16391-0.91903-1.1474z" stroke-width=".23334"/>
-  <g transform="matrix(1 0 0 1.25 0 -.99221)" fill="#3096fa" stroke-width=".20871">
+  <g transform="matrix(1 0 0 1.25 0 -.99221)" class="Highlight" fill="currentColor" stroke-width=".20871">
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
-  <g transform="matrix(1 0 0 1.25 3.889e-5 6.9453)" fill="#3096fa" stroke-width=".20871">
+  <g transform="matrix(1 0 0 1.25 3.889e-5 6.9453)" class="Highlight" fill="currentColor" stroke-width=".20871">
    <path d="m1.8521 1.9925-0.91903 0.91794-0.13129-0.13113 0.91903-0.91793z"/>
    <path d="m0.13124 1.8521 0.91903 0.91794-0.13129 0.13113-0.91903-0.91793z"/>
   </g>
diff --git a/dlls/light.msstyles/blue_tooltip_wrench_17px.svg b/dlls/light.msstyles/blue_tooltip_wrench_17px.svg
index 056a3cb1335..cb77225f59d 100644
--- a/dlls/light.msstyles/blue_tooltip_wrench_17px.svg
+++ b/dlls/light.msstyles/blue_tooltip_wrench_17px.svg
@@ -13,14 +13,14 @@
  </metadata>
  <g transform="translate(-40.717,-1.1913)" stroke-width=".26458">
   <g fill="#fff">
-   <g transform="matrix(.75874 0 0 .68439 9.8627 .47961)" stroke="#3096fa" stroke-width=".36716">
+   <g transform="matrix(.75874 0 0 .68439 9.8627 .47961)" class="Highlight" stroke="currentColor" stroke-width=".36716">
     <rect x="40.849" y="7.409" width="5.5564" height="5.8208" rx=".69743" ry=".77319" stroke-width=".36716"/>
    </g>
   </g>
   <rect x="40.849" y="9.7902" width="4.2333" height="3.9687" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
   <g stroke-width=".070003">
    <path d="m43.648 4.5906-0.94415-0.95147q-0.08417 0.029276-0.16834 0.047573-0.08417 0.018299-0.172 0.018299-0.35497 0-0.60382-0.24702t-0.24885-0.60199q0-0.11344 0.02928-0.2214t0.08417-0.2031l0.53063 0.53063 0.33667-0.31472-0.54526-0.54527q0.09515-0.054893 0.20127-0.085998 0.10613-0.031106 0.21591-0.031106 0.36229 0 0.61663 0.25434t0.25434 0.61663q0 0.087828-0.0183 0.172-0.0183 0.084168-0.04757 0.16834l0.94781 0.94415q0.04025 0.040255 0.04025 0.096977t-0.04025 0.096977l-0.27812 0.25616q-0.04026 0.040255-0.09515 0.040255t-0.09515-0.040255zm0.10247-0.20859 0.14638-0.14638-0.99904-0.99904q0.05855-0.076849 0.08783-0.18115 0.02928-0.1043 0.02928-0.19944 0-0.27446-0.2031-0.46476-0.2031-0.19029-0.46293-0.19395l0.36961 0.37693q0.03294 0.032935 0.03294 0.080509t-0.03294 0.080509l-0.48305 0.45378q-0.03294 0.032935-0.08051 0.032935t-0.08051-0.032935l-0.35497-0.35131q0.01098 0.28178 0.19944 0.46476t0.44463 0.18298q0.09149 0 0.19395-0.029276 0.10247-0.029276 0.17932-0.087828z" fill="#aeaeae"/>
-   <path d="m43.648 8.8239-0.94415-0.95147q-0.08417 0.029276-0.16834 0.047573-0.08417 0.018299-0.172 0.018299-0.35497 0-0.60382-0.24702t-0.24885-0.60199q0-0.11344 0.02928-0.2214t0.08417-0.2031l0.53063 0.53063 0.33667-0.31472-0.54526-0.54527q0.09515-0.054893 0.20127-0.085998 0.10613-0.031106 0.21591-0.031106 0.36229 0 0.61663 0.25434t0.25434 0.61663q0 0.087828-0.0183 0.172-0.0183 0.084168-0.04757 0.16834l0.94781 0.94415q0.04025 0.040255 0.04025 0.096977t-0.04025 0.096977l-0.27812 0.25616q-0.04026 0.040255-0.09515 0.040255t-0.09515-0.040255zm0.10247-0.20859 0.14638-0.14638-0.99904-0.99904q0.05855-0.076849 0.08783-0.18115 0.02928-0.1043 0.02928-0.19944 0-0.27446-0.2031-0.46476-0.2031-0.19029-0.46293-0.19395l0.36961 0.37693q0.03294 0.032935 0.03294 0.080509t-0.03294 0.080509l-0.48305 0.45378q-0.03294 0.032935-0.08051 0.032935t-0.08051-0.032935l-0.35497-0.35131q0.01098 0.28178 0.19944 0.46476t0.44463 0.18298q0.09149 0 0.19395-0.029276 0.10247-0.029276 0.17932-0.087828z" fill="#3096fa"/>
+   <path d="m43.648 8.8239-0.94415-0.95147q-0.08417 0.029276-0.16834 0.047573-0.08417 0.018299-0.172 0.018299-0.35497 0-0.60382-0.24702t-0.24885-0.60199q0-0.11344 0.02928-0.2214t0.08417-0.2031l0.53063 0.53063 0.33667-0.31472-0.54526-0.54527q0.09515-0.054893 0.20127-0.085998 0.10613-0.031106 0.21591-0.031106 0.36229 0 0.61663 0.25434t0.25434 0.61663q0 0.087828-0.0183 0.172-0.0183 0.084168-0.04757 0.16834l0.94781 0.94415q0.04025 0.040255 0.04025 0.096977t-0.04025 0.096977l-0.27812 0.25616q-0.04026 0.040255-0.09515 0.040255t-0.09515-0.040255zm0.10247-0.20859 0.14638-0.14638-0.99904-0.99904q0.05855-0.076849 0.08783-0.18115 0.02928-0.1043 0.02928-0.19944 0-0.27446-0.2031-0.46476-0.2031-0.19029-0.46293-0.19395l0.36961 0.37693q0.03294 0.032935 0.03294 0.080509t-0.03294 0.080509l-0.48305 0.45378q-0.03294 0.032935-0.08051 0.032935t-0.08051-0.032935l-0.35497-0.35131q0.01098 0.28178 0.19944 0.46476t0.44463 0.18298q0.09149 0 0.19395-0.029276 0.10247-0.029276 0.17932-0.087828z" class="Highlight"
  fill="currentColor"/>
    <path d="m43.648 13.057-0.94415-0.95147q-0.08417 0.02928-0.16834 0.04757-0.08417 0.0183-0.172 0.0183-0.35497 0-0.60382-0.24702t-0.24885-0.60199q0-0.11344 0.02928-0.2214t0.08417-0.2031l0.53063 0.53063 0.33667-0.31472-0.54526-0.54527q0.09515-0.05489 0.20127-0.086 0.10613-0.03111 0.21591-0.03111 0.36229 0 0.61663 0.25434t0.25434 0.61663q0 0.08783-0.0183 0.172t-0.04757 0.16834l0.94781 0.94415q0.04025 0.04026 0.04025 0.09698t-0.04025 0.09698l-0.27812 0.25616q-0.04026 0.04026-0.09515 0.04026t-0.09515-0.04026zm0.10247-0.20859 0.14638-0.14638-0.99904-0.99904q0.05855-0.07685 0.08783-0.18114 0.02928-0.1043 0.02928-0.19944 0-0.27446-0.2031-0.46476-0.2031-0.19029-0.46293-0.19395l0.36961 0.37693q0.03294 0.03294 0.03294 0.08051t-0.03294 0.08051l-0.48305 0.45378q-0.03294 0.03294-0.08051 0.03294t-0.08051-0.03294l-0.35497-0.35131q0.01098 0.28178 0.19944 0.46476t0.44463 0.18298q0.09149 0 0.19395-0.02928 0.10247-0.02928 0.17932-0.08783z" class="HighlightOutline" fill="currentColor"/>
   </g>
  </g>
diff --git a/dlls/light.msstyles/blue_tooltip_wrench_21px.svg b/dlls/light.msstyles/blue_tooltip_wrench_21px.svg
index 044c07496e6..33040139b2b 100644
--- a/dlls/light.msstyles/blue_tooltip_wrench_21px.svg
+++ b/dlls/light.msstyles/blue_tooltip_wrench_21px.svg
@@ -13,14 +13,14 @@
  </metadata>
  <g transform="translate(-40.717,-1.1913)" stroke-width=".26458">
   <g transform="translate(.9364 4.9015)" fill="#fff">
-   <g transform="matrix(.95025 0 0 .86559 1.102 -4.705)" stroke="#3096fa" stroke-width=".29173">
+   <g transform="matrix(.95025 0 0 .86559 1.102 -4.705)" class="Highlight" stroke="currentColor" stroke-width=".29173">
     <rect x="40.849" y="7.409" width="5.5562" height="5.8208" rx=".55687" ry=".61134" stroke-width=".29173"/>
    </g>
   </g>
   <rect x="40.849" y="11.907" width="5.2917" height="5.0271" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
   <g stroke-width=".070003">
    <path d="m44.554 5.6369-1.2274-1.2369q-0.10942 0.038059-0.21884 0.061845-0.10942 0.023789-0.2236 0.023789-0.46146 0-0.78497-0.32113-0.3235-0.32113-0.3235-0.78259 0-0.14747 0.03806-0.28782t0.10942-0.26403l0.68982 0.68982 0.43767-0.40914-0.70884-0.70885q0.1237-0.071361 0.26165-0.1118 0.13797-0.040438 0.28068-0.040438 0.47098 0 0.80162 0.33064t0.33064 0.80162q0 0.11418-0.02379 0.2236t-0.06184 0.21884l1.2322 1.2274q0.05232 0.052332 0.05232 0.12607 0 0.073739-0.05232 0.12607l-0.36156 0.33301q-0.05234 0.052332-0.1237 0.052332t-0.1237-0.052332zm0.13321-0.27117 0.1903-0.19029-1.2988-1.2988q0.07612-0.099904 0.11418-0.2355 0.03806-0.13559 0.03806-0.25927 0-0.3568-0.26403-0.60419-0.26403-0.24738-0.60181-0.25214l0.48049 0.49001q0.04282 0.042816 0.04282 0.10466 0 0.061846-0.04282 0.10466l-0.62797 0.58991q-0.04282 0.042816-0.10466 0.042816t-0.10466-0.042816l-0.46146-0.4567q0.01427 0.36631 0.25927 0.60419 0.245 0.23787 0.57802 0.23787 0.11894 0 0.25214-0.038059 0.13321-0.038059 0.23312-0.11418z
 " fill="#aeaeae"/>
-   <path d="m44.554 10.929-1.2274-1.2369q-0.10942 0.03806-0.21884 0.06184-0.10942 0.02379-0.2236 0.02379-0.46146 0-0.78497-0.32113-0.3235-0.32112-0.3235-0.78258 0-0.14747 0.03806-0.28782t0.10942-0.26403l0.68982 0.68982 0.43767-0.40914-0.70884-0.70885q0.1237-0.07136 0.26165-0.1118 0.13797-0.04044 0.28068-0.04044 0.47098 0 0.80162 0.33064t0.33064 0.80162q0 0.11418-0.02379 0.2236t-0.06184 0.21884l1.2322 1.2274q0.05233 0.05234 0.05233 0.12607 0 0.07374-0.05233 0.12607l-0.36156 0.33301q-0.05234 0.05234-0.1237 0.05234t-0.1237-0.05234zm0.13321-0.27117 0.19029-0.19029-1.2988-1.2987q0.07611-0.0999 0.11418-0.23549 0.03806-0.13559 0.03806-0.25927 0-0.3568-0.26403-0.60419-0.26403-0.24738-0.60181-0.25213l0.48049 0.49001q0.04282 0.04282 0.04282 0.10466t-0.04282 0.10466l-0.62797 0.58991q-0.04282 0.04282-0.10466 0.04282t-0.10466-0.04282l-0.46146-0.4567q0.01427 0.36631 0.25927 0.60419 0.245 0.23787 0.57802 0.23787 0.11894 0 0.25214-0.03806 0.13321-0.03806 0.23312-0.11418z" fill="#3096fa"/>
+   <path d="m44.554 10.929-1.2274-1.2369q-0.10942 0.03806-0.21884 0.06184-0.10942 0.02379-0.2236 0.02379-0.46146 0-0.78497-0.32113-0.3235-0.32112-0.3235-0.78258 0-0.14747 0.03806-0.28782t0.10942-0.26403l0.68982 0.68982 0.43767-0.40914-0.70884-0.70885q0.1237-0.07136 0.26165-0.1118 0.13797-0.04044 0.28068-0.04044 0.47098 0 0.80162 0.33064t0.33064 0.80162q0 0.11418-0.02379 0.2236t-0.06184 0.21884l1.2322 1.2274q0.05233 0.05234 0.05233 0.12607 0 0.07374-0.05233 0.12607l-0.36156 0.33301q-0.05234 0.05234-0.1237 0.05234t-0.1237-0.05234zm0.13321-0.27117 0.19029-0.19029-1.2988-1.2987q0.07611-0.0999 0.11418-0.23549 0.03806-0.13559 0.03806-0.25927 0-0.3568-0.26403-0.60419-0.26403-0.24738-0.60181-0.25213l0.48049 0.49001q0.04282 0.04282 0.04282 0.10466t-0.04282 0.10466l-0.62797 0.58991q-0.04282 0.04282-0.10466 0.04282t-0.10466-0.04282l-0.46146-0.4567q0.01427 0.36631 0.25927 0.60419 0.245 0.23787 0.57802 0.23787 0.11894 0 0.25214-0.03806 0.13321-0.03806 0.23312-0.11418z" class="Highlight" fill="cu
 rrentColor"/>
    <path d="m44.554 16.22-1.2274-1.2369q-0.10942 0.03806-0.21884 0.06184-0.10942 0.02379-0.2236 0.02379-0.46146 0-0.78497-0.32112-0.3235-0.32113-0.3235-0.78258 0-0.14747 0.03806-0.28782t0.10942-0.26403l0.68982 0.68982 0.43767-0.40914-0.70884-0.70885q0.1237-0.07136 0.26165-0.1118 0.13797-0.04044 0.28068-0.04044 0.47098 0 0.80162 0.33064t0.33064 0.80162q0 0.11418-0.02379 0.2236t-0.06184 0.21884l1.2322 1.2274q0.05233 0.05234 0.05233 0.12607 0 0.07374-0.05233 0.12607l-0.36156 0.33301q-0.05234 0.05234-0.1237 0.05234t-0.1237-0.05234zm0.13321-0.27117 0.19029-0.19029-1.2988-1.2987q0.07611-0.0999 0.11418-0.23548 0.03806-0.13559 0.03806-0.25927 0-0.3568-0.26403-0.60419-0.26403-0.24738-0.60181-0.25213l0.48049 0.49001q0.04282 0.04282 0.04282 0.10466t-0.04282 0.10466l-0.62797 0.58991q-0.04282 0.04282-0.10466 0.04282t-0.10466-0.04282l-0.46146-0.4567q0.01427 0.36631 0.25927 0.60419 0.245 0.23787 0.57802 0.23787 0.11894 0 0.25214-0.03806 0.13321-0.03806 0.23312-0.11418z" class="HighlightOutline" fi
 ll="currentColor"/>
   </g>
  </g>
diff --git a/dlls/light.msstyles/blue_tooltip_wrench_26px.svg b/dlls/light.msstyles/blue_tooltip_wrench_26px.svg
index 5ed89db2681..52cc7149c39 100644
--- a/dlls/light.msstyles/blue_tooltip_wrench_26px.svg
+++ b/dlls/light.msstyles/blue_tooltip_wrench_26px.svg
@@ -13,14 +13,14 @@
  </metadata>
  <g transform="translate(-40.717,-1.1913)">
   <g transform="matrix(1.2497,0,0,1.2109,-9.0269,5.5974)" fill="#fff" stroke-width=".21508">
-   <g transform="matrix(.95025 0 0 .86559 1.102 -4.705)" stroke="#3096fa" stroke-width=".23716">
+   <g transform="matrix(.95025 0 0 .86559 1.102 -4.705)" class="Highlight" stroke="currentColor" stroke-width=".23716">
     <rect x="40.849" y="7.409" width="5.5562" height="5.8208" rx=".4456" ry=".50486" stroke-width=".23716"/>
    </g>
   </g>
   <rect x="40.849" y="14.024" width="6.6146" height="6.0854" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
   <g stroke-width=".070003">
    <path d="m45.459 6.4186-1.5106-1.5223q-0.13467 0.046842-0.26934 0.076117-0.13467 0.029279-0.2752 0.029279-0.56795 0-0.96611-0.39524-0.39815-0.39524-0.39815-0.96319 0-0.1815 0.04684-0.35424t0.13467-0.32496l0.849 0.84901 0.53867-0.50356-0.87241-0.87243q0.15224-0.087829 0.32203-0.1376 0.16981-0.04977 0.34545-0.04977 0.57966 0 0.9866 0.40694t0.40694 0.98661q0 0.14053-0.02928 0.2752t-0.07611 0.26934l1.5165 1.5106q0.06439 0.064409 0.06439 0.15516 0 0.090756-0.06439 0.15516l-0.44499 0.40986q-0.06442 0.064409-0.15224 0.064409-0.08783 0-0.15224-0.064409zm0.16395-0.33375 0.23421-0.2342-1.5985-1.5985q0.09369-0.12296 0.14053-0.28985 0.04684-0.16688 0.04684-0.3191 0-0.43914-0.32496-0.74362-0.32495-0.30447-0.74068-0.31033l0.59137 0.60309q0.0527 0.052697 0.0527 0.12881 0 0.076118-0.0527 0.12881l-0.77288 0.72604q-0.0527 0.052697-0.12881 0.052697t-0.12881-0.052697l-0.56795-0.56209q0.01756 0.45084 0.3191 0.74362 0.30154 0.29276 0.7114 0.29276 0.14639 0 0.31032-0.046842 0.16395-0.046842 0.28692-0.1
 4053z" fill="#aeaeae"/>
-   <path d="m45.459 12.769-1.5106-1.5223q-0.13467 0.04684-0.26934 0.07611-0.13467 0.02928-0.2752 0.02928-0.56794 0-0.96611-0.39524-0.39815-0.39522-0.39815-0.96317 0-0.1815 0.04684-0.35424t0.13467-0.32496l0.849 0.84901 0.53867-0.50356-0.87241-0.87243q0.15224-0.087828 0.32203-0.1376 0.16981-0.049772 0.34545-0.049772 0.57966 0 0.9866 0.40694t0.40694 0.98661q0 0.14053-0.02928 0.2752t-0.07611 0.26934l1.5165 1.5106q0.06441 0.06442 0.06441 0.15516 0 0.09076-0.06441 0.15516l-0.44499 0.40986q-0.06442 0.06442-0.15224 0.06442-0.08783 0-0.15224-0.06442zm0.16395-0.33375 0.2342-0.2342-1.5985-1.5984q0.09367-0.12295 0.14053-0.28983 0.04684-0.16688 0.04684-0.3191 0-0.43914-0.32496-0.74362-0.32496-0.30447-0.74068-0.31031l0.59137 0.60309q0.0527 0.052701 0.0527 0.12881 0 0.076111-0.0527 0.12881l-0.77288 0.72604q-0.0527 0.0527-0.12881 0.0527t-0.12881-0.0527l-0.56794-0.56209q0.01756 0.45084 0.3191 0.74362 0.30154 0.29276 0.7114 0.29276 0.14639 0 0.31032-0.04684 0.16395-0.04684 0.28691-0.14053z" fill="#30
 96fa"/>
+   <path d="m45.459 12.769-1.5106-1.5223q-0.13467 0.04684-0.26934 0.07611-0.13467 0.02928-0.2752 0.02928-0.56794 0-0.96611-0.39524-0.39815-0.39522-0.39815-0.96317 0-0.1815 0.04684-0.35424t0.13467-0.32496l0.849 0.84901 0.53867-0.50356-0.87241-0.87243q0.15224-0.087828 0.32203-0.1376 0.16981-0.049772 0.34545-0.049772 0.57966 0 0.9866 0.40694t0.40694 0.98661q0 0.14053-0.02928 0.2752t-0.07611 0.26934l1.5165 1.5106q0.06441 0.06442 0.06441 0.15516 0 0.09076-0.06441 0.15516l-0.44499 0.40986q-0.06442 0.06442-0.15224 0.06442-0.08783 0-0.15224-0.06442zm0.16395-0.33375 0.2342-0.2342-1.5985-1.5984q0.09367-0.12295 0.14053-0.28983 0.04684-0.16688 0.04684-0.3191 0-0.43914-0.32496-0.74362-0.32496-0.30447-0.74068-0.31031l0.59137 0.60309q0.0527 0.052701 0.0527 0.12881 0 0.076111-0.0527 0.12881l-0.77288 0.72604q-0.0527 0.0527-0.12881 0.0527t-0.12881-0.0527l-0.56794-0.56209q0.01756 0.45084 0.3191 0.74362 0.30154 0.29276 0.7114 0.29276 0.14639 0 0.31032-0.04684 0.16395-0.04684 0.28691-0.14053z" class="Hi
 ghlight" fill="currentColor"/>
    <path d="m45.459 19.119-1.5106-1.5223q-0.13467 0.04684-0.26934 0.07611-0.13467 0.02928-0.2752 0.02928-0.56794 0-0.96611-0.39522-0.39815-0.39524-0.39815-0.96317 0-0.1815 0.04684-0.35424t0.13467-0.32496l0.849 0.84901 0.53866-0.50356-0.87241-0.87243q0.15224-0.08783 0.32203-0.1376 0.16981-0.04977 0.34545-0.04977 0.57966 0 0.9866 0.40694t0.40694 0.98661q0 0.14053-0.02928 0.2752t-0.07611 0.26934l1.5165 1.5106q0.06441 0.06442 0.06441 0.15516 0 0.09076-0.06441 0.15516l-0.44499 0.40986q-0.06442 0.06442-0.15224 0.06442-0.08783 0-0.15224-0.06442zm0.16395-0.33375 0.2342-0.2342-1.5985-1.5984q0.09367-0.12295 0.14053-0.28982 0.04684-0.16688 0.04684-0.3191 0-0.43914-0.32496-0.74362-0.32496-0.30447-0.74068-0.31031l0.59137 0.60309q0.0527 0.0527 0.0527 0.12881t-0.0527 0.12881l-0.77288 0.72604q-0.0527 0.0527-0.12881 0.0527t-0.12881-0.0527l-0.56794-0.56209q0.01756 0.45084 0.3191 0.74362 0.30154 0.29276 0.7114 0.29276 0.14639 0 0.31032-0.04684 0.16395-0.04684 0.28691-0.14053z" class="HighlightOutline"
  fill="currentColor"/>
   </g>
  </g>
diff --git a/dlls/light.msstyles/blue_tooltip_wrench_34px.svg b/dlls/light.msstyles/blue_tooltip_wrench_34px.svg
index 6c77638d941..6082f6cc913 100644
--- a/dlls/light.msstyles/blue_tooltip_wrench_34px.svg
+++ b/dlls/light.msstyles/blue_tooltip_wrench_34px.svg
@@ -13,14 +13,14 @@
  </metadata>
  <g transform="translate(-40.717,-1.1913)">
   <g transform="matrix(1.651,0,0,1.6306,-25.048,6.9981)" fill="#fff" stroke-width=".16126">
-   <g transform="matrix(.95025 0 0 .86559 1.102 -4.705)" stroke="#3096fa" stroke-width=".17781">
+   <g transform="matrix(.95025 0 0 .86559 1.102 -4.705)" class="Highlight" stroke="currentColor" stroke-width=".17781">
     <rect x="40.849" y="7.409" width="5.5562" height="5.8208" rx=".33729" ry=".37492" stroke-width=".17781"/>
    </g>
   </g>
   <rect x="40.849" y="18.257" width="8.7313" height="8.2021" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
   <g stroke-width=".070003">
    <path d="m46.579 7.99-1.8883-1.9029q-0.16834 0.058553-0.33668 0.095148-0.16834 0.036599-0.344 0.036599-0.70994 0-1.2076-0.49406-0.49769-0.49406-0.49769-1.204 0-0.22688 0.05855-0.44281 0.05854-0.21593 0.16834-0.40621l1.0613 1.0613 0.67334-0.62946-1.0905-1.0906q0.1903-0.10979 0.40254-0.172 0.21226-0.062213 0.43182-0.062213 0.72458 0 1.2333 0.50868 0.50868 0.50868 0.50868 1.2333 0 0.17566-0.0366 0.344t-0.09513 0.33668l1.8956 1.8883q0.08049 0.080512 0.08049 0.19395 0 0.11345-0.08049 0.19395l-0.55624 0.51233q-0.08052 0.080512-0.1903 0.080512-0.10979 0-0.1903-0.080512zm0.20494-0.41719 0.29276-0.29275-1.9981-1.9982q0.11711-0.1537 0.17566-0.36232 0.05856-0.2086 0.05856-0.39888 0-0.54893-0.4062-0.92954-0.40619-0.38059-0.92586-0.38792l0.73922 0.75387q0.06588 0.065872 0.06588 0.16101 0 0.095149-0.06588 0.16101l-0.96611 0.90756q-0.06588 0.065872-0.16101 0.065872-0.09515 0-0.16102-0.065872l-0.70995-0.70262q0.02196 0.56356 0.39888 0.92954 0.37693 0.36595 0.88926 0.36595 0.18299 0 0.3879-0.0585
 53 0.20494-0.058553 0.35865-0.17566z" fill="#aeaeae"/>
-   <path d="m46.579 16.457-1.8883-1.9029q-0.16834 0.05855-0.33668 0.09514-0.16834 0.0366-0.344 0.0366-0.70993 0-1.2076-0.49406-0.49769-0.49403-0.49769-1.204 0-0.22688 0.05855-0.4428t0.16834-0.4062l1.0613 1.0613 0.67334-0.62946-1.0905-1.0905q0.1903-0.10979 0.40254-0.172 0.21226-0.06221 0.43181-0.06221 0.72458 0 1.2333 0.50868t0.50868 1.2333q0 0.17566-0.0366 0.344t-0.09514 0.33668l1.8956 1.8883q0.08051 0.08052 0.08051 0.19395 0 0.11345-0.08051 0.19395l-0.55624 0.51233q-0.08053 0.08053-0.1903 0.08053-0.10979 0-0.1903-0.08053zm0.20494-0.41719 0.29275-0.29275-1.9981-1.998q0.11709-0.15369 0.17566-0.36229 0.05855-0.2086 0.05855-0.39888 0-0.54893-0.4062-0.92953-0.4062-0.38059-0.92586-0.38789l0.73922 0.75387q0.06588 0.06588 0.06588 0.16101 0 0.09514-0.06588 0.16101l-0.9661 0.90756q-0.06587 0.06588-0.16101 0.06588t-0.16101-0.06588l-0.70993-0.70262q0.02195 0.56356 0.39888 0.92954 0.37693 0.36595 0.88925 0.36595 0.18299 0 0.3879-0.05855 0.20494-0.05855 0.35864-0.17566z" fill="#3096fa"/>
+   <path d="m46.579 16.457-1.8883-1.9029q-0.16834 0.05855-0.33668 0.09514-0.16834 0.0366-0.344 0.0366-0.70993 0-1.2076-0.49406-0.49769-0.49403-0.49769-1.204 0-0.22688 0.05855-0.4428t0.16834-0.4062l1.0613 1.0613 0.67334-0.62946-1.0905-1.0905q0.1903-0.10979 0.40254-0.172 0.21226-0.06221 0.43181-0.06221 0.72458 0 1.2333 0.50868t0.50868 1.2333q0 0.17566-0.0366 0.344t-0.09514 0.33668l1.8956 1.8883q0.08051 0.08052 0.08051 0.19395 0 0.11345-0.08051 0.19395l-0.55624 0.51233q-0.08053 0.08053-0.1903 0.08053-0.10979 0-0.1903-0.08053zm0.20494-0.41719 0.29275-0.29275-1.9981-1.998q0.11709-0.15369 0.17566-0.36229 0.05855-0.2086 0.05855-0.39888 0-0.54893-0.4062-0.92953-0.4062-0.38059-0.92586-0.38789l0.73922 0.75387q0.06588 0.06588 0.06588 0.16101 0 0.09514-0.06588 0.16101l-0.9661 0.90756q-0.06587 0.06588-0.16101 0.06588t-0.16101-0.06588l-0.70993-0.70262q0.02195 0.56356 0.39888 0.92954 0.37693 0.36595 0.88925 0.36595 0.18299 0 0.3879-0.05855 0.20494-0.05855 0.35864-0.17566z" class="Highlight" fill="
 currentColor"/>
    <path d="m46.579 24.923-1.8883-1.9029q-0.16834 0.05855-0.33668 0.09514-0.16834 0.0366-0.344 0.0366-0.70993 0-1.2076-0.49403-0.49769-0.49406-0.49769-1.204 0-0.22688 0.05855-0.4428t0.16834-0.4062l1.0613 1.0613 0.67333-0.62946-1.0905-1.0905q0.1903-0.10979 0.40254-0.172 0.21226-0.06221 0.43182-0.06221 0.72458 0 1.2333 0.50868t0.50868 1.2333q0 0.17566-0.0366 0.344t-0.09514 0.33668l1.8956 1.8883q0.08051 0.08053 0.08051 0.19395 0 0.11345-0.08051 0.19395l-0.55624 0.51233q-0.08053 0.08053-0.1903 0.08053-0.10979 0-0.1903-0.08053zm0.20494-0.41719 0.29275-0.29275-1.9981-1.998q0.11709-0.15369 0.17566-0.36228 0.05855-0.2086 0.05855-0.39888 0-0.54893-0.4062-0.92954-0.4062-0.38059-0.92586-0.38789l0.73922 0.75387q0.06587 0.06588 0.06587 0.16101 0 0.09514-0.06587 0.16101l-0.96611 0.90756q-0.06588 0.06587-0.16101 0.06587-0.09514 0-0.16101-0.06587l-0.70993-0.70262q0.02195 0.56356 0.39888 0.92953 0.37693 0.36595 0.88926 0.36595 0.18299 0 0.3879-0.05855 0.20494-0.05855 0.35864-0.17566z" class="Highlig
 htOutline" fill="currentColor"/>
   </g>
  </g>
diff --git a/dlls/light.msstyles/blue_tooltip_wrench_42px.svg b/dlls/light.msstyles/blue_tooltip_wrench_42px.svg
index eaf7f8a1230..92bb0247588 100644
--- a/dlls/light.msstyles/blue_tooltip_wrench_42px.svg
+++ b/dlls/light.msstyles/blue_tooltip_wrench_42px.svg
@@ -13,14 +13,14 @@
  </metadata>
  <g transform="translate(-40.717,-1.1913)">
   <g transform="matrix(2.0522,0,0,2.0504,-41.067,8.3985)" fill="#fff" stroke-width=".12899">
-   <g transform="matrix(.95025 0 0 .86559 1.102 -4.705)" stroke="#3096fa" stroke-width=".14222">
+   <g transform="matrix(.95025 0 0 .86559 1.102 -4.705)" class="Highlight" stroke="currentColor" stroke-width=".14222">
     <rect x="40.849" y="7.409" width="5.5564" height="5.8208" rx=".27135" ry=".29815" stroke-width=".14222"/>
    </g>
   </g>
   <rect x="40.849" y="22.49" width="10.848" height="10.319" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".26458"/>
   <g stroke-width=".070003">
    <path d="m48.227 9.5614-2.2659-2.2835q-0.20201 0.070263-0.40401 0.11418-0.202 0.043919-0.4128 0.043919-0.85192 0-1.4491-0.59287-0.59722-0.59287-0.59722-1.4448 0-0.27225 0.07026-0.53137 0.07025-0.25911 0.20201-0.48745l1.2735 1.2736 0.808-0.75535-1.3086-1.3087q0.22836-0.13175 0.48304-0.2064 0.25471-0.074655 0.51818-0.074655 0.86949 0 1.4799 0.61041t0.61041 1.48q0 0.21079-0.04392 0.4128t-0.11416 0.40401l2.2747 2.2659q0.09659 0.096614 0.09659 0.23274 0 0.13614-0.09659 0.23274l-0.66748 0.61479q-0.09662 0.096614-0.22836 0.096614-0.13175 0-0.22836-0.096614zm0.24592-0.50062 0.35131-0.3513-2.3977-2.3978q0.14053-0.18444 0.21079-0.43478 0.07027-0.25032 0.07027-0.47865 0-0.65871-0.48743-1.1154-0.48742-0.4567-1.111-0.4655l0.88705 0.90464q0.07905 0.079046 0.07905 0.19321 0 0.11418-0.07905 0.19321l-1.1593 1.0891q-0.07905 0.079046-0.19321 0.079046-0.11418 0-0.19322-0.079046l-0.85193-0.84314q0.02635 0.67627 0.47865 1.1154 0.45231 0.43914 1.0671 0.43914 0.21959 0 0.46548-0.070263 0.24592-0.070263 
 0.43038-0.21079z" fill="#aeaeae"/>
-   <path d="m48.227 20.145-2.2659-2.2835q-0.20201 0.07026-0.40401 0.11417-0.202 0.04392-0.4128 0.04392-0.8519 0-1.4491-0.59287-0.59722-0.59283-0.59722-1.4448 0-0.27225 0.07026-0.53135t0.20201-0.48744l1.2735 1.2735 0.808-0.75534-1.3086-1.3086q0.22836-0.13175 0.48304-0.2064 0.25471-0.07465 0.51816-0.07465 0.86949 0 1.4799 0.61041 0.61046 0.61041 0.61041 1.4799 0 0.21079-0.04392 0.4128t-0.11417 0.40401l2.2747 2.2659q0.09661 0.09662 0.09661 0.23274 0 0.13614-0.09661 0.23274l-0.66748 0.61479q-0.09663 0.09664-0.22836 0.09664-0.13175 0-0.22836-0.09664zm0.24592-0.50062 0.3513-0.3513-2.3977-2.3976q0.14051-0.18443 0.21079-0.43474 0.07026-0.25032 0.07026-0.47865 0-0.65871-0.48743-1.1154-0.48744-0.4567-1.111-0.46546l0.88705 0.90464q0.07906 0.07906 0.07906 0.19321 0 0.11417-0.07906 0.19321l-1.1593 1.0891q-0.07904 0.07906-0.19321 0.07906t-0.19321-0.07906l-0.85191-0.84314q0.02634 0.67626 0.47865 1.1154t1.0671 0.43914q0.21959 0 0.46548-0.07026 0.24592-0.07026 0.43036-0.21079z" fill="#3096fa"/>
+   <path d="m48.227 20.145-2.2659-2.2835q-0.20201 0.07026-0.40401 0.11417-0.202 0.04392-0.4128 0.04392-0.8519 0-1.4491-0.59287-0.59722-0.59283-0.59722-1.4448 0-0.27225 0.07026-0.53135t0.20201-0.48744l1.2735 1.2735 0.808-0.75534-1.3086-1.3086q0.22836-0.13175 0.48304-0.2064 0.25471-0.07465 0.51816-0.07465 0.86949 0 1.4799 0.61041 0.61046 0.61041 0.61041 1.4799 0 0.21079-0.04392 0.4128t-0.11417 0.40401l2.2747 2.2659q0.09661 0.09662 0.09661 0.23274 0 0.13614-0.09661 0.23274l-0.66748 0.61479q-0.09663 0.09664-0.22836 0.09664-0.13175 0-0.22836-0.09664zm0.24592-0.50062 0.3513-0.3513-2.3977-2.3976q0.14051-0.18443 0.21079-0.43474 0.07026-0.25032 0.07026-0.47865 0-0.65871-0.48743-1.1154-0.48744-0.4567-1.111-0.46546l0.88705 0.90464q0.07906 0.07906 0.07906 0.19321 0 0.11417-0.07906 0.19321l-1.1593 1.0891q-0.07904 0.07906-0.19321 0.07906t-0.19321-0.07906l-0.85191-0.84314q0.02634 0.67626 0.47865 1.1154t1.0671 0.43914q0.21959 0 0.46548-0.07026 0.24592-0.07026 0.43036-0.21079z" class="Highlight" fil
 l="currentColor"/>
    <path d="m48.227 30.728-2.2659-2.2835q-0.20201 0.07026-0.40401 0.11417-0.202 0.04392-0.4128 0.04392-0.8519 0-1.4491-0.59283-0.59722-0.59287-0.59722-1.4448 0-0.27225 0.07026-0.53136t0.20201-0.48744l1.2735 1.2735 0.80799-0.75534-1.3086-1.3086q0.22836-0.13175 0.48304-0.2064 0.25471-0.07465 0.51818-0.07465 0.86949 0 1.4799 0.61041 0.61046 0.61041 0.61041 1.4799 0 0.21079-0.04392 0.4128t-0.11417 0.40401l2.2747 2.2659q0.09661 0.09663 0.09661 0.23274 0 0.13614-0.09661 0.23274l-0.66748 0.61479q-0.09663 0.09663-0.22836 0.09663-0.13175 0-0.22836-0.09663zm0.24592-0.50062 0.3513-0.3513-2.3977-2.3976q0.14051-0.18443 0.21079-0.43473 0.07026-0.25032 0.07026-0.47865 0-0.65871-0.48743-1.1154-0.48744-0.4567-1.111-0.46546l0.88705 0.90464q0.07904 0.07906 0.07904 0.19321 0 0.11417-0.07904 0.19321l-1.1593 1.0891q-0.07905 0.07904-0.19321 0.07904-0.11417 0-0.19321-0.07904l-0.85191-0.84314q0.02634 0.67626 0.47865 1.1154t1.0671 0.43914q0.21959 0 0.46548-0.07026 0.24592-0.07026 0.43036-0.21079z" class="Hig
 hlightOutline" fill="currentColor"/>
   </g>
  </g>
diff --git a/dlls/light.msstyles/blue_tooltip_wrench_51px.svg b/dlls/light.msstyles/blue_tooltip_wrench_51px.svg
index a3ae1dd3625..14726ee0373 100644
--- a/dlls/light.msstyles/blue_tooltip_wrench_51px.svg
+++ b/dlls/light.msstyles/blue_tooltip_wrench_51px.svg
@@ -13,14 +13,14 @@
  </metadata>
  <g transform="translate(-40.717,-1.1913)">
   <g transform="matrix(2.4502 0 0 2.4208 -56.814 10.008)" fill="#fff" stroke-width=".21727">
-   <g transform="matrix(.95025 0 0 .86559 1.1022 -4.7052)" stroke="#3096fa" stroke-width=".23957">
+   <g transform="matrix(.95025 0 0 .86559 1.1022 -4.7052)" class="Highlight" stroke="currentColor" stroke-width=".23957">
     <rect x="40.849" y="7.409" width="5.5563" height="5.8208" rx=".22727" ry=".25253" stroke-width=".23957"/>
    </g>
   </g>
   <rect x="40.981" y="26.856" width="12.965" height="12.171" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".52917"/>
   <g transform="translate(0 .26455)" stroke-width=".070003">
    <path d="m49.723 11.385-2.9268-2.9495q-0.26093 0.090757-0.52185 0.14748-0.26092 0.056729-0.53321 0.056729-1.1004 0-1.8718-0.76579-0.77142-0.76579-0.77142-1.8662 0-0.35166 0.09076-0.68635 0.09074-0.33468 0.26093-0.62962l1.645 1.6451 1.0437-0.97566-1.6903-1.6904q0.29497-0.17018 0.62394-0.2666 0.329-0.09643 0.66932-0.09643 1.1231 0 1.9116 0.78845 0.78846 0.78845 0.78846 1.9117 0 0.27227-0.05673 0.5332-0.05673 0.26093-0.14746 0.52185l2.9382 2.9268q0.12476 0.12479 0.12476 0.30062 0 0.17585-0.12476 0.30062l-0.86217 0.7941q-0.1248 0.12479-0.29497 0.12479-0.17018 0-0.29497-0.12479zm0.31765-0.64663 0.45378-0.45376-3.0971-3.0972q0.18152-0.23823 0.27227-0.56159 0.09077-0.32333 0.09077-0.61826 0-0.85083-0.6296-1.4407-0.6296-0.5899-1.4351-0.60127l1.1458 1.1685q0.1021 0.1021 0.1021 0.24956 0 0.14748-0.1021 0.24956l-1.4974 1.4068q-0.1021 0.1021-0.24957 0.1021-0.14748 0-0.24958-0.1021l-1.1004-1.0891q0.03404 0.87351 0.61826 1.4407 0.58424 0.56722 1.3784 0.56722 0.28364 0 0.60125-0.090757 0.31765-
 0.090757 0.55592-0.27227z" fill="#aeaeae"/>
-   <path d="m49.723 24.085-2.9268-2.9496q-0.26093 0.09075-0.52185 0.14747-0.26092 0.05673-0.53321 0.05673-1.1004 0-1.8718-0.7658-0.77142-0.76575-0.77142-1.8662 0-0.35166 0.09075-0.68634 0.09075-0.33467 0.26094-0.62962l1.645 1.645 1.0437-0.97566-1.6903-1.6903q0.29497-0.17018 0.62394-0.2666 0.32901-0.09642 0.6693-0.09642 1.1231 0 1.9116 0.78846 0.78852 0.78846 0.78846 1.9116 0 0.27227-0.05673 0.53321-0.05673 0.26093-0.14747 0.52185l2.9382 2.9268q0.12479 0.1248 0.12479 0.30063 0 0.17585-0.12479 0.30063l-0.86218 0.79411q-0.12482 0.12483-0.29497 0.12483-0.17018 0-0.29497-0.12483zm0.31765-0.64664 0.45377-0.45377-3.0971-3.0969q0.1815-0.23822 0.27228-0.56155 0.09075-0.32333 0.09075-0.61826 0-0.85084-0.62961-1.4407-0.62962-0.58991-1.4351-0.60122l1.1458 1.1685q0.10212 0.10212 0.10212 0.24956 0 0.14747-0.10212 0.24957l-1.4975 1.4068q-0.1021 0.10212-0.24957 0.10212t-0.24957-0.10212l-1.1004-1.0891q0.03402 0.87351 0.61827 1.4407 0.58424 0.56723 1.3784 0.56723 0.28364 0 0.60125-0.09075 0.31765-0.0
 9075 0.55589-0.27227z" fill="#3096fa"/>
+   <path d="m49.723 24.085-2.9268-2.9496q-0.26093 0.09075-0.52185 0.14747-0.26092 0.05673-0.53321 0.05673-1.1004 0-1.8718-0.7658-0.77142-0.76575-0.77142-1.8662 0-0.35166 0.09075-0.68634 0.09075-0.33467 0.26094-0.62962l1.645 1.645 1.0437-0.97566-1.6903-1.6903q0.29497-0.17018 0.62394-0.2666 0.32901-0.09642 0.6693-0.09642 1.1231 0 1.9116 0.78846 0.78852 0.78846 0.78846 1.9116 0 0.27227-0.05673 0.53321-0.05673 0.26093-0.14747 0.52185l2.9382 2.9268q0.12479 0.1248 0.12479 0.30063 0 0.17585-0.12479 0.30063l-0.86218 0.79411q-0.12482 0.12483-0.29497 0.12483-0.17018 0-0.29497-0.12483zm0.31765-0.64664 0.45377-0.45377-3.0971-3.0969q0.1815-0.23822 0.27228-0.56155 0.09075-0.32333 0.09075-0.61826 0-0.85084-0.62961-1.4407-0.62962-0.58991-1.4351-0.60122l1.1458 1.1685q0.10212 0.10212 0.10212 0.24956 0 0.14747-0.10212 0.24957l-1.4975 1.4068q-0.1021 0.10212-0.24957 0.10212t-0.24957-0.10212l-1.1004-1.0891q0.03402 0.87351 0.61827 1.4407 0.58424 0.56723 1.3784 0.56723 0.28364 0 0.60125-0.09075 0.31765-0.0
 9075 0.55589-0.27227z" class="Highlight" fill="currentColor"/>
    <path d="m49.723 36.785-2.9268-2.9496q-0.26093 0.09075-0.52185 0.14747-0.26092 0.05673-0.53321 0.05673-1.1004 0-1.8718-0.76575-0.77142-0.7658-0.77142-1.8662 0-0.35166 0.09075-0.68635t0.26093-0.62962l1.645 1.645 1.0437-0.97566-1.6903-1.6903q0.29497-0.17018 0.62394-0.2666 0.329-0.09642 0.66933-0.09642 1.1231 0 1.9116 0.78846 0.78852 0.78846 0.78846 1.9116 0 0.27227-0.05673 0.53321t-0.14747 0.52185l2.9382 2.9268q0.12479 0.12482 0.12479 0.30063 0 0.17585-0.12479 0.30063l-0.86217 0.79411q-0.12482 0.12482-0.29497 0.12482-0.17018 0-0.29497-0.12482zm0.31765-0.64664 0.45377-0.45377-3.0971-3.0969q0.1815-0.23822 0.27228-0.56153 0.09075-0.32333 0.09075-0.61826 0-0.85084-0.62961-1.4407-0.62962-0.58991-1.4351-0.60123l1.1458 1.1685q0.10209 0.10212 0.10209 0.24957 0 0.14747-0.10209 0.24957l-1.4975 1.4068q-0.10211 0.10209-0.24957 0.10209-0.14747 0-0.24957-0.10209l-1.1004-1.0891q0.03402 0.87351 0.61826 1.4407 0.58424 0.56723 1.3784 0.56723 0.28364 0 0.60125-0.09075 0.31765-0.09075 0.55589-0.27227z
 " class="HighlightOutline" fill="currentColor"/>
   </g>
  </g>
diff --git a/dlls/light.msstyles/blue_tooltip_wrench_68px.svg b/dlls/light.msstyles/blue_tooltip_wrench_68px.svg
index 17c4c05840e..7fc05ee4554 100644
--- a/dlls/light.msstyles/blue_tooltip_wrench_68px.svg
+++ b/dlls/light.msstyles/blue_tooltip_wrench_68px.svg
@@ -13,14 +13,14 @@
  </metadata>
  <g transform="translate(-40.717,-1.1913)">
   <g transform="matrix(3.3019 0 0 3.261 -90.816 12.806)" fill="#fff" stroke-width=".16126">
-   <g transform="matrix(.95025 0 0 .86559 1.1022 -4.7052)" stroke="#3096fa" stroke-width=".17781">
+   <g transform="matrix(.95025 0 0 .86559 1.1022 -4.7052)" class="Highlight" stroke="currentColor" stroke-width=".17781">
     <rect x="40.849" y="7.409" width="5.5563" height="5.8208" rx=".16865" ry=".18747" stroke-width=".17781"/>
    </g>
   </g>
   <rect x="40.981" y="35.323" width="17.462" height="16.404" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor" stroke-width=".52917"/>
   <g transform="translate(.26454 .52937)" stroke-width=".070003">
    <path d="m52.074 14.251-3.9653-3.9961q-0.35351 0.12296-0.70701 0.19981-0.3535 0.07686-0.7224 0.07686-1.4908 0-2.536-1.0375-1.0451-1.0375-1.0451-2.5284 0-0.47644 0.12296-0.92989 0.12294-0.45343 0.35351-0.85303l2.2287 2.2288 1.414-1.3219-2.2901-2.2902q0.39963-0.23056 0.84533-0.3612 0.44574-0.13065 0.90681-0.13065 1.5216 0 2.5899 1.0682 1.0682 1.0682 1.0682 2.59 0 0.36888-0.07686 0.7224-0.07686 0.35352-0.19978 0.70702l3.9807 3.9653q0.16903 0.16907 0.16903 0.40729 0 0.23825-0.16903 0.40729l-1.1681 1.0759q-0.16908 0.16907-0.39963 0.16907-0.23056 0-0.39963-0.16907zm0.43036-0.87607 0.61479-0.61477-4.196-4.1962q0.24593-0.32276 0.36888-0.76086 0.12298-0.43806 0.12298-0.83764 0-1.1527-0.853-1.9519-0.853-0.79922-1.9443-0.81462l1.5524 1.5831q0.13833 0.13833 0.13833 0.33811 0 0.19981-0.13833 0.33811l-2.0287 1.906q-0.13833 0.13833-0.33812 0.13833-0.19981 0-0.33814-0.13833l-1.4908-1.4755q0.04612 1.1835 0.83763 1.9519 0.79154 0.76849 1.8675 0.76849 0.38428 0 0.81459-0.12296 0.43036-0.12296 0.753
 17-0.36888z" fill="#aeaeae"/>
-   <path d="m52.074 31.185-3.9653-3.9962q-0.35351 0.12295-0.70701 0.1998-0.3535 0.07686-0.7224 0.07686-1.4908 0-2.536-1.0375-1.0451-1.0375-1.0451-2.5284 0-0.47644 0.12295-0.92988 0.12295-0.45342 0.35353-0.85303l2.2287 2.2287 1.414-1.3219-2.2901-2.2901q0.39963-0.23057 0.84533-0.3612 0.44575-0.13063 0.90678-0.13063 1.5216 0 2.5899 1.0682 1.0683 1.0682 1.0682 2.5899 0 0.36888-0.07686 0.72241-0.07686 0.35352-0.1998 0.70702l3.9807 3.9653q0.16907 0.16908 0.16907 0.4073 0 0.23825-0.16907 0.4073l-1.1681 1.0759q-0.16911 0.16912-0.39963 0.16912-0.23056 0-0.39963-0.16912zm0.43036-0.87609 0.61478-0.61478-4.196-4.1958q0.2459-0.32275 0.36889-0.76081 0.12295-0.43806 0.12295-0.83764 0-1.1527-0.85301-1.9519-0.85302-0.79923-1.9443-0.81455l1.5524 1.5831q0.13836 0.13836 0.13836 0.33811 0 0.1998-0.13836 0.33812l-2.0288 1.906q-0.13833 0.13836-0.33812 0.13836-0.1998 0-0.33812-0.13836l-1.4908-1.4755q0.04609 1.1835 0.83765 1.9519 0.79154 0.7685 1.8675 0.7685 0.38428 0 0.81459-0.12295 0.43036-0.12295 0.75313
 -0.36888z" fill="#3096fa"/>
+   <path d="m52.074 31.185-3.9653-3.9962q-0.35351 0.12295-0.70701 0.1998-0.3535 0.07686-0.7224 0.07686-1.4908 0-2.536-1.0375-1.0451-1.0375-1.0451-2.5284 0-0.47644 0.12295-0.92988 0.12295-0.45342 0.35353-0.85303l2.2287 2.2287 1.414-1.3219-2.2901-2.2901q0.39963-0.23057 0.84533-0.3612 0.44575-0.13063 0.90678-0.13063 1.5216 0 2.5899 1.0682 1.0683 1.0682 1.0682 2.5899 0 0.36888-0.07686 0.72241-0.07686 0.35352-0.1998 0.70702l3.9807 3.9653q0.16907 0.16908 0.16907 0.4073 0 0.23825-0.16907 0.4073l-1.1681 1.0759q-0.16911 0.16912-0.39963 0.16912-0.23056 0-0.39963-0.16912zm0.43036-0.87609 0.61478-0.61478-4.196-4.1958q0.2459-0.32275 0.36889-0.76081 0.12295-0.43806 0.12295-0.83764 0-1.1527-0.85301-1.9519-0.85302-0.79923-1.9443-0.81455l1.5524 1.5831q0.13836 0.13836 0.13836 0.33811 0 0.1998-0.13836 0.33812l-2.0288 1.906q-0.13833 0.13836-0.33812 0.13836-0.1998 0-0.33812-0.13836l-1.4908-1.4755q0.04609 1.1835 0.83765 1.9519 0.79154 0.7685 1.8675 0.7685 0.38428 0 0.81459-0.12295 0.43036-0.12295 0.75313
 -0.36888z" class="Highlight" fill="currentColor"/>
    <path d="m52.074 48.118-3.9653-3.9962q-0.35351 0.12295-0.70701 0.1998-0.3535 0.07686-0.7224 0.07686-1.4908 0-2.536-1.0375-1.0451-1.0375-1.0451-2.5284 0-0.47644 0.12296-0.92989 0.12296-0.45345 0.35351-0.85303l2.2287 2.2287 1.414-1.3219-2.2901-2.2901q0.39963-0.23057 0.84533-0.3612 0.44574-0.13063 0.90682-0.13063 1.5216 0 2.5899 1.0682 1.0683 1.0682 1.0682 2.5899 0 0.36888-0.07686 0.72241-0.07686 0.35353-0.1998 0.70702l3.9807 3.9653q0.16907 0.16911 0.16907 0.4073 0 0.23825-0.16907 0.4073l-1.1681 1.0759q-0.16911 0.16911-0.39963 0.16911-0.23056 0-0.39963-0.16911zm0.43036-0.87609 0.61478-0.61478-4.196-4.1958q0.2459-0.32275 0.36889-0.76078 0.12296-0.43806 0.12296-0.83764 0-1.1527-0.85301-1.9519-0.85302-0.79923-1.9443-0.81457l1.5524 1.5831q0.13831 0.13836 0.13831 0.33813 0 0.1998-0.13831 0.33813l-2.0288 1.906q-0.13834 0.13832-0.33812 0.13832-0.1998 0-0.33812-0.13832l-1.4908-1.4756q0.04609 1.1835 0.83763 1.9519 0.79154 0.7685 1.8675 0.7685 0.38428 0 0.81458-0.12295 0.43036-0.12295 0.75313
 -0.36888z" class="HighlightOutline" fill="currentColor"/>
   </g>
  </g>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_11px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_11px.svg
index 963fefba7b0..1e52e24c77e 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_down_11px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_down_11px.svg
@@ -16,8 +16,8 @@
   <path d="m2.9104 13.766-0.00208-3.7121h-2.9062l-0.002084 3.7121 1.4552 1.315z" class="HighlightOutline" fill="currentColor"/>
   <g fill="#fff">
    <path d="m2.7781 23.728-0.00189-3.4877h-2.642l-0.001887 3.4877 1.3229 1.2355z" stroke="#aeaeae"/>
-   <path d="m2.7781 8.6469-0.00188-3.4877h-2.642l-0.001888 3.4877 1.3229 1.2355z" stroke="#3096fa"/>
-   <path d="m2.7781 18.701-0.00188-3.4877h-2.642l-0.001888 3.4877 1.3229 1.2355z" stroke="#3096fa"/>
+   <path d="m2.7781 8.6469-0.00188-3.4877h-2.642l-0.001888 3.4877 1.3229 1.2355z" class="Highlight" stroke="currentColor"/>
+   <path d="m2.7781 18.701-0.00188-3.4877h-2.642l-0.001888 3.4877 1.3229 1.2355z" class="Highlight" stroke="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_15px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_15px.svg
index e6cb816af2d..a2284f09285 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_down_15px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_down_15px.svg
@@ -15,9 +15,9 @@
   <path d="m3.5718 4.3935-0.00227-4.2612h-3.1704l-0.002271 4.2612 1.5875 1.5095z" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/>
   <path d="m3.7042 17.194-0.00246-4.4936h-3.4347l-0.002463 4.4936 1.7198 1.5918z" class="HighlightOutline" fill="currentColor"/>
   <g fill="#fff">
-   <path d="m3.5718 10.74-0.00227-4.2576h-3.1704l-0.002273 4.2576 1.5875 1.5082z" stroke="#3096fa"/>
+   <path d="m3.5718 10.74-0.00227-4.2576h-3.1704l-0.002273 4.2576 1.5875 1.5082z" class="Highlight" stroke="currentColor"/>
    <path d="m3.5718 29.79-0.0023-4.2576h-3.1704l-0.00227 4.2576 1.5875 1.5082z" stroke="#aeaeae"/>
-   <path d="m3.5718 23.44-0.00227-4.2576h-3.1704l-0.002273 4.2576 1.5875 1.5082z" stroke="#3096fa"/>
+   <path d="m3.5718 23.44-0.00227-4.2576h-3.1704l-0.002273 4.2576 1.5875 1.5082z" class="Highlight" stroke="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_17px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_17px.svg
index 45d63ecd6b5..36e9b705627 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_down_17px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_down_17px.svg
@@ -15,9 +15,9 @@
   <path d="m4.101 5.3667-0.0026483-5.2344h-3.6988l-0.00265 5.2344 1.8521 1.8542z" fill="#fff" stroke="#aeaeae"/>
   <path d="m4.2333 20.816-0.00284-5.4705h-3.9631l-0.00284 5.4705 1.9844 1.9378z" class="HighlightOutline" fill="currentColor"/>
   <g transform="translate(4.3679 10.716)" fill="#fff">
-   <path d="m-0.26696 2.3365-0.002648-5.2468h-3.6988l-0.00265 5.2468 1.8521 1.8586z" stroke="#3096fa"/>
+   <path d="m-0.26696 2.3365-0.002648-5.2468h-3.6988l-0.00265 5.2468 1.8521 1.8586z" class="Highlight" stroke="currentColor"/>
    <path d="m-0.26696 25.355-0.00268-5.2468h-3.6988l-0.00265 5.2468 1.8521 1.8586z" stroke="#aeaeae"/>
-   <path d="m-0.26696 17.682-0.00265-5.2468h-3.6988l-0.00265 5.2468 1.8521 1.8586z" stroke="#3096fa"/>
+   <path d="m-0.26696 17.682-0.00265-5.2468h-3.6988l-0.00265 5.2468 1.8521 1.8586z" class="Highlight" stroke="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_22px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_22px.svg
index 4776322358d..3f4486e3ca3 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_down_22px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_down_22px.svg
@@ -15,9 +15,9 @@
   <path d="m5.5562 7.255-0.0037857-6.9904h-5.284l-0.003786 6.9904 2.6459 2.4762z" fill="#fff" stroke="#aeaeae" stroke-width=".52917"/>
   <path d="m5.8209 27.533-0.00417-7.4244h-5.8126l-0.004165 7.4244 2.9105 2.6299z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
   <g transform="translate(4.3679,10.716)" fill="#fff">
-   <path d="m1.1883 6.593-0.00378-6.9902h-5.284l-0.00379 6.9902 2.6459 2.4762z" stroke="#3096fa" stroke-width=".52917"/>
+   <path d="m1.1883 6.593-0.00378-6.9902h-5.284l-0.00379 6.9902 2.6459 2.4762z" class="Highlight" stroke="currentColor" stroke-width=".52917"/>
    <path d="m1.1882 36.756-0.00383-6.9902h-5.2839l-0.00379 6.9902 2.6458 2.4762z" stroke="#aeaeae" stroke-width=".52917"/>
-   <path d="m1.1883 26.702-0.00379-6.9902h-5.284l-0.00379 6.9902 2.6459 2.4762z" stroke="#3096fa" stroke-width=".52917"/>
+   <path d="m1.1883 26.702-0.00379-6.9902h-5.284l-0.00379 6.9902 2.6459 2.4762z" class="Highlight" stroke="currentColor" stroke-width=".52917"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_28px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_28px.svg
index 6fc9688a9df..e163d634b24 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_down_28px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_down_28px.svg
@@ -14,8 +14,8 @@
  <path d="m7.1437 9.1454-0.0049271-8.8808h-6.8692l-0.0049218 8.8808 3.4397 3.1458z" fill="#fff" stroke="#aeaeae" stroke-width=".52917"/>
  <path d="m7.4083 34.778-0.00531-9.3781h-7.3977l-0.0053008 9.3781 3.7042 3.3219z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(4.3679,10.716)" fill="#fff" stroke-width=".52917">
-  <path d="m2.7758 11.191-0.00491-8.9419h-6.8692l-0.00493 8.9419 3.4397 3.1676z" stroke="#3096fa"/>
+  <path d="m2.7758 11.191-0.00491-8.9419h-6.8692l-0.00493 8.9419 3.4397 3.1676z" class="Highlight" stroke="currentColor"/>
   <path d="m2.7758 49.291-0.00498-8.9419h-6.8692l-0.00493 8.9419 3.4396 3.1676z" stroke="#aeaeae"/>
-  <path d="m2.7758 36.566-0.00493-8.917h-6.8692l-0.00493 8.917 3.4397 3.1588z" stroke="#3096fa"/>
+  <path d="m2.7758 36.566-0.00493-8.917h-6.8692l-0.00493 8.917 3.4397 3.1588z" class="Highlight" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_33px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_33px.svg
index 9c1cbb2643f..0c435a7e0db 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_down_33px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_down_33px.svg
@@ -14,8 +14,8 @@
  <path d="m8.3343 10.839-0.0056884-10.442h-7.9259l-0.005679 10.442 3.9689 3.6989z" fill="#fff" stroke="#aeaeae" stroke-width=".79375"/>
  <path d="m8.7312 41.299-0.00626-11.136h-8.7187l-0.0062474 11.136 4.3657 3.9448z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(4.3679,10.716)" fill="#fff" stroke-width=".79375">
-  <path d="m3.9664 15.23-0.00567-10.468h-7.926l-0.00569 10.468 3.9689 3.7083z" stroke="#3096fa"/>
+  <path d="m3.9664 15.23-0.00567-10.468h-7.926l-0.00569 10.468 3.9689 3.7083z" class="Highlight" stroke="currentColor"/>
   <path d="m3.9664 60.474-0.00575-10.468h-7.9259l-0.00569 10.468 3.9687 3.7083z" stroke="#aeaeae"/>
-  <path d="m3.9664 45.393-0.00569-10.469h-7.9259l-0.00569 10.469 3.9688 3.7085z" stroke="#3096fa"/>
+  <path d="m3.9664 45.393-0.00569-10.469h-7.9259l-0.00569 10.469 3.9688 3.7085z" class="Highlight" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_44px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_44px.svg
index 6fac6de32c1..9829a300027 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_down_44px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_down_44px.svg
@@ -14,8 +14,8 @@
  <path d="m11.112 14.51-0.007584-13.981h-10.568l-0.007572 13.981 5.2919 4.9525z" fill="#fff" stroke="#aeaeae" stroke-width="1.0583"/>
  <path d="m11.642 55.065-0.0084-14.848h-11.625l-0.00833 14.848 5.8209 5.2599z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(4.3679,10.716)" fill="#fff" stroke-width="1.0583">
-  <path d="m6.7444 23.902-0.00756-13.98h-10.568l-0.00759 13.98 5.2918 4.9526z" stroke="#3096fa"/>
+  <path d="m6.7444 23.902-0.00756-13.98h-10.568l-0.00759 13.98 5.2918 4.9526z" class="Highlight" stroke="currentColor"/>
   <path d="m6.7444 84.227-0.0076666-13.98h-10.568l-0.00759 13.98 5.2916 4.9526z" stroke="#aeaeae"/>
-  <path d="m6.7444 64.118-0.0075867-13.981h-10.568l-0.00759 13.981 5.2917 4.9524z" stroke="#3096fa"/>
+  <path d="m6.7444 64.118-0.0075867-13.981h-10.568l-0.00759 13.981 5.2917 4.9524z" class="Highlight" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg
index 7196981367b..9f5b42e1c3f 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg
@@ -14,7 +14,7 @@
  <rect y="-.00023066" width="2.9104" height="27.781" fill="#fdffff" stroke-linejoin="round" stroke-width=".070004"/>
  <g stroke-width=".26458">
   <rect x=".13229" y=".13206" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
-  <rect x=".13229" y="5.6883" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/>
+  <rect x=".13229" y="5.6883" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" class="Highlight" stroke="currentColor"/>
   <rect x=".13229" y="11.245" width="2.6458" height="5.2917" rx=".52917" ry=".52917" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <rect x=".13229" y="16.801" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
   <rect x=".13229" y="22.357" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_19px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_19px.svg
index 8a3b55fd7e0..6c25f799d61 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_left_19px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_left_19px.svg
@@ -14,8 +14,8 @@
  <path d="m1.4113 2.7781 3.474-0.00189v-2.642l-3.474-0.001895-1.2306 1.3229z" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/>
  <path d="m1.315 8.7312 3.7121-0.00211v-2.9062l-3.7121-0.0021144-1.315 1.4552z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(-.27412)" fill="#fff" stroke-width=".26458">
-  <path d="m1.6854 5.6885 3.474-0.00189v-2.642l-3.474-0.0018875-1.2306 1.3229z" stroke="#3096fa"/>
+  <path d="m1.6854 5.6885 3.474-0.00189v-2.642l-3.474-0.0018875-1.2306 1.3229z" class="Highlight" stroke="currentColor"/>
   <path d="m1.6854 14.42 3.474-0.0019v-2.642l-3.474-0.0019-1.2306 1.3229z" stroke="#aeaeae"/>
-  <path d="m1.6854 11.509 3.474-0.0019v-2.642l-3.474-0.0018875-1.2306 1.3229z" stroke="#3096fa"/>
+  <path d="m1.6854 11.509 3.474-0.0019v-2.642l-3.474-0.0018875-1.2306 1.3229z" class="Highlight" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_25px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_25px.svg
index d987a62ab2e..eceadbd91fe 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_left_25px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_left_25px.svg
@@ -16,9 +16,9 @@
   <path d="m1.9572 3.5718 4.2628-0.00227v-3.1704l-4.2628-0.0022736-1.5101 1.5875z" fill="#fff" stroke="#aeaeae"/>
   <path d="m1.8564 11.642 4.4936-0.0025v-3.4347l-4.4936-0.0025-1.5918 1.7198z" class="HighlightOutline" fill="currentColor"/>
   <g fill="#fff">
-   <path d="m1.9572 7.5406 4.2628-0.00227v-3.1704l-4.2628-0.0022666-1.5101 1.5875z" stroke="#3096fa"/>
+   <path d="m1.9572 7.5406 4.2628-0.00227v-3.1704l-4.2628-0.0022666-1.5101 1.5875z" class="Highlight" stroke="currentColor"/>
    <path d="m1.9572 19.447 4.2628-0.0023v-3.1704l-4.2628-0.0023-1.5101 1.5875z" stroke="#aeaeae"/>
-   <path d="m1.9572 15.478 4.2628-0.0023v-3.1704l-4.2628-0.0023-1.5101 1.5875z" stroke="#3096fa"/>
+   <path d="m1.9572 15.478 4.2628-0.0023v-3.1704l-4.2628-0.0023-1.5101 1.5875z" class="Highlight" stroke="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_29px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_29px.svg
index c565cbd0c33..815555314f2 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_left_29px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_left_29px.svg
@@ -15,9 +15,9 @@
   <path d="m2.0415 4.101 5.2345-0.00265v-3.6989l-5.2345-0.0026531-1.8543 1.8521z" fill="#fff" stroke="#aeaeae"/>
   <path d="m1.9378 13.229 5.4706-0.0029v-3.963l-5.4706-0.0028846-1.9379 1.9843z" class="HighlightOutline" fill="currentColor"/>
   <g transform="translate(-.26464)" fill="#fff">
-   <path d="m2.3061 8.5991 5.2345-0.00265v-3.6989l-5.2345-0.0026484-1.8543 1.8521z" stroke="#3096fa"/>
+   <path d="m2.3061 8.5991 5.2345-0.00265v-3.6989l-5.2345-0.0026484-1.8543 1.8521z" class="Highlight" stroke="currentColor"/>
    <path d="m2.3061 22.093 5.2345-0.0027v-3.6988l-5.2345-0.0027-1.8543 1.8521z" stroke="#aeaeae"/>
-   <path d="m2.3061 17.595 5.2345-0.0027v-3.6988l-5.2345-0.0027-1.8543 1.8521z" stroke="#3096fa"/>
+   <path d="m2.3061 17.595 5.2345-0.0027v-3.6988l-5.2345-0.0027-1.8543 1.8521z" class="Highlight" stroke="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_38px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_38px.svg
index 7fe45ed29a5..6f94058df00 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_left_38px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_left_38px.svg
@@ -14,8 +14,8 @@
  <path d="m2.8243 5.5563 6.9525-0.00379v-5.2841l-6.9525-0.00379-2.4629 2.6458z" fill="#fff" stroke="#aeaeae" stroke-width=".52918"/>
  <path d="m2.6299 17.463 7.4244-0.0043v-5.8124l-7.4244-0.0042-2.63 2.9103z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(-.26464)" fill="#fff" stroke-width=".52918">
-  <path d="m3.0923 11.377 6.962-0.0038v-5.2841l-6.962-0.0037857-2.4663 2.6458z" stroke="#3096fa"/>
+  <path d="m3.0923 11.377 6.962-0.0038v-5.2841l-6.962-0.0037857-2.4663 2.6458z" class="Highlight" stroke="currentColor"/>
   <path d="m3.0889 28.84 6.9525-0.0039v-5.284l-6.9525-0.0039-2.4629 2.6458z" stroke="#aeaeae"/>
-  <path d="m3.0923 23.019 6.962-0.0039v-5.284l-6.962-0.0039-2.4663 2.6458z" stroke="#3096fa"/>
+  <path d="m3.0923 23.019 6.962-0.0039v-5.284l-6.962-0.0039-2.4663 2.6458z" class="Highlight" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_48px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_48px.svg
index 7076fed2795..c4587954e3a 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_left_48px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_left_48px.svg
@@ -14,8 +14,8 @@
  <path d="m3.5173 7.1439 8.9159-0.00493v-6.8694l-8.9159-0.0049271-3.1584 3.4396z" fill="#fff" stroke="#aeaeae" stroke-width=".52918"/>
  <path d="m3.3218 22.226 9.3782-0.0055v-7.3977l-9.3782-0.0053-3.3221 3.7041z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(-.26464 1.5879)" fill="#fff">
-  <path d="m3.7844 12.965 8.9157-0.0049v-6.8695l-8.9157-0.0049271-3.1584 3.4396z" stroke="#3096fa" stroke-width=".52918"/>
+  <path d="m3.7844 12.965 8.9157-0.0049v-6.8695l-8.9157-0.0049271-3.1584 3.4396z" class="Highlight" stroke="currentColor" stroke-width=".52918"/>
   <path d="m3.782 35.19 8.9159-0.0051v-6.8691l-8.9159-0.0051-3.1584 3.4395z" stroke="#aeaeae" stroke-width=".52918"/>
-  <path d="m3.782 27.782 8.9157-0.0051v-6.8691l-8.9157-0.0051-3.1584 3.4395z" stroke="#3096fa" stroke-width=".52918"/>
+  <path d="m3.782 27.782 8.9157-0.0051v-6.8691l-8.9157-0.0051-3.1584 3.4395z" class="Highlight" stroke="currentColor" stroke-width=".52918"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_57px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_57px.svg
index 7fb8e8f857f..e929fbf80cf 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_left_57px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_left_57px.svg
@@ -14,8 +14,8 @@
  <path d="m4.2427 8.3346 10.446-0.0056885v-7.9263l-10.446-0.005685-3.7003 3.9688z" fill="#fff" stroke="#aeaeae" stroke-width=".79378"/>
  <path d="m3.9448 26.195 11.137-0.0065v-8.7188l-11.137-0.0062-3.945 4.3656z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(-.26464 1.5879)" fill="#fff" stroke-width=".79378">
-  <path d="m4.5074 15.478 10.446-0.0057v-7.9262l-10.446-0.0056885-3.7004 3.9687z" stroke="#3096fa"/>
+  <path d="m4.5074 15.478 10.446-0.0057v-7.9262l-10.446-0.0056885-3.7004 3.9687z" class="Highlight" stroke="currentColor"/>
   <path d="m4.5073 41.673 10.446-0.0059v-7.9258l-10.446-0.0059-3.7003 3.9686z" stroke="#aeaeae"/>
-  <path d="m4.5074 32.941 10.446-0.0059v-7.9258l-10.446-0.0059-3.7004 3.9686z" stroke="#3096fa"/>
+  <path d="m4.5074 32.941 10.446-0.0059v-7.9258l-10.446-0.0059-3.7004 3.9686z" class="Highlight" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_76px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_76px.svg
index ea95ede4760..cb8f951b3fe 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_left_76px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_left_76px.svg
@@ -14,8 +14,8 @@
  <path d="m5.6552 11.113 13.924-0.007586v-10.568l-13.924-0.00758-4.9323 5.2918z" fill="#fff" stroke="#aeaeae" stroke-width="1.0584"/>
  <path d="m5.2594 34.926 14.849-0.008667v-11.625l-14.849-0.0083-5.2599 5.8209z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(-.084146 4.631)" fill="#fff" stroke-width="1.0584">
-  <path d="m5.7394 18.124 13.924-0.0076v-10.568l-13.924-0.0075847-4.9324 5.2917z" stroke="#3096fa"/>
+  <path d="m5.7394 18.124 13.924-0.0076v-10.568l-13.924-0.0075847-4.9324 5.2917z" class="Highlight" stroke="currentColor"/>
   <path d="m5.7393 53.05 13.924-0.0079v-10.568l-13.924-0.0079-4.9323 5.2915z" stroke="#aeaeae"/>
-  <path d="m5.7394 41.408 13.924-0.0079v-10.568l-13.924-0.0079-4.9324 5.2915z" stroke="#3096fa"/>
+  <path d="m5.7394 41.408 13.924-0.0079v-10.568l-13.924-0.0079-4.9324 5.2915z" class="Highlight" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_19px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_19px.svg
index a4fa7eee34a..53f6a0521f6 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_right_19px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_right_19px.svg
@@ -15,9 +15,9 @@
   <path d="m3.6158 2.7781-3.474-0.00189v-2.642l3.474-0.001895 1.2306 1.3229z" fill="#fff" stroke="#aeaeae"/>
   <path d="m3.7121 8.7312-3.7121-0.00211v-2.9062l3.7121-0.00211 1.315 1.4552z" class="HighlightOutline" fill="currentColor"/>
   <g transform="matrix(-1 0 0 1 5.3012 0)" fill="#fff">
-   <path d="m1.6854 5.6885 3.474-0.00189v-2.642l-3.474-0.00189-1.2306 1.3229z" stroke="#3096fa"/>
+   <path d="m1.6854 5.6885 3.474-0.00189v-2.642l-3.474-0.00189-1.2306 1.3229z" class="Highlight" stroke="currentColor"/>
    <path d="m1.6854 14.42 3.474-0.0019v-2.642l-3.474-0.0019-1.2306 1.3229z" stroke="#aeaeae"/>
-   <path d="m1.6854 11.509 3.474-0.0019v-2.642l-3.474-0.00189-1.2306 1.3229z" stroke="#3096fa"/>
+   <path d="m1.6854 11.509 3.474-0.0019v-2.642l-3.474-0.00189-1.2306 1.3229z" class="Highlight" stroke="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_25px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_25px.svg
index 358f625756e..6e401f96738 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_right_25px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_right_25px.svg
@@ -15,9 +15,9 @@
   <path d="m1.9572 3.5718 4.2628-0.00227v-3.1704l-4.2628-0.002274-1.5101 1.5875z" fill="#fff" stroke="#aeaeae"/>
   <path d="m1.8564 11.642 4.4936-0.0025v-3.4347l-4.4936-0.0025-1.5918 1.7198z" class="HighlightOutline" fill="currentColor"/>
   <g fill="#fff">
-   <path d="m1.9572 7.5406 4.2628-0.00227v-3.1704l-4.2628-0.00227-1.5101 1.5875z" stroke="#3096fa"/>
+   <path d="m1.9572 7.5406 4.2628-0.00227v-3.1704l-4.2628-0.00227-1.5101 1.5875z" class="Highlight" stroke="currentColor"/>
    <path d="m1.9572 19.447 4.2628-0.0023v-3.1704l-4.2628-0.0023-1.5101 1.5875z" stroke="#aeaeae"/>
-   <path d="m1.9572 15.478 4.2628-0.0023v-3.1704l-4.2628-0.0023-1.5101 1.5875z" stroke="#3096fa"/>
+   <path d="m1.9572 15.478 4.2628-0.0023v-3.1704l-4.2628-0.0023-1.5101 1.5875z" class="Highlight" stroke="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_29px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_29px.svg
index fadf813e627..f7abfbfc120 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_right_29px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_right_29px.svg
@@ -15,9 +15,9 @@
   <path d="m2.0415 4.101 5.2345-0.00265v-3.6989l-5.2345-0.002653-1.8543 1.8521z" fill="#fff" stroke="#aeaeae"/>
   <path d="m1.9378 13.229 5.4706-0.0029v-3.963l-5.4706-0.0028846-1.9379 1.9843z" class="HighlightOutline" fill="currentColor"/>
   <g transform="translate(-.26464)" fill="#fff">
-   <path d="m2.3061 8.5991 5.2345-0.00265v-3.6989l-5.2345-0.00265-1.8543 1.8521z" stroke="#3096fa"/>
+   <path d="m2.3061 8.5991 5.2345-0.00265v-3.6989l-5.2345-0.00265-1.8543 1.8521z" class="Highlight" stroke="currentColor"/>
    <path d="m2.3061 22.093 5.2345-0.0027v-3.6988l-5.2345-0.0027-1.8543 1.8521z" stroke="#aeaeae"/>
-   <path d="m2.3061 17.595 5.2345-0.0027v-3.6988l-5.2345-0.0027-1.8543 1.8521z" stroke="#3096fa"/>
+   <path d="m2.3061 17.595 5.2345-0.0027v-3.6988l-5.2345-0.0027-1.8543 1.8521z" class="Highlight" stroke="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_38px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_38px.svg
index 3dc5ae7197c..b70b940e814 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_right_38px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_right_38px.svg
@@ -14,8 +14,8 @@
  <path d="m7.2296 5.5563-6.9525-0.00379v-5.2841l6.9525-0.00379 2.4629 2.6458z" fill="#fff" stroke="#aeaeae" stroke-width=".52918"/>
  <path d="m7.424 17.463-7.4244-0.0043v-5.8124l7.4244-0.0042 2.63 2.9103z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="matrix(-1 0 0 1 10.319 0)" fill="#fff" stroke-width=".52918">
-  <path d="m3.0923 11.377 6.962-0.0038v-5.2841l-6.962-0.00379-2.4663 2.6458z" stroke="#3096fa"/>
+  <path d="m3.0923 11.377 6.962-0.0038v-5.2841l-6.962-0.00379-2.4663 2.6458z" class="Highlight" stroke="currentColor"/>
   <path d="m3.0889 28.84 6.9525-0.0039v-5.284l-6.9525-0.0039-2.4629 2.6458z" stroke="#aeaeae"/>
-  <path d="m3.0923 23.019 6.962-0.0039v-5.284l-6.962-0.0039-2.4663 2.6458z" stroke="#3096fa"/>
+  <path d="m3.0923 23.019 6.962-0.0039v-5.284l-6.962-0.0039-2.4663 2.6458z" class="Highlight" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_48px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_48px.svg
index 13a44a69909..6555521e114 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_right_48px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_right_48px.svg
@@ -14,8 +14,8 @@
  <path d="m9.1824 7.1439-8.9159-0.00493v-6.8694l8.9159-0.004927 3.1584 3.4396z" fill="#fff" stroke="#aeaeae" stroke-width=".52918"/>
  <path d="m9.3779 22.226-9.3782-0.0055v-7.3977l9.3782-0.0053 3.3221 3.7041z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="matrix(-1 0 0 1 12.964 1.5879)" fill="#fff" stroke-width=".52918">
-  <path d="m3.7844 12.965 8.9157-0.0049v-6.8695l-8.9157-0.00493-3.1584 3.4396z" stroke="#3096fa"/>
+  <path d="m3.7844 12.965 8.9157-0.0049v-6.8695l-8.9157-0.00493-3.1584 3.4396z" class="Highlight" stroke="currentColor"/>
   <path d="m3.782 35.19 8.9159-0.0051v-6.8691l-8.9159-0.0051-3.1584 3.4395z" stroke="#aeaeae"/>
-  <path d="m3.782 27.782 8.9157-0.0051v-6.8691l-8.9157-0.0051-3.1584 3.4395z" stroke="#3096fa"/>
+  <path d="m3.782 27.782 8.9157-0.0051v-6.8691l-8.9157-0.0051-3.1584 3.4395z" class="Highlight" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_57px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_57px.svg
index b24197fe2ea..a0aa4792682 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_right_57px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_right_57px.svg
@@ -14,8 +14,8 @@
  <path d="m10.843 8.3346-10.446-0.0056885v-7.9263l10.446-0.005685 3.7003 3.9688z" fill="#fff" stroke="#aeaeae" stroke-width=".79378"/>
  <path d="m11.141 26.195-11.137-0.0065v-8.7188l11.137-0.0062 3.945 4.3656z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="matrix(-1 0 0 1 15.35 1.5879)" fill="#fff" stroke-width=".79378">
-  <path d="m4.5074 15.478 10.446-0.0057v-7.9262l-10.446-0.0056885-3.7004 3.9687z" stroke="#3096fa"/>
+  <path d="m4.5074 15.478 10.446-0.0057v-7.9262l-10.446-0.0056885-3.7004 3.9687z" class="Highlight" stroke="currentColor"/>
   <path d="m4.5073 41.673 10.446-0.0059v-7.9258l-10.446-0.0059-3.7003 3.9686z" stroke="#aeaeae"/>
-  <path d="m4.5074 32.941 10.446-0.0059v-7.9258l-10.446-0.0059-3.7004 3.9686z" stroke="#3096fa"/>
+  <path d="m4.5074 32.941 10.446-0.0059v-7.9258l-10.446-0.0059-3.7004 3.9686z" class="Highlight" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_76px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_76px.svg
index b583c9240be..5054b6d1d63 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_right_76px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_right_76px.svg
@@ -14,8 +14,8 @@
  <path d="m14.453 11.113-13.924-0.0076v-10.568l13.924-0.00758 4.9323 5.2918z" fill="#fff" stroke="#aeaeae" stroke-width="1.0584"/>
  <path d="m14.848 34.926-14.849-0.0087v-11.625l14.849-0.008267 5.2599 5.8209z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="matrix(-1 0 0 1 20.192 4.631)" fill="#fff" stroke-width="1.0584">
-  <path d="m5.7394 18.124 13.924-0.0076v-10.568l-13.924-0.0075847-4.9324 5.2917z" stroke="#3096fa"/>
+  <path d="m5.7394 18.124 13.924-0.0076v-10.568l-13.924-0.0075847-4.9324 5.2917z" class="Highlight" stroke="currentColor"/>
   <path d="m5.7393 53.05 13.924-0.0079v-10.568l-13.924-0.0079-4.9323 5.2915z" stroke="#aeaeae"/>
-  <path d="m5.7394 41.408 13.924-0.0079v-10.568l-13.924-0.0079-4.9324 5.2915z" stroke="#3096fa"/>
+  <path d="m5.7394 41.408 13.924-0.0079v-10.568l-13.924-0.0079-4.9324 5.2915z" class="Highlight" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_11px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_11px.svg
index 259f880c4e9..c2dfd70e578 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_up_11px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_up_11px.svg
@@ -16,8 +16,8 @@
   <path d="m2.9104 11.369-0.00208 3.7121h-2.9062l-0.002084-3.7121 1.4552-1.315z" class="HighlightOutline" fill="currentColor"/>
   <g fill="#fff">
    <path d="m2.7781 21.525-0.00189 3.4877h-2.642l-0.001887-3.4877 1.3229-1.2355z" stroke="#aeaeae"/>
-   <path d="m2.7781 6.4434-0.00188 3.4877h-2.642l-0.001888-3.4877 1.3229-1.2355z" stroke="#3096fa"/>
-   <path d="m2.7781 16.498-0.00188 3.4877h-2.642l-0.001888-3.4877 1.3229-1.2355z" stroke="#3096fa"/>
+   <path d="m2.7781 6.4434-0.00188 3.4877h-2.642l-0.001888-3.4877 1.3229-1.2355z" class="Highlight" stroke="currentColor"/>
+   <path d="m2.7781 16.498-0.00188 3.4877h-2.642l-0.001888-3.4877 1.3229-1.2355z" class="Highlight" stroke="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_15px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_15px.svg
index 2305bb46b2b..4a3041e331f 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_up_15px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_up_15px.svg
@@ -15,9 +15,9 @@
   <path d="m3.5718 1.6921-0.00227 4.2612h-3.1704l-0.002271-4.2612 1.5875-1.5095z" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/>
   <path d="m3.7042 14.292-0.00246 4.4936h-3.4347l-0.002463-4.4936 1.7198-1.5918z" class="HighlightOutline" fill="currentColor"/>
   <g fill="#fff">
-   <path d="m3.5718 8.0408-0.00227 4.2576h-3.1704l-0.002273-4.2576 1.5875-1.5082z" stroke="#3096fa"/>
+   <path d="m3.5718 8.0408-0.00227 4.2576h-3.1704l-0.002273-4.2576 1.5875-1.5082z" class="Highlight" stroke="currentColor"/>
    <path d="m3.5718 27.091-0.0023 4.2576h-3.1704l-0.00227-4.2576 1.5875-1.5082z" stroke="#aeaeae"/>
-   <path d="m3.5718 20.741-0.00227 4.2576h-3.1704l-0.002273-4.2576 1.5875-1.5082z" stroke="#3096fa"/>
+   <path d="m3.5718 20.741-0.00227 4.2576h-3.1704l-0.002273-4.2576 1.5875-1.5082z" class="Highlight" stroke="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_17px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_17px.svg
index e9908ed8e56..f4595e57fd7 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_up_17px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_up_17px.svg
@@ -15,9 +15,9 @@
   <path d="m4.101 2.0414-0.00265 5.2344h-3.6988l-0.00265-5.2344 1.8521-1.8542z" fill="#fff" stroke="#aeaeae"/>
   <path d="m4.2333 17.283-0.00284 5.4705h-3.9631l-0.00284-5.4705 1.9844-1.9378z" class="HighlightOutline" fill="currentColor"/>
   <g transform="translate(4.3679 10.716)" fill="#fff">
-   <path d="m-0.26696-0.99657-0.002648 5.2468h-3.6988l-0.00265-5.2468 1.8521-1.8586z" stroke="#3096fa"/>
+   <path d="m-0.26696-0.99657-0.002648 5.2468h-3.6988l-0.00265-5.2468 1.8521-1.8586z" class="Highlight" stroke="currentColor"/>
    <path d="m-0.26696 22.022-0.00268 5.2468h-3.6988l-0.00265-5.2468 1.8521-1.8586z" stroke="#aeaeae"/>
-   <path d="m-0.26696 14.349-0.00265 5.2468h-3.6988l-0.00265-5.2468 1.8521-1.8586z" stroke="#3096fa"/>
+   <path d="m-0.26696 14.349-0.00265 5.2468h-3.6988l-0.00265-5.2468 1.8521-1.8586z" class="Highlight" stroke="currentColor"/>
   </g>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_22px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_22px.svg
index deee2201167..4b0675ce616 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_up_22px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_up_22px.svg
@@ -14,8 +14,8 @@
  <path d="m5.5562 2.8386-0.00379 6.9904h-5.284l-0.003786-6.9904 2.6459-2.4762z" fill="#fff" stroke="#aeaeae" stroke-width=".52917"/>
  <path d="m5.8209 22.738-0.00417 7.4244h-5.8126l-0.004165-7.4244 2.9105-2.6299z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(4.3679,10.716)" fill="#fff" stroke-width=".52917">
-  <path d="m1.1883 2.1768-0.00378 6.9902h-5.284l-0.00379-6.9902 2.6459-2.4762z" stroke="#3096fa"/>
+  <path d="m1.1883 2.1768-0.00378 6.9902h-5.284l-0.00379-6.9902 2.6459-2.4762z" class="Highlight" stroke="currentColor"/>
   <path d="m1.1882 32.34-0.00383 6.9902h-5.2839l-0.00379-6.9902 2.6458-2.4762z" stroke="#aeaeae"/>
-  <path d="m1.1883 22.286-0.00379 6.9902h-5.284l-0.00379-6.9902 2.6459-2.4762z" stroke="#3096fa"/>
+  <path d="m1.1883 22.286-0.00379 6.9902h-5.284l-0.00379-6.9902 2.6459-2.4762z" class="Highlight" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_28px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_28px.svg
index c40eeeb011f..2cbfcef68bf 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_up_28px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_up_28px.svg
@@ -14,8 +14,8 @@
  <path d="m7.1437 3.5044-0.00493 8.8808h-6.8692l-0.004922-8.8808 3.4397-3.1458z" fill="#fff" stroke="#aeaeae" stroke-width=".52917"/>
  <path d="m7.4083 28.722-0.00531 9.3781h-7.3977l-0.0053008-9.3781 3.7042-3.3219z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(4.3679,10.716)" fill="#fff" stroke-width=".52917">
-  <path d="m2.7758 5.5118-0.00491 8.9419h-6.8692l-0.00493-8.9419 3.4397-3.1676z" stroke="#3096fa"/>
+  <path d="m2.7758 5.5118-0.00491 8.9419h-6.8692l-0.00493-8.9419 3.4397-3.1676z" class="Highlight" stroke="currentColor"/>
   <path d="m2.7758 43.612-0.00498 8.9419h-6.8692l-0.00493-8.9419 3.4396-3.1676z" stroke="#aeaeae"/>
-  <path d="m2.7758 30.902-0.00493 8.917h-6.8692l-0.00493-8.917 3.4397-3.1588z" stroke="#3096fa"/>
+  <path d="m2.7758 30.902-0.00493 8.917h-6.8692l-0.00493-8.917 3.4397-3.1588z" class="Highlight" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_33px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_33px.svg
index c6b85b7ea93..fee4d92cc1c 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_up_33px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_up_33px.svg
@@ -14,8 +14,8 @@
  <path d="m8.3343 4.2416-0.00569 10.442h-7.9259l-0.005679-10.442 3.9689-3.6989z" fill="#fff" stroke="#aeaeae" stroke-width=".79375"/>
  <path d="m8.7312 34.108-0.00626 11.136h-8.7187l-0.0062474-11.136 4.3657-3.9448z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(4.3679,10.716)" fill="#fff" stroke-width=".79375">
-  <path d="m3.9664 8.6166-0.00567 10.468h-7.926l-0.00569-10.468 3.9689-3.7083z" stroke="#3096fa"/>
+  <path d="m3.9664 8.6166-0.00567 10.468h-7.926l-0.00569-10.468 3.9689-3.7083z" class="Highlight" stroke="currentColor"/>
   <path d="m3.9664 53.861-0.00575 10.468h-7.9259l-0.00569-10.468 3.9687-3.7083z" stroke="#aeaeae"/>
-  <path d="m3.9664 38.779-0.00569 10.469h-7.9259l-0.00569-10.469 3.9688-3.7085z" stroke="#3096fa"/>
+  <path d="m3.9664 38.779-0.00569 10.469h-7.9259l-0.00569-10.469 3.9688-3.7085z" class="Highlight" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_44px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_44px.svg
index 3d890ca7c7e..540a97b1ab8 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_up_44px.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_up_44px.svg
@@ -14,8 +14,8 @@
  <path d="m11.112 5.6771-0.0076 13.981h-10.568l-0.007556-13.981 5.2919-4.9525z" fill="#fff" stroke="#aeaeae" stroke-width="1.0583"/>
  <path d="m11.642 45.477-0.0084 14.848h-11.625l-0.00833-14.848 5.8209-5.2599z" class="HighlightOutline" fill="currentColor" stroke-width=".26458"/>
  <g transform="translate(4.3679,10.716)" fill="#fff" stroke-width="1.0583">
-  <path d="m6.7444 15.07-0.00756 13.98h-10.568l-0.00759-13.98 5.2918-4.9526z" stroke="#3096fa"/>
+  <path d="m6.7444 15.07-0.00756 13.98h-10.568l-0.00759-13.98 5.2918-4.9526z" class="Highlight" stroke="currentColor"/>
   <path d="m6.7444 75.395-0.00767 13.98h-10.568l-0.00759-13.98 5.2916-4.9526z" stroke="#aeaeae"/>
-  <path d="m6.7444 55.285-0.00759 13.981h-10.568l-0.00759-13.981 5.2917-4.9524z" stroke="#3096fa"/>
+  <path d="m6.7444 55.285-0.00759 13.981h-10.568l-0.00759-13.981 5.2917-4.9524z" class="Highlight" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg b/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg
index 3b8913c09c7..f95ae6b5120 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg
@@ -14,7 +14,7 @@
  <rect x="-9.0909e-6" y="2.2204e-16" width="5.5562" height="14.552" fill="#fdffff" stroke-linejoin="round" stroke-width=".070003"/>
  <g stroke-width=".26458">
   <rect x=".13229" y=".13229" width="5.2916" height="2.6458" rx=".52916" ry=".52916" fill="#fff" stroke="#aeaeae"/>
-  <rect x=".13229" y="3.0427" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" stroke="#3096fa"/>
+  <rect x=".13229" y="3.0427" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" class="Highlight" stroke="currentColor"/>
   <rect x=".13229" y="5.9531" width="5.2917" height="2.6458" rx=".52917" ry=".52916" class="HighlightOutline" fill="currentColor" stroke="currentColor"/>
   <rect x=".13229" y="8.8635" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" stroke="#aeaeae"/>
   <rect x=".13229" y="11.774" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" stroke="#aeaeae"/>
diff --git a/dlls/light.msstyles/blue_window_help_button_background.svg b/dlls/light.msstyles/blue_window_help_button_background.svg
index 41b6e51f1f7..831142b91aa 100644
--- a/dlls/light.msstyles/blue_window_help_button_background.svg
+++ b/dlls/light.msstyles/blue_window_help_button_background.svg
@@ -14,11 +14,11 @@
  <rect y="-7e-5" width="1.3229" height="35.984" fill="#fff" stroke-width=".26458"/>
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="none" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
-  <rect x=".13228" y="4.6303" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#3096fa"/>
+  <rect x=".13228" y="4.6303" width="1.0583" height="4.2334" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="9.1282" width="1.0583" height="4.2334" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="13.626" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
   <rect x=".13228" y="18.124" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
-  <rect x=".13228" y="22.622" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#3096fa"/>
+  <rect x=".13228" y="22.622" width="1.0583" height="4.2334" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="27.12" width="1.0583" height="4.2334" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="31.618" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_window_help_button_glyph_13px.svg b/dlls/light.msstyles/blue_window_help_button_glyph_13px.svg
index c8ee389ed72..a475899ae35 100644
--- a/dlls/light.msstyles/blue_window_help_button_glyph_13px.svg
+++ b/dlls/light.msstyles/blue_window_help_button_glyph_13px.svg
@@ -5,11 +5,11 @@
  </style>
  <g stroke-width=".070004">
   <path d="m1.7393 1.7637c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26695 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22183-0.28463 0.28951-0.35973 0.43239-0.03028 0.057652-0.042393 0.095251-0.042393 0.28074h-0.35004c-0.00121-0.097758-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" fill="#aeaeae"/>
-  <path d="m1.7393 5.2033c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26695 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22183-0.28463 0.28951-0.35973 0.43239-0.03028 0.057652-0.042393 0.095251-0.042393 0.28074h-0.35004c-0.00121-0.097758-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" fill="#3096fa"/>
+  <path d="m1.7393 5.2033c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26695 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22183-0.28463 0.28951-0.35973 0.43239-0.03028 0.057652-0.042393 0.095251-0.042393 0.28074h-0.35004c-0.00121-0.097758-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" class="Highlight" fill="currentColor"/>
   <path d="m1.7393 8.6429c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26695 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22183-0.28463 0.28951-0.35973 0.43239-0.03028 0.057652-0.042393 0.095251-0.042393 0.28074h-0.35004c-0.00121-0.097758-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" class="HighlightOutline" fill="currentColor"/>
   <path d="m1.7393 12.083c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26695 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22184-0.28463 0.28951-0.35973 0.43239-0.03028 0.05765-0.042393 0.09525-0.042393 0.28074h-0.35004c-0.00121-0.09776-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" fill="#aeaeae"/>
   <path d="m1.7393 15.522c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26695 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22184-0.28463 0.28951-0.35973 0.43239-0.03028 0.05765-0.042393 0.09525-0.042393 0.28074h-0.35004c-0.00121-0.09776-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" fill="#aeaeae"/>
-  <path d="m1.7393 18.962c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26696 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22184-0.28463 0.28951-0.35973 0.43239-0.03028 0.05765-0.042393 0.09525-0.042393 0.28074h-0.35004c-0.00121-0.09776-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" fill="#3096fa"/>
+  <path d="m1.7393 18.962c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26696 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22184-0.28463 0.28951-0.35973 0.43239-0.03028 0.05765-0.042393 0.09525-0.042393 0.28074h-0.35004c-0.00121-0.09776-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" class="Highlight" fill="currentColor"/>
   <path d="m1.7393 22.401c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26695 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22184-0.28463 0.28951-0.35973 0.43239-0.03028 0.05765-0.042393 0.09525-0.042393 0.28074h-0.35004c-0.00121-0.09776-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" class="HighlightOutline" fill="currentColor"/>
   <path d="m1.7393 25.841c0.093263-0.17421 0.27252-0.27698 0.37669-0.43114 0.11022-0.16168 0.048448-0.46372-0.26404-0.46372-0.20469 0-0.30522 0.16042-0.34762 0.29327l-0.3137-0.13661c0.085996-0.26695 0.31976-0.49631 0.66011-0.49631 0.28463 0 0.47964 0.1341 0.57896 0.30205 0.084785 0.14413 0.13444 0.41359 0.00364 0.61412-0.14534 0.22184-0.28463 0.28951-0.35973 0.43239-0.03028 0.05765-0.042393 0.09525-0.042393 0.28074h-0.35004c-0.00121-0.09776-0.015745-0.25693 0.058138-0.39479zm0.35488 0.89611c0 0.13786-0.10901 0.25066-0.24224 0.25066-0.13323 0-0.24224-0.1128-0.24224-0.25066 0-0.13786 0.10901-0.25066 0.24224-0.25066 0.13323 0 0.24224 0.1128 0.24224 0.25066z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_window_help_button_glyph_19px.svg b/dlls/light.msstyles/blue_window_help_button_glyph_19px.svg
index e921ce37708..89099460315 100644
--- a/dlls/light.msstyles/blue_window_help_button_glyph_19px.svg
+++ b/dlls/light.msstyles/blue_window_help_button_glyph_19px.svg
@@ -5,11 +5,11 @@
  </style>
  <g stroke-width=".070004">
   <path d="m2.3556 2.5769c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42731 0.23172-0.48666 0.42362l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 0.00502 0.88706-0.20349 0.32043-0.39849 0.41818-0.50362 0.62456-0.042397 0.083271-0.059348 0.13758-0.059348 0.40551h-0.49006c-0.00163-0.14121-0.022038-0.37111 0.081399-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206s0.15261-0.36206 0.33914-0.36206c0.18653 0 0.33914 0.16293 0.33914 0.36206z" fill="#aeaeae"/>
-  <path d="m2.3557 7.604c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42732 0.23172-0.48666 0.42361l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 5e-3 0.88706-0.20348 0.32043-0.39849 0.41818-0.50362 0.62456-0.0424 0.08327-0.05935 0.13758-0.05935 0.40551h-0.49006c-0.0016-0.14121-0.02204-0.37111 0.0814-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206s0.15261-0.36206 0.33914-0.36206c0.18653 0 0.33914 0.16293 0.33914 0.36206z" fill="#3096fa"/>
+  <path d="m2.3557 7.604c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42732 0.23172-0.48666 0.42361l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 5e-3 0.88706-0.20348 0.32043-0.39849 0.41818-0.50362 0.62456-0.0424 0.08327-0.05935 0.13758-0.05935 0.40551h-0.49006c-0.0016-0.14121-0.02204-0.37111 0.0814-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206s0.15261-0.36206 0.33914-0.36206c0.18653 0 0.33914 0.16293 0.33914 0.36206z" class="Highlight" fill="currentColor"/>
   <path d="m2.3557 12.631c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42732 0.23172-0.48666 0.42361l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 5e-3 0.88706-0.20348 0.32043-0.39849 0.41818-0.50362 0.62456-0.0424 0.08327-0.05935 0.13758-0.05935 0.40551h-0.49006c-0.0016-0.14121-0.02204-0.37112 0.0814-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206s0.15261-0.36206 0.33914-0.36206c0.18653 0 0.33914 0.16293 0.33914 0.36206z" class="HighlightOutline" fill="currentColor"/>
   <path d="m2.3556 17.658c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42731 0.23172-0.48666 0.42362l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 0.00502 0.88706-0.20349 0.32043-0.39849 0.41818-0.50362 0.62456-0.042397 0.08327-0.059349 0.13758-0.059349 0.40551h-0.49006c-0.00163-0.14121-0.022038-0.37112 0.081399-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206s0.15261-0.36206 0.33914-0.36206c0.18653 0 0.33914 0.16293 0.33914 0.36206z" fill="#aeaeae"/>
   <path d="m2.3556 22.685c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42731 0.23172-0.48666 0.42362l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 0.00502 0.88706-0.20349 0.32043-0.39849 0.41818-0.50362 0.62456-0.042397 0.08327-0.059349 0.13758-0.059349 0.40551h-0.49006c-0.00163-0.14121-0.022038-0.37112 0.081399-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206 0-0.19914 0.15261-0.36206 0.33914-0.36206 0.18653 0 0.33914 0.16293 0.33914 0.36206z" fill="#aeaeae"/>
-  <path d="m2.3557 27.713c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42732 0.23172-0.48666 0.42361l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 5e-3 0.88706-0.20348 0.32043-0.39849 0.41818-0.50362 0.62456-0.0424 0.08327-0.05935 0.13758-0.05935 0.40551h-0.49006c-0.0016-0.14121-0.02204-0.37111 0.0814-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206s0.15261-0.36206 0.33914-0.36206c0.18653 0 0.33914 0.16293 0.33914 0.36206z" fill="#3096fa"/>
+  <path d="m2.3557 27.713c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42732 0.23172-0.48666 0.42361l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 5e-3 0.88706-0.20348 0.32043-0.39849 0.41818-0.50362 0.62456-0.0424 0.08327-0.05935 0.13758-0.05935 0.40551h-0.49006c-0.0016-0.14121-0.02204-0.37111 0.0814-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206s0.15261-0.36206 0.33914-0.36206c0.18653 0 0.33914 0.16293 0.33914 0.36206z" class="Highlight" fill="currentColor"/>
   <path d="m2.3557 32.74c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42732 0.23172-0.48666 0.42361l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 5e-3 0.88706-0.20348 0.32043-0.39849 0.41818-0.50362 0.62456-0.0424 0.08327-0.05935 0.13758-0.05935 0.40551h-0.49006c-0.0016-0.14121-0.02204-0.37112 0.0814-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206s0.15261-0.36206 0.33914-0.36206c0.18653 0 0.33914 0.16293 0.33914 0.36206z" class="HighlightOutline" fill="currentColor"/>
   <path d="m2.3556 37.767c0.13056-0.25163 0.38153-0.40008 0.52736-0.62275 0.15431-0.23353 0.06783-0.66982-0.36966-0.66982-0.28657 0-0.42731 0.23172-0.48666 0.42362l-0.43918-0.19732c0.1204-0.3856 0.44766-0.71689 0.92415-0.71689 0.39849 0 0.6715 0.1937 0.81054 0.43629 0.11871 0.20819 0.18822 0.59741 0.00502 0.88706-0.20349 0.32043-0.39849 0.41818-0.50362 0.62456-0.042397 0.08327-0.059349 0.13758-0.059349 0.40551h-0.49006c-0.00163-0.14121-0.022038-0.37112 0.081399-0.57025zm0.49684 1.2944c0 0.19914-0.15261 0.36206-0.33914 0.36206-0.18653 0-0.33914-0.16293-0.33914-0.36206s0.15261-0.36206 0.33914-0.36206c0.18653 0 0.33914 0.16293 0.33914 0.36206z" fill="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_window_help_button_glyph_23px.svg b/dlls/light.msstyles/blue_window_help_button_glyph_23px.svg
index ffa209ca80d..a7e2eb9b5c9 100644
--- a/dlls/light.msstyles/blue_window_help_button_glyph_23px.svg
+++ b/dlls/light.msstyles/blue_window_help_button_glyph_23px.svg
@@ -6,11 +6,11 @@
  <g stroke-width=".26458">
   <path d="m2.8397 3.253c0.16786-0.3097 0.49054-0.49241 0.67804-0.76646 0.1984-0.28742 0.08721-0.8244-0.47528-0.8244-0.36845 0-0.5494 0.28519-0.62571 0.52138l-0.56466-0.24286c0.1548-0.47459 0.57557-0.88233 1.1882-0.88233 0.51235 0 0.86336 0.2384 1.0421 0.53697 0.15263 0.25623 0.242 0.73528 0.00645 1.0918-0.26163 0.39438-0.51235 0.51469-0.64752 0.76869-0.05451 0.10249-0.076305 0.16933-0.076305 0.49909h-0.63008c-0.0021-0.1738-0.028335-0.45675 0.10466-0.70185zm0.6388 1.5931c0 0.2451-0.19621 0.44561-0.43604 0.44561s-0.43604-0.20053-0.43604-0.44561c0-0.24508 0.19621-0.44561 0.43604-0.44561s0.43604 0.20053 0.43604 0.44561z" fill="#aeaeae"/>
   <path d="m2.8397 21.51c0.16786-0.3097 0.49054-0.49241 0.67804-0.76646 0.1984-0.28742 0.08721-0.8244-0.47528-0.8244-0.36845 0-0.5494 0.28519-0.62571 0.52138l-0.56466-0.24286c0.1548-0.47459 0.57557-0.88233 1.1882-0.88233 0.51235 0 0.86336 0.2384 1.0421 0.53698 0.15263 0.25623 0.242 0.73528 0.0064 1.0918-0.26163 0.39438-0.51235 0.51468-0.64752 0.76869-0.05451 0.10249-0.0763 0.16933-0.0763 0.49909h-0.63008c-0.0021-0.1738-0.02834-0.45675 0.10466-0.70185zm0.6388 1.5931c0 0.2451-0.19622 0.44561-0.43604 0.44561-0.23983 0-0.43604-0.20053-0.43604-0.44561 0-0.24508 0.19622-0.44561 0.43604-0.44561 0.23982 0 0.43604 0.20053 0.43604 0.44561z" fill="#aeaeae"/>
-  <path d="m2.8397 9.3385c0.16786-0.3097 0.49054-0.49241 0.67804-0.76646 0.1984-0.28742 0.08721-0.82439-0.47528-0.82439-0.36845 0-0.54942 0.28519-0.62571 0.52137l-0.56466-0.24286c0.1548-0.47458 0.57557-0.88233 1.1882-0.88233 0.51235 0 0.86336 0.2384 1.0421 0.53697 0.15263 0.25623 0.242 0.73527 0.00643 1.0918-0.26162 0.39437-0.51235 0.51468-0.64752 0.76869-0.054514 0.10249-0.076307 0.16933-0.076307 0.49909h-0.63008c-0.00206-0.1738-0.028337-0.45675 0.10466-0.70185zm0.6388 1.5931c0 0.2451-0.19621 0.44561-0.43604 0.44561-0.23983 0-0.43604-0.20053-0.43604-0.44561s0.19621-0.44561 0.43604-0.44561c0.23983 0 0.43604 0.20053 0.43604 0.44561z" fill="#3096fa"/>
+  <path d="m2.8397 9.3385c0.16786-0.3097 0.49054-0.49241 0.67804-0.76646 0.1984-0.28742 0.08721-0.82439-0.47528-0.82439-0.36845 0-0.54942 0.28519-0.62571 0.52137l-0.56466-0.24286c0.1548-0.47458 0.57557-0.88233 1.1882-0.88233 0.51235 0 0.86336 0.2384 1.0421 0.53697 0.15263 0.25623 0.242 0.73527 0.00643 1.0918-0.26162 0.39437-0.51235 0.51468-0.64752 0.76869-0.054514 0.10249-0.076307 0.16933-0.076307 0.49909h-0.63008c-0.00206-0.1738-0.028337-0.45675 0.10466-0.70185zm0.6388 1.5931c0 0.2451-0.19621 0.44561-0.43604 0.44561-0.23983 0-0.43604-0.20053-0.43604-0.44561s0.19621-0.44561 0.43604-0.44561c0.23983 0 0.43604 0.20053 0.43604 0.44561z" class="Highlight" fill="currentColor"/>
   <path d="m2.8397 15.424c0.16786-0.3097 0.49054-0.49241 0.67804-0.76646 0.1984-0.28742 0.08721-0.8244-0.47528-0.8244-0.36845 0-0.54942 0.28519-0.62571 0.52137l-0.56466-0.24286c0.1548-0.47458 0.57557-0.88233 1.1882-0.88233 0.51235 0 0.86336 0.2384 1.0421 0.53697 0.15263 0.25623 0.242 0.73527 0.00643 1.0918-0.26162 0.39438-0.51235 0.51468-0.64752 0.76869-0.054514 0.10249-0.076307 0.16933-0.076307 0.49909h-0.63008c-0.00206-0.1738-0.028337-0.45676 0.10466-0.70185zm0.6388 1.5931c0 0.2451-0.19621 0.44561-0.43604 0.44561-0.23983 0-0.43604-0.20053-0.43604-0.44561s0.19621-0.44561 0.43604-0.44561c0.23983 0 0.43604 0.20053 0.43604 0.44561z" class="HighlightOutline" fill="currentColor"/>
   <path d="m2.8397 27.595c0.16786-0.3097 0.49054-0.4924 0.67804-0.76646 0.1984-0.28742 0.08721-0.8244-0.47528-0.8244-0.36845 0-0.5494 0.2852-0.62571 0.52138l-0.56466-0.24285c0.1548-0.47459 0.57557-0.88233 1.1882-0.88233 0.51235 0 0.86336 0.2384 1.0421 0.53697 0.15263 0.25624 0.242 0.73528 0.0064 1.0918-0.26163 0.39438-0.51235 0.51469-0.64752 0.76869-0.05451 0.10249-0.0763 0.16933-0.0763 0.49909h-0.63008c-0.0021-0.17379-0.02834-0.45675 0.10466-0.70184zm0.6388 1.5931c0 0.24509-0.19622 0.44561-0.43604 0.44561-0.23983 0-0.43604-0.20053-0.43604-0.44561 0-0.24509 0.19622-0.44562 0.43604-0.44562 0.23982 0 0.43604 0.20053 0.43604 0.44562z" fill="#aeaeae"/>
   <path d="m2.8397 45.852c0.16786-0.3097 0.49054-0.4924 0.67804-0.76646 0.1984-0.28742 0.08721-0.8244-0.47528-0.8244-0.36845 0-0.5494 0.2852-0.62571 0.52138l-0.56466-0.24285c0.1548-0.47459 0.57557-0.88233 1.1882-0.88233 0.51235 0 0.86336 0.2384 1.0421 0.53697 0.15263 0.25624 0.242 0.73528 0.0064 1.0918-0.26163 0.39438-0.51235 0.51469-0.64752 0.76869-0.05451 0.10249-0.0763 0.16933-0.0763 0.49909h-0.63008c-0.0021-0.17379-0.02834-0.45675 0.10466-0.70184zm0.6388 1.5931c0 0.24509-0.19622 0.44561-0.43604 0.44561-0.23983 0-0.43604-0.20053-0.43604-0.44561 0-0.24509 0.19622-0.44562 0.43604-0.44562 0.23982 0 0.43604 0.20053 0.43604 0.44562z" fill="#aeaeae"/>
-  <path d="m2.8397 33.681c0.16786-0.3097 0.49054-0.49241 0.67804-0.76646 0.1984-0.28742 0.08721-0.8244-0.47528-0.8244-0.36845 0-0.54942 0.2852-0.62571 0.52137l-0.56466-0.24286c0.1548-0.47458 0.57557-0.88232 1.1882-0.88232 0.51235 0 0.86336 0.2384 1.0421 0.53697 0.15263 0.25624 0.242 0.73528 0.0064 1.0918-0.26162 0.39437-0.51235 0.51468-0.64752 0.76869-0.05451 0.10248-0.07631 0.16933-0.07631 0.49908h-0.63008c-0.0021-0.17379-0.02834-0.45674 0.10466-0.70184zm0.6388 1.5931c0 0.24509-0.19622 0.44561-0.43604 0.44561-0.23983 0-0.43604-0.20053-0.43604-0.44561 0-0.24509 0.19621-0.44562 0.43604-0.44562 0.23983 0 0.43604 0.20053 0.43604 0.44562z" fill="#3096fa"/>
+  <path d="m2.8397 33.681c0.16786-0.3097 0.49054-0.49241 0.67804-0.76646 0.1984-0.28742 0.08721-0.8244-0.47528-0.8244-0.36845 0-0.54942 0.2852-0.62571 0.52137l-0.56466-0.24286c0.1548-0.47458 0.57557-0.88232 1.1882-0.88232 0.51235 0 0.86336 0.2384 1.0421 0.53697 0.15263 0.25624 0.242 0.73528 0.0064 1.0918-0.26162 0.39437-0.51235 0.51468-0.64752 0.76869-0.05451 0.10248-0.07631 0.16933-0.07631 0.49908h-0.63008c-0.0021-0.17379-0.02834-0.45674 0.10466-0.70184zm0.6388 1.5931c0 0.24509-0.19622 0.44561-0.43604 0.44561-0.23983 0-0.43604-0.20053-0.43604-0.44561 0-0.24509 0.19621-0.44562 0.43604-0.44562 0.23983 0 0.43604 0.20053 0.43604 0.44562z" class="Highlight" fill="currentColor"/>
   <path d="m2.8397 39.766c0.16786-0.3097 0.49054-0.49241 0.67804-0.76646 0.1984-0.28742 0.08721-0.8244-0.47528-0.8244-0.36845 0-0.54942 0.2852-0.62571 0.52137l-0.56466-0.24286c0.1548-0.47458 0.57557-0.88232 1.1882-0.88232 0.51235 0 0.86336 0.2384 1.0421 0.53697 0.15263 0.25623 0.242 0.73527 0.0064 1.0918-0.26162 0.39437-0.51235 0.51468-0.64752 0.76869-0.05451 0.10248-0.07631 0.16933-0.07631 0.49909h-0.63008c-0.0021-0.1738-0.02834-0.45677 0.10466-0.70185zm0.6388 1.5931c0 0.24509-0.19622 0.44561-0.43604 0.44561-0.23983 0-0.43604-0.20053-0.43604-0.44561 0-0.24509 0.19621-0.44562 0.43604-0.44562 0.23983 0 0.43604 0.20053 0.43604 0.44562z" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_help_button_glyph_26px.svg b/dlls/light.msstyles/blue_window_help_button_glyph_26px.svg
index f372666a6f5..ba74c071d4e 100644
--- a/dlls/light.msstyles/blue_window_help_button_glyph_26px.svg
+++ b/dlls/light.msstyles/blue_window_help_button_glyph_26px.svg
@@ -6,11 +6,11 @@
  <g transform="translate(-.18147 23.974)" stroke-width=".070004">
   <path d="m3.3954-20.446c0.18653-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.096896-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.00728 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.084785 0.1905-0.084785 0.56148h-0.70008c-0.00242-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132-0.26646 0-0.48448-0.2256-0.48448-0.50132 0-0.27572 0.21802-0.50132 0.48448-0.50132 0.26646 0 0.48448 0.2256 0.48448 0.50132z" fill="#aeaeae"/>
   <path d="m3.3954 0.1915c0.18652-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.0969-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.0073 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.08479 0.1905-0.08479 0.56148h-0.70008c-0.0024-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132s-0.48448-0.2256-0.48448-0.50132c0-0.27572 0.21802-0.50132 0.48448-0.50132s0.48448 0.2256 0.48448 0.50132z" fill="#aeaeae"/>
-  <path d="m3.3954-13.567c0.18653-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.096896-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.00728 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.084786 0.1905-0.084786 0.56148h-0.70008c-0.00242-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132s-0.48448-0.2256-0.48448-0.50132 0.21802-0.50132 0.48448-0.50132 0.48448 0.2256 0.48448 0.50132z" fill="#3096fa"/>
+  <path d="m3.3954-13.567c0.18653-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.096896-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.00728 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.084786 0.1905-0.084786 0.56148h-0.70008c-0.00242-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132s-0.48448-0.2256-0.48448-0.50132 0.21802-0.50132 0.48448-0.50132 0.48448 0.2256 0.48448 0.50132z" class="Highlight" fill="currentColor"/>
   <path d="m3.3954-6.6877c0.18653-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.096896-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.00728 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.084785 0.1905-0.084785 0.56148h-0.70008c-0.00242-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132s-0.48448-0.2256-0.48448-0.50132c0-0.27572 0.21802-0.50132 0.48448-0.50132s0.48448 0.2256 0.48448 0.50132z" class="HighlightOutline" fill="currentColor"/>
   <path d="m3.3954 7.0708c0.18652-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.0969-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.0073 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.08479 0.1905-0.08479 0.56148h-0.70009c-0.00242-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132-0.26646 0-0.48448-0.2256-0.48448-0.50132 0-0.27572 0.21802-0.50132 0.48448-0.50132 0.26646 0 0.48448 0.2256 0.48448 0.50132z" fill="#aeaeae"/>
   <path d="m3.3954 27.709c0.18652-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.0969-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.0073 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.08479 0.1905-0.08479 0.56148h-0.70008c-0.0024-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132-0.26646 0-0.48448-0.2256-0.48448-0.50132 0-0.27572 0.21802-0.50132 0.48448-0.50132 0.26646 0 0.48448 0.2256 0.48448 0.50132z" fill="#aeaeae"/>
-  <path d="m3.3954 13.95c0.18653-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.0969-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.0073 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.08479 0.1905-0.08479 0.56148h-0.70009c-0.00242-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132-0.26646 0-0.48448-0.2256-0.48448-0.50132s0.21802-0.50132 0.48448-0.50132c0.26646 0 0.48448 0.2256 0.48448 0.50132z" fill="#3096fa"/>
+  <path d="m3.3954 13.95c0.18653-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.0969-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.0073 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.08479 0.1905-0.08479 0.56148h-0.70009c-0.00242-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132-0.26646 0-0.48448-0.2256-0.48448-0.50132s0.21802-0.50132 0.48448-0.50132c0.26646 0 0.48448 0.2256 0.48448 0.50132z" class="Highlight" fill="currentColor"/>
   <path d="m3.3954 20.829c0.18653-0.34842 0.54504-0.55396 0.75338-0.86228 0.22044-0.32336 0.0969-0.92744-0.52808-0.92744-0.40938 0-0.61044 0.32084-0.69524 0.58654l-0.6274-0.27322c0.17199-0.5339 0.63952-0.99262 1.3202-0.99262 0.56926 0 0.95928 0.2682 1.1579 0.6041 0.16957 0.28826 0.26888 0.82718 0.0073 1.2282-0.29068 0.44366-0.56926 0.57902-0.71946 0.86478-0.06056 0.1153-0.08479 0.1905-0.08479 0.56148h-0.70009c-0.00242-0.19552-0.03149-0.51386 0.11628-0.78958zm0.70976 1.7922c0 0.27572-0.21802 0.50132-0.48448 0.50132-0.26646 0-0.48448-0.2256-0.48448-0.50132 0-0.27572 0.21802-0.50132 0.48448-0.50132 0.26646 0 0.48448 0.2256 0.48448 0.50132z" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_help_button_glyph_32px.svg b/dlls/light.msstyles/blue_window_help_button_glyph_32px.svg
index 58428441a3b..19fe6d559cc 100644
--- a/dlls/light.msstyles/blue_window_help_button_glyph_32px.svg
+++ b/dlls/light.msstyles/blue_window_help_button_glyph_32px.svg
@@ -6,11 +6,11 @@
  <g stroke-width=".070004">
   <path d="m4.1174 4.3309c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10659-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18653 0.32029 0.29577 0.91909 0.00801 1.3647-0.31975 0.49295-0.62618 0.64335-0.7914 0.96086-0.066616 0.12812-0.093263 0.21167-0.093263 0.62387h-0.77008c-0.00266-0.21724-0.034639-0.57095 0.1279-0.87731zm0.78073 1.9914c0 0.30636-0.23982 0.55702-0.53292 0.55702-0.2931 0-0.53292-0.25066-0.53292-0.55702 0-0.30635 0.23982-0.55702 0.53292-0.55702 0.2931 0 0.53292 0.25067 0.53292 0.55702z" fill="#aeaeae"/>
   <path d="m4.1174 29.731c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10658-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18653 0.32029 0.29577 0.91909 8e-3 1.3647-0.31975 0.49295-0.62618 0.64335-0.7914 0.96086-0.06662 0.12812-0.09326 0.21167-0.09326 0.62387h-0.77008c-0.0027-0.21724-0.03464-0.57095 0.1279-0.87731zm0.78073 1.9914c0 0.30636-0.23982 0.55702-0.53292 0.55702s-0.53292-0.25066-0.53292-0.55702c0-0.30635 0.23982-0.55702 0.53292-0.55702s0.53292 0.25067 0.53292 0.55702z" fill="#aeaeae"/>
-  <path d="m4.1174 12.798c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10659-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18653 0.32029 0.29577 0.91908 0.00801 1.3647-0.31975 0.49296-0.62618 0.64336-0.7914 0.96086-0.066616 0.12811-0.093265 0.21167-0.093265 0.62386h-0.77008c-0.00266-0.21724-0.034639-0.57095 0.1279-0.87731zm0.78073 1.9914c0 0.30636-0.23982 0.55702-0.53292 0.55702s-0.53292-0.25066-0.53292-0.55702 0.23982-0.55702 0.53292-0.55702 0.53292 0.25067 0.53292 0.55702z" fill="#3096fa"/>
+  <path d="m4.1174 12.798c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10659-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18653 0.32029 0.29577 0.91908 0.00801 1.3647-0.31975 0.49296-0.62618 0.64336-0.7914 0.96086-0.066616 0.12811-0.093265 0.21167-0.093265 0.62386h-0.77008c-0.00266-0.21724-0.034639-0.57095 0.1279-0.87731zm0.78073 1.9914c0 0.30636-0.23982 0.55702-0.53292 0.55702s-0.53292-0.25066-0.53292-0.55702 0.23982-0.55702 0.53292-0.55702 0.53292 0.25067 0.53292 0.55702z" class="Highlight" fill="currentColor"/>
   <path d="m4.1174 21.264c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10659-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18653 0.32029 0.29577 0.91909 0.00801 1.3647-0.31975 0.49296-0.62618 0.64335-0.7914 0.96086-0.066616 0.12811-0.093263 0.21167-0.093263 0.62386h-0.77008c-0.00266-0.21724-0.034639-0.57095 0.1279-0.87731zm0.78073 1.9913c0 0.30636-0.23982 0.55702-0.53292 0.55702s-0.53292-0.25066-0.53292-0.55702c0-0.30635 0.23982-0.55702 0.53292-0.55702s0.53292 0.25067 0.53292 0.55702z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.1174 38.198c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10659-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18652 0.32029 0.29577 0.91909 8e-3 1.3647-0.31975 0.49295-0.62618 0.64335-0.7914 0.96086-0.06662 0.12812-0.09326 0.21167-0.09326 0.62387h-0.77008c-0.0027-0.21724-0.03464-0.57095 0.1279-0.87731zm0.78073 1.9914c0 0.30636-0.23982 0.55702-0.53292 0.55702s-0.53292-0.25066-0.53292-0.55702c0-0.30635 0.23982-0.55702 0.53292-0.55702s0.53292 0.25067 0.53292 0.55702z" fill="#aeaeae"/>
   <path d="m4.1174 63.598c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10658-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18653 0.32029 0.29577 0.91909 8e-3 1.3647-0.31975 0.49295-0.62618 0.64335-0.7914 0.96086-0.06662 0.12812-0.09326 0.21167-0.09326 0.62387h-0.77008c-0.0027-0.21724-0.03464-0.57095 0.1279-0.87731zm0.78073 1.9914c0 0.30636-0.23982 0.55702-0.53292 0.55702s-0.53292-0.25066-0.53292-0.55702c0-0.30635 0.23982-0.55702 0.53292-0.55702s0.53292 0.25067 0.53292 0.55702z" fill="#aeaeae"/>
-  <path d="m4.1174 46.665c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10658-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18653 0.32029 0.29577 0.91909 8e-3 1.3647-0.31975 0.49296-0.62618 0.64336-0.7914 0.96086-0.06662 0.12811-0.09326 0.21167-0.09326 0.62386h-0.77008c-0.0027-0.21724-0.03464-0.57095 0.1279-0.87731zm0.78073 1.9913c0 0.30636-0.23982 0.55702-0.53292 0.55702-0.2931 0-0.53292-0.25066-0.53292-0.55702 0-0.30636 0.23982-0.55702 0.53292-0.55702 0.2931 0 0.53292 0.25067 0.53292 0.55702z" fill="#3096fa"/>
+  <path d="m4.1174 46.665c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10658-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18653 0.32029 0.29577 0.91909 8e-3 1.3647-0.31975 0.49296-0.62618 0.64336-0.7914 0.96086-0.06662 0.12811-0.09326 0.21167-0.09326 0.62386h-0.77008c-0.0027-0.21724-0.03464-0.57095 0.1279-0.87731zm0.78073 1.9913c0 0.30636-0.23982 0.55702-0.53292 0.55702-0.2931 0-0.53292-0.25066-0.53292-0.55702 0-0.30636 0.23982-0.55702 0.53292-0.55702 0.2931 0 0.53292 0.25067 0.53292 0.55702z" class="Highlight" fill="currentColor"/>
   <path d="m4.1174 55.131c0.20518-0.38713 0.59954-0.61551 0.82871-0.95809 0.24248-0.35929 0.10658-1.0305-0.58088-1.0305-0.45032 0-0.67148 0.35649-0.76476 0.65171l-0.69014-0.30358c0.18919-0.59322 0.70347-1.1029 1.4522-1.1029 0.62618 0 1.0552 0.298 1.2737 0.67122 0.18653 0.32029 0.29577 0.91909 8e-3 1.3647-0.31975 0.49296-0.62618 0.64335-0.7914 0.96086-0.06662 0.12811-0.09326 0.21167-0.09326 0.62386h-0.77008c-0.0027-0.21724-0.03464-0.57095 0.1279-0.87731zm0.78073 1.9913c0 0.30636-0.23982 0.55702-0.53292 0.55702-0.2931 0-0.53292-0.25066-0.53292-0.55702 0-0.30635 0.23982-0.55702 0.53292-0.55702 0.2931 0 0.53292 0.25067 0.53292 0.55702z" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_help_button_glyph_39px.svg b/dlls/light.msstyles/blue_window_help_button_glyph_39px.svg
index 774bf1aea62..b50f4cf4952 100644
--- a/dlls/light.msstyles/blue_window_help_button_glyph_39px.svg
+++ b/dlls/light.msstyles/blue_window_help_button_glyph_39px.svg
@@ -6,11 +6,11 @@
  <g>
   <path d="m4.8211 5.2493c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48126-1.0429 0.87982l-0.94111-0.40984c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.4023 1.7369 0.90616 0.25436 0.4324 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.00363-0.29328-0.047235-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41359-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.3384-0.72673-0.75199 0-0.41358 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.3384 0.72673 0.75199z" fill="#aeaeae"/>
   <path d="m4.8211 36.248c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48126-1.0429 0.87982l-0.94111-0.40984c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.4023 1.7369 0.90616 0.25436 0.4324 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.00363-0.29328-0.047235-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41359-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.3384-0.72673-0.75199 0-0.41358 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.3384 0.72673 0.75199z" fill="#aeaeae"/>
-  <path d="m4.8211 15.61c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48127-1.0429 0.87982l-0.94111-0.40984c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.40231 1.7369 0.90616 0.25436 0.43239 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.00363-0.29328-0.047235-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41358-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.33841-0.72673-0.75199 0-0.41359 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.3384 0.72673 0.75199z" fill="#3096fa"/>
+  <path d="m4.8211 15.61c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48127-1.0429 0.87982l-0.94111-0.40984c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.40231 1.7369 0.90616 0.25436 0.43239 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.00363-0.29328-0.047235-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41358-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.33841-0.72673-0.75199 0-0.41359 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.3384 0.72673 0.75199z" class="Highlight" fill="currentColor"/>
   <path d="m4.8211 25.929c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48127-1.0429 0.87982l-0.94111-0.40983c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.4023 1.7369 0.90616 0.25436 0.4324 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.00363-0.29328-0.047235-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41359-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.3384-0.72673-0.75199 0-0.41358 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.33841 0.72673 0.75199z" class="HighlightOutline" fill="currentColor"/>
   <path d="m4.8211 46.567c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48126-1.0429 0.87982l-0.94111-0.40984c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.4023 1.7369 0.90616 0.25436 0.4324 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.0036-0.29328-0.04724-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41359-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.3384-0.72673-0.75199 0-0.41358 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.3384 0.72673 0.75199z" fill="#aeaeae"/>
   <path d="m4.8211 77.565c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48126-1.0429 0.87982l-0.94111-0.40984c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.4023 1.7369 0.90616 0.25436 0.4324 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.0036-0.29328-0.04724-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41359-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.3384-0.72673-0.75199 0-0.41358 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.3384 0.72673 0.75199z" fill="#aeaeae"/>
-  <path d="m4.8211 56.927c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48127-1.0429 0.87982l-0.94111-0.40984c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.40231 1.7369 0.90616 0.25436 0.43239 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.0036-0.29328-0.04724-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41358-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.33841-0.72673-0.75199 0-0.41359 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.3384 0.72673 0.75199z" fill="#3096fa"/>
+  <path d="m4.8211 56.927c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48127-1.0429 0.87982l-0.94111-0.40984c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.40231 1.7369 0.90616 0.25436 0.43239 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.0036-0.29328-0.04724-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41358-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.33841-0.72673-0.75199 0-0.41359 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.3384 0.72673 0.75199z" class="Highlight" fill="currentColor"/>
   <path d="m4.8211 67.246c0.27979-0.52264 0.81757-0.83095 1.1301-1.2934 0.33066-0.48505 0.14535-1.3912-0.79213-1.3912-0.61408 0-0.91567 0.48127-1.0429 0.87982l-0.94111-0.40983c0.25799-0.80086 0.95929-1.4889 1.9803-1.4889 0.8539 0 1.4389 0.4023 1.7369 0.90616 0.25436 0.4324 0.40332 1.2408 0.01092 1.8424-0.43602 0.6655-0.8539 0.86854-1.0792 1.2972-0.09084 0.17295-0.12718 0.28575-0.12718 0.84223h-1.0501c-0.0036-0.29328-0.04724-0.7708 0.17442-1.1844zm1.0646 2.6884c0 0.41359-0.32703 0.75199-0.72673 0.75199-0.39969 0-0.72673-0.3384-0.72673-0.75199 0-0.41358 0.32703-0.75199 0.72673-0.75199 0.39969 0 0.72673 0.33841 0.72673 0.75199z" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_help_button_glyph_52px.svg b/dlls/light.msstyles/blue_window_help_button_glyph_52px.svg
index 65c47907bda..ac26c66e635 100644
--- a/dlls/light.msstyles/blue_window_help_button_glyph_52px.svg
+++ b/dlls/light.msstyles/blue_window_help_button_glyph_52px.svg
@@ -6,11 +6,11 @@
  <g>
   <path d="m6.4283 7.0549c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64675 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.6417-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57654 0.53779 1.6544 0.0146 2.4565-0.58139 0.88736-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38102-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027s0.43606-1.0027 0.969-1.0027c0.53295 0 0.96901 0.45122 0.96901 1.0027z" fill="#aeaeae"/>
   <path d="m6.4283 48.332c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64675 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.6417-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57654 0.53779 1.6544 0.0146 2.4565-0.58139 0.88736-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38102-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027s0.43606-1.0027 0.969-1.0027c0.53295 0 0.96901 0.45122 0.96901 1.0027z" fill="#aeaeae"/>
-  <path d="m6.4283 20.814c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64675 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.6417-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57654 0.53779 1.6544 0.0146 2.4565-0.58139 0.88736-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38102-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027s0.43606-1.0027 0.969-1.0027c0.53295 0 0.96901 0.45122 0.96901 1.0027z" fill="#3096fa"/>
+  <path d="m6.4283 20.814c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64675 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.6417-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57654 0.53779 1.6544 0.0146 2.4565-0.58139 0.88736-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38102-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027s0.43606-1.0027 0.969-1.0027c0.53295 0 0.96901 0.45122 0.96901 1.0027z" class="Highlight" fill="currentColor"/>
   <path d="m6.4283 34.573c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64675 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.64171-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57654 0.53779 1.6544 0.0146 2.4565-0.58139 0.88736-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38101-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027 0-0.55146 0.43606-1.0027 0.969-1.0027 0.53295 0 0.96901 0.45122 0.96901 1.0027z" class="HighlightOutline" fill="currentColor"/>
   <path d="m6.4283 62.09c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64675 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.6417-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57654 0.53779 1.6544 0.0146 2.4565-0.58139 0.88736-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38102-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027s0.43606-1.0027 0.969-1.0027c0.53295 0 0.96901 0.45122 0.96901 1.0027z" fill="#aeaeae"/>
   <path d="m6.4283 103.37c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64674 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.64171-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57655 0.53779 1.6544 0.0146 2.4565-0.58139 0.88735-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38102-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027s0.43606-1.0027 0.969-1.0027c0.53295 0 0.96901 0.45122 0.96901 1.0027z" fill="#aeaeae"/>
-  <path d="m6.4283 75.849c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64675 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.6417-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57654 0.53779 1.6544 0.0146 2.4565-0.58139 0.88736-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38102-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027s0.43606-1.0027 0.969-1.0027c0.53295 0 0.96901 0.45122 0.96901 1.0027z" fill="#3096fa"/>
+  <path d="m6.4283 75.849c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64675 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.6417-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57654 0.53779 1.6544 0.0146 2.4565-0.58139 0.88736-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38102-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027s0.43606-1.0027 0.969-1.0027c0.53295 0 0.96901 0.45122 0.96901 1.0027z" class="Highlight" fill="currentColor"/>
   <path d="m6.4283 89.608c0.37308-0.69687 1.0901-1.108 1.5068-1.7246 0.4409-0.64675 0.1938-1.855-1.0562-1.855-0.8188 0-1.2209 0.64171-1.3905 1.1731l-1.2549-0.54646c0.344-1.0678 1.2791-1.9853 2.6405-1.9853 1.1386 0 1.9186 0.53642 2.3159 1.2082 0.33916 0.57654 0.53779 1.6544 0.0146 2.4565-0.58139 0.88736-1.1386 1.1581-1.439 1.7296-0.12112 0.23061-0.16958 0.38101-0.16958 1.123h-1.4002c-0.0048-0.39106-0.06298-1.0278 0.23257-1.5792zm1.4196 3.5845c0 0.55146-0.43606 1.0027-0.96901 1.0027-0.53294 0-0.969-0.45122-0.969-1.0027 0-0.55146 0.43606-1.0027 0.969-1.0027 0.53295 0 0.96901 0.45122 0.96901 1.0027z" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_max_button_background.svg b/dlls/light.msstyles/blue_window_max_button_background.svg
index 41b6e51f1f7..831142b91aa 100644
--- a/dlls/light.msstyles/blue_window_max_button_background.svg
+++ b/dlls/light.msstyles/blue_window_max_button_background.svg
@@ -14,11 +14,11 @@
  <rect y="-7e-5" width="1.3229" height="35.984" fill="#fff" stroke-width=".26458"/>
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="none" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
-  <rect x=".13228" y="4.6303" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#3096fa"/>
+  <rect x=".13228" y="4.6303" width="1.0583" height="4.2334" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="9.1282" width="1.0583" height="4.2334" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="13.626" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
   <rect x=".13228" y="18.124" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
-  <rect x=".13228" y="22.622" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#3096fa"/>
+  <rect x=".13228" y="22.622" width="1.0583" height="4.2334" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="27.12" width="1.0583" height="4.2334" rx=".52917" ry=".52917" fill="#fff" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="31.618" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_window_max_button_glyph_13px.svg b/dlls/light.msstyles/blue_window_max_button_glyph_13px.svg
index 51e3130807f..a77bd593412 100644
--- a/dlls/light.msstyles/blue_window_max_button_glyph_13px.svg
+++ b/dlls/light.msstyles/blue_window_max_button_glyph_13px.svg
@@ -6,11 +6,11 @@
  <g fill="none" stroke-width=".26458">
   <rect x=".66146" y=".66146" width="2.1167" height="2.1167" stroke="#aeaeae"/>
   <rect x=".66146" y="10.98" width="2.1167" height="2.1167" stroke="#aeaeae"/>
-  <rect x=".66146" y="4.101" width="2.1167" height="2.1167" stroke="#3096fa"/>
+  <rect x=".66146" y="4.101" width="2.1167" height="2.1167" class="Highlight" stroke="currentColor"/>
   <rect x=".66146" y="7.5406" width="2.1167" height="2.1167" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".66146" y="14.42" width="2.1167" height="2.1167" stroke="#aeaeae"/>
   <rect x=".66146" y="24.739" width="2.1167" height="2.1167" stroke="#aeaeae"/>
-  <rect x=".66146" y="17.859" width="2.1167" height="2.1167" stroke="#3096fa"/>
+  <rect x=".66146" y="17.859" width="2.1167" height="2.1167" class="Highlight" stroke="currentColor"/>
   <rect x=".66146" y="21.299" width="2.1167" height="2.1167" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_max_button_glyph_19px.svg b/dlls/light.msstyles/blue_window_max_button_glyph_19px.svg
index 4ea6a58859c..008ef91baa6 100644
--- a/dlls/light.msstyles/blue_window_max_button_glyph_19px.svg
+++ b/dlls/light.msstyles/blue_window_max_button_glyph_19px.svg
@@ -6,11 +6,11 @@
  <g fill="none" stroke-width=".26458">
   <rect x=".92603" y=".92605" width="3.175" height="3.175" stroke="#aeaeae"/>
   <rect x=".92603" y="16.007" width="3.175" height="3.175" stroke="#aeaeae"/>
-  <rect x=".92603" y="5.9532" width="3.175" height="3.175" stroke="#3096fa"/>
+  <rect x=".92603" y="5.9532" width="3.175" height="3.175" class="Highlight" stroke="currentColor"/>
   <rect x=".92603" y="10.98" width="3.175" height="3.175" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".92603" y="21.035" width="3.175" height="3.175" stroke="#aeaeae"/>
   <rect x=".92603" y="36.116" width="3.175" height="3.175" stroke="#aeaeae"/>
-  <rect x=".92603" y="26.062" width="3.175" height="3.175" stroke="#3096fa"/>
+  <rect x=".92603" y="26.062" width="3.175" height="3.175" class="Highlight" stroke="currentColor"/>
   <rect x=".92603" y="31.089" width="3.175" height="3.175" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_max_button_glyph_23px.svg b/dlls/light.msstyles/blue_window_max_button_glyph_23px.svg
index fcb61c08eb5..ae9740e4ade 100644
--- a/dlls/light.msstyles/blue_window_max_button_glyph_23px.svg
+++ b/dlls/light.msstyles/blue_window_max_button_glyph_23px.svg
@@ -6,11 +6,11 @@
  <g fill="none" stroke-width=".26458">
   <rect x="1.1906" y="1.1906" width="3.7042" height="3.7042" stroke="#aeaeae"/>
   <rect x="1.1906" y="19.447" width="3.7042" height="3.7042" stroke="#aeaeae"/>
-  <rect x="1.1906" y="7.2761" width="3.7042" height="3.7042" stroke="#3096fa"/>
+  <rect x="1.1906" y="7.2761" width="3.7042" height="3.7042" class="Highlight" stroke="currentColor"/>
   <rect x="1.1906" y="13.362" width="3.7042" height="3.7042" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1.1906" y="25.532" width="3.7042" height="3.7042" stroke="#aeaeae"/>
   <rect x="1.1906" y="43.789" width="3.7042" height="3.7042" stroke="#aeaeae"/>
-  <rect x="1.1906" y="31.618" width="3.7042" height="3.7042" stroke="#3096fa"/>
+  <rect x="1.1906" y="31.618" width="3.7042" height="3.7042" class="Highlight" stroke="currentColor"/>
   <rect x="1.1906" y="37.703" width="3.7042" height="3.7042" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_max_button_glyph_26px.svg b/dlls/light.msstyles/blue_window_max_button_glyph_26px.svg
index 14eaede371b..b196245b6d6 100644
--- a/dlls/light.msstyles/blue_window_max_button_glyph_26px.svg
+++ b/dlls/light.msstyles/blue_window_max_button_glyph_26px.svg
@@ -6,11 +6,11 @@
  <g fill="none" stroke-width=".52917">
   <rect x="1.3229" y="1.3229" width="4.2334" height="4.2334" stroke="#aeaeae"/>
   <rect x="1.3229" y="21.961" width="4.2334" height="4.2334" stroke="#aeaeae"/>
-  <rect x="1.3229" y="8.2022" width="4.2334" height="4.2334" stroke="#3096fa"/>
+  <rect x="1.3229" y="8.2022" width="4.2334" height="4.2334" class="Highlight" stroke="currentColor"/>
   <rect x="1.3229" y="15.081" width="4.2334" height="4.2334" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1.3229" y="28.84" width="4.2334" height="4.2334" stroke="#aeaeae"/>
   <rect x="1.3229" y="49.478" width="4.2334" height="4.2334" stroke="#aeaeae"/>
-  <rect x="1.3229" y="35.719" width="4.2334" height="4.2334" stroke="#3096fa"/>
+  <rect x="1.3229" y="35.719" width="4.2334" height="4.2334" class="Highlight" stroke="currentColor"/>
   <rect x="1.3229" y="42.599" width="4.2334" height="4.2334" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_max_button_glyph_32px.svg b/dlls/light.msstyles/blue_window_max_button_glyph_32px.svg
index 2191b6e48b6..414e6955cb1 100644
--- a/dlls/light.msstyles/blue_window_max_button_glyph_32px.svg
+++ b/dlls/light.msstyles/blue_window_max_button_glyph_32px.svg
@@ -6,11 +6,11 @@
  <g fill="none" stroke-width=".52917">
   <rect x="1.852" y="1.8521" width="4.7626" height="4.7626" stroke="#aeaeae"/>
   <rect x="1.852" y="27.252" width="4.7626" height="4.7626" stroke="#aeaeae"/>
-  <rect x="1.852" y="10.319" width="4.7626" height="4.7626" stroke="#3096fa"/>
+  <rect x="1.852" y="10.319" width="4.7626" height="4.7626" class="Highlight" stroke="currentColor"/>
   <rect x="1.852" y="18.786" width="4.7626" height="4.7626" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1.852" y="35.719" width="4.7626" height="4.7626" stroke="#aeaeae"/>
   <rect x="1.852" y="61.119" width="4.7626" height="4.7626" stroke="#aeaeae"/>
-  <rect x="1.852" y="44.186" width="4.7626" height="4.7626" stroke="#3096fa"/>
+  <rect x="1.852" y="44.186" width="4.7626" height="4.7626" class="Highlight" stroke="currentColor"/>
   <rect x="1.852" y="52.653" width="4.7626" height="4.7626" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_max_button_glyph_39px.svg b/dlls/light.msstyles/blue_window_max_button_glyph_39px.svg
index f2dce71e010..dd284f88c2d 100644
--- a/dlls/light.msstyles/blue_window_max_button_glyph_39px.svg
+++ b/dlls/light.msstyles/blue_window_max_button_glyph_39px.svg
@@ -6,11 +6,11 @@
  <g fill="none" stroke-width=".79376">
   <rect x="1.9843" y="1.9844" width="6.3501" height="6.3501" stroke="#aeaeae"/>
   <rect x="1.9843" y="32.941" width="6.3501" height="6.3501" stroke="#aeaeae"/>
-  <rect x="1.9843" y="12.303" width="6.3501" height="6.3501" stroke="#3096fa"/>
+  <rect x="1.9843" y="12.303" width="6.3501" height="6.3501" class="Highlight" stroke="currentColor"/>
   <rect x="1.9843" y="22.622" width="6.3501" height="6.3501" class="HighlightOutline" stroke="currentColor"/>
   <rect x="1.9843" y="43.26" width="6.3501" height="6.3501" stroke="#aeaeae"/>
   <rect x="1.9843" y="74.216" width="6.3501" height="6.3501" stroke="#aeaeae"/>
-  <rect x="1.9843" y="53.579" width="6.3501" height="6.3501" stroke="#3096fa"/>
+  <rect x="1.9843" y="53.579" width="6.3501" height="6.3501" class="Highlight" stroke="currentColor"/>
   <rect x="1.9843" y="63.898" width="6.3501" height="6.3501" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_max_button_glyph_52px.svg b/dlls/light.msstyles/blue_window_max_button_glyph_52px.svg
index af43cad72df..550f7b3872b 100644
--- a/dlls/light.msstyles/blue_window_max_button_glyph_52px.svg
+++ b/dlls/light.msstyles/blue_window_max_button_glyph_52px.svg
@@ -6,11 +6,11 @@
  <g fill="none" stroke-width="1.0584">
   <rect x="2.6459" y="2.6458" width="8.4669" height="8.4669" stroke="#aeaeae"/>
   <rect x="2.6459" y="43.922" width="8.4669" height="8.4669" stroke="#aeaeae"/>
-  <rect x="2.6459" y="16.404" width="8.4669" height="8.4669" stroke="#3096fa"/>
+  <rect x="2.6459" y="16.404" width="8.4669" height="8.4669" class="Highlight" stroke="currentColor"/>
   <rect x="2.6459" y="30.163" width="8.4669" height="8.4669" class="HighlightOutline" stroke="currentColor"/>
   <rect x="2.6459" y="57.68" width="8.4669" height="8.4669" stroke="#aeaeae"/>
   <rect x="2.6459" y="98.956" width="8.4669" height="8.4669" stroke="#aeaeae"/>
-  <rect x="2.6459" y="71.438" width="8.4669" height="8.4669" stroke="#3096fa"/>
+  <rect x="2.6459" y="71.438" width="8.4669" height="8.4669" class="Highlight" stroke="currentColor"/>
   <rect x="2.6459" y="85.197" width="8.4669" height="8.4669" class="HighlightOutline" stroke="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_mdi_min_button_background.svg b/dlls/light.msstyles/blue_window_mdi_min_button_background.svg
index ffe87a4c4c3..173268454c3 100644
--- a/dlls/light.msstyles/blue_window_mdi_min_button_background.svg
+++ b/dlls/light.msstyles/blue_window_mdi_min_button_background.svg
@@ -14,7 +14,7 @@
  <rect x="-2.5542e-6" width="1.5875" height="10.583" fill="#fff" stroke-width=".26458"/>
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="none" stroke-width=".26458">
   <rect x=".13228" y=".39694" width="1.0583" height="2.1166" stroke="#aeaeae"/>
-  <rect x=".13228" y="3.0427" width="1.0583" height="2.1166" stroke="#3096fa"/>
+  <rect x=".13228" y="3.0427" width="1.0583" height="2.1166" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="5.6886" width="1.0583" height="2.1166" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="8.3344" width="1.0583" height="2.1166" fill="#aeaeae" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_window_mdi_min_button_glyph.svg b/dlls/light.msstyles/blue_window_mdi_min_button_glyph.svg
index f70343ac83a..adf2a72ba91 100644
--- a/dlls/light.msstyles/blue_window_mdi_min_button_glyph.svg
+++ b/dlls/light.msstyles/blue_window_mdi_min_button_glyph.svg
@@ -6,7 +6,7 @@
  <g transform="matrix(.8182 0 0 1 .3127 0)" stroke-width="1.2222">
   <rect transform="scale(-1,1)" x="-1.8814" y="2.1167" width="1.9402" height=".52917" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-1.8814" y="10.054" width="1.9403" height=".52917" fill="#aeaeae"/>
-  <rect transform="scale(-1,1)" x="-1.8814" y="4.7626" width="1.9403" height=".52917" fill="#3096fa"/>
+  <rect transform="scale(-1,1)" x="-1.8814" y="4.7626" width="1.9403" height=".52917" class="Highlight" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-1.8814" y="7.4084" width="1.9403" height=".52917" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_mdi_restore_button_background.svg b/dlls/light.msstyles/blue_window_mdi_restore_button_background.svg
index ffe87a4c4c3..173268454c3 100644
--- a/dlls/light.msstyles/blue_window_mdi_restore_button_background.svg
+++ b/dlls/light.msstyles/blue_window_mdi_restore_button_background.svg
@@ -14,7 +14,7 @@
  <rect x="-2.5542e-6" width="1.5875" height="10.583" fill="#fff" stroke-width=".26458"/>
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="none" stroke-width=".26458">
   <rect x=".13228" y=".39694" width="1.0583" height="2.1166" stroke="#aeaeae"/>
-  <rect x=".13228" y="3.0427" width="1.0583" height="2.1166" stroke="#3096fa"/>
+  <rect x=".13228" y="3.0427" width="1.0583" height="2.1166" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="5.6886" width="1.0583" height="2.1166" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="8.3344" width="1.0583" height="2.1166" fill="#aeaeae" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_window_mdi_restore_button_glyph.svg b/dlls/light.msstyles/blue_window_mdi_restore_button_glyph.svg
index 1aa49f66c73..3080e63bce7 100644
--- a/dlls/light.msstyles/blue_window_mdi_restore_button_glyph.svg
+++ b/dlls/light.msstyles/blue_window_mdi_restore_button_glyph.svg
@@ -5,7 +5,7 @@
  </style>
  <g transform="matrix(.99998 0 0 .99998 1.3229 -.52926)" fill="none" stroke-width=".26458">
   <rect x="-.92607" y="1.7199" width="1.3229" height="1.3229" stroke="#aeaeae"/>
-  <rect x="-.92607" y="4.3657" width="1.3229" height="1.3229" stroke="#3096fa"/>
+  <rect x="-.92607" y="4.3657" width="1.3229" height="1.3229" class="Highlight" stroke="currentColor"/>
   <rect x="-.92607" y="7.0116" width="1.3229" height="1.3229" class="HighlightOutline" stroke="currentColor"/>
  </g>
  <rect transform="scale(-1,1)" x="-2.3812" y=".52913" width="1.5875" height=".26458" fill="#aeaeae" stroke-width=".23931"/>
@@ -15,8 +15,8 @@
   <rect transform="scale(-1,1)" x="-2.3813" y="8.4665" width="1.5875" height=".26459" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-2.3813" y="8.731" width=".2646" height="1.3229" fill="#aeaeae"/>
   <g transform="matrix(.99998 0 0 .99998 1.3229 -.52926)">
-   <rect transform="scale(-1,1)" x="-1.0583" y="3.7043" width="1.5875" height=".26459" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-1.0583" y="3.9688" width=".26459" height="1.3229" fill="#3096fa"/>
+   <rect transform="scale(-1,1)" x="-1.0583" y="3.7043" width="1.5875" height=".26459" class="Highlight" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-1.0583" y="3.9688" width=".26459" height="1.3229" class="Highlight" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-1.0583" y="6.3501" width="1.5875" height=".26459" class="HighlightOutline" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-1.0583" y="6.6147" width=".26459" height="1.3229" class="HighlightOutline" fill="currentColor"/>
   </g>
diff --git a/dlls/light.msstyles/blue_window_min_button_background.svg b/dlls/light.msstyles/blue_window_min_button_background.svg
index bdb89fa53dd..47d7bfb5a7d 100644
--- a/dlls/light.msstyles/blue_window_min_button_background.svg
+++ b/dlls/light.msstyles/blue_window_min_button_background.svg
@@ -14,11 +14,11 @@
  <rect y="-7e-5" width="1.3229" height="35.984" fill="#fff" stroke-width=".26458"/>
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="none" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
-  <rect x=".13228" y="4.6303" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#3096fa"/>
+  <rect x=".13228" y="4.6303" width="1.0583" height="4.2334" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="9.1282" width="1.0583" height="4.2334" rx=".52917" ry=".52917" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="13.626" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
   <rect x=".13228" y="18.124" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
-  <rect x=".13228" y="22.622" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#3096fa"/>
+  <rect x=".13228" y="22.622" width="1.0583" height="4.2334" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="27.12" width="1.0583" height="4.2334" rx=".52917" ry=".52917" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="31.618" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_window_min_button_glyph_13px.svg b/dlls/light.msstyles/blue_window_min_button_glyph_13px.svg
index fa9e52df798..6d649c09c28 100644
--- a/dlls/light.msstyles/blue_window_min_button_glyph_13px.svg
+++ b/dlls/light.msstyles/blue_window_min_button_glyph_13px.svg
@@ -6,11 +6,11 @@
  <g transform="matrix(.8182 0 0 1 .3127 0)" stroke-width="1.2222">
   <rect transform="scale(-1,1)" x="-3.1749" y="2.6458" width="2.9104" height=".26459" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-3.1749" y="12.965" width="2.9104" height=".26459" fill="#aeaeae"/>
-  <rect transform="scale(-1,1)" x="-3.1749" y="6.0855" width="2.9104" height=".26459" fill="#3096fa"/>
+  <rect transform="scale(-1,1)" x="-3.1749" y="6.0855" width="2.9104" height=".26459" class="Highlight" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-3.1749" y="9.5251" width="2.9104" height=".26459" class="HighlightOutline" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-3.1749" y="16.404" width="2.9104" height=".26459" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-3.1749" y="26.723" width="2.9104" height=".26459" fill="#aeaeae"/>
-  <rect transform="scale(-1,1)" x="-3.1749" y="19.844" width="2.9104" height=".26459" fill="#3096fa"/>
+  <rect transform="scale(-1,1)" x="-3.1749" y="19.844" width="2.9104" height=".26459" class="Highlight" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-3.1749" y="23.283" width="2.9104" height=".26459" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_min_button_glyph_19px.svg b/dlls/light.msstyles/blue_window_min_button_glyph_19px.svg
index 925135aeace..91c8be0cc38 100644
--- a/dlls/light.msstyles/blue_window_min_button_glyph_19px.svg
+++ b/dlls/light.msstyles/blue_window_min_button_glyph_19px.svg
@@ -6,11 +6,11 @@
  <g>
   <rect transform="scale(-1,1)" x="-4.2333" y="3.9688" width="3.4396" height=".26459" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-4.2333" y="19.05" width="3.4396" height=".26459" fill="#aeaeae"/>
-  <rect transform="scale(-1,1)" x="-4.2333" y="8.9959" width="3.4396" height=".26459" fill="#3096fa"/>
+  <rect transform="scale(-1,1)" x="-4.2333" y="8.9959" width="3.4396" height=".26459" class="Highlight" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-4.2333" y="14.023" width="3.4396" height=".26459" class="HighlightOutline" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-4.2333" y="24.077" width="3.4396" height=".26459" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-4.2333" y="39.159" width="3.4396" height=".26459" fill="#aeaeae"/>
-  <rect transform="scale(-1,1)" x="-4.2333" y="29.105" width="3.4396" height=".26459" fill="#3096fa"/>
+  <rect transform="scale(-1,1)" x="-4.2333" y="29.105" width="3.4396" height=".26459" class="Highlight" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-4.2333" y="34.132" width="3.4396" height=".26459" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_min_button_glyph_23px.svg b/dlls/light.msstyles/blue_window_min_button_glyph_23px.svg
index f096becfbce..acbf7e4c35c 100644
--- a/dlls/light.msstyles/blue_window_min_button_glyph_23px.svg
+++ b/dlls/light.msstyles/blue_window_min_button_glyph_23px.svg
@@ -6,13 +6,13 @@
  <rect transform="scale(-1,1)" x="-5.0271" y="4.7626" width="3.9688" height=".26459" fill="#aeaeae"/>
  <g transform="matrix(.88235 0 0 1 .35802 .79377)" stroke-width="1.1333">
   <rect transform="scale(-1,1)" x="-5.2916" y="22.225" width="4.498" height=".26459" fill="#aeaeae"/>
-  <rect transform="scale(-1,1)" x="-5.2916" y="10.054" width="4.498" height=".26459" fill="#3096fa"/>
+  <rect transform="scale(-1,1)" x="-5.2916" y="10.054" width="4.498" height=".26459" class="Highlight" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-5.2916" y="16.14" width="4.498" height=".26459" class="HighlightOutline" fill="currentColor"/>
  </g>
  <rect transform="scale(-1,1)" x="-5.0271" y="29.105" width="3.9688" height=".26459" fill="#aeaeae"/>
  <g transform="matrix(.88235 0 0 1 .35802 .79377)" stroke-width="1.1333">
   <rect transform="scale(-1,1)" x="-5.2916" y="46.567" width="4.498" height=".26459" fill="#aeaeae"/>
-  <rect transform="scale(-1,1)" x="-5.2916" y="34.396" width="4.498" height=".26459" fill="#3096fa"/>
+  <rect transform="scale(-1,1)" x="-5.2916" y="34.396" width="4.498" height=".26459" class="Highlight" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-5.2916" y="40.482" width="4.498" height=".26459" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_min_button_glyph_26px.svg b/dlls/light.msstyles/blue_window_min_button_glyph_26px.svg
index e36cbbe1a44..608b543e5d3 100644
--- a/dlls/light.msstyles/blue_window_min_button_glyph_26px.svg
+++ b/dlls/light.msstyles/blue_window_min_button_glyph_26px.svg
@@ -6,11 +6,11 @@
  <rect transform="scale(-1,1)" x="-5.8208" y="5.2917" width="4.7625" height=".52917" fill="#aeaeae"/>
  <g transform="matrix(1.0588 0 0 1 .43437 0)" stroke-width="1.0193">
   <rect transform="scale(-1,1)" x="-5.0872" y="25.93" width="4.498" height=".52917" fill="#aeaeae"/>
-  <rect transform="scale(-1,1)" x="-5.0872" y="12.171" width="4.498" height=".52917" fill="#3096fa"/>
+  <rect transform="scale(-1,1)" x="-5.0872" y="12.171" width="4.498" height=".52917" class="Highlight" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-5.0872" y="19.05" width="4.498" height=".52917" class="HighlightOutline" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-5.0872" y="32.809" width="4.498" height=".52917" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-5.0872" y="53.447" width="4.498" height=".52917" fill="#aeaeae"/>
-  <rect transform="scale(-1,1)" x="-5.0872" y="39.688" width="4.498" height=".52917" fill="#3096fa"/>
+  <rect transform="scale(-1,1)" x="-5.0872" y="39.688" width="4.498" height=".52917" class="Highlight" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-5.0872" y="46.567" width="4.498" height=".52917" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_min_button_glyph_32px.svg b/dlls/light.msstyles/blue_window_min_button_glyph_32px.svg
index 0a185586bc0..23e2dca3832 100644
--- a/dlls/light.msstyles/blue_window_min_button_glyph_32px.svg
+++ b/dlls/light.msstyles/blue_window_min_button_glyph_32px.svg
@@ -7,13 +7,13 @@
  <g transform="matrix(1.1765 0 0 1 .89419 2.1167)">
   <g stroke-width=".96695">
    <rect transform="scale(-1,1)" x="-5.0872" y="29.634" width="4.498" height=".52917" fill="#aeaeae"/>
-   <rect transform="scale(-1,1)" x="-5.0872" y="12.7" width="4.498" height=".52917" fill="#3096fa"/>
+   <rect transform="scale(-1,1)" x="-5.0872" y="12.7" width="4.498" height=".52917" class="Highlight" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-5.0872" y="21.167" width="4.498" height=".52917" class="HighlightOutline" fill="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-5.0872" y="38.1" width="4.498" height=".52917" fill="#aeaeae" stroke-width=".92196"/>
   <g stroke-width=".96695">
    <rect transform="scale(-1,1)" x="-5.0872" y="63.501" width="4.498" height=".52917" fill="#aeaeae"/>
-   <rect transform="scale(-1,1)" x="-5.0872" y="46.567" width="4.498" height=".52917" fill="#3096fa"/>
+   <rect transform="scale(-1,1)" x="-5.0872" y="46.567" width="4.498" height=".52917" class="Highlight" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-5.0872" y="55.034" width="4.498" height=".52917" class="HighlightOutline" fill="currentColor"/>
   </g>
  </g>
diff --git a/dlls/light.msstyles/blue_window_min_button_glyph_39px.svg b/dlls/light.msstyles/blue_window_min_button_glyph_39px.svg
index e91f2ad30ba..1ab9d373f0d 100644
--- a/dlls/light.msstyles/blue_window_min_button_glyph_39px.svg
+++ b/dlls/light.msstyles/blue_window_min_button_glyph_39px.svg
@@ -6,11 +6,11 @@
  <g transform="matrix(2.4546 0 0 1 -.12013 0)" stroke-width=".4074">
   <rect transform="scale(-1,1)" x="-3.606" y="7.9376" width="2.9104" height=".79376" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-3.606" y="38.894" width="2.9104" height=".79376" fill="#aeaeae"/>
-  <rect transform="scale(-1,1)" x="-3.606" y="18.256" width="2.9104" height=".79376" fill="#3096fa"/>
+  <rect transform="scale(-1,1)" x="-3.606" y="18.256" width="2.9104" height=".79376" class="Highlight" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-3.606" y="28.575" width="2.9104" height=".79376" class="HighlightOutline" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-3.606" y="49.213" width="2.9104" height=".79376" fill="#aeaeae"/>
   <rect transform="scale(-1,1)" x="-3.606" y="80.17" width="2.9104" height=".79376" fill="#aeaeae"/>
-  <rect transform="scale(-1,1)" x="-3.606" y="59.532" width="2.9104" height=".79376" fill="#3096fa"/>
+  <rect transform="scale(-1,1)" x="-3.606" y="59.532" width="2.9104" height=".79376" class="Highlight" fill="currentColor"/>
   <rect transform="scale(-1,1)" x="-3.606" y="69.851" width="2.9104" height=".79376" class="HighlightOutline" fill="currentColor"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_window_min_button_glyph_52px.svg b/dlls/light.msstyles/blue_window_min_button_glyph_52px.svg
index eba48a6cc9a..92b0cc6ce1b 100644
--- a/dlls/light.msstyles/blue_window_min_button_glyph_52px.svg
+++ b/dlls/light.msstyles/blue_window_min_button_glyph_52px.svg
@@ -7,13 +7,13 @@
  <g transform="matrix(1.0588 0 0 1 -5.6513 4.2334)">
   <g stroke-width="1.0193">
    <rect transform="scale(-1,1)" x="-16.332" y="47.626" width="8.9959" height="1.0583" fill="#aeaeae"/>
-   <rect transform="scale(-1,1)" x="-16.332" y="20.109" width="8.9959" height="1.0583" fill="#3096fa"/>
+   <rect transform="scale(-1,1)" x="-16.332" y="20.109" width="8.9959" height="1.0583" class="Highlight" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-16.332" y="33.867" width="8.9959" height="1.0583" class="HighlightOutline" fill="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-16.332" y="61.384" width="8.996" height="1.0583" fill="#aeaeae" stroke-width=".97184"/>
   <g stroke-width="1.0193">
    <rect transform="scale(-1,1)" x="-16.332" y="102.66" width="8.9959" height="1.0583" fill="#aeaeae"/>
-   <rect transform="scale(-1,1)" x="-16.332" y="75.143" width="8.9959" height="1.0583" fill="#3096fa"/>
+   <rect transform="scale(-1,1)" x="-16.332" y="75.143" width="8.9959" height="1.0583" class="Highlight" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-16.332" y="88.901" width="8.9959" height="1.0583" class="HighlightOutline" fill="currentColor"/>
   </g>
  </g>
diff --git a/dlls/light.msstyles/blue_window_restore_button_background.svg b/dlls/light.msstyles/blue_window_restore_button_background.svg
index bdb89fa53dd..47d7bfb5a7d 100644
--- a/dlls/light.msstyles/blue_window_restore_button_background.svg
+++ b/dlls/light.msstyles/blue_window_restore_button_background.svg
@@ -14,11 +14,11 @@
  <rect y="-7e-5" width="1.3229" height="35.984" fill="#fff" stroke-width=".26458"/>
  <g transform="translate(5.0184e-6,-6.4982e-5)" fill="none" stroke-width=".26458">
   <rect x=".13228" y=".13228" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
-  <rect x=".13228" y="4.6303" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#3096fa"/>
+  <rect x=".13228" y="4.6303" width="1.0583" height="4.2334" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="9.1282" width="1.0583" height="4.2334" rx=".52917" ry=".52917" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="13.626" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
   <rect x=".13228" y="18.124" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
-  <rect x=".13228" y="22.622" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#3096fa"/>
+  <rect x=".13228" y="22.622" width="1.0583" height="4.2334" rx=".52917" ry=".52917" class="Highlight" stroke="currentColor"/>
   <rect x=".13228" y="27.12" width="1.0583" height="4.2334" rx=".52917" ry=".52917" class="HighlightOutline" stroke="currentColor"/>
   <rect x=".13228" y="31.618" width="1.0583" height="4.2334" rx=".52917" ry=".52917" stroke="#aeaeae"/>
  </g>
diff --git a/dlls/light.msstyles/blue_window_restore_button_glyph_13px.svg b/dlls/light.msstyles/blue_window_restore_button_glyph_13px.svg
index c39e9e5a7f7..75ffe65bf39 100644
--- a/dlls/light.msstyles/blue_window_restore_button_glyph_13px.svg
+++ b/dlls/light.msstyles/blue_window_restore_button_glyph_13px.svg
@@ -6,7 +6,7 @@
  <g fill="none">
   <g stroke-width=".26458">
    <rect x=".66146" y="1.1906" width="1.5875" height="1.5875" stroke="#aeaeae"/>
-   <rect x=".66146" y="4.6303" width="1.5875" height="1.5875" stroke="#3096fa"/>
+   <rect x=".66146" y="4.6303" width="1.5875" height="1.5875" class="Highlight" stroke="currentColor"/>
    <rect x=".66146" y="8.0699" width="1.5875" height="1.5875" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-2.9104" y=".52917" width="1.8521" height=".26459" fill="#aeaeae" stroke-width=".23932"/>
@@ -15,14 +15,14 @@
   <rect transform="scale(-1,1)" x="-2.9104" y="10.848" width="1.8521" height=".26459" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-2.9104" y="11.113" width=".26459" height="1.5875" fill="#aeaeae" stroke-width=".23932"/>
   <g stroke-width=".23932">
-   <rect transform="scale(-1,1)" x="-2.9104" y="3.9688" width="1.8521" height=".26459" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-2.9104" y="4.2334" width=".26459" height="1.5875" fill="#3096fa"/>
+   <rect transform="scale(-1,1)" x="-2.9104" y="3.9688" width="1.8521" height=".26459" class="Highlight" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-2.9104" y="4.2334" width=".26459" height="1.5875" class="Highlight" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-2.9104" y="7.4084" width="1.8521" height=".26459" class="HighlightOutline" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-2.9104" y="7.673" width=".26459" height="1.5875" class="HighlightOutline" fill="currentColor"/>
   </g>
   <g stroke-width=".26458">
    <rect x=".66146" y="14.949" width="1.5875" height="1.5875" stroke="#aeaeae"/>
-   <rect x=".66146" y="18.389" width="1.5875" height="1.5875" stroke="#3096fa"/>
+   <rect x=".66146" y="18.389" width="1.5875" height="1.5875" class="Highlight" stroke="currentColor"/>
    <rect x=".66146" y="21.828" width="1.5875" height="1.5875" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-2.9104" y="14.288" width="1.8521" height=".26459" fill="#aeaeae" stroke-width=".23932"/>
@@ -31,8 +31,8 @@
   <rect transform="scale(-1,1)" x="-2.9104" y="24.607" width="1.8521" height=".26459" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-2.9104" y="24.871" width=".26459" height="1.5875" fill="#aeaeae" stroke-width=".23932"/>
   <g stroke-width=".23932">
-   <rect transform="scale(-1,1)" x="-2.9104" y="17.727" width="1.8521" height=".26459" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-2.9104" y="17.992" width=".26459" height="1.5875" fill="#3096fa"/>
+   <rect transform="scale(-1,1)" x="-2.9104" y="17.727" width="1.8521" height=".26459" class="Highlight" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-2.9104" y="17.992" width=".26459" height="1.5875" class="Highlight" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-2.9104" y="21.167" width="1.8521" height=".26459" class="HighlightOutline" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-2.9104" y="21.432" width=".26459" height="1.5875" class="HighlightOutline" fill="currentColor"/>
   </g>
diff --git a/dlls/light.msstyles/blue_window_restore_button_glyph_19px.svg b/dlls/light.msstyles/blue_window_restore_button_glyph_19px.svg
index c52bfc9fca4..3b3a51195c9 100644
--- a/dlls/light.msstyles/blue_window_restore_button_glyph_19px.svg
+++ b/dlls/light.msstyles/blue_window_restore_button_glyph_19px.svg
@@ -6,7 +6,7 @@
  <g fill="none">
   <g stroke-width=".26458">
    <rect x=".92603" y="1.7198" width="2.3813" height="2.3813" stroke="#aeaeae"/>
-   <rect x=".92603" y="6.7469" width="2.3813" height="2.3813" stroke="#3096fa"/>
+   <rect x=".92603" y="6.7469" width="2.3813" height="2.3813" class="Highlight" stroke="currentColor"/>
    <rect x=".92603" y="11.774" width="2.3813" height="2.3813" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-4.2334" y=".79375" width="2.6459" height=".26459" fill="#aeaeae" stroke-width=".23932"/>
@@ -15,14 +15,14 @@
   <g stroke-width=".23932">
    <rect transform="scale(-1,1)" x="-4.2334" y="15.875" width="2.6459" height=".26459" fill="#aeaeae"/>
    <rect transform="scale(-1,1)" x="-4.2334" y="16.14" width=".26459" height="2.3813" fill="#aeaeae"/>
-   <rect transform="scale(-1,1)" x="-4.2334" y="5.8209" width="2.6459" height=".26459" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-4.2334" y="6.0855" width=".26459" height="2.3813" fill="#3096fa"/>
+   <rect transform="scale(-1,1)" x="-4.2334" y="5.8209" width="2.6459" height=".26459" class="Highlight" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-4.2334" y="6.0855" width=".26459" height="2.3813" class="Highlight" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-4.2334" y="10.848" width="2.6459" height=".26459" class="HighlightOutline" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-4.2334" y="11.113" width=".26459" height="2.3813" class="HighlightOutline" fill="currentColor"/>
   </g>
   <g transform="translate(4.1044e-6 20.109)" stroke-width=".26458">
    <rect x=".92603" y="1.7198" width="2.3813" height="2.3813" stroke="#aeaeae"/>
-   <rect x=".92603" y="6.7469" width="2.3813" height="2.3813" stroke="#3096fa"/>
+   <rect x=".92603" y="6.7469" width="2.3813" height="2.3813" class="Highlight" stroke="currentColor"/>
    <rect x=".92603" y="11.774" width="2.3813" height="2.3813" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-4.2334" y="20.902" width="2.6459" height=".26459" fill="#aeaeae" stroke-width=".23932"/>
@@ -32,8 +32,8 @@
    <rect transform="scale(-1,1)" x="-4.2334" y="35.984" width="2.6459" height=".26459" fill="#aeaeae"/>
    <rect transform="scale(-1,1)" x="-4.2334" y="36.248" width=".26459" height="2.3813" fill="#aeaeae"/>
    <g transform="translate(4.1044e-6 20.109)">
-    <rect transform="scale(-1,1)" x="-4.2334" y="5.8209" width="2.6459" height=".26459" fill="#3096fa"/>
-    <rect transform="scale(-1,1)" x="-4.2334" y="6.0855" width=".26459" height="2.3813" fill="#3096fa"/>
+    <rect transform="scale(-1,1)" x="-4.2334" y="5.8209" width="2.6459" height=".26459" class="Highlight" fill="currentColor"/>
+    <rect transform="scale(-1,1)" x="-4.2334" y="6.0855" width=".26459" height="2.3813" class="Highlight" fill="currentColor"/>
     <rect transform="scale(-1,1)" x="-4.2334" y="10.848" width="2.6459" height=".26459" class="HighlightOutline" fill="currentColor"/>
     <rect transform="scale(-1,1)" x="-4.2334" y="11.113" width=".26459" height="2.3813" class="HighlightOutline" fill="currentColor"/>
    </g>
diff --git a/dlls/light.msstyles/blue_window_restore_button_glyph_23px.svg b/dlls/light.msstyles/blue_window_restore_button_glyph_23px.svg
index de430d6fc9f..7a6b4f9a81a 100644
--- a/dlls/light.msstyles/blue_window_restore_button_glyph_23px.svg
+++ b/dlls/light.msstyles/blue_window_restore_button_glyph_23px.svg
@@ -6,7 +6,7 @@
  <g fill="none">
   <g stroke-width=".26458">
    <rect x="1.1906" y="1.9844" width="2.9105" height="2.9105" stroke="#aeaeae"/>
-   <rect x="1.1906" y="8.0699" width="2.9105" height="2.9105" stroke="#3096fa"/>
+   <rect x="1.1906" y="8.0699" width="2.9105" height="2.9105" class="Highlight" stroke="currentColor"/>
    <rect x="1.1906" y="14.155" width="2.9105" height="2.9105" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-5.0271" y="1.0583" width="3.175" height=".26459" fill="#aeaeae" stroke-width=".23932"/>
@@ -15,14 +15,14 @@
   <rect transform="scale(-1,1)" x="-5.0271" y="19.315" width="3.175" height=".26459" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-5.0271" y="19.579" width=".26459" height="2.9105" fill="#aeaeae" stroke-width=".23932"/>
   <g stroke-width=".23932">
-   <rect transform="scale(-1,1)" x="-5.0271" y="7.1438" width="3.175" height=".26459" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-5.0271" y="7.4084" width=".26459" height="2.9105" fill="#3096fa"/>
+   <rect transform="scale(-1,1)" x="-5.0271" y="7.1438" width="3.175" height=".26459" class="Highlight" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-5.0271" y="7.4084" width=".26459" height="2.9105" class="Highlight" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-5.0271" y="13.229" width="3.175" height=".26459" class="HighlightOutline" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-5.0271" y="13.494" width=".26459" height="2.9105" class="HighlightOutline" fill="currentColor"/>
   </g>
   <g stroke-width=".26458">
    <rect x="1.1906" y="26.326" width="2.9105" height="2.9105" stroke="#aeaeae"/>
-   <rect x="1.1906" y="32.412" width="2.9105" height="2.9105" stroke="#3096fa"/>
+   <rect x="1.1906" y="32.412" width="2.9105" height="2.9105" class="Highlight" stroke="currentColor"/>
    <rect x="1.1906" y="38.497" width="2.9105" height="2.9105" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-5.0271" y="25.4" width="3.175" height=".26459" fill="#aeaeae" stroke-width=".23932"/>
@@ -31,8 +31,8 @@
   <rect transform="scale(-1,1)" x="-5.0271" y="43.657" width="3.175" height=".26459" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-5.0271" y="43.921" width=".26459" height="2.9105" fill="#aeaeae" stroke-width=".23932"/>
   <g stroke-width=".23932">
-   <rect transform="scale(-1,1)" x="-5.0271" y="31.486" width="3.175" height=".26459" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-5.0271" y="31.75" width=".26459" height="2.9105" fill="#3096fa"/>
+   <rect transform="scale(-1,1)" x="-5.0271" y="31.486" width="3.175" height=".26459" class="Highlight" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-5.0271" y="31.75" width=".26459" height="2.9105" class="Highlight" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-5.0271" y="37.571" width="3.175" height=".26459" class="HighlightOutline" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-5.0271" y="37.836" width=".26459" height="2.9105" class="HighlightOutline" fill="currentColor"/>
   </g>
diff --git a/dlls/light.msstyles/blue_window_restore_button_glyph_26px.svg b/dlls/light.msstyles/blue_window_restore_button_glyph_26px.svg
index 7bba6dbb2d9..90ec36a3e30 100644
--- a/dlls/light.msstyles/blue_window_restore_button_glyph_26px.svg
+++ b/dlls/light.msstyles/blue_window_restore_button_glyph_26px.svg
@@ -6,7 +6,7 @@
  <g fill="none" stroke-width=".52917">
   <g stroke-width=".52917">
    <rect x="1.3229" y="2.3813" width="3.175" height="3.175" stroke="#aeaeae"/>
-   <rect x="1.3228" y="9.2605" width="3.175" height="3.175" stroke="#3096fa"/>
+   <rect x="1.3228" y="9.2605" width="3.175" height="3.175" class="Highlight" stroke="currentColor"/>
    <rect x="1.3229" y="16.14" width="3.175" height="3.175" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-5.8208" y="1.0583" width="3.7042" height=".52917" fill="#aeaeae" stroke-width=".23932"/>
@@ -15,14 +15,14 @@
   <rect transform="scale(-1,1)" x="-5.8208" y="21.696" width="3.7042" height=".52917" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-5.8208" y="22.225" width=".52917" height="3.175" fill="#aeaeae" stroke-width=".23932"/>
   <g>
-   <rect transform="scale(-1,1)" x="-5.8208" y="7.9376" width="3.7042" height=".52917" fill="#3096fa" stroke-width=".23932"/>
-   <rect transform="scale(-1,1)" x="-5.8208" y="8.4668" width=".52917" height="3.175" fill="#3096fa" stroke-width=".23932"/>
+   <rect transform="scale(-1,1)" x="-5.8208" y="7.9376" width="3.7042" height=".52917" class="Highlight" fill="currentColor" stroke-width=".23932"/>
+   <rect transform="scale(-1,1)" x="-5.8208" y="8.4668" width=".52917" height="3.175" class="Highlight" fill="currentColor" stroke-width=".23932"/>
    <rect transform="scale(-1,1)" x="-5.8208" y="14.817" width="3.7042" height=".52917" class="HighlightOutline" fill="currentColor" stroke-width=".23932"/>
    <rect transform="scale(-1,1)" x="-5.8208" y="15.346" width=".52917" height="3.175" class="HighlightOutline" fill="currentColor" stroke-width=".23932"/>
   </g>
   <g stroke-width=".52917">
    <rect x="1.3229" y="29.898" width="3.175" height="3.175" stroke="#aeaeae"/>
-   <rect x="1.3229" y="36.778" width="3.175" height="3.175" stroke="#3096fa"/>
+   <rect x="1.3229" y="36.778" width="3.175" height="3.175" class="Highlight" stroke="currentColor"/>
    <rect x="1.3229" y="43.657" width="3.175" height="3.175" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-5.8209" y="28.575" width="3.7042" height=".52917" fill="#aeaeae" stroke-width=".23932"/>
@@ -31,8 +31,8 @@
   <rect transform="scale(-1,1)" x="-5.8208" y="49.213" width="3.7042" height=".52917" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-5.8208" y="49.742" width=".52917" height="3.175" fill="#aeaeae" stroke-width=".23932"/>
   <g>
-   <rect transform="scale(-1,1)" x="-5.8209" y="35.455" width="3.7042" height=".52917" fill="#3096fa" stroke-width=".23932"/>
-   <rect transform="scale(-1,1)" x="-5.8209" y="35.984" width=".52917" height="3.175" fill="#3096fa" stroke-width=".23932"/>
+   <rect transform="scale(-1,1)" x="-5.8209" y="35.455" width="3.7042" height=".52917" class="Highlight" fill="currentColor" stroke-width=".23932"/>
+   <rect transform="scale(-1,1)" x="-5.8209" y="35.984" width=".52917" height="3.175" class="Highlight" fill="currentColor" stroke-width=".23932"/>
    <rect transform="scale(-1,1)" x="-5.8209" y="42.334" width="3.7042" height=".52917" class="HighlightOutline" fill="currentColor" stroke-width=".23932"/>
    <rect transform="scale(-1,1)" x="-5.8209" y="42.863" width=".52917" height="3.175" class="HighlightOutline" fill="currentColor" stroke-width=".23932"/>
   </g>
diff --git a/dlls/light.msstyles/blue_window_restore_button_glyph_32px.svg b/dlls/light.msstyles/blue_window_restore_button_glyph_32px.svg
index 77cd3e97b2b..4970c63ce6d 100644
--- a/dlls/light.msstyles/blue_window_restore_button_glyph_32px.svg
+++ b/dlls/light.msstyles/blue_window_restore_button_glyph_32px.svg
@@ -6,14 +6,14 @@
  <g fill="none">
   <g stroke-width=".52917">
    <rect x="1.852" y="3.175" width="3.4396" height="3.4396" stroke="#aeaeae"/>
-   <rect x="1.852" y="11.642" width="3.4396" height="3.4396" stroke="#3096fa"/>
+   <rect x="1.852" y="11.642" width="3.4396" height="3.4396" class="Highlight" stroke="currentColor"/>
    <rect x="1.852" y="20.109" width="3.4396" height="3.4396" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-6.8792" y="1.5875" width="3.9688" height=".52917" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-6.8792" y="2.1167" width=".52917" height="3.4396" fill="#aeaeae" stroke-width=".23932"/>
   <g stroke-width=".23932">
-   <rect transform="scale(-1,1)" x="-6.8792" y="10.054" width="3.9688" height=".52917" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-6.8792" y="10.583" width=".52917" height="3.4396" fill="#3096fa"/>
+   <rect transform="scale(-1,1)" x="-6.8792" y="10.054" width="3.9688" height=".52917" class="Highlight" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-6.8792" y="10.583" width=".52917" height="3.4396" class="Highlight" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-6.8792" y="18.521" width="3.9688" height=".52917" class="HighlightOutline" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-6.8792" y="19.05" width=".52917" height="3.4396" class="HighlightOutline" fill="currentColor"/>
   </g>
@@ -22,14 +22,14 @@
   <rect transform="scale(-1,1)" x="-6.8792" y="27.517" width=".52917" height="3.4396" fill="#aeaeae" stroke-width=".23932"/>
   <g stroke-width=".52917">
    <rect x="1.852" y="37.042" width="3.4396" height="3.4396" stroke="#aeaeae"/>
-   <rect x="1.852" y="45.509" width="3.4396" height="3.4396" stroke="#3096fa"/>
+   <rect x="1.852" y="45.509" width="3.4396" height="3.4396" class="Highlight" stroke="currentColor"/>
    <rect x="1.852" y="53.976" width="3.4396" height="3.4396" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-6.8792" y="35.454" width="3.9688" height=".52917" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-6.8792" y="35.984" width=".52917" height="3.4396" fill="#aeaeae" stroke-width=".23932"/>
   <g stroke-width=".23932">
-   <rect transform="scale(-1,1)" x="-6.8792" y="43.921" width="3.9688" height=".52917" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-6.8792" y="44.45" width=".52917" height="3.4396" fill="#3096fa"/>
+   <rect transform="scale(-1,1)" x="-6.8792" y="43.921" width="3.9688" height=".52917" class="Highlight" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-6.8792" y="44.45" width=".52917" height="3.4396" class="Highlight" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-6.8792" y="52.388" width="3.9688" height=".52917" class="HighlightOutline" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-6.8792" y="52.917" width=".52917" height="3.4396" class="HighlightOutline" fill="currentColor"/>
   </g>
diff --git a/dlls/light.msstyles/blue_window_restore_button_glyph_39px.svg b/dlls/light.msstyles/blue_window_restore_button_glyph_39px.svg
index 288fb434c29..9c00c2ee621 100644
--- a/dlls/light.msstyles/blue_window_restore_button_glyph_39px.svg
+++ b/dlls/light.msstyles/blue_window_restore_button_glyph_39px.svg
@@ -6,7 +6,7 @@
  <g fill="none">
   <g stroke-width=".79376">
    <rect x="1.9844" y="3.5719" width="4.7626" height="4.7626" stroke="#aeaeae"/>
-   <rect x="1.9844" y="13.891" width="4.7626" height="4.7626" stroke="#3096fa"/>
+   <rect x="1.9844" y="13.891" width="4.7626" height="4.7626" class="Highlight" stroke="currentColor"/>
    <rect x="1.9844" y="24.21" width="4.7626" height="4.7626" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-8.7315" y="1.5875" width="5.5564" height=".79377" fill="#aeaeae" stroke-width=".23932"/>
@@ -15,14 +15,14 @@
   <rect transform="scale(-1,1)" x="-8.7315" y="32.544" width="5.5564" height=".79377" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-8.7315" y="33.338" width=".79377" height="4.7626" fill="#aeaeae" stroke-width=".23932"/>
   <g stroke-width=".23932">
-   <rect transform="scale(-1,1)" x="-8.7315" y="11.906" width="5.5564" height=".79377" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-8.7315" y="12.7" width=".79377" height="4.7626" fill="#3096fa"/>
+   <rect transform="scale(-1,1)" x="-8.7315" y="11.906" width="5.5564" height=".79377" class="Highlight" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-8.7315" y="12.7" width=".79377" height="4.7626" class="Highlight" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-8.7315" y="22.225" width="5.5564" height=".79377" class="HighlightOutline" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-8.7315" y="23.019" width=".79377" height="4.7626" class="HighlightOutline" fill="currentColor"/>
   </g>
   <g stroke-width=".79376">
    <rect x="1.9844" y="44.847" width="4.7626" height="4.7626" stroke="#aeaeae"/>
-   <rect x="1.9844" y="55.166" width="4.7626" height="4.7626" stroke="#3096fa"/>
+   <rect x="1.9844" y="55.166" width="4.7626" height="4.7626" class="Highlight" stroke="currentColor"/>
    <rect x="1.9844" y="65.485" width="4.7626" height="4.7626" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-8.7315" y="42.863" width="5.5564" height=".79377" fill="#aeaeae" stroke-width=".23932"/>
@@ -31,8 +31,8 @@
   <rect transform="scale(-1,1)" x="-8.7315" y="73.82" width="5.5564" height=".79377" fill="#aeaeae" stroke-width=".23932"/>
   <rect transform="scale(-1,1)" x="-8.7315" y="74.614" width=".79377" height="4.7626" fill="#aeaeae" stroke-width=".23932"/>
   <g stroke-width=".23932">
-   <rect transform="scale(-1,1)" x="-8.7315" y="53.182" width="5.5564" height=".79377" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-8.7315" y="53.976" width=".79377" height="4.7626" fill="#3096fa"/>
+   <rect transform="scale(-1,1)" x="-8.7315" y="53.182" width="5.5564" height=".79377" class="Highlight" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-8.7315" y="53.976" width=".79377" height="4.7626" class="Highlight" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-8.7315" y="63.501" width="5.5564" height=".79377" class="HighlightOutline" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-8.7315" y="64.295" width=".79377" height="4.7626" class="HighlightOutline" fill="currentColor"/>
   </g>
diff --git a/dlls/light.msstyles/blue_window_restore_button_glyph_52px.svg b/dlls/light.msstyles/blue_window_restore_button_glyph_52px.svg
index d20f0997cd5..46147a9eced 100644
--- a/dlls/light.msstyles/blue_window_restore_button_glyph_52px.svg
+++ b/dlls/light.msstyles/blue_window_restore_button_glyph_52px.svg
@@ -6,7 +6,7 @@
  <g fill="none">
   <g stroke-width="1.0584">
    <rect x="2.646" y="4.7626" width="6.3503" height="6.3503" stroke="#aeaeae"/>
-   <rect x="2.646" y="18.521" width="6.3503" height="6.3503" stroke="#3096fa"/>
+   <rect x="2.646" y="18.521" width="6.3503" height="6.3503" class="Highlight" stroke="currentColor"/>
    <rect x="2.646" y="32.28" width="6.3503" height="6.3503" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-11.642" y="2.1166" width="7.4087" height="1.0584" fill="#aeaeae" stroke-width=".23933"/>
@@ -15,14 +15,14 @@
   <rect transform="scale(-1,1)" x="-11.642" y="43.393" width="7.4087" height="1.0584" fill="#aeaeae" stroke-width=".23933"/>
   <rect transform="scale(-1,1)" x="-11.642" y="44.452" width="1.0584" height="6.3503" fill="#aeaeae" stroke-width=".23933"/>
   <g stroke-width=".23933">
-   <rect transform="scale(-1,1)" x="-11.642" y="15.876" width="7.4087" height="1.0584" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-11.642" y="16.934" width="1.0584" height="6.3503" fill="#3096fa"/>
+   <rect transform="scale(-1,1)" x="-11.642" y="15.876" width="7.4087" height="1.0584" class="Highlight" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-11.642" y="16.934" width="1.0584" height="6.3503" class="Highlight" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-11.642" y="29.634" width="7.4087" height="1.0584" class="HighlightOutline" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-11.642" y="30.693" width="1.0584" height="6.3503" class="HighlightOutline" fill="currentColor"/>
   </g>
   <g stroke-width="1.0584">
    <rect x="2.646" y="59.798" width="6.3503" height="6.3503" stroke="#aeaeae"/>
-   <rect x="2.646" y="73.557" width="6.3503" height="6.3503" stroke="#3096fa"/>
+   <rect x="2.646" y="73.557" width="6.3503" height="6.3503" class="Highlight" stroke="currentColor"/>
    <rect x="2.646" y="87.316" width="6.3503" height="6.3503" class="HighlightOutline" stroke="currentColor"/>
   </g>
   <rect transform="scale(-1,1)" x="-11.642" y="57.152" width="7.4087" height="1.0584" fill="#aeaeae" stroke-width=".23933"/>
@@ -31,8 +31,8 @@
   <rect transform="scale(-1,1)" x="-11.642" y="98.429" width="7.4087" height="1.0584" fill="#aeaeae" stroke-width=".23933"/>
   <rect transform="scale(-1,1)" x="-11.642" y="99.487" width="1.0584" height="6.3503" fill="#aeaeae" stroke-width=".23933"/>
   <g stroke-width=".23933">
-   <rect transform="scale(-1,1)" x="-11.642" y="70.911" width="7.4087" height="1.0584" fill="#3096fa"/>
-   <rect transform="scale(-1,1)" x="-11.642" y="71.969" width="1.0584" height="6.3503" fill="#3096fa"/>
+   <rect transform="scale(-1,1)" x="-11.642" y="70.911" width="7.4087" height="1.0584" class="Highlight" fill="currentColor"/>
+   <rect transform="scale(-1,1)" x="-11.642" y="71.969" width="1.0584" height="6.3503" class="Highlight" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-11.642" y="84.67" width="7.4087" height="1.0584" class="HighlightOutline" fill="currentColor"/>
    <rect transform="scale(-1,1)" x="-11.642" y="85.728" width="1.0584" height="6.3503" class="HighlightOutline" fill="currentColor"/>
   </g>
diff --git a/dlls/light.msstyles/colors.css b/dlls/light.msstyles/colors.css
index c8c9f7f663d..e00ee06c4c9 100644
--- a/dlls/light.msstyles/colors.css
+++ b/dlls/light.msstyles/colors.css
@@ -39,6 +39,11 @@
  * <rect ... class="WindowBackgroundHighlightOutline" />
  */
 
+.Highlight
+{
+    color:#3096fa; /* 48 150 250 */
+}
+
 .HighlightOutline
 {
     color:#2979ff; /* 41 121 255 */
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/7590

[Zhiyi Zhang (＠zhiyi)]

This is nice! Thanks for taking a look. Do you have a whole branch somewhere?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7590#note_98363

[Stefan Dösinger]

On Wed Mar 19 14:42:39 2025 +0000, Zhiyi Zhang wrote:
> This is nice! Thanks for working on this. Do you have a whole branch somewhere?
> https://gitlab.winehq.org/stefan/wine/-/tree/css?ref_type=heads has a lot more patches which still shouldn't change the generated .bmp files. It should allow you to see where things are going.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7590#note_98417

[Zhiyi Zhang (＠zhiyi)]

On Wed Mar 19 14:42:39 2025 +0000, Stefan Dösinger wrote:
> https://gitlab.winehq.org/stefan/wine/-/tree/css?ref_type=heads has a
> lot more patches which still shouldn't change the generated .bmp files.
> It should allow you to see where things are going.
> I only see three light.msstyles patches on top of wine at that branch. Are you sure it's the right one?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7590#note_98418

[Stefan Dösinger]

Depends on what you are looking for. Did you mean a full branch for a dark theme? No, I don't have that. I started building one partially and found it totally unmanageable by just sed-replacing colors in the SVGs.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7590#note_98419

[Stefan Dösinger]

I do have that partial dark theme branch somewhere on one of my computers. I can push it to my repo, but it is of little use for reviewing this MR and tricky to build because I didn't integrate the new DLL into the build system and prefix creation/update properly yet. And it looks rather bad because some stuff is still white, some stuff is green or pink so I know where various elements are actually used, etc.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7590#note_98421

[Zhiyi Zhang (＠zhiyi)]

On Wed Mar 19 14:57:40 2025 +0000, Stefan Dösinger wrote:
> Depends on what you are looking for. Did you mean a full branch for a
> dark theme? No, I don't have that. I started building one partially and
> found it totally unmanageable by just sed-replacing colors in the SVGs.
> I meant a branch that replaces all the colors in those SVGs. I am asking because I see you use names like HighlightOutline or Highlight. It would be better if you use something like Normal, Hot, Pressed, Disabled, HotSelected. These names are more consistent with the theme part state names in stylemap.c. Without a whole branch that replaces all the colors, pretty soon you might find it difficult to name some colors used for other parts.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7590#note_98422

[Zhiyi Zhang (＠zhiyi)]

On Wed Mar 19 14:58:01 2025 +0000, Zhiyi Zhang wrote:
> I meant a branch that replaces all the colors in those SVGs. I am asking
> because I see you use names like HighlightOutline or Highlight. It would
> be better if you use something like Normal, Hot, Pressed, Disabled,
> HotSelected. These names are more consistent with the theme part state
> names in stylemap.c. Without a whole branch that replaces all the
> colors, pretty soon you might find it difficult to name some colors used
> for other parts.
> I would use names like class-state or class-part-state, for example, something like button-hot if the theme class has only a few colors or button-pushbutton-hot if the theme class contains many parts, and those parts have many states and in turn many colors. Also, see if you can specify a color for different CSS classes. For example, #2979ff for both button-pushbutton-hot and button-checkbox-checkedhot.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7590#note_98433

[Zhiyi Zhang (＠zhiyi)]

On Wed Mar 19 15:14:20 2025 +0000, Zhiyi Zhang wrote:
> I would use names like class-state or class-part-state, for example,
> something like button-hot if the theme class has only a few colors or
> button-pushbutton-hot if the theme class contains many parts, and those
> parts have many states and in turn many colors. Also, see if you can
> specify a color for different CSS classes. For example, #2979ff for both
> button-pushbutton-hot and button-checkbox-checkedhot.
> if we need to separately specify fill and stroke colors, then maybe button-pushbutton-hot-fill and button-pushbutton-stroke

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7590#note_98435

[Stefan Dösinger]

On Wed Mar 19 15:23:17 2025 +0000, Zhiyi Zhang wrote:
> if we need to separately specify fill and stroke colors, then maybe
> button-pushbutton-hot-fill and button-pushbutton-hot-stroke
> Yeah coming up with a sensible naming scheme is indeed a problem.

Is there any documentation from Microsoft's side about the terms to use? Going by control state as you suggest has some appeal, but doesn't match up well to the registry entries and .rc values. Without knowing the uxtheme/comctl implementations I didn't see those terms anywhere.

E.g. the pre-theme colors make a difference between light and dark shadows, which can make a control appear either raised (button) or depressed (textbox, pressed buttoon). The light theme doesn't make a difference in the SVGs - is this a limitation of the .msstyle interface itself or simply an artistic choice on your end?

We don't need to come up with a perfect scheme right away. While working on the patches that I have so far I came across a few cases of "this seems, wrong, shouldn't it be color XYZ" and deliberately ignored them for now to keep my patches a functional no-op. Before adding any more themes we're certainly going to clean up a few things.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7590#note_98448

[Zhiyi Zhang (＠zhiyi)]

> Is there any documentation from Microsoft's side about the terms to use?

No, other than the class-part-state scheme. I doubt Microsoft will name all the colors in modern themes. The most probable way would be that those graphic designers use a set of colors as the palette/UI guideline for a theme so the user experience is consistent. For classic themes, there are things like EDGE_RAISED, EDGE_SUNKEN, EDGE_ETCHED, BDR_RAISED, etc. However, I don't think they will be useful for modern themes. Because these theme parts are basically bitmaps. For example, how do you name all the colors in a theme with skeuomorphic icons? For the light theme, as I am not a graphic designer and I was lazy, so I designed those icons with bare rounded corners and no complex effects. That's why there are usually just the fill and stroke colors for those icons with a palette consisting of mainly different blue colors.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7590#note_98577