diff --git a/links/16/actions/preferences-desktop-baloo.svg b/links/16/actions/preferences-desktop-baloo.svg
new file mode 120000
index 000000000..8dc94d863
--- /dev/null
+++ b/links/16/actions/preferences-desktop-baloo.svg
@@ -0,0 +1 @@
+preferences-system-search.svg
\ No newline at end of file
diff --git a/links/scalable/apps/DV_Panels.svg b/links/scalable/apps/DV_Panels.svg
new file mode 120000
index 000000000..d9e61336f
--- /dev/null
+++ b/links/scalable/apps/DV_Panels.svg
@@ -0,0 +1 @@
+davinci-panels.svg
\ No newline at end of file
diff --git a/links/scalable/apps/DV_Resolve.svg b/links/scalable/apps/DV_Resolve.svg
new file mode 120000
index 000000000..4c83d48e3
--- /dev/null
+++ b/links/scalable/apps/DV_Resolve.svg
@@ -0,0 +1 @@
+resolve.svg
\ No newline at end of file
diff --git a/links/scalable/apps/appimagekit-PCSX2.svg b/links/scalable/apps/appimagekit-PCSX2.svg
new file mode 120000
index 000000000..9327d927d
--- /dev/null
+++ b/links/scalable/apps/appimagekit-PCSX2.svg
@@ -0,0 +1 @@
+PCSX2.svg
\ No newline at end of file
diff --git a/links/scalable/apps/com.thebrokenrail.MCPIReborn.svg b/links/scalable/apps/com.thebrokenrail.MCPIReborn.svg
new file mode 120000
index 000000000..e9b89b2f2
--- /dev/null
+++ b/links/scalable/apps/com.thebrokenrail.MCPIReborn.svg
@@ -0,0 +1 @@
+minecraft-pi.svg
\ No newline at end of file
diff --git a/links/scalable/apps/godot-mono.svg b/links/scalable/apps/godot-mono.svg
new file mode 120000
index 000000000..d2f793f01
--- /dev/null
+++ b/links/scalable/apps/godot-mono.svg
@@ -0,0 +1 @@
+godot.svg
\ No newline at end of file
diff --git a/links/scalable/apps/jami-gnome.svg b/links/scalable/apps/jami-gnome.svg
new file mode 120000
index 000000000..b57bb8cb0
--- /dev/null
+++ b/links/scalable/apps/jami-gnome.svg
@@ -0,0 +1 @@
+ring.svg
\ No newline at end of file
diff --git a/links/scalable/apps/net.blockbench.Blockbench.svg b/links/scalable/apps/net.blockbench.Blockbench.svg
new file mode 120000
index 000000000..529603d9a
--- /dev/null
+++ b/links/scalable/apps/net.blockbench.Blockbench.svg
@@ -0,0 +1 @@
+blockbench.svg
\ No newline at end of file
diff --git a/links/scalable/apps/org.gnome.World.Secrets.svg b/links/scalable/apps/org.gnome.World.Secrets.svg
new file mode 120000
index 000000000..4bc7c74f1
--- /dev/null
+++ b/links/scalable/apps/org.gnome.World.Secrets.svg
@@ -0,0 +1 @@
+org.gnome.PasswordSafe.svg
\ No newline at end of file
diff --git a/links/scalable/apps/org.kde.subtitlecomposer.svg b/links/scalable/apps/org.kde.subtitlecomposer.svg
new file mode 120000
index 000000000..5e57a7c98
--- /dev/null
+++ b/links/scalable/apps/org.kde.subtitlecomposer.svg
@@ -0,0 +1 @@
+subtitlecomposer.svg
\ No newline at end of file
diff --git a/links/scalable/apps/passwordmanager.svg b/links/scalable/apps/passwordmanager.svg
new file mode 120000
index 000000000..4373e6c50
--- /dev/null
+++ b/links/scalable/apps/passwordmanager.svg
@@ -0,0 +1 @@
+password-manager.svg
\ No newline at end of file
diff --git a/links/scalable/apps/studio.kx.carla.svg b/links/scalable/apps/studio.kx.carla.svg
new file mode 120000
index 000000000..3100371a0
--- /dev/null
+++ b/links/scalable/apps/studio.kx.carla.svg
@@ -0,0 +1 @@
+carla.svg
\ No newline at end of file
diff --git a/links/scalable/apps/xfsm-lock.svg b/links/scalable/apps/xfsm-lock.svg
new file mode 120000
index 000000000..5d254d24b
--- /dev/null
+++ b/links/scalable/apps/xfsm-lock.svg
@@ -0,0 +1 @@
+system-lock-screen.svg
\ No newline at end of file
diff --git a/src/16/actions/baloo.svg b/src/16/actions/baloo.svg
new file mode 100644
index 000000000..f7002216f
--- /dev/null
+++ b/src/16/actions/baloo.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+ <defs>
+  <style id="current-color-scheme" type="text/css">
+   .ColorScheme-Text { color:#565656; } .ColorScheme-Highlight { color:#5294e2; }
+  </style>
+ </defs>
+ <path style="fill:currentColor" class="ColorScheme-Text" d="M 6.5 1 A 5.5 5.5 0 0 0 1 6.5 A 5.5 5.5 0 0 0 6.5 12 A 5.5 5.5 0 0 0 9.6172 11.031 L 13.279 14.693 A 1 1 0 0 0 14 15 A 1 1 0 0 0 15 14 A 1 1 0 0 0 14.697 13.283 L 11.027 9.6133 A 5.5 5.5 0 0 0 12 6.5 A 5.5 5.5 0 0 0 6.5 1 z M 6.5 3 A 3.5 3.5 0 0 1 10 6.5 A 3.5 3.5 0 0 1 6.5 10 A 3.5 3.5 0 0 1 3 6.5 A 3.5 3.5 0 0 1 6.5 3 z"/>
+</svg>
diff --git a/src/16/apps/edit-paste.svg b/src/16/apps/edit-paste.svg
index 5cd0481d3..33d1356c5 100644
--- a/src/16/apps/edit-paste.svg
+++ b/src/16/apps/edit-paste.svg
@@ -1 +1,7 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 4.233 4.233"><defs><linearGradient id="a"><stop offset="0"/><stop offset="1" stop-opacity="0"/></linearGradient><linearGradient xlink:href="#a" id="b" x1="31.672" y1="31" x2="50" y2="31" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.06615 0 0 .06345 0 293.053)"/></defs><g transform="translate(0 -292.767)"><path d="M.595 293.434h3.043c.037 0 .066.028.066.063v3.173c0 .035-.03.063-.066.063H.595a.065.065 0 0 1-.066-.063v-3.173c0-.035.03-.063.066-.063z" fill="#303030" paint-order="fill markers stroke"/><path d="M.785 293.624h2.663c.032 0 .058.025.058.056v2.807a.057.057 0 0 1-.058.056H.785a.057.057 0 0 1-.057-.056v-2.807c0-.03.025-.056.057-.056z" opacity=".15" fill="#fff" paint-order="fill markers stroke"/><ellipse cx="2.117" cy="293.37" rx=".149" ry=".143" fill="none" stroke="#037ad9" stroke-width=".397" stroke-linejoin="bevel"/><path d="M.926 293.688v2.665h1.521l.86-.825v-1.84z" fill="#fff" stroke="#000" stroke-width=".529" stroke-linecap="round" stroke-opacity=".098" paint-order="markers stroke fill"/><path d="M1.654 293.783s.066-.38.198-.38h.53c.132 0 .198.38.198.38z" fill="#46a9ee" fill-rule="evenodd" stroke="#037ad9" stroke-width=".265"/><path d="M3.303 293.688a3.506 3.363 0 0 1 .004.127v-.127zm.004.127a3.506 3.363 0 0 1-1.212 2.538h.352l.86-.825z" opacity=".25" fill="url(#b)" paint-order="markers stroke fill"/><path d="M2.447 295.528h.86l-.86.825z" fill="#b3b3b3" paint-order="markers stroke fill"/></g></svg>
\ No newline at end of file
+<svg width="16" height="16" version="1.1" viewBox="0 0 4.233 4.233" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <rect x=".52913" y=".52912" width="3.1748" height="3.4393" rx=".52913" ry=".52913" fill="#303030"/>
+ <path transform="scale(.26456)" d="m4 3c-0.554 0-1 0.446-1 1v9c0 0.554 0.446 1 1 1h5l4-4v-6c0-0.554-0.446-1-1-1h-8z" fill="#ffffff"/>
+ <ellipse cx="2.117" cy=".603" rx=".149" ry=".143" fill="none" stroke="#037ad9" stroke-linejoin="bevel" stroke-width=".397"/>
+ <path transform="scale(.26456)" d="m6.998 1.9043c-0.36503 0-0.6001 0.23665-0.73828 0.43555-0.13818 0.1989-0.22407 0.41711-0.29492 0.62109-0.14171 0.40796-0.20703 0.79688-0.20703 0.79688l-0.10352 0.58398h0.59961 4.0957l-0.10352-0.58398s-0.063365-0.38891-0.20508-0.79688c-0.070859-0.20398-0.15869-0.42219-0.29688-0.62109-0.13818-0.1989-0.37325-0.43555-0.73828-0.43555h-2.0078z" color="#000000" fill="#249bfa" fill-rule="evenodd" stroke-width="1.0016" style="-inkscape-stroke:none"/>
+ <path d="m2.3811 3.7039 1.0582-1.0582h-0.79369c-0.14657 0-0.26456 0.11799-0.26456 0.26456z" fill="#c0bfbc"/>
+</svg>
diff --git a/src/16/apps/find-location.svg b/src/16/apps/find-location.svg
index 0cdf052c5..0ba41d630 100644
--- a/src/16/apps/find-location.svg
+++ b/src/16/apps/find-location.svg
@@ -1 +1,10 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 4.233 4.233"><g transform="matrix(.25 0 0 .25 0 -70.017)" stroke-width="4"><rect transform="matrix(0 -1 -1 0 0 0)" ry="6.879" rx="6.879" y="-15.346" x="-295.413" height="13.758" width="13.758" fill="#fff" stroke="#000" stroke-width="1.058" stroke-opacity=".059" paint-order="markers stroke fill"/><rect width="13.758" height="13.758" x="-295.413" y="-15.346" rx="6.879" ry="6.879" transform="matrix(0 -1 -1 0 0 0)" fill="#fff" paint-order="markers stroke fill"/><rect width="11.642" height="11.642" x="-294.354" y="-14.288" rx="5.821" ry="5.821" transform="matrix(0 -1 -1 0 0 0)" fill="#4d8dd8"/><rect transform="matrix(0 -1 -1 0 0 0)" ry="4.233" rx="4.233" y="-12.7" x="-292.767" height="8.467" width="8.467" opacity=".25" fill="#fff"/><rect width="5.292" height="5.292" x="-291.179" y="-11.113" rx="2.646" ry="2.646" transform="matrix(0 -1 -1 0 0 0)" opacity=".25" fill="#fff"/><rect transform="matrix(0 -1 -1 0 0 0)" ry=".794" rx=".794" y="-9.26" x="-289.327" height="1.587" width="1.587" fill="#fff"/><path d="M8.467 288.346l4.49-4.49.187.187-4.49 4.49z" fill="#fff" paint-order="markers stroke fill"/></g></svg>
\ No newline at end of file
+<svg width="16" height="16" version="1.1" viewBox="0 0 4.233 4.233" xmlns="http://www.w3.org/2000/svg">
+ <g transform="matrix(.25 0 0 .25 0 -70.017)" stroke-width="4">
+  <rect transform="matrix(0,-1,-1,0,0,0)" x="-295.94" y="-15.874" width="14.816" height="14.816" rx="7.4078" ry="7.4078" fill="#edf4fd" stroke-width="4.3075" paint-order="markers stroke fill"/>
+  <rect transform="matrix(0 -1 -1 0 0 0)" x="-294.35" y="-14.288" width="11.642" height="11.642" rx="5.821" ry="5.821" fill="#4d8dd8"/>
+  <rect transform="matrix(0 -1 -1 0 0 0)" x="-292.77" y="-12.7" width="8.467" height="8.467" rx="4.233" ry="4.233" fill="#fff" opacity=".25"/>
+  <rect transform="matrix(0 -1 -1 0 0 0)" x="-291.18" y="-11.113" width="5.292" height="5.292" rx="2.646" ry="2.646" fill="#fff" opacity=".25"/>
+  <rect transform="matrix(0 -1 -1 0 0 0)" x="-289.33" y="-9.26" width="1.587" height="1.587" rx=".794" ry=".794" fill="#fff"/>
+  <path d="M8.467 288.346l4.49-4.49.187.187-4.49 4.49z" fill="#fff" paint-order="markers stroke fill"/>
+ </g>
+</svg>
diff --git a/src/16/apps/onboard.svg b/src/16/apps/onboard.svg
index f47ba74d0..e8a2fb1c4 100644
--- a/src/16/apps/onboard.svg
+++ b/src/16/apps/onboard.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 4.233 4.233"><g transform="matrix(.25962 0 0 .25933 -.084 -72.78)" stroke-width="3.854"><rect width="9.525" height="9.525" x="1.852" y="282.448" ry=".529" rx=".529" fill="#fff" stroke="#000" stroke-width="1.02" stroke-opacity=".059" paint-order="stroke markers fill"/><rect rx=".529" ry=".529" y="282.448" x="1.852" height="9.525" width="9.525" fill="#fff" paint-order="stroke markers fill"/><text y="290.277" x="3.515" style="line-height:1.25" font-weight="400" font-size="8.355" font-family="sans-serif" letter-spacing="0" word-spacing="0" fill="#ccc" stroke-width="1.02"><tspan y="290.277" x="3.515">O</tspan></text><rect rx=".529" ry=".529" y="286.152" x="6.085" height="9.525" width="9.525" fill="#5583ff" paint-order="stroke markers fill"/><text style="line-height:1.25" x="7.873" y="293.977" font-weight="400" font-size="8.355" font-family="sans-serif" letter-spacing="0" word-spacing="0" fill="#fff" stroke-width="1.02"><tspan x="7.873" y="293.977">B</tspan></text></g></svg>
\ No newline at end of file
+<svg width="16" height="16" version="1.1" viewBox="0 0 4.233 4.233" xmlns="http://www.w3.org/2000/svg">
+ <rect x=".26456" y=".26456" width="2.6456" height="2.6456" rx=".52913" ry=".52913" fill="#f6f5f4" stroke-width="1.0705" paint-order="stroke markers fill"/>
+ <text transform="scale(1.0006 .99944)" x="0.76005876" y="2.3526602" fill="#cccccc" font-family="sans-serif" font-size="2.0999px" font-weight="400" letter-spacing="0" stroke-width=".25636" word-spacing="0" style="line-height:1.25"><tspan x="0.76005876" y="2.3526602" stroke-width=".25636">O</tspan></text>
+ <rect x="1.3228" y="1.3228" width="2.6456" height="2.6456" rx=".52912" ry=".52912" fill="#5583ff" stroke-width="1.0705" paint-order="stroke markers fill"/>
+ <text transform="scale(1.0006 .99944)" x="1.8670384" y="3.4412334" fill="#ffffff" font-family="sans-serif" font-size="2.1787px" font-weight="400" letter-spacing="0" stroke-width=".26598" word-spacing="0" style="line-height:1.25"><tspan x="1.8670384" y="3.4412334" stroke-width=".26598">B</tspan></text>
+</svg>
diff --git a/src/16/apps/preferences-system.svg b/src/16/apps/preferences-system.svg
index 19d187988..efb156279 100644
--- a/src/16/apps/preferences-system.svg
+++ b/src/16/apps/preferences-system.svg
@@ -1 +1,7 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 4.233 4.233"><g transform="translate(-.163 -75.565) scale(.26923)" stroke-width="3.714" paint-order="stroke markers fill"><circle r="6.879" cy="288.533" cx="8.467" fill="#5da3ee"/><rect ry="1.965" y="286.568" x="3.553" height="3.931" width="7.862" opacity=".35" fill="#fff"/><circle r="2.948" cy="288.533" cx="10.432" fill="#fff"/></g></svg>
\ No newline at end of file
+<svg width="16" height="16" version="1.1" viewBox="0 0 4.233 4.233" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-.163 -75.565) scale(.26923)" stroke-width="3.714" paint-order="stroke markers fill">
+  <circle cx="8.4666" cy="288.53" r="6.8786" fill="#5da3ee" stroke-width="3.7138"/>
+  <rect x="3.553" y="286.57" width="7.862" height="3.931" ry="1.965" fill="#fff" opacity=".35"/>
+  <circle cx="10.432" cy="288.53" r="2.948" fill="#fff"/>
+ </g>
+</svg>
diff --git a/src/16/apps/reload.svg b/src/16/apps/reload.svg
index 57b35fce0..dc5e63141 100644
--- a/src/16/apps/reload.svg
+++ b/src/16/apps/reload.svg
@@ -1,6 +1,5 @@
 <svg width="16" height="16" version="1.1" viewBox="0 0 4.233 4.233" xmlns="http://www.w3.org/2000/svg">
- <circle cx="2.1165" cy="2.1165" r="1.8519" fill="#fff" stroke="#000" stroke-opacity=".059" stroke-width=".52916" style="paint-order:stroke markers fill"/>
- <circle cx="2.1169" cy="2.1168" r="1.5875" fill="#fff" stroke-width=".99993" style="paint-order:stroke markers fill"/>
+ <circle cx="2.1165" cy="2.1165" r="1.8519" fill="#f5f5f5"/>
  <g transform="matrix(1.2757 0 0 1.2757 -.58393 -.58369)" stroke-width=".78385">
   <path d="m2.0825 1.0799a1.038 1.038 0 0 0-0.69969 0.303 1.038 1.038 0 0 0-0.084693 1.3696l0.21808-0.21808a0.73269 0.73269 0 0 1 0.082616-0.93554 0.73269 0.73269 0 0 1 0.76223-0.17169v0.26215l0.39162-0.39162a1.038 1.038 0 0 0-0.67016-0.21785z" fill="#4c8fd8" style="paint-order:stroke markers fill"/>
   <path d="m2.9357 1.4812-0.21808 0.21808a0.73269 0.73269 0 0 1-0.082846 0.93554 0.73269 0.73269 0 0 1-0.76223 0.17169v-0.26239l-0.25892 0.25915-0.13269 0.13246a1.038 1.038 0 0 0 1.3699-0.084923 1.038 1.038 0 0 0 0.084923-1.3696z" fill="#6ddce7" style="paint-order:stroke markers fill"/>
diff --git a/src/16/panel/matray.svg b/src/16/panel/matray.svg
new file mode 100644
index 000000000..5d8d2241d
--- /dev/null
+++ b/src/16/panel/matray.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" version="1" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style id="current-color-scheme" type="text/css">
+   .ColorScheme-Text { color:#dfdfdf; } .ColorScheme-Highlight { color:#4285f4; }
+  </style>
+ </defs>
+ <path style="fill:currentColor" class="ColorScheme-Text" d="m9 3v5c0 0.554-0.446 1-1 1h-6v4.2637c0 0.45012 0.34648 0.7317 0.77734 0.73633h7.1992l1.5566 2 1.5547-2h2.1348c0.43089 0 0.77734-0.2862 0.77734-0.73633v-9.4512c0-0.45012-0.34646-0.8125-0.77734-0.8125h-6.2227z"/>
+ <path style="fill:currentColor" class="ColorScheme-Text" d="m0.46957 0c-0.26014 0-0.46957 0.20943-0.46957 0.46958v7.0608c0 0.26015 0.20943 0.46958 0.46957 0.46958h1.5304v-5.9999h3v-2.0001zm5.5304 0v8h1.5299c0.26014 0 0.46957-0.20943 0.46957-0.46958v-7.0608c0-0.26015-0.20943-0.46958-0.46957-0.46958zm-3 3.0001v4.9999h2v-4.9999z"/>
+</svg>
diff --git a/src/22/panel/matray.svg b/src/22/panel/matray.svg
new file mode 100644
index 000000000..f2a7bf18d
--- /dev/null
+++ b/src/22/panel/matray.svg
@@ -0,0 +1,7 @@
+<svg width="22" height="22" version="1" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#dfdfdf; } .ColorScheme-Highlight { color:#4285f4; }</style>
+ </defs>
+ <path class="ColorScheme-Text" d="m12 6v5c0 0.554-0.446 1-1 1h-6v4.2637c0 0.45012 0.34648 0.7317 0.77734 0.73633h7.1992l1.5566 2 1.5547-2h2.1348c0.43089 0 0.77734-0.2862 0.77734-0.73633v-9.4512c0-0.45012-0.34646-0.8125-0.77734-0.8125h-6.2227z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m3.4696 3c-0.26014 0-0.46957 0.20943-0.46957 0.46958v7.0608c0 0.26015 0.20943 0.46958 0.46957 0.46958h1.5304v-5.9999h3v-2.0001zm5.5304 0v8h1.5299c0.26014 0 0.46957-0.20943 0.46957-0.46958v-7.0608c0-0.26015-0.20943-0.46958-0.46957-0.46958zm-3 3.0001v4.9999h2v-4.9999z" fill="currentColor"/>
+</svg>
diff --git a/src/24/panel/matray.svg b/src/24/panel/matray.svg
new file mode 100644
index 000000000..63d8eff3f
--- /dev/null
+++ b/src/24/panel/matray.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" version="1" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#dfdfdf; } .ColorScheme-Highlight { color:#4285f4; }</style>
+ </defs>
+ <path class="ColorScheme-Text" d="m13 7v5c0 0.554-0.446 1-1 1h-6v4.2637c0 0.45012 0.34648 0.7317 0.77734 0.73633h7.1992l1.5566 2 1.5547-2h2.1348c0.43089 0 0.77734-0.2862 0.77734-0.73633v-9.4512c0-0.45012-0.34646-0.8125-0.77734-0.8125h-6.2227z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m4.4696 4c-0.26014 0-0.46957 0.20943-0.46957 0.46958v7.0608c0 0.26015 0.20943 0.46958 0.46957 0.46958h1.5304v-5.9999h3v-2.0001zm5.5304 0v8h1.5299c0.26014 0 0.46957-0.20943 0.46957-0.46958v-7.0608c0-0.26015-0.20943-0.46958-0.46957-0.46958zm-3 3.0001v4.9999h2v-4.9999z" fill="currentColor"/>
+</svg>
diff --git a/src/32/status/weather-clear-night.svg b/src/32/status/weather-clear-night.svg
index 93f29cd71..d67165549 100644
--- a/src/32/status/weather-clear-night.svg
+++ b/src/32/status/weather-clear-night.svg
@@ -1,72 +1,4 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
  <path d="m3 16a13 13 0 0 1 13-13 13 13 0 0 1 13 13 13 13 0 0 1-13 13 13 13 0 0 1-13-13z" fill="#eceff1" stroke-width="1.0834"/>
  <circle cx="11.5" cy="10.5" r="1.5" fill="#d1d9dd"/>
  <circle cx="21.049" cy="18.964" r="2.5" fill="#d1d9dd"/>
diff --git a/src/32/status/weather-clear.svg b/src/32/status/weather-clear.svg
index fea84c280..3307dea38 100644
--- a/src/32/status/weather-clear.svg
+++ b/src/32/status/weather-clear.svg
@@ -1,72 +1,4 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
  <path d="m6 16a10 10 0 0 1 10-10 10 10 0 0 1 10 10 10 10 0 0 1-10 10 10 10 0 0 1-10-10z" fill="#ffcc33"/>
  <path d="m16 2c-0.554 0-1 0.446-1 1v1c0 0.554 0.446 1 1 1s1-0.446 1-1v-1c0-0.554-0.446-1-1-1zm-9.1914 3.8066c-0.25562 0-0.51312 0.0971-0.70898 0.29297-0.39174 0.39174-0.39174 1.0243 0 1.416l0.70898 0.70703c0.39174 0.39174 1.0223 0.39174 1.4141 0 0.39174-0.39174 0.39174-1.0243 0-1.416l-0.70703-0.70703c-0.19587-0.19587-0.45141-0.29297-0.70703-0.29297zm18.385 0c-0.25562 0-0.51312 0.0971-0.70898 0.29297l-0.70703 0.70703c-0.39174 0.39174-0.39174 1.0243 0 1.416 0.39174 0.39174 1.0243 0.39174 1.416 0l0.70703-0.70703c0.39174-0.39174 0.39174-1.0243 0-1.416-0.19587-0.19587-0.45141-0.29297-0.70703-0.29297zm-22.193 9.1934c-0.554 0-1 0.446-1 1s0.446 1 1 1h1c0.554 0 1-0.446 1-1s-0.446-1-1-1zm25 0c-0.554 0-1 0.446-1 1s0.446 1 1 1h1c0.554 0 1-0.446 1-1s-0.446-1-1-1zm-20.484 8.4844c-0.25562 0-0.51116 0.0971-0.70703 0.29297l-0.70898 0.70703c-0.39174 0.39174-0.39174 1.0243 0 1.416 0.39174 0.39174 1.0243 0.39174 1.416 0l0.70703-0.70898c0.39174-0.39174 0.39174-1.0223 0-1.4141-0.19587-0.19587-0.45141-0.29297-0.70703-0.29297zm16.969 0c-0.25562 0-0.51116 0.0971-0.70703 0.29297-0.39174 0.39174-0.39174 1.0223 0 1.4141l0.70703 0.70898c0.39174 0.39174 1.0243 0.39174 1.416 0 0.39174-0.39174 0.39174-1.0243 0-1.416l-0.70703-0.70703c-0.19587-0.19587-0.45336-0.29297-0.70898-0.29297zm-8.4844 3.5156c-0.554 0-1 0.446-1 1v1c0 0.554 0.446 1 1 1s1-0.446 1-1v-1c0-0.554-0.446-1-1-1z" fill="#ffcc33"/>
 </svg>
diff --git a/src/32/status/weather-clouds-night.svg b/src/32/status/weather-clouds-night.svg
index 1cff823fd..4e33f2439 100644
--- a/src/32/status/weather-clouds-night.svg
+++ b/src/32/status/weather-clouds-night.svg
@@ -1,147 +1,11 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
- <g transform="translate(0 -1020.4)">
-  <path d="m7 1035.4a12 12 0 0 1 12-12 12 12 0 0 1 12 12 12 12 0 0 1-12 12 12 12 0 0 1-12-12z" fill="#eceff1"/>
-  <g fill="#d1d9dd">
-   <circle cx="14.5" cy="1029.9" r="1.5"/>
-   <circle cx="23.5" cy="1037.9" r="2.5"/>
-   <circle cx="14.5" cy="1036.9" r="2.5"/>
-   <circle cx="17.5" cy="1041.9" r="1.5"/>
-   <circle cx="21.5" cy="1028.9" r=".5"/>
-  </g>
-  <path transform="translate(0,1020.4)" d="m10.98 9a10 10 0 0 0-9.9805 10 10 10 0 0 0 10 10h0.019531 8.9805a7 7 0 0 0 7-7 7 7 0 0 0-6.834-6.998 10 10 0 0 0-9.166-6.002 10 10 0 0 0-0.019531 0z" fill="#f9f9f9" opacity=".9"/>
+ <path d="m7 15a12 12 0 0 1 12-12 12 12 0 0 1 12 12 12 12 0 0 1-12 12 12 12 0 0 1-12-12z" fill="#eceff1"/>
+ <g transform="translate(0,-1020.4)" fill="#d1d9dd">
+  <circle cx="14.5" cy="1029.9" r="1.5"/>
+  <circle cx="23.5" cy="1037.9" r="2.5"/>
+  <circle cx="14.5" cy="1036.9" r="2.5"/>
+  <circle cx="17.5" cy="1041.9" r="1.5"/>
+  <circle cx="21.5" cy="1028.9" r=".5"/>
  </g>
+ <path d="m10.98 9a10 10 0 0 0-9.9805 10 10 10 0 0 0 10 10h9a7 7 0 0 0 7-7 7 7 0 0 0-6.834-6.998 10 10 0 0 0-9.166-6.002 10 10 0 0 0-0.019531 0z" opacity=".9" style="fill:#e6e6e6"/>
 </svg>
diff --git a/src/32/status/weather-clouds.svg b/src/32/status/weather-clouds.svg
index 3188120ea..5bb4ad0d5 100644
--- a/src/32/status/weather-clouds.svg
+++ b/src/32/status/weather-clouds.svg
@@ -1,138 +1,4 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
  <path d="m8 16a10 10 0 0 1 10-10 10 10 0 0 1 10 10 10 10 0 0 1-10 10 10 10 0 0 1-10-10z" fill="#ffca28"/>
  <g transform="translate(0,-1020.4)" fill="#ffca28">
   <rect x="17" y="1022.4" width="2" height="3" ry="1"/>
@@ -144,5 +10,5 @@
   <rect transform="rotate(45)" x="744.55" y="706.09" width="2" height="3" ry="1"/>
   <rect transform="rotate(45)" x="744.55" y="731.09" width="2" height="3" ry="1"/>
  </g>
- <path d="m10.98 9a10 10 0 0 0-9.9805 10 10 10 0 0 0 10 10 10 10 0 0 0 0.019531 0h8.9805a7 7 0 0 0 7-7 7 7 0 0 0-6.834-6.998 10 10 0 0 0-9.166-6.002 10 10 0 0 0-0.019531 0z" fill="#f9f9f9" opacity=".9"/>
+ <path d="m10.98 9a10 10 0 0 0-9.9805 10 10 10 0 0 0 10 10 10 10 0 0 0 0.019531 0h8.9805a7 7 0 0 0 7-7 7 7 0 0 0-6.834-6.998 10 10 0 0 0-9.166-6.002 10 10 0 0 0-0.019531 0z" opacity=".9" style="fill:#f2f2f2"/>
 </svg>
diff --git a/src/32/status/weather-few-clouds-night.svg b/src/32/status/weather-few-clouds-night.svg
index 8c7f1db2a..ad62d99ca 100644
--- a/src/32/status/weather-few-clouds-night.svg
+++ b/src/32/status/weather-few-clouds-night.svg
@@ -1,147 +1,11 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
- <g transform="translate(0 -1020.4)">
-  <path d="m7 1035.4a12 12 0 0 1 12-12 12 12 0 0 1 12 12 12 12 0 0 1-12 12 12 12 0 0 1-12-12z" fill="#eceff1"/>
-  <g fill="#d1d9dd">
-   <circle cx="14.5" cy="1029.9" r="1.5"/>
-   <circle cx="23.5" cy="1037.9" r="2.5"/>
-   <circle cx="14.5" cy="1036.9" r="2.5"/>
-   <circle cx="17.5" cy="1041.9" r="1.5"/>
-   <circle cx="21.5" cy="1028.9" r=".5"/>
-  </g>
-  <path transform="translate(0,1020.4)" d="m7.9062 15a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7 7 7 0 0 0 0.09375 0h5.9062c2.7614 0 5-2.2386 5-5 0-2.6494-2.0619-4.8129-4.668-4.9844a7 7 0 0 0-6.332-4.0156 7 7 0 0 0-0.09375 0z" fill="#f9f9f9" opacity=".9"/>
+ <path d="m7 15a12 12 0 0 1 12-12 12 12 0 0 1 12 12 12 12 0 0 1-12 12 12 12 0 0 1-12-12z" fill="#eceff1"/>
+ <g transform="translate(0,-1020.4)" fill="#d1d9dd">
+  <circle cx="14.5" cy="1029.9" r="1.5"/>
+  <circle cx="23.5" cy="1037.9" r="2.5"/>
+  <circle cx="14.5" cy="1036.9" r="2.5"/>
+  <circle cx="17.5" cy="1041.9" r="1.5"/>
+  <circle cx="21.5" cy="1028.9" r=".5"/>
  </g>
+ <path d="m7.9062 15a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7 7 7 0 0 0 0.09375 0h5.9062c2.7614 0 5-2.2386 5-5 0-2.6494-2.0619-4.8129-4.668-4.9844a7 7 0 0 0-6.332-4.0156 7 7 0 0 0-0.09375 0z" opacity=".9" style="fill:#e6e6e6"/>
 </svg>
diff --git a/src/32/status/weather-few-clouds.svg b/src/32/status/weather-few-clouds.svg
index cd90fc6c4..cf7a2a6c5 100644
--- a/src/32/status/weather-few-clouds.svg
+++ b/src/32/status/weather-few-clouds.svg
@@ -1,143 +1,7 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
- <g transform="translate(0 -1020.4)">
-  <path d="m8 1036.4a10 10 0 0 1 10-10 10 10 0 0 1 10 10 10 10 0 0 1-10 10 10 10 0 0 1-10-10z" fill="#ffca28"/>
-  <g fill="#ffca28">
-   <path d="m18 1022.4c-0.554 0-1 0.446-1 1v1c0 0.554 0.446 1 1 1s1-0.446 1-1v-1c0-0.554-0.446-1-1-1zm-9.1914 3.8066c-0.25562 0-0.51312 0.097-0.70898 0.293-0.39174 0.3917-0.39174 1.0243 0 1.416l0.70898 0.7071c0.39174 0.3917 1.0223 0.3917 1.4141 0 0.39174-0.3918 0.39174-1.0243 0-1.4161l-0.70703-0.707c-0.19587-0.1959-0.45141-0.293-0.70703-0.293zm18.385 0c-0.25562 0-0.51312 0.097-0.70898 0.293l-0.70703 0.707c-0.39174 0.3918-0.39174 1.0243 0 1.4161 0.39174 0.3917 1.0243 0.3917 1.416 0l0.70703-0.7071c0.39174-0.3917 0.39174-1.0243 0-1.416-0.19587-0.1959-0.45141-0.293-0.70703-0.293zm-22.193 9.1934c-0.554 0-1 0.446-1 1s0.446 1 1 1h1c0.554 0 1-0.446 1-1s-0.446-1-1-1zm25 0c-0.554 0-1 0.446-1 1s0.446 1 1 1h1c0.554 0 1-0.446 1-1s-0.446-1-1-1zm-20.484 8.4844c-0.25562 0-0.51116 0.097-0.70703 0.2929l-0.70898 0.7071c-0.39174 0.3917-0.39174 1.0243 0 1.416s1.0243 0.3917 1.416 0l0.70703-0.709c0.39174-0.3917 0.39174-1.0223 0-1.4141-0.19587-0.1958-0.45141-0.2929-0.70703-0.2929zm16.969 0c-0.25562 0-0.51116 0.097-0.70703 0.2929-0.39174 0.3918-0.39174 1.0224 0 1.4141l0.70703 0.709c0.39174 0.3917 1.0243 0.3917 1.416 0 0.39174-0.3917 0.39174-1.0243 0-1.416l-0.70703-0.7071c-0.19587-0.1958-0.45336-0.2929-0.70898-0.2929zm-8.4844 3.5156c-0.554 0-1 0.446-1 1v1c0 0.554 0.446 1 1 1s1-0.446 1-1v-1c0-0.554-0.446-1-1-1z"/>
-  </g>
-  <path transform="translate(0,1020.4)" d="m7.9062 15a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7h0.09375 5.9062c2.7614 0 5-2.2386 5-5 0-2.6494-2.0619-4.8129-4.668-4.9844a7 7 0 0 0-6.332-4.0156 7 7 0 0 0-0.09375 0z" fill="#f9f9f9" opacity=".9"/>
+ <path d="m8 16a10 10 0 0 1 10-10 10 10 0 0 1 10 10 10 10 0 0 1-10 10 10 10 0 0 1-10-10z" fill="#ffca28"/>
+ <g transform="translate(0,-1020.4)" fill="#ffca28">
+  <path d="m18 1022.4c-0.554 0-1 0.446-1 1v1c0 0.554 0.446 1 1 1s1-0.446 1-1v-1c0-0.554-0.446-1-1-1zm-9.1914 3.8066c-0.25562 0-0.51312 0.097-0.70898 0.293-0.39174 0.3917-0.39174 1.0243 0 1.416l0.70898 0.7071c0.39174 0.3917 1.0223 0.3917 1.4141 0 0.39174-0.3918 0.39174-1.0243 0-1.4161l-0.70703-0.707c-0.19587-0.1959-0.45141-0.293-0.70703-0.293zm18.385 0c-0.25562 0-0.51312 0.097-0.70898 0.293l-0.70703 0.707c-0.39174 0.3918-0.39174 1.0243 0 1.4161 0.39174 0.3917 1.0243 0.3917 1.416 0l0.70703-0.7071c0.39174-0.3917 0.39174-1.0243 0-1.416-0.19587-0.1959-0.45141-0.293-0.70703-0.293zm-22.193 9.1934c-0.554 0-1 0.446-1 1s0.446 1 1 1h1c0.554 0 1-0.446 1-1s-0.446-1-1-1zm25 0c-0.554 0-1 0.446-1 1s0.446 1 1 1h1c0.554 0 1-0.446 1-1s-0.446-1-1-1zm-20.484 8.4844c-0.25562 0-0.51116 0.097-0.70703 0.2929l-0.70898 0.7071c-0.39174 0.3917-0.39174 1.0243 0 1.416s1.0243 0.3917 1.416 0l0.70703-0.709c0.39174-0.3917 0.39174-1.0223 0-1.4141-0.19587-0.1958-0.45141-0.2929-0.70703-0.2929zm16.969 0c-0.25562 0-0.51116 0.097-0.70703 0.2929-0.39174 0.3918-0.39174 1.0224 0 1.4141l0.70703 0.709c0.39174 0.3917 1.0243 0.3917 1.416 0 0.39174-0.3917 0.39174-1.0243 0-1.416l-0.70703-0.7071c-0.19587-0.1958-0.45336-0.2929-0.70898-0.2929zm-8.4844 3.5156c-0.554 0-1 0.446-1 1v1c0 0.554 0.446 1 1 1s1-0.446 1-1v-1c0-0.554-0.446-1-1-1z"/>
  </g>
+ <path d="m7.9062 15a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7h6c2.7614 0 5-2.2386 5-5 0-2.6494-2.0619-4.8129-4.668-4.9844a7 7 0 0 0-6.332-4.0156 7 7 0 0 0-0.09375 0z" opacity=".9" style="fill:#f2f2f2"/>
 </svg>
diff --git a/src/32/status/weather-freezing-rain.svg b/src/32/status/weather-freezing-rain.svg
index 0acab77cb..cead74cac 100644
--- a/src/32/status/weather-freezing-rain.svg
+++ b/src/32/status/weather-freezing-rain.svg
@@ -1,74 +1,5 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
- <path d="m13 10v14h9a7 7 0 0 0 7-7 7 7 0 0 0-7-7z" fill="#f5f5f5"/>
- <circle cx="13" cy="14" r="10" fill="#f5f5f5"/>
+ <path d="m13 4a10 10 0 0 0-10 10 10 10 0 0 0 10 10h9a7 7 0 0 0 7-7 7 7 0 0 0-6.8359-6.9961 10 10 0 0 0-9.1641-6.0039z" style="fill:#e6e6e6"/>
  <rect x="7" y="20" width="3" height="3" ry="1.5" fill="#64b5f6"/>
  <rect x="14" y="22" width="3" height="3" ry="1.5" fill="#64b5f6"/>
  <rect x="10" y="27" width="3" height="3" ry="1.5" fill="#64b5f6"/>
diff --git a/src/32/status/weather-hail.svg b/src/32/status/weather-hail.svg
index 8561ae953..2ced6e760 100644
--- a/src/32/status/weather-hail.svg
+++ b/src/32/status/weather-hail.svg
@@ -1,77 +1,8 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
- <g transform="translate(0 -1020.4)">
-  <path d="m13 1030.4v14h9a7 7 0 0 0 7-7 7 7 0 0 0-7-7z" fill="#f5f5f5"/>
-  <circle cx="13" cy="1034.4" r="10" fill="#f5f5f5"/>
-  <rect x="10" y="1047.4" width="3" height="3" ry="1.5" fill="#64b5f6"/>
-  <rect x="22" y="1045.4" width="3" height="3" ry="1.5" fill="#64b5f6"/>
-  <rect x="15" y="1040.4" width="3" height="3" ry="1.5" fill="#64b5f6"/>
+ <path d="m13 4a10 10 0 0 0-10 10 10 10 0 0 0 10 10h9a7 7 0 0 0 7-7 7 7 0 0 0-6.8359-6.9961 10 10 0 0 0-9.1641-6.0039z" style="fill:#e6e6e6"/>
+ <g transform="translate(0 -1020.4)" fill="#64b5f6">
+  <rect x="10" y="1047.4" width="3" height="3" ry="1.5"/>
+  <rect x="22" y="1045.4" width="3" height="3" ry="1.5"/>
+  <rect x="15" y="1040.4" width="3" height="3" ry="1.5"/>
  </g>
 </svg>
diff --git a/src/32/status/weather-many-clouds.svg b/src/32/status/weather-many-clouds.svg
index 3b0d36bd6..b001551a5 100644
--- a/src/32/status/weather-many-clouds.svg
+++ b/src/32/status/weather-many-clouds.svg
@@ -1,272 +1,4 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
- <g transform="translate(0 -1020.4)">
-  <path transform="translate(0,1020.4)" d="m14.98 3a10 10 0 0 0-9.9805 10 10 10 0 0 0 10 10h0.019531 8.9805a7 7 0 0 0 7-7 7 7 0 0 0-6.834-6.998 10 10 0 0 0-9.166-6.002 10 10 0 0 0-0.019531 0z" fill="#ececec"/>
-  <path transform="translate(0,1020.4)" d="m7.9062 15a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7 7 7 0 0 0 0.09375 0h5.9062c2.7614 0 5-2.2386 5-5 0-2.6494-2.0619-4.8129-4.668-4.9844a7 7 0 0 0-6.332-4.0156 7 7 0 0 0-0.09375 0z" fill="#f9f9f9" opacity=".9"/>
- </g>
+ <path d="m14.98 3a10 10 0 0 0-9.9805 10 10 10 0 0 0 10 10h9a7 7 0 0 0 7-7 7 7 0 0 0-6.834-6.998 10 10 0 0 0-9.166-6.002 10 10 0 0 0-0.019531 0z" fill="#ececec" style="fill:#e6e6e6"/>
+ <path d="m7.9062 15a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7 7 7 0 0 0 0.09375 0h5.9062c2.7614 0 5-2.2386 5-5 0-2.6494-2.0619-4.8129-4.668-4.9844a7 7 0 0 0-6.332-4.0156 7 7 0 0 0-0.09375 0z" opacity=".9" style="fill:#f2f2f2"/>
 </svg>
diff --git a/src/32/status/weather-showers-day.svg b/src/32/status/weather-showers-day.svg
index db135d762..bb6f6ba97 100644
--- a/src/32/status/weather-showers-day.svg
+++ b/src/32/status/weather-showers-day.svg
@@ -1,270 +1,4 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
  <g transform="translate(0 -1020.4)">
   <path d="m9 1036.4a9 9 0 0 1 9-9 9 9 0 0 1 9 9 9 9 0 0 1-9 9 9 9 0 0 1-9-9z" fill="#ffca28"/>
   <path d="m18 1022.4c-0.554 0-1 0.446-1 1v1c0 0.554 0.446 1 1 1s1-0.446 1-1v-1c0-0.554-0.446-1-1-1zm-9.1914 3.8066c-0.25562 0-0.51312 0.097-0.70898 0.293-0.39174 0.3917-0.39174 1.0243 0 1.416l0.70898 0.7071c0.39174 0.3917 1.0223 0.3917 1.4141 0 0.39174-0.3918 0.39174-1.0243 0-1.4161l-0.70703-0.707c-0.19587-0.1959-0.45141-0.293-0.70703-0.293zm18.385 0c-0.25562 0-0.51312 0.097-0.70898 0.293l-0.70703 0.707c-0.39174 0.3918-0.39174 1.0243 0 1.4161 0.39174 0.3917 1.0243 0.3917 1.416 0l0.70703-0.7071c0.39174-0.3917 0.39174-1.0243 0-1.416-0.19587-0.1959-0.45141-0.293-0.70703-0.293zm-22.193 9.1934c-0.554 0-1 0.446-1 1s0.446 1 1 1h1c0.554 0 1-0.446 1-1s-0.446-1-1-1zm25 0c-0.554 0-1 0.446-1 1s0.446 1 1 1h1c0.554 0 1-0.446 1-1s-0.446-1-1-1zm-20.484 8.4844c-0.25562 0-0.51116 0.097-0.70703 0.2929l-0.70898 0.7071c-0.39174 0.3917-0.39174 1.0243 0 1.416s1.0243 0.3917 1.416 0l0.70703-0.709c0.39174-0.3917 0.39174-1.0223 0-1.4141-0.19587-0.1958-0.45141-0.2929-0.70703-0.2929zm16.969 0c-0.25562 0-0.51116 0.097-0.70703 0.2929-0.39174 0.3918-0.39174 1.0224 0 1.4141l0.70703 0.709c0.39174 0.3917 1.0243 0.3917 1.416 0 0.39174-0.3917 0.39174-1.0243 0-1.416l-0.70703-0.7071c-0.19587-0.1958-0.45336-0.2929-0.70898-0.2929zm-8.4844 3.5156c-0.554 0-1 0.446-1 1v1c0 0.554 0.446 1 1 1s1-0.446 1-1v-1c0-0.554-0.446-1-1-1z" fill="#ffca28"/>
@@ -273,6 +7,6 @@
    <rect x="9" y="1047.4" width="2" height="2.9999" ry="1"/>
    <rect x="13" y="1045.4" width="2" height="3.9996" ry="1"/>
   </g>
-  <path transform="translate(0,1020.4)" d="m7.9062 11a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7h0.09375 5.9062c2.7614 0 5-2.2386 5-5 0-2.6494-2.0619-4.8129-4.668-4.9844a7 7 0 0 0-6.332-4.0156 7 7 0 0 0-0.09375 0z" fill="#f9f9f9" opacity=".9"/>
+  <path transform="translate(0,1020.4)" d="m7.9062 11a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7h6c2.7614 0 5-2.2386 5-5 0-2.6494-2.0619-4.8129-4.668-4.9844a7 7 0 0 0-6.332-4.0156 7 7 0 0 0-0.09375 0z" opacity=".9" style="fill:#f2f2f2"/>
  </g>
 </svg>
diff --git a/src/32/status/weather-showers-night.svg b/src/32/status/weather-showers-night.svg
index 8b82b576f..4286fa189 100644
--- a/src/32/status/weather-showers-night.svg
+++ b/src/32/status/weather-showers-night.svg
@@ -1,402 +1,4 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
  <g transform="translate(0 -1020.4)">
   <path d="m7 1035.4a12 12 0 0 1 12-12 12 12 0 0 1 12 12 12 12 0 0 1-12 12 12 12 0 0 1-12-12z" fill="#eceff1"/>
   <g fill="#d1d9dd">
@@ -407,10 +9,10 @@
    <circle cx="21.5" cy="1028.9" r=".5"/>
   </g>
   <g fill="#2196f3">
-   <rect x="5" y="1045.4" width="2" height="3.9996" ry="1"/>
-   <rect x="9" y="1047.4" width="2" height="2.9999" ry="1"/>
-   <rect x="13" y="1045.4" width="2" height="3.9996" ry="1"/>
+   <rect x="5" y="1045.4" width="2" height="4" ry="1"/>
+   <rect x="9" y="1047.4" width="2" height="3" ry="1"/>
+   <rect x="13" y="1045.4" width="2" height="4" ry="1"/>
   </g>
-  <path transform="translate(0,1020.4)" d="m7.9062 11a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7h0.09375 5.9062c2.7614 0 5-2.2386 5-5 0-2.6494-2.0619-4.8129-4.668-4.9844a7 7 0 0 0-6.332-4.0156 7 7 0 0 0-0.09375 0z" fill="#f9f9f9" opacity=".9"/>
+  <path transform="translate(0,1020.4)" d="m7.9062 11a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7h6c2.7614 0 5-2.2386 5-5 0-2.6494-2.0619-4.8129-4.668-4.9844a7 7 0 0 0-6.332-4.0156 7 7 0 0 0-0.09375 0z" opacity=".9" style="fill:#e6e6e6"/>
  </g>
 </svg>
diff --git a/src/32/status/weather-showers-scattered-day.svg b/src/32/status/weather-showers-scattered-day.svg
index e6c6f1dc2..970be79aa 100644
--- a/src/32/status/weather-showers-scattered-day.svg
+++ b/src/32/status/weather-showers-scattered-day.svg
@@ -1,274 +1,8 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
  <g transform="translate(0 -1020.4)">
   <path d="m9 1036.4a9 9 0 0 1 9-9 9 9 0 0 1 9 9 9 9 0 0 1-9 9 9 9 0 0 1-9-9z" fill="#ffca28"/>
   <path d="m18 1022.4c-0.554 0-1 0.446-1 1v1c0 0.554 0.446 1 1 1s1-0.446 1-1v-1c0-0.554-0.446-1-1-1zm-9.1914 3.8066c-0.25562 0-0.51312 0.097-0.70898 0.293-0.39174 0.3917-0.39174 1.0243 0 1.416l0.70898 0.7071c0.39174 0.3917 1.0223 0.3917 1.4141 0 0.39174-0.3918 0.39174-1.0243 0-1.4161l-0.70703-0.707c-0.19587-0.1959-0.45141-0.293-0.70703-0.293zm18.385 0c-0.25562 0-0.51312 0.097-0.70898 0.293l-0.70703 0.707c-0.39174 0.3918-0.39174 1.0243 0 1.4161 0.39174 0.3917 1.0243 0.3917 1.416 0l0.70703-0.7071c0.39174-0.3917 0.39174-1.0243 0-1.416-0.19587-0.1959-0.45141-0.293-0.70703-0.293zm-22.193 9.1934c-0.554 0-1 0.446-1 1s0.446 1 1 1h1c0.554 0 1-0.446 1-1s-0.446-1-1-1zm25 0c-0.554 0-1 0.446-1 1s0.446 1 1 1h1c0.554 0 1-0.446 1-1s-0.446-1-1-1zm-20.484 8.4844c-0.25562 0-0.51116 0.097-0.70703 0.2929l-0.70898 0.7071c-0.39174 0.3917-0.39174 1.0243 0 1.416s1.0243 0.3917 1.416 0l0.70703-0.709c0.39174-0.3917 0.39174-1.0223 0-1.4141-0.19587-0.1958-0.45141-0.2929-0.70703-0.2929zm16.969 0c-0.25562 0-0.51116 0.097-0.70703 0.2929-0.39174 0.3918-0.39174 1.0224 0 1.4141l0.70703 0.709c0.39174 0.3917 1.0243 0.3917 1.416 0 0.39174-0.3917 0.39174-1.0243 0-1.416l-0.70703-0.7071c-0.19587-0.1958-0.45336-0.2929-0.70898-0.2929zm-8.4844 3.5156c-0.554 0-1 0.446-1 1v1c0 0.554 0.446 1 1 1s1-0.446 1-1v-1c0-0.554-0.446-1-1-1z" fill="#ffca28"/>
-  <rect x="9" y="1047.4" width="2" height="2.9999" ry="1" fill="#2196f3"/>
-  <path transform="translate(0,1020.4)" d="m7.9062 11a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7 7 7 0 0 0 0.09375 0h5.9062c2.7614 0 5-2.2386 5-5 0-2.6494-2.0619-4.8129-4.668-4.9844a7 7 0 0 0-6.332-4.0156 7 7 0 0 0-0.09375 0z" fill="#f9f9f9" opacity=".9"/>
+  <rect x="9" y="1047.4" width="2" height="3" ry="1" fill="#2196f3"/>
+  <path transform="translate(0,1020.4)" d="m7.9062 11a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7 7 7 0 0 0 0.09375 0h5.9062c2.7614 0 5-2.2386 5-5 0-2.6494-2.0619-4.8129-4.668-4.9844a7 7 0 0 0-6.332-4.0156 7 7 0 0 0-0.09375 0z" opacity=".9" style="fill:#f2f2f2"/>
  </g>
 </svg>
diff --git a/src/32/status/weather-showers-scattered-night.svg b/src/32/status/weather-showers-scattered-night.svg
index c9271d0c5..406420d53 100644
--- a/src/32/status/weather-showers-scattered-night.svg
+++ b/src/32/status/weather-showers-scattered-night.svg
@@ -1,412 +1,12 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
- <g transform="translate(0 -1020.4)">
-  <path d="m7 1035.4a12 12 0 0 1 12-12 12 12 0 0 1 12 12 12 12 0 0 1-12 12 12 12 0 0 1-12-12z" fill="#eceff1"/>
-  <g fill="#d1d9dd">
-   <circle cx="14.5" cy="1029.9" r="1.5"/>
-   <circle cx="23.5" cy="1037.9" r="2.5"/>
-   <circle cx="14.5" cy="1036.9" r="2.5"/>
-   <circle cx="17.5" cy="1041.9" r="1.5"/>
-   <circle cx="21.5" cy="1028.9" r=".5"/>
-  </g>
-  <rect x="9" y="1047.4" width="2" height="2.9999" ry="1" fill="#2196f3"/>
-  <path transform="translate(0,1020.4)" d="m7.9062 11a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7h0.09375 5.9062c2.7614 0 5-2.2386 5-5 0-2.6494-2.0619-4.8129-4.668-4.9844a7 7 0 0 0-6.332-4.0156 7 7 0 0 0-0.09375 0z" fill="#f9f9f9" opacity=".9"/>
+ <path d="m7 15a12 12 0 0 1 12-12 12 12 0 0 1 12 12 12 12 0 0 1-12 12 12 12 0 0 1-12-12z" fill="#eceff1"/>
+ <g transform="translate(0,-1020.4)" fill="#d1d9dd">
+  <circle cx="14.5" cy="1029.9" r="1.5"/>
+  <circle cx="23.5" cy="1037.9" r="2.5"/>
+  <circle cx="14.5" cy="1036.9" r="2.5"/>
+  <circle cx="17.5" cy="1041.9" r="1.5"/>
+  <circle cx="21.5" cy="1028.9" r=".5"/>
  </g>
+ <rect x="9" y="27" width="2" height="3" ry="1" fill="#2196f3"/>
+ <path d="m7.9062 11a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7h6c2.7614 0 5-2.2386 5-5 0-2.6494-2.0619-4.8129-4.668-4.9844a7 7 0 0 0-6.332-4.0156 7 7 0 0 0-0.09375 0z" opacity=".9" style="fill:#e6e6e6"/>
 </svg>
diff --git a/src/32/status/weather-showers-scattered.svg b/src/32/status/weather-showers-scattered.svg
index 572b665c9..e5f15bf59 100644
--- a/src/32/status/weather-showers-scattered.svg
+++ b/src/32/status/weather-showers-scattered.svg
@@ -1,75 +1,6 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
  <g transform="translate(0 -1020.4)">
-  <path d="m13 1030.4v14h9a7 7 0 0 0 7-7 7 7 0 0 0-7-7z" fill="#f5f5f5"/>
-  <circle cx="13" cy="1034.4" r="10" fill="#f5f5f5"/>
+  <path transform="translate(0,1020.4)" d="m13 4a10 10 0 0 0-10 10 10 10 0 0 0 10 10h9a7 7 0 0 0 7-7 7 7 0 0 0-6.8359-6.9961 10 10 0 0 0-9.1641-6.0039z" style="fill:#e6e6e6"/>
   <rect x="16" y="1046.4" width="2" height="4" ry="1" fill="#2196f3"/>
  </g>
 </svg>
diff --git a/src/32/status/weather-showers.svg b/src/32/status/weather-showers.svg
index 05296a39f..4d144cfdd 100644
--- a/src/32/status/weather-showers.svg
+++ b/src/32/status/weather-showers.svg
@@ -1,79 +1,8 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
- <g transform="translate(0 -1020.4)">
-  <path d="m13 1030.4v14h9a7 7 0 0 0 7-7 7 7 0 0 0-7-7z" fill="#f5f5f5"/>
-  <circle cx="13" cy="1034.4" r="10" fill="#f5f5f5"/>
-  <g fill="#2196f3">
-   <rect x="12" y="1046.4" width="2" height="2.9998" ry="1"/>
-   <rect x="16" y="1046.4" width="2" height="4" ry="1"/>
-   <rect x="20" y="1046.4" width="2" height="2.9998" ry="1"/>
-  </g>
+ <g transform="translate(0,-1020.4)" fill="#2196f3">
+  <rect x="12" y="1046.4" width="2" height="2.9998" ry="1"/>
+  <rect x="16" y="1046.4" width="2" height="4" ry="1"/>
+  <rect x="20" y="1046.4" width="2" height="2.9998" ry="1"/>
  </g>
+ <path d="m13 4a10 10 0 0 0-10 10 10 10 0 0 0 10 10h9a7 7 0 0 0 7-7 7 7 0 0 0-6.8359-6.9961 10 10 0 0 0-9.1641-6.0039z" style="fill:#e6e6e6"/>
 </svg>
diff --git a/src/32/status/weather-snow-rain.svg b/src/32/status/weather-snow-rain.svg
index be32e9ba9..27bd79537 100644
--- a/src/32/status/weather-snow-rain.svg
+++ b/src/32/status/weather-snow-rain.svg
@@ -1,82 +1,11 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
- <g transform="translate(0 -1020.4)">
-  <path d="m13 1030.4v14h9a7 7 0 0 0 7-7 7 7 0 0 0-7-7z" fill="#f5f5f5"/>
-  <circle cx="13" cy="1034.4" r="10" fill="#f5f5f5"/>
-  <rect x="12" y="1046.4" width="2" height="3" ry="1" fill="#2196f3"/>
-  <rect x="20" y="1046.4" width="2" height="3" ry="1" fill="#2196f3"/>
-  <rect x="16" y="1042.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
-  <rect x="24" y="1045.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
-  <rect x="20" y="1038.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
-  <rect x="6" y="1042.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
-  <rect x="10" y="1038.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
-  <rect x="16" y="1046.4" width="2" height="4" ry="1" fill="#2196f3"/>
- </g>
+ <path d="m13 4a10 10 0 0 0-10 10 10 10 0 0 0 10 10h9a7 7 0 0 0 7-7 7 7 0 0 0-6.8359-6.9961 10 10 0 0 0-9.1641-6.0039z" style="fill:#e6e6e6"/>
+ <rect x="12" y="26" width="2" height="3" ry="1" fill="#2196f3"/>
+ <rect x="20" y="26" width="2" height="3" ry="1" fill="#2196f3"/>
+ <rect x="16" y="22" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
+ <rect x="24" y="25" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
+ <rect x="20" y="18" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
+ <rect x="6" y="22" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
+ <rect x="10" y="18" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
+ <rect x="16" y="26" width="2" height="4" ry="1" fill="#2196f3"/>
 </svg>
diff --git a/src/32/status/weather-snow-scattered-day.svg b/src/32/status/weather-snow-scattered-day.svg
index 9c5acd55d..3f8576199 100644
--- a/src/32/status/weather-snow-scattered-day.svg
+++ b/src/32/status/weather-snow-scattered-day.svg
@@ -1,274 +1,8 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
  <g transform="translate(0 -1020.4)">
   <path d="m9 1036.4a9 9 0 0 1 9-9 9 9 0 0 1 9 9 9 9 0 0 1-9 9 9 9 0 0 1-9-9z" fill="#ffca28"/>
   <path d="m18 1022.4c-0.554 0-1 0.446-1 1v1c0 0.554 0.446 1 1 1s1-0.446 1-1v-1c0-0.554-0.446-1-1-1zm-9.1914 3.8066c-0.25562 0-0.51312 0.097-0.70898 0.293-0.39174 0.3917-0.39174 1.0243 0 1.416l0.70898 0.7071c0.39174 0.3917 1.0223 0.3917 1.4141 0 0.39174-0.3918 0.39174-1.0243 0-1.4161l-0.70703-0.707c-0.19587-0.1959-0.45141-0.293-0.70703-0.293zm18.385 0c-0.25562 0-0.51312 0.097-0.70898 0.293l-0.70703 0.707c-0.39174 0.3918-0.39174 1.0243 0 1.4161 0.39174 0.3917 1.0243 0.3917 1.416 0l0.70703-0.7071c0.39174-0.3917 0.39174-1.0243 0-1.416-0.19587-0.1959-0.45141-0.293-0.70703-0.293zm-22.193 9.1934c-0.554 0-1 0.446-1 1s0.446 1 1 1h1c0.554 0 1-0.446 1-1s-0.446-1-1-1zm25 0c-0.554 0-1 0.446-1 1s0.446 1 1 1h1c0.554 0 1-0.446 1-1s-0.446-1-1-1zm-20.484 8.4844c-0.25562 0-0.51116 0.097-0.70703 0.2929l-0.70898 0.7071c-0.39174 0.3917-0.39174 1.0243 0 1.416s1.0243 0.3917 1.416 0l0.70703-0.709c0.39174-0.3917 0.39174-1.0223 0-1.4141-0.19587-0.1958-0.45141-0.2929-0.70703-0.2929zm16.969 0c-0.25562 0-0.51116 0.097-0.70703 0.2929-0.39174 0.3918-0.39174 1.0224 0 1.4141l0.70703 0.709c0.39174 0.3917 1.0243 0.3917 1.416 0 0.39174-0.3917 0.39174-1.0243 0-1.416l-0.70703-0.7071c-0.19587-0.1958-0.45336-0.2929-0.70898-0.2929zm-8.4844 3.5156c-0.554 0-1 0.446-1 1v1c0 0.554 0.446 1 1 1s1-0.446 1-1v-1c0-0.554-0.446-1-1-1z" fill="#ffca28"/>
-  <path transform="translate(0,1020.4)" d="m7.9062 11a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7h0.09375 5.9062c2.7614 0 5-2.2386 5-5 0-2.6494-2.0619-4.8129-4.668-4.9844a7 7 0 0 0-6.332-4.0156 7 7 0 0 0-0.09375 0z" fill="#f9f9f9" opacity=".9"/>
+  <path transform="translate(0,1020.4)" d="m7.9062 11a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7h6c2.7614 0 5-2.2386 5-5 0-2.6494-2.0619-4.8129-4.668-4.9844a7 7 0 0 0-6.332-4.0156 7 7 0 0 0-0.09375 0z" opacity=".9" style="fill:#f2f2f2"/>
   <rect x="3" y="1045.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
   <rect x="11" y="1045.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
   <rect x="7" y="1047.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
diff --git a/src/32/status/weather-snow-scattered-night.svg b/src/32/status/weather-snow-scattered-night.svg
index c63926806..5fd82e67a 100644
--- a/src/32/status/weather-snow-scattered-night.svg
+++ b/src/32/status/weather-snow-scattered-night.svg
@@ -1,270 +1,4 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
  <g transform="translate(0 -1020.4)">
   <path d="m7 1035.4a12 12 0 0 1 12-12 12 12 0 0 1 12 12 12 12 0 0 1-12 12 12 12 0 0 1-12-12z" fill="#eceff1"/>
   <g fill="#d1d9dd">
@@ -274,7 +8,7 @@
    <circle cx="17.5" cy="1041.9" r="1.5"/>
    <circle cx="21.5" cy="1028.9" r=".5"/>
   </g>
-  <path transform="translate(0,1020.4)" d="m7.9062 11a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7h0.09375 5.9062c2.7614 0 5-2.2386 5-5 0-2.6494-2.0619-4.8129-4.668-4.9844a7 7 0 0 0-6.332-4.0156 7 7 0 0 0-0.09375 0z" fill="#f9f9f9" opacity=".9"/>
+  <path transform="translate(0,1020.4)" d="m7.9062 11a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7h6c2.7614 0 5-2.2386 5-5 0-2.6494-2.0619-4.8129-4.668-4.9844a7 7 0 0 0-6.332-4.0156 7 7 0 0 0-0.09375 0z" opacity=".9" style="fill:#e6e6e6"/>
   <rect x="3" y="1045.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
   <rect x="11" y="1045.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
   <rect x="7" y="1047.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
diff --git a/src/32/status/weather-snow-scattered.svg b/src/32/status/weather-snow-scattered.svg
index 258b20263..59363d4d2 100644
--- a/src/32/status/weather-snow-scattered.svg
+++ b/src/32/status/weather-snow-scattered.svg
@@ -1,341 +1,6 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
- <g transform="translate(0 -1020.4)">
-  <path d="m13 1030.4v14h9a7 7 0 0 0 7-7 7 7 0 0 0-7-7z" fill="#f5f5f5"/>
-  <circle cx="13" cy="1034.4" r="10" fill="#f5f5f5"/>
-  <rect x="10" y="1047.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
-  <rect x="22" y="1045.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
-  <rect x="15" y="1040.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
- </g>
+ <path d="m13 4a10 10 0 0 0-10 10 10 10 0 0 0 10 10h9a7 7 0 0 0 7-7 7 7 0 0 0-6.8359-6.9961 10 10 0 0 0-9.1641-6.0039z" style="fill:#e6e6e6"/>
+ <rect x="10" y="27" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
+ <rect x="22" y="25" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
+ <rect x="15" y="20" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
 </svg>
diff --git a/src/32/status/weather-snow.svg b/src/32/status/weather-snow.svg
index 48e58d042..a43d20a27 100644
--- a/src/32/status/weather-snow.svg
+++ b/src/32/status/weather-snow.svg
@@ -1,343 +1,8 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
- <g transform="translate(0 -1020.4)">
-  <path d="m13 1030.4v14h9a7 7 0 0 0 7-7 7 7 0 0 0-7-7z" fill="#f5f5f5"/>
-  <circle cx="13" cy="1034.4" r="10" fill="#f5f5f5"/>
-  <rect x="10" y="1044.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
-  <rect x="20" y="1044.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
-  <rect x="15" y="1047.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
-  <rect x="6" y="1047.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
-  <rect x="24" y="1047.4" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
- </g>
+ <rect x="10" y="24" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
+ <rect x="20" y="24" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
+ <rect x="15" y="27" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
+ <rect x="6" y="27" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
+ <rect x="24" y="27" width="3" height="3" ry="1.5" fill="#cfd8dc"/>
+ <path d="m13 4a10 10 0 0 0-10 10 10 10 0 0 0 10 10h9a7 7 0 0 0 7-7 7 7 0 0 0-6.8359-6.9961 10 10 0 0 0-9.1641-6.0039z" style="fill:#e6e6e6"/>
 </svg>
diff --git a/src/32/status/weather-storm.svg b/src/32/status/weather-storm.svg
index dec355eb3..8fe2a4782 100644
--- a/src/32/status/weather-storm.svg
+++ b/src/32/status/weather-storm.svg
@@ -1,80 +1,9 @@
 <svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-  <style type="text/css">.ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
- </defs>
- <g transform="translate(0 -1020.4)">
-  <path d="m13 1030.4v14h9a7 7 0 0 0 7-7 7 7 0 0 0-7-7z" fill="#f5f5f5"/>
-  <circle cx="13" cy="1034.4" r="10" fill="#f5f5f5"/>
-  <g fill="#2196f3">
-   <rect x="12" y="1046.4" width="2" height="2.9998" ry="1"/>
-   <rect x="16" y="1046.4" width="2" height="4" ry="1"/>
-   <rect x="20" y="1046.4" width="2" height="2.9998" ry="1"/>
-  </g>
-  <path d="m7.9698 1033.4c-0.33386 0.01-0.64081 0.1856-0.81814 0.4687l-4.9986 7.9996c-0.41507 0.6658 0.063 1.5285 0.84742 1.5293h1.9995v4.9997c-4.08e-4 1.0045 1.3141 1.3826 1.8472 0.5313l4.9986-7.9996c0.4175-0.6662-0.06138-1.5314-0.84742-1.5312h-1.9995v-4.9998c-9.42e-4 -0.5631-0.46629-1.0144-1.029-0.998z" color="#000000" color-rendering="auto" fill="#ffca28" fill-rule="evenodd" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-transform:none;white-space:normal"/>
+ <path d="m13 4a10 10 0 0 0-10 10 10 10 0 0 0 10 10h9a7 7 0 0 0 7-7 7 7 0 0 0-6.8359-6.9961 10 10 0 0 0-9.1641-6.0039z" style="fill:#e6e6e6"/>
+ <g transform="translate(0,-1020.4)" fill="#2196f3">
+  <rect x="12" y="1046.4" width="2" height="3" ry="1"/>
+  <rect x="16" y="1046.4" width="2" height="4" ry="1"/>
+  <rect x="20" y="1046.4" width="2" height="3" ry="1"/>
  </g>
+ <path d="m7.9698 13c-0.33386 0.01-0.64081 0.1856-0.81814 0.4687l-4.9986 7.9996c-0.41507 0.6658 0.063 1.5285 0.84742 1.5293h1.9995v4.9997c-4.08e-4 1.0045 1.3141 1.3826 1.8472 0.5313l4.9986-7.9996c0.4175-0.6662-0.06138-1.5314-0.84742-1.5312h-1.9995v-4.9998c-9.42e-4 -0.5631-0.46629-1.0144-1.029-0.998z" fill="#ffca28"/>
 </svg>
diff --git a/src/scalable/apps/datespell.svg b/src/scalable/apps/datespell.svg
new file mode 100644
index 000000000..191346e0c
--- /dev/null
+++ b/src/scalable/apps/datespell.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg">
+ <path d="m15.61 8.4665a7.1436 7.1436 0 0 1-7.1436 7.1436 7.1436 7.1436 0 0 1-7.1436-7.1436 7.1436 7.1436 0 0 1 7.1436-7.1436 7.1436 7.1436 0 0 1 7.1436 7.1436z" fill="#1dc99a" stroke-width=".26458"/>
+ <rect x="4.4978" y="4.4978" width="7.9373" height="7.9373" rx="1.3229" ry="1.3229" fill="#303030" style="paint-order:markers stroke fill"/>
+ <path d="m5.8207 10.756h3.1059v0.62118h-3.1059z" fill="#f9f9f9" stroke-width=".26458"/>
+ <g transform="translate(.062897)" fill="#fff" stroke-width=".10494" aria-label="DS">
+  <path d="m6.2853 6.4287v1.8672h0.28285q0.48372 0 0.73788-0.23981 0.25621-0.23981 0.25621-0.69689 0-0.45503-0.25416-0.69279t-0.73993-0.23776zm-0.78912-0.59645h0.83217q0.69689 0 1.0371 0.10043 0.34229 0.098384 0.5862 0.33615 0.21522 0.20702 0.31975 0.47757 0.10453 0.27056 0.10453 0.61285 0 0.34639-0.10453 0.619-0.10453 0.27056-0.31975 0.47757-0.24596 0.23776-0.5903 0.3382-0.34434 0.098384-1.033 0.098384h-0.83217z"/>
+  <path d="m11.11 5.9285v0.6477q-0.25211-0.11273-0.49192-0.17012-0.23981-0.057391-0.45298-0.057391-0.28285 0-0.41813 0.077887t-0.13528 0.24186q0 0.12298 0.090185 0.19267 0.092235 0.067639 0.33205 0.11683l0.33615 0.067639q0.51037 0.10248 0.72558 0.31155t0.21522 0.5944q0 0.50627-0.3013 0.75428-0.29925 0.24596-0.9162 0.24596-0.29105 0-0.58416-0.055341-0.2931-0.05534-0.5862-0.16397v-0.66614q0.2931 0.15577 0.56571 0.23571 0.27466 0.077887 0.52881 0.077887 0.25826 0 0.39559-0.086086t0.13733-0.24596q0-0.14348-0.09428-0.22136-0.09224-0.077887-0.37099-0.13938l-0.30541-0.067639q-0.45913-0.098384-0.67229-0.3136-0.21112-0.21522-0.21112-0.58006 0-0.45708 0.29515-0.70304 0.29515-0.24596 0.84856-0.24596 0.25211 0 0.51857 0.038944 0.26646 0.036894 0.55136 0.11273z"/>
+ </g>
+</svg>
diff --git a/src/scalable/apps/matray.svg b/src/scalable/apps/matray.svg
new file mode 100644
index 000000000..c70c38404
--- /dev/null
+++ b/src/scalable/apps/matray.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64" height="64" version="1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12.778 16c-1.5389 0-2.7778 1.2265-2.7778 2.75v32.599c0 1.5235 1.2389 2.6449 2.7778 2.651h25l5.5556 6 5.5556-6h8.3333c1.5389 0 2.7778-1.1275 2.7778-2.651v-32.599c0-1.5235-1.2389-2.75-2.7778-2.75z" fill="#35454c"/>
+ <path d="m5.6696 4c-0.92494 0-1.6696 0.74461-1.6696 1.6695v30.661c0 0.92492 0.74463 1.6695 1.6696 1.6695h8.3304v-24h12v-9.9998zm22.33 0v34h8.3292c0.92494 0 1.6708-0.74461 1.6708-1.6695v-30.661c0-0.92492-0.74584-1.6695-1.6708-1.6695zm-12 12v22h10v-22z" fill="#16a085" stroke-width=".99999"/>
+</svg>
diff --git a/src/symbolic/apps/system-file-manager-symbolic.svg b/src/symbolic/apps/system-file-manager-symbolic.svg
index 9c1d1121d..2eea2d15b 100644
--- a/src/symbolic/apps/system-file-manager-symbolic.svg
+++ b/src/symbolic/apps/system-file-manager-symbolic.svg
@@ -1,8 +1,12 @@
-<svg width="16" height="16.003" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16.003" enable-background="new" version="1.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#">
  <title>Paper Symbolic Icon Theme</title>
- <g transform="translate(-604 -508)" fill="#555555">
-  <path d="m606 509s-1 0-1 1v1h14s0-1-1-1h-6l-1-1h-5z" color="#000000" enable-background="accumulate" style="block-progression:tb;text-decoration-line:none;text-indent:0;text-transform:none"/>
- </g>
- <path d="m2 4c-1.108 0-2 0.892-2 2v8c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-8c0-1.108-0.892-2-2-2h-12zm0 2h12v8h-12v-8z" fill="#555555" stroke-linecap="square" stroke-width="2" style="paint-order:fill markers stroke"/>
- <rect x="5" y="7" width="6" height="2" rx="1" ry="1" fill="#555555" stroke-linecap="square" stroke-width="2" style="paint-order:fill markers stroke"/>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:title>Paper Symbolic Icon Theme</dc:title>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path d="m2 1c-1.0907 0-2 0.9093-2 2v2 2 1 3 2c0 1.0907 0.9093 2 2 2h12c1.0907 0 2-0.9093 2-2v-2-1-5c0-0.068169-0.002839-0.13655-0.009766-0.20312-0.10389-0.99861-0.9677-1.7969-1.9902-1.7969h-4.8184l-0.33594-0.5332c-0.097713-0.15509-0.20327-0.41684-0.44922-0.74414-0.24595-0.3273-0.79982-0.72266-1.3965-0.72266h-5zm0 2h4.8398c0.052811 0.086557 0.14089 0.25773 0.31445 0.5332l0.27734 0.44141c-0.12993 0.2093-0.2064 0.3796-0.27734 0.49219l-0.33594 0.5332h-4.8184v-2zm7.1602 2h4.8398v5 1 2h-12v-2-1-2-1h5.9199l0.92578-1.4668c0.17356-0.27547 0.26164-0.44665 0.31445-0.5332z" fill="#555"/>
 </svg>