diff --git a/src/desktoptheme/breeze/widgets/action-overlays.svgz b/src/desktoptheme/breeze/widgets/action-overlays.svgz
index 2742bffe1..3204c0a78 100644
Binary files a/src/desktoptheme/breeze/widgets/action-overlays.svgz and b/src/desktoptheme/breeze/widgets/action-overlays.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/arrows.svgz b/src/desktoptheme/breeze/widgets/arrows.svgz
index a5c37f484..558d38b41 100644
Binary files a/src/desktoptheme/breeze/widgets/arrows.svgz and b/src/desktoptheme/breeze/widgets/arrows.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/background.svgz b/src/desktoptheme/breeze/widgets/background.svgz
index e4490c4d6..dcbad4cdc 100644
Binary files a/src/desktoptheme/breeze/widgets/background.svgz and b/src/desktoptheme/breeze/widgets/background.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/bar_meter_horizontal.svgz b/src/desktoptheme/breeze/widgets/bar_meter_horizontal.svgz
index 25a7c9c40..787d5908f 100644
Binary files a/src/desktoptheme/breeze/widgets/bar_meter_horizontal.svgz and b/src/desktoptheme/breeze/widgets/bar_meter_horizontal.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/bar_meter_vertical.svgz b/src/desktoptheme/breeze/widgets/bar_meter_vertical.svgz
index dd7f140aa..da2cd223c 100644
Binary files a/src/desktoptheme/breeze/widgets/bar_meter_vertical.svgz and b/src/desktoptheme/breeze/widgets/bar_meter_vertical.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/busywidget.svgz b/src/desktoptheme/breeze/widgets/busywidget.svgz
index 9a2ff5083..28aa9a418 100644
Binary files a/src/desktoptheme/breeze/widgets/busywidget.svgz and b/src/desktoptheme/breeze/widgets/busywidget.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/button.svgz b/src/desktoptheme/breeze/widgets/button.svgz
index b427a204d..5f6db49a5 100644
Binary files a/src/desktoptheme/breeze/widgets/button.svgz and b/src/desktoptheme/breeze/widgets/button.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/checkmarks.svgz b/src/desktoptheme/breeze/widgets/checkmarks.svgz
index 7e2bc1398..2771f0d6e 100644
Binary files a/src/desktoptheme/breeze/widgets/checkmarks.svgz and b/src/desktoptheme/breeze/widgets/checkmarks.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/configuration-icons.svgz b/src/desktoptheme/breeze/widgets/configuration-icons.svgz
index edf76c391..ef80bd2b0 100644
Binary files a/src/desktoptheme/breeze/widgets/configuration-icons.svgz and b/src/desktoptheme/breeze/widgets/configuration-icons.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/frame.svgz b/src/desktoptheme/breeze/widgets/frame.svgz
index 5f53cc5bc..592abed0b 100644
Binary files a/src/desktoptheme/breeze/widgets/frame.svgz and b/src/desktoptheme/breeze/widgets/frame.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/glowbar.svgz b/src/desktoptheme/breeze/widgets/glowbar.svgz
index 32cce803b..7fbc723bb 100644
Binary files a/src/desktoptheme/breeze/widgets/glowbar.svgz and b/src/desktoptheme/breeze/widgets/glowbar.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/line.svgz b/src/desktoptheme/breeze/widgets/line.svgz
index bd8dd1288..d47aa0fd8 100644
Binary files a/src/desktoptheme/breeze/widgets/line.svgz and b/src/desktoptheme/breeze/widgets/line.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/notes.svgz b/src/desktoptheme/breeze/widgets/notes.svgz
new file mode 100644
index 000000000..0bcbbe486
Binary files /dev/null and b/src/desktoptheme/breeze/widgets/notes.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/panel-background.svgz b/src/desktoptheme/breeze/widgets/panel-background.svgz
index 624a11eaa..f402dbb35 100644
Binary files a/src/desktoptheme/breeze/widgets/panel-background.svgz and b/src/desktoptheme/breeze/widgets/panel-background.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/scrollbar.svgz b/src/desktoptheme/breeze/widgets/scrollbar.svgz
index 502a7cead..965ba9b65 100644
Binary files a/src/desktoptheme/breeze/widgets/scrollbar.svgz and b/src/desktoptheme/breeze/widgets/scrollbar.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/scrollwidget.svgz b/src/desktoptheme/breeze/widgets/scrollwidget.svgz
index 0f9f6b6c9..4a666ea78 100644
Binary files a/src/desktoptheme/breeze/widgets/scrollwidget.svgz and b/src/desktoptheme/breeze/widgets/scrollwidget.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/slider.svgz b/src/desktoptheme/breeze/widgets/slider.svgz
index 0c60ee891..2c561e29e 100644
Binary files a/src/desktoptheme/breeze/widgets/slider.svgz and b/src/desktoptheme/breeze/widgets/slider.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/tabbar.svgz b/src/desktoptheme/breeze/widgets/tabbar.svgz
index 1999ecb4d..10f2804b8 100644
Binary files a/src/desktoptheme/breeze/widgets/tabbar.svgz and b/src/desktoptheme/breeze/widgets/tabbar.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/tasks.svgz b/src/desktoptheme/breeze/widgets/tasks.svgz
index bd65295fc..77f3b88ee 100644
Binary files a/src/desktoptheme/breeze/widgets/tasks.svgz and b/src/desktoptheme/breeze/widgets/tasks.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/timer.svgz b/src/desktoptheme/breeze/widgets/timer.svgz
new file mode 100644
index 000000000..746bf9b63
Binary files /dev/null and b/src/desktoptheme/breeze/widgets/timer.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/toolbar.svgz b/src/desktoptheme/breeze/widgets/toolbar.svgz
index 7005e5a9e..e49e8dd91 100644
Binary files a/src/desktoptheme/breeze/widgets/toolbar.svgz and b/src/desktoptheme/breeze/widgets/toolbar.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/tooltip.svgz b/src/desktoptheme/breeze/widgets/tooltip.svgz
index 57166b2a5..70d3892a5 100644
Binary files a/src/desktoptheme/breeze/widgets/tooltip.svgz and b/src/desktoptheme/breeze/widgets/tooltip.svgz differ
diff --git a/src/desktoptheme/breeze/widgets/translucentbackground.svgz b/src/desktoptheme/breeze/widgets/translucentbackground.svgz
index 0cf0ea3d3..80b012157 100644
Binary files a/src/desktoptheme/breeze/widgets/translucentbackground.svgz and b/src/desktoptheme/breeze/widgets/translucentbackground.svgz differ
diff --git a/src/tools/apply-stylesheet.sh b/src/tools/apply-stylesheet.sh
index 797c5fd73..c9f571859 100755
--- a/src/tools/apply-stylesheet.sh
+++ b/src/tools/apply-stylesheet.sh
@@ -20,54 +20,103 @@ echo Processing $file
 stylesheet='
       .ColorScheme-Text {
         color:#31363b;
+        stop-color:#31363b;
       }
       .ColorScheme-Background {
         color:#eff0f1;
+        stop-color:#eff0f1;
       }
       .ColorScheme-Highlight {
         color:#3daee9;
+        stop-color:#3daee9;
       }
       .ColorScheme-ViewText {
         color:#31363b;
+        stop-color:#31363b;
       }
       .ColorScheme-ViewBackground {
         color:#fcfcfc;
+        stop-color:#fcfcfc;
       }
       .ColorScheme-ViewHover {
         color:#93cee9;
+        stop-color:#93cee9;
       }
       .ColorScheme-ViewFocus{
         color:#3daee9;
+        stop-color:#3daee9;
       }
       .ColorScheme-ButtonText {
         color:#31363b;
+        stop-color:#31363b;
       }
       .ColorScheme-ButtonBackground {
         color:#eff0f1;
+        stop-color:#eff0f1;
       }
       .ColorScheme-ButtonHover {
         color:#93cee9;
+        stop-color:#93cee9;
       }
       .ColorScheme-ButtonFocus{
         color:#3daee9;
+        stop-color:#3daee9;
       }
       '
-colors=(\#31363b \#eff0f1 \#3daee9 \#fcfcfc \#93cee9)
+colors=(\#caced0 \#ffffff \#93cee9 \#fcfcfc \#a3cee9)
 colorNames=(ColorScheme-Text ColorScheme-Background ColorScheme-Highlight ColorScheme-ViewBackground ColorScheme-ViewHover)
 
+
+reorderXslt='
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:svg="http://www.w3.org/2000/svg">
+ <xsl:output omit-xml-declaration="yes" indent="yes"/>
+ <xsl:strip-space elements="*"/>
+
+  <xsl:template match="@* | node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@* | node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="svg:defs">
+    <xsl:copy>
+      <xsl:apply-templates select="@*" />
+      <xsl:apply-templates select="*">
+        <xsl:sort select="name()" data-type="text" order="descending"/>
+      </xsl:apply-templates>
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>
+'
+echo $reorderXslt > transform.xsl
+
+if grep -q '"current-color-scheme"' $file.svg; then
+    echo replacing the stylesheet
+    xml ed --update "/svg:svg/svg:defs/_:style" -v "$stylesheet" $file.svg > temp.svg
+else
+    echo adding the stylesheet
 xml ed --subnode "/svg:svg/svg:defs" -t elem -n "style" -v "$stylesheet"\
        --subnode "/svg:svg/svg:defs/style" -t attr -n "type" -v "text/css"\
        --subnode "/svg:svg/svg:defs/style" -t attr -n "id" -v "current-color-scheme" $file.svg > temp.svg
+fi
+
+xml tr transform.xsl temp.svg > temp2.svg
+mv temp2.svg temp.svg
 
 for i in {0..4}
 do
-  xml ed --subnode "//*/*[contains(@style, '${colors[i]}')]" -t attr -n "class" -v "${colorNames[i]}" temp.svg > temp2.svg
+  xml ed --subnode "//*/*[contains(@style, '${colors[i]}') and not (@class)]" -t attr -n "class" -v "${colorNames[i]}" temp.svg > temp2.svg
 
   mv temp2.svg temp.svg
 
   sed -i 's/\(style=".*\)fill:'${colors[i]}'/\1fill:currentColor/g' temp.svg
+  sed -i 's/\(style=".*\)stop-color:'${colors[i]}'/\1stop-color:currentColor/g' temp.svg
 done
 
+rm transform.xsl
+
 mv temp.svg $file.svg
 gzip $file.svg
 mv $file.svg.gz $file.svgz