diff --git a/src/assets/icons/checkbox.svg b/src/assets/icons/checkbox.svg
index c59b1ab..6ff76e7 100644
--- a/src/assets/icons/checkbox.svg
+++ b/src/assets/icons/checkbox.svg
@@ -1,5 +1,5 @@
 <svg width="105.15mm" height="95.879mm" version="1.1" viewBox="0 0 105.15 95.879" xmlns="http://www.w3.org/2000/svg">
- <g transform="translate(-43.246 -132.45)" shape-rendering="auto">
-  <path id="tick" d="m140.26 147.26-48.793 48.793-21.674-21.674-9.1914 9.1934 30.865 30.865 57.984-57.986z" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" stroke="#222222" stroke-width="6" />
+ <g transform="translate(-43.246 -132.45)">
+  <path id="tick" d="m140.26 147.26-48.793 48.793-21.674-21.674-9.1914 9.1934 30.865 30.865 57.984-57.986z" stroke="#222222" stroke-width="6" />
  </g>
 </svg>
diff --git a/src/assets/icons/clock_moon.svg b/src/assets/icons/clock_moon.svg
index 24eda34..d64972b 100644
--- a/src/assets/icons/clock_moon.svg
+++ b/src/assets/icons/clock_moon.svg
@@ -2,16 +2,12 @@
  <g>
   <path d="m85.562 65.682v9.2246h6.4688v6.75h-6.4688v13.133h12.031v-5.7891h3.4688v-3.625h5.4062v9.4141h8.2031v-29.107h-15.797v4.9746h-6.625v-4.9746h-6.6875zm25.545 5.3672v7.2148h-7.5215v-7.2129l7.5215-0.001953z"/>
   <g transform="translate(-21.213 1.7678)">
-   <path d="m100.56 53.492a1.0677 1.0677 0 0 0-1.0684 1.0664v6.7402a1.0677 1.0677 0 0 0 1.0684 1.0684 1.0677 1.0677 0 0 0 1.0664-1.0684v-6.7402a1.0677 1.0677 0 0 0-1.0664-1.0664z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m97.186 56.861a1.0677 1.0677 0 0 0-1.0664 1.0684 1.0677 1.0677 0 0 0 1.0664 1.0664h6.7402a1.0677 1.0677 0 0 0 1.0684-1.0664 1.0677 1.0677 0 0 0-1.0684-1.0684h-6.7402z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
+   <path d="m100.56 53.492a1.0677 1.0677 0 0 0-1.0684 1.0664v6.7402a1.0677 1.0677 0 0 0 1.0684 1.0684 1.0677 1.0677 0 0 0 1.0664-1.0684v-6.7402a1.0677 1.0677 0 0 0-1.0664-1.0664z"/>
+   <path d="m97.186 56.861a1.0677 1.0677 0 0 0-1.0664 1.0684 1.0677 1.0677 0 0 0 1.0664 1.0664h6.7402a1.0677 1.0677 0 0 0 1.0684-1.0664 1.0677 1.0677 0 0 0-1.0684-1.0684h-6.7402z"/>
   </g>
   <g transform="translate(-3.5355 19.003)">
-   <path d="m118.96 79.605a1.0677 1.0677 0 0 0-1.0684 1.0684 1.0677 1.0677 0 0 0 1.0684 1.0684h6.7402a1.0677 1.0677 0 0 0 1.0684-1.0684 1.0677 1.0677 0 0 0-1.0684-1.0684h-6.7402z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m122.32 76.236a1.0677 1.0677 0 0 0-1.0664 1.0684v6.7383a1.0677 1.0677 0 0 0 1.0664 1.0684 1.0677 1.0677 0 0 0 1.0684-1.0684v-6.7383a1.0677 1.0677 0 0 0-1.0684-1.0684z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
+   <path d="m118.96 79.605a1.0677 1.0677 0 0 0-1.0684 1.0684 1.0677 1.0677 0 0 0 1.0684 1.0684h6.7402a1.0677 1.0677 0 0 0 1.0684-1.0684 1.0677 1.0677 0 0 0-1.0684-1.0684h-6.7402z"/>
+   <path d="m122.32 76.236a1.0677 1.0677 0 0 0-1.0664 1.0684v6.7383a1.0677 1.0677 0 0 0 1.0664 1.0684 1.0677 1.0677 0 0 0 1.0684-1.0684v-6.7383a1.0677 1.0677 0 0 0-1.0684-1.0684z"/>
   </g>
  </g>
 </svg>
diff --git a/src/assets/icons/clock_moon_rain.svg b/src/assets/icons/clock_moon_rain.svg
index 94d9eb7..d563779 100644
--- a/src/assets/icons/clock_moon_rain.svg
+++ b/src/assets/icons/clock_moon_rain.svg
@@ -2,27 +2,18 @@
  <g>
   <path d="m89.938 59.713v9.2246h6.4688v3.0781c0.24224 0.24447 0.46245 0.5159 0.66406 0.80859 0.9096 1.0269 0.91602 1.7812 0.91602 1.7812 4.5712-2.0833 9.3588-1.6889 10.611 4.8008h2.2461v5.6191c1.7289 0.89891 2.5984 2.3193 2.875 3.7949h5.3281v-29.107h-15.797v4.9746h-6.625v-4.9746zm25.545 5.3672v7.2148h-7.5215v-7.2129z"/>
   <g>
-   <path d="m79.343 55.229a1.0677 1.0677 0 0 0-1.0684 1.0664v6.7402a1.0677 1.0677 0 0 0 1.0684 1.0684 1.0677 1.0677 0 0 0 1.0664-1.0684v-6.7402a1.0677 1.0677 0 0 0-1.0664-1.0664z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m75.972 58.598a1.0677 1.0677 0 0 0-1.0664 1.0684 1.0677 1.0677 0 0 0 1.0664 1.0664h6.7402a1.0677 1.0677 0 0 0 1.0684-1.0664 1.0677 1.0677 0 0 0-1.0684-1.0684z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m115.42 97.015a1.0677 1.0677 0 0 0-1.0684 1.0684 1.0677 1.0677 0 0 0 1.0684 1.0684h6.7402a1.0677 1.0677 0 0 0 1.0684-1.0684 1.0677 1.0677 0 0 0-1.0684-1.0684z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m118.79 93.646a1.0677 1.0677 0 0 0-1.0664 1.0684v6.7383a1.0677 1.0677 0 0 0 1.0664 1.0684 1.0677 1.0677 0 0 0 1.0684-1.0684v-6.7383a1.0677 1.0677 0 0 0-1.0684-1.0684z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
+   <path d="m79.343 55.229a1.0677 1.0677 0 0 0-1.0684 1.0664v6.7402a1.0677 1.0677 0 0 0 1.0684 1.0684 1.0677 1.0677 0 0 0 1.0664-1.0684v-6.7402a1.0677 1.0677 0 0 0-1.0664-1.0664z"/>
+   <path d="m75.972 58.598a1.0677 1.0677 0 0 0-1.0664 1.0684 1.0677 1.0677 0 0 0 1.0664 1.0664h6.7402a1.0677 1.0677 0 0 0 1.0684-1.0664 1.0677 1.0677 0 0 0-1.0684-1.0684z"/>
+   <path d="m115.42 97.015a1.0677 1.0677 0 0 0-1.0684 1.0684 1.0677 1.0677 0 0 0 1.0684 1.0684h6.7402a1.0677 1.0677 0 0 0 1.0684-1.0684 1.0677 1.0677 0 0 0-1.0684-1.0684z"/>
+   <path d="m118.79 93.646a1.0677 1.0677 0 0 0-1.0664 1.0684v6.7383a1.0677 1.0677 0 0 0 1.0664 1.0684 1.0677 1.0677 0 0 0 1.0684-1.0684v-6.7383a1.0677 1.0677 0 0 0-1.0684-1.0684z"/>
   </g>
   <path d="m91.104 71.066c-1.1528-0.01129-2.3479 0.19839-3.4434 0.61524-2.1909 0.83369-3.8886 2.4144-4.3047 4.4219-0.41608 2.0074 0.34439 4.7108 3.793 8.0312a1.071 1.071 0 0 1 0.0293 1.5137 1.071 1.071 0 0 1-1.5137 0.0293c-1.2149-1.1697-2.1466-2.3208-2.8555-3.4453-4.7346-1.035-7.5122 0.63769-8.7578 3.0234-1.2206 2.3379-0.85898 5.4819 1.291 7.7988h36.109c0.84689-0.74667 1.5903-2.6029 1.1738-4.2891-0.41806-1.6926-1.724-3.2474-5.1953-3.5625-0.95461 1.2047-2.2927 2.1692-4.041 2.6699a1.071 1.071 0 0 1-1.3242-0.73438 1.071 1.071 0 0 1 0.73438-1.3242c1.4086-0.40342 2.4445-1.1778 3.1465-2.1387a1.071 1.071 0 0 1 0.2461-0.36523c1e-3 -2e-3 3e-3 -0.0039 4e-3 -0.0059 0.92582-1.506 1.1077-3.3797 0.65625-5.0039-0.3953-1.4223-1.2601-2.5773-2.5371-3.1543-1.2102-0.54682-2.8829-0.61578-5.123 0.33008 0.12671 0.75629 0.18427 1.5621 0.12695 2.4375a1.071 1.071 0 0 1-1.1387 0.99805 1.071 1.071 0 0 1-0.99805-1.1387c0.21826-3.3336-1.0422-5.0613-2.8906-5.9961-0.92423-0.46739-2.0347-0.69965-3.1875-0.71094z" stroke-width="0"/>
   <g>
-   <path d="m80.875 96.59a1.071 1.071 0 0 0-0.90234 0.49609l-2.4551 3.8555a1.071 1.071 0 0 0 0.32812 1.4785 1.071 1.071 0 0 0 1.4785-0.32812l2.4551-3.8555a1.071 1.071 0 0 0-0.32617-1.4785 1.071 1.071 0 0 0-0.57812-0.16797z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m94.133 96.59a1.071 1.071 0 0 0-0.90039 0.49609l-2.457 3.8555a1.071 1.071 0 0 0 0.32812 1.4785 1.071 1.071 0 0 0 1.4785-0.32812l2.457-3.8555a1.071 1.071 0 0 0-0.32812-1.4785 1.071 1.071 0 0 0-0.57813-0.16797z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m107.39 96.59a1.071 1.071 0 0 0-0.90039 0.49609l-2.4551 3.8555a1.071 1.071 0 0 0 0.32812 1.4785 1.071 1.071 0 0 0 1.4785-0.32812l2.4551-3.8555a1.071 1.071 0 0 0-0.32813-1.4785 1.071 1.071 0 0 0-0.57813-0.16797z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m86.178 104.54a1.071 1.071 0 0 0-0.90039 0.49414l-2.457 3.8555a1.071 1.071 0 0 0 0.32813 1.4805 1.071 1.071 0 0 0 1.4785-0.32812l2.457-3.8555a1.071 1.071 0 0 0-0.32812-1.4785 1.071 1.071 0 0 0-0.57812-0.16797z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m99.438 104.54a1.071 1.071 0 0 0-0.90234 0.49414l-2.4551 3.8555a1.071 1.071 0 0 0 0.32812 1.4805 1.071 1.071 0 0 0 1.4785-0.32812l2.4551-3.8555a1.071 1.071 0 0 0-0.32813-1.4785 1.071 1.071 0 0 0-0.57617-0.16797z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
+   <path d="m80.875 96.59a1.071 1.071 0 0 0-0.90234 0.49609l-2.4551 3.8555a1.071 1.071 0 0 0 0.32812 1.4785 1.071 1.071 0 0 0 1.4785-0.32812l2.4551-3.8555a1.071 1.071 0 0 0-0.32617-1.4785 1.071 1.071 0 0 0-0.57812-0.16797z"/>
+   <path d="m94.133 96.59a1.071 1.071 0 0 0-0.90039 0.49609l-2.457 3.8555a1.071 1.071 0 0 0 0.32812 1.4785 1.071 1.071 0 0 0 1.4785-0.32812l2.457-3.8555a1.071 1.071 0 0 0-0.32812-1.4785 1.071 1.071 0 0 0-0.57813-0.16797z"/>
+   <path d="m107.39 96.59a1.071 1.071 0 0 0-0.90039 0.49609l-2.4551 3.8555a1.071 1.071 0 0 0 0.32812 1.4785 1.071 1.071 0 0 0 1.4785-0.32812l2.4551-3.8555a1.071 1.071 0 0 0-0.32813-1.4785 1.071 1.071 0 0 0-0.57813-0.16797z"/>
+   <path d="m86.178 104.54a1.071 1.071 0 0 0-0.90039 0.49414l-2.457 3.8555a1.071 1.071 0 0 0 0.32813 1.4805 1.071 1.071 0 0 0 1.4785-0.32812l2.457-3.8555a1.071 1.071 0 0 0-0.32812-1.4785 1.071 1.071 0 0 0-0.57812-0.16797z"/>
+   <path d="m99.438 104.54a1.071 1.071 0 0 0-0.90234 0.49414l-2.4551 3.8555a1.071 1.071 0 0 0 0.32812 1.4805 1.071 1.071 0 0 0 1.4785-0.32812l2.4551-3.8555a1.071 1.071 0 0 0-0.32813-1.4785 1.071 1.071 0 0 0-0.57617-0.16797z"/>
   </g>
  </g>
 </svg>
diff --git a/src/assets/icons/clock_moon_storm.svg b/src/assets/icons/clock_moon_storm.svg
index d67f218..2323ce1 100644
--- a/src/assets/icons/clock_moon_storm.svg
+++ b/src/assets/icons/clock_moon_storm.svg
@@ -2,10 +2,7 @@
  <g>
   <path d="m89.938 59.713v9.2246h6.4688v3.0781c0.24224 0.24447 0.46245 0.5159 0.66406 0.80859 0.9096 1.0269 0.91602 1.7812 0.91602 1.7812 4.5712-2.0833 9.3588-1.6889 10.611 4.8008h2.2461v5.6191c1.7289 0.89891 2.5984 2.3193 2.875 3.7949h5.3281v-29.107h-15.797v4.9746h-6.625v-4.9746zm25.545 5.3672v7.2148h-7.5215v-7.2129z"/>
   <path d="m91.104 71.066c-1.1528-0.01129-2.3479 0.19839-3.4434 0.61524-2.1909 0.83369-3.8886 2.4144-4.3047 4.4219-0.41608 2.0074 0.34439 4.7108 3.793 8.0312a1.071 1.071 0 0 1 0.0293 1.5137 1.071 1.071 0 0 1-1.5137 0.0293c-1.2149-1.1697-2.1466-2.3208-2.8555-3.4453-4.7346-1.035-7.5122 0.63769-8.7578 3.0234-1.2206 2.3379-0.85898 5.4819 1.291 7.7988h36.109c0.84689-0.74667 1.5903-2.6029 1.1738-4.2891-0.41806-1.6926-1.724-3.2474-5.1953-3.5625-0.95461 1.2047-2.2927 2.1692-4.041 2.6699a1.071 1.071 0 0 1-1.3242-0.73438 1.071 1.071 0 0 1 0.73438-1.3242c1.4086-0.40342 2.4445-1.1778 3.1465-2.1387a1.071 1.071 0 0 1 0.2461-0.36523c1e-3 -2e-3 3e-3 -0.0039 4e-3 -0.0059 0.92582-1.506 1.1077-3.3797 0.65625-5.0039-0.3953-1.4223-1.2601-2.5773-2.5371-3.1543-1.2102-0.54682-2.8829-0.61578-5.123 0.33008 0.12671 0.75629 0.18427 1.5621 0.12695 2.4375a1.071 1.071 0 0 1-1.1387 0.99805 1.071 1.071 0 0 1-0.99805-1.1387c0.21826-3.3336-1.0422-5.0613-2.8906-5.9961-0.92423-0.46739-2.0347-0.69965-3.1875-0.71094z" stroke-width="0"/>
-  <path d="m86.346 96.055a1.071 1.071 0 0 0-0.87891 0.53516l-2.5059 4.3398a1.0711 1.0711 0 0 0 0.73242 1.5879l1.8926 0.35156-3.3848 5.8613a1.071 1.071 0 0 0 0.39258 1.4629 1.071 1.071 0 0 0 1.4629-0.39258l4.1406-7.1719a1.0711 1.0711 0 0 0-0.73242-1.5879l-1.8906-0.35157 1.748-3.0293a1.071 1.071 0 0 0-0.39258-1.4629 1.071 1.071 0 0 0-0.58398-0.14258z"
-        dominant-baseline="auto"
-        solid-color="#000000" stop-color="#000000" />
-  <path d="m101.81 96.055a1.071 1.071 0 0 0-0.8789 0.53516l-2.5059 4.3398a1.0711 1.0711 0 0 0 0.73242 1.5879l1.8926 0.35156-3.3848 5.8613a1.071 1.071 0 0 0 0.39258 1.4629 1.071 1.071 0 0 0 1.4629-0.39258l4.1406-7.1719a1.0711 1.0711 0 0 0-0.73243-1.5879l-1.8906-0.35157 1.748-3.0293a1.071 1.071 0 0 0-0.39258-1.4629 1.071 1.071 0 0 0-0.58399-0.14258z"
-        dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
+  <path d="m86.346 96.055a1.071 1.071 0 0 0-0.87891 0.53516l-2.5059 4.3398a1.0711 1.0711 0 0 0 0.73242 1.5879l1.8926 0.35156-3.3848 5.8613a1.071 1.071 0 0 0 0.39258 1.4629 1.071 1.071 0 0 0 1.4629-0.39258l4.1406-7.1719a1.0711 1.0711 0 0 0-0.73242-1.5879l-1.8906-0.35157 1.748-3.0293a1.071 1.071 0 0 0-0.39258-1.4629 1.071 1.071 0 0 0-0.58398-0.14258z"/>
+  <path d="m101.81 96.055a1.071 1.071 0 0 0-0.8789 0.53516l-2.5059 4.3398a1.0711 1.0711 0 0 0 0.73242 1.5879l1.8926 0.35156-3.3848 5.8613a1.071 1.071 0 0 0 0.39258 1.4629 1.071 1.071 0 0 0 1.4629-0.39258l4.1406-7.1719a1.0711 1.0711 0 0 0-0.73243-1.5879l-1.8906-0.35157 1.748-3.0293a1.071 1.071 0 0 0-0.39258-1.4629 1.071 1.071 0 0 0-0.58399-0.14258z"/>
  </g>
 </svg>
diff --git a/src/assets/icons/clock_sun_rain.svg b/src/assets/icons/clock_sun_rain.svg
index 313d1ac..1319bb8 100644
--- a/src/assets/icons/clock_sun_rain.svg
+++ b/src/assets/icons/clock_sun_rain.svg
@@ -1,39 +1,24 @@
 <svg width="200" height="160" version="1.1" viewBox="0 0 200 160" xmlns="http://www.w3.org/2000/svg">
  <g>
   <g>
-   <path d="m123.33 73.355a1.0677 1.0677 0 0 0-1.0684 1.0684 1.0677 1.0677 0 0 0 1.0684 1.0684h6.7402a1.0677 1.0677 0 0 0 1.0684-1.0684 1.0677 1.0677 0 0 0-1.0684-1.0684z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m129.96 61.701a1.0677 1.0677 0 0 0-0.2832 0.03516l-6.5117 1.7441a1.0677 1.0677 0 0 0-0.75391 1.3086 1.0677 1.0677 0 0 0 1.3066 0.75586l6.5117-1.7461a1.0677 1.0677 0 0 0 0.75391-1.3066 1.0677 1.0677 0 0 0-1.0234-0.79102z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m123.46 83.266a1.0677 1.0677 0 0 0-1.0508 0.79102 1.0677 1.0677 0 0 0 0.7539 1.3086l6.5117 1.7441a1.0677 1.0677 0 0 0 1.3066-0.75586 1.0677 1.0677 0 0 0-0.7539-1.3066l-6.5117-1.7441a1.0677 1.0677 0 0 0-0.25586-0.03711z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m128.3 49.459a1.0677 1.0677 0 0 0-0.72461 0.31055l-4.7656 4.7656a1.0677 1.0677 0 0 0 0 1.5117 1.0677 1.0677 0 0 0 1.5098 0l4.7656-4.7656a1.0677 1.0677 0 0 0 0-1.5117 1.0677 1.0677 0 0 0-0.78515-0.31055z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m114.37 94.203a1.0677 1.0677 0 0 0-0.28321 0.04687 1.0677 1.0677 0 0 0-0.70117 1.3379l1.3027 4.1777a1.0677 1.0677 0 0 0 1.3359 0.70118 1.0677 1.0677 0 0 0 0.70313-1.3359l-1.3027-4.1797a1.0677 1.0677 0 0 0-1.0547-0.74805z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m123.16 91.996a1.0677 1.0677 0 0 0-0.72461 0.3125 1.0677 1.0677 0 0 0 0 1.5098l4.7656 4.7656a1.0677 1.0677 0 0 0 1.5098 0 1.0677 1.0677 0 0 0 0-1.5098l-4.7656-4.7656a1.0677 1.0677 0 0 0-0.78516-0.3125z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m104.93 47.242a1.0677 1.0677 0 0 0-1.0684 1.0664v6.7402a1.0677 1.0677 0 0 0 1.0684 1.0684 1.0677 1.0677 0 0 0 1.0664-1.0684v-6.7402a1.0677 1.0677 0 0 0-1.0664-1.0664z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m93.283 47.357a1.0677 1.0677 0 0 0-0.28516 0.03516 1.0677 1.0677 0 0 0-0.75391 1.3086l1.7441 6.5098a1.0677 1.0677 0 0 0 1.3086 0.75391 1.0677 1.0677 0 0 0 0.75391-1.3066l-1.7441-6.5098a1.0677 1.0677 0 0 0-1.0234-0.79102z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m116.6 47.361a1.0677 1.0677 0 0 0-1.0508 0.79102l-1.7441 6.5098a1.0677 1.0677 0 0 0 0.75586 1.3066 1.0677 1.0677 0 0 0 1.3066-0.75391l1.7441-6.5098a1.0677 1.0677 0 0 0-0.7539-1.3086 1.0677 1.0677 0 0 0-0.25781-0.03516z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m81.002 48.977a1.0677 1.0677 0 0 0-0.72461 0.3125 1.0677 1.0677 0 0 0 0 1.5098l4.7656 4.7656a1.0677 1.0677 0 0 0 1.5098 0 1.0677 1.0677 0 0 0 0-1.5098l-4.7656-4.7656a1.0677 1.0677 0 0 0-0.78516-0.3125z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
+   <path d="m123.33 73.355a1.0677 1.0677 0 0 0-1.0684 1.0684 1.0677 1.0677 0 0 0 1.0684 1.0684h6.7402a1.0677 1.0677 0 0 0 1.0684-1.0684 1.0677 1.0677 0 0 0-1.0684-1.0684z"/>
+   <path d="m129.96 61.701a1.0677 1.0677 0 0 0-0.2832 0.03516l-6.5117 1.7441a1.0677 1.0677 0 0 0-0.75391 1.3086 1.0677 1.0677 0 0 0 1.3066 0.75586l6.5117-1.7461a1.0677 1.0677 0 0 0 0.75391-1.3066 1.0677 1.0677 0 0 0-1.0234-0.79102z"/>
+   <path d="m123.46 83.266a1.0677 1.0677 0 0 0-1.0508 0.79102 1.0677 1.0677 0 0 0 0.7539 1.3086l6.5117 1.7441a1.0677 1.0677 0 0 0 1.3066-0.75586 1.0677 1.0677 0 0 0-0.7539-1.3066l-6.5117-1.7441a1.0677 1.0677 0 0 0-0.25586-0.03711z"/>
+   <path d="m128.3 49.459a1.0677 1.0677 0 0 0-0.72461 0.31055l-4.7656 4.7656a1.0677 1.0677 0 0 0 0 1.5117 1.0677 1.0677 0 0 0 1.5098 0l4.7656-4.7656a1.0677 1.0677 0 0 0 0-1.5117 1.0677 1.0677 0 0 0-0.78515-0.31055z"/>
+   <path d="m114.37 94.203a1.0677 1.0677 0 0 0-0.28321 0.04687 1.0677 1.0677 0 0 0-0.70117 1.3379l1.3027 4.1777a1.0677 1.0677 0 0 0 1.3359 0.70118 1.0677 1.0677 0 0 0 0.70313-1.3359l-1.3027-4.1797a1.0677 1.0677 0 0 0-1.0547-0.74805z"/>
+   <path d="m123.16 91.996a1.0677 1.0677 0 0 0-0.72461 0.3125 1.0677 1.0677 0 0 0 0 1.5098l4.7656 4.7656a1.0677 1.0677 0 0 0 1.5098 0 1.0677 1.0677 0 0 0 0-1.5098l-4.7656-4.7656a1.0677 1.0677 0 0 0-0.78516-0.3125z"/>
+   <path d="m104.93 47.242a1.0677 1.0677 0 0 0-1.0684 1.0664v6.7402a1.0677 1.0677 0 0 0 1.0684 1.0684 1.0677 1.0677 0 0 0 1.0664-1.0684v-6.7402a1.0677 1.0677 0 0 0-1.0664-1.0664z"/>
+   <path d="m93.283 47.357a1.0677 1.0677 0 0 0-0.28516 0.03516 1.0677 1.0677 0 0 0-0.75391 1.3086l1.7441 6.5098a1.0677 1.0677 0 0 0 1.3086 0.75391 1.0677 1.0677 0 0 0 0.75391-1.3066l-1.7441-6.5098a1.0677 1.0677 0 0 0-1.0234-0.79102z"/>
+   <path d="m116.6 47.361a1.0677 1.0677 0 0 0-1.0508 0.79102l-1.7441 6.5098a1.0677 1.0677 0 0 0 0.75586 1.3066 1.0677 1.0677 0 0 0 1.3066-0.75391l1.7441-6.5098a1.0677 1.0677 0 0 0-0.7539-1.3086 1.0677 1.0677 0 0 0-0.25781-0.03516z"/>
+   <path d="m81.002 48.977a1.0677 1.0677 0 0 0-0.72461 0.3125 1.0677 1.0677 0 0 0 0 1.5098l4.7656 4.7656a1.0677 1.0677 0 0 0 1.5098 0 1.0677 1.0677 0 0 0 0-1.5098l-4.7656-4.7656a1.0677 1.0677 0 0 0-0.78516-0.3125z"/>
   </g>
   <path d="m89.938 59.432v10.852c3.4258-0.39375 6.9291 0.9376 7.9922 4.6094 0.40346-0.21278 0.35849-0.19025 0.44531-0.23633 8.3721-3.8563 11.803 4.5742 8.5703 9.4219 4.2397 0.20726 6.1905 2.2386 6.7266 4.4609h5.375v-29.107zm8.6211 15.486c-65.706-49.945-32.853-24.973 0 0z"/>
   <g>
-   <path d="m80.875 96.59a1.071 1.071 0 0 0-0.90234 0.49609l-2.4551 3.8555a1.071 1.071 0 0 0 0.32812 1.4785 1.071 1.071 0 0 0 1.4785-0.32812l2.4551-3.8555a1.071 1.071 0 0 0-0.32617-1.4785 1.071 1.071 0 0 0-0.57812-0.16797z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m94.133 96.59a1.071 1.071 0 0 0-0.90039 0.49609l-2.457 3.8555a1.071 1.071 0 0 0 0.32812 1.4785 1.071 1.071 0 0 0 1.4785-0.32812l2.457-3.8555a1.071 1.071 0 0 0-0.32812-1.4785 1.071 1.071 0 0 0-0.57813-0.16797z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m107.39 96.59a1.071 1.071 0 0 0-0.90039 0.49609l-2.4551 3.8555a1.071 1.071 0 0 0 0.32812 1.4785 1.071 1.071 0 0 0 1.4785-0.32812l2.4551-3.8555a1.071 1.071 0 0 0-0.32813-1.4785 1.071 1.071 0 0 0-0.57813-0.16797z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m86.178 104.54a1.071 1.071 0 0 0-0.90039 0.49414l-2.457 3.8555a1.071 1.071 0 0 0 0.32813 1.4805 1.071 1.071 0 0 0 1.4785-0.32812l2.457-3.8555a1.071 1.071 0 0 0-0.32812-1.4785 1.071 1.071 0 0 0-0.57812-0.16797z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m99.438 104.54a1.071 1.071 0 0 0-0.90234 0.49414l-2.4551 3.8555a1.071 1.071 0 0 0 0.32812 1.4805 1.071 1.071 0 0 0 1.4785-0.32812l2.4551-3.8555a1.071 1.071 0 0 0-0.32813-1.4785 1.071 1.071 0 0 0-0.57617-0.16797z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
+   <path d="m80.875 96.59a1.071 1.071 0 0 0-0.90234 0.49609l-2.4551 3.8555a1.071 1.071 0 0 0 0.32812 1.4785 1.071 1.071 0 0 0 1.4785-0.32812l2.4551-3.8555a1.071 1.071 0 0 0-0.32617-1.4785 1.071 1.071 0 0 0-0.57812-0.16797z"/>
+   <path d="m94.133 96.59a1.071 1.071 0 0 0-0.90039 0.49609l-2.457 3.8555a1.071 1.071 0 0 0 0.32812 1.4785 1.071 1.071 0 0 0 1.4785-0.32812l2.457-3.8555a1.071 1.071 0 0 0-0.32812-1.4785 1.071 1.071 0 0 0-0.57813-0.16797z"/>
+   <path d="m107.39 96.59a1.071 1.071 0 0 0-0.90039 0.49609l-2.4551 3.8555a1.071 1.071 0 0 0 0.32812 1.4785 1.071 1.071 0 0 0 1.4785-0.32812l2.4551-3.8555a1.071 1.071 0 0 0-0.32813-1.4785 1.071 1.071 0 0 0-0.57813-0.16797z"/>
+   <path d="m86.178 104.54a1.071 1.071 0 0 0-0.90039 0.49414l-2.457 3.8555a1.071 1.071 0 0 0 0.32813 1.4805 1.071 1.071 0 0 0 1.4785-0.32812l2.457-3.8555a1.071 1.071 0 0 0-0.32812-1.4785 1.071 1.071 0 0 0-0.57812-0.16797z"/>
+   <path d="m99.438 104.54a1.071 1.071 0 0 0-0.90234 0.49414l-2.4551 3.8555a1.071 1.071 0 0 0 0.32812 1.4805 1.071 1.071 0 0 0 1.4785-0.32812l2.4551-3.8555a1.071 1.071 0 0 0-0.32813-1.4785 1.071 1.071 0 0 0-0.57617-0.16797z"/>
   </g>
   <path d="m91.104 71.066c-1.1528-0.01129-2.3479 0.19839-3.4434 0.61524-2.1909 0.83369-3.8886 2.4144-4.3047 4.4219-0.41608 2.0074 0.34439 4.7108 3.793 8.0312a1.071 1.071 0 0 1 0.0293 1.5137 1.071 1.071 0 0 1-1.5137 0.0293c-1.2149-1.1697-2.1466-2.3208-2.8555-3.4453-4.7346-1.035-7.5122 0.63769-8.7578 3.0234-1.2206 2.3379-0.85898 5.4819 1.291 7.7988h36.109c0.84689-0.74667 1.5903-2.6029 1.1738-4.2891-0.41806-1.6926-1.724-3.2474-5.1953-3.5625-0.95461 1.2047-2.2927 2.1692-4.041 2.6699a1.071 1.071 0 0 1-1.3242-0.73438 1.071 1.071 0 0 1 0.73438-1.3242c1.4086-0.40342 2.4445-1.1778 3.1465-2.1387a1.071 1.071 0 0 1 0.2461-0.36523c1e-3 -2e-3 3e-3 -0.0039 4e-3 -0.0059 0.92582-1.506 1.1077-3.3797 0.65625-5.0039-0.3953-1.4223-1.2601-2.5773-2.5371-3.1543-1.2102-0.54682-2.8829-0.61578-5.123 0.33008 0.12671 0.75629 0.18427 1.5621 0.12695 2.4375a1.071 1.071 0 0 1-1.1387 0.99805 1.071 1.071 0 0 1-0.99805-1.1387c0.21826-3.3336-1.0422-5.0613-2.8906-5.9961-0.92423-0.46739-2.0347-0.69965-3.1875-0.71094z"/>
  </g>
diff --git a/src/assets/icons/clock_sun_storm.svg b/src/assets/icons/clock_sun_storm.svg
index b439e22..9b21669 100644
--- a/src/assets/icons/clock_sun_storm.svg
+++ b/src/assets/icons/clock_sun_storm.svg
@@ -1,32 +1,20 @@
 <svg width="200" height="160" version="1.1" viewBox="0 0 200 160" xmlns="http://www.w3.org/2000/svg">
  <g>
   <g>
-   <path d="m123.33 73.355a1.0677 1.0677 0 0 0-1.0684 1.0684 1.0677 1.0677 0 0 0 1.0684 1.0684h6.7402a1.0677 1.0677 0 0 0 1.0684-1.0684 1.0677 1.0677 0 0 0-1.0684-1.0684z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m129.96 61.701a1.0677 1.0677 0 0 0-0.2832 0.03516l-6.5117 1.7441a1.0677 1.0677 0 0 0-0.75391 1.3086 1.0677 1.0677 0 0 0 1.3066 0.75586l6.5117-1.7461a1.0677 1.0677 0 0 0 0.75391-1.3066 1.0677 1.0677 0 0 0-1.0234-0.79102z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m123.46 83.266a1.0677 1.0677 0 0 0-1.0508 0.79102 1.0677 1.0677 0 0 0 0.7539 1.3086l6.5117 1.7441a1.0677 1.0677 0 0 0 1.3066-0.75586 1.0677 1.0677 0 0 0-0.7539-1.3066l-6.5117-1.7441a1.0677 1.0677 0 0 0-0.25586-0.03711z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m128.3 49.459a1.0677 1.0677 0 0 0-0.72461 0.31055l-4.7656 4.7656a1.0677 1.0677 0 0 0 0 1.5117 1.0677 1.0677 0 0 0 1.5098 0l4.7656-4.7656a1.0677 1.0677 0 0 0 0-1.5117 1.0677 1.0677 0 0 0-0.78515-0.31055z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m114.37 94.203a1.0677 1.0677 0 0 0-0.28321 0.04687 1.0677 1.0677 0 0 0-0.70117 1.3379l1.3027 4.1777a1.0677 1.0677 0 0 0 1.3359 0.70118 1.0677 1.0677 0 0 0 0.70313-1.3359l-1.3027-4.1797a1.0677 1.0677 0 0 0-1.0547-0.74805z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m123.16 91.996a1.0677 1.0677 0 0 0-0.72461 0.3125 1.0677 1.0677 0 0 0 0 1.5098l4.7656 4.7656a1.0677 1.0677 0 0 0 1.5098 0 1.0677 1.0677 0 0 0 0-1.5098l-4.7656-4.7656a1.0677 1.0677 0 0 0-0.78516-0.3125z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m104.93 47.242a1.0677 1.0677 0 0 0-1.0684 1.0664v6.7402a1.0677 1.0677 0 0 0 1.0684 1.0684 1.0677 1.0677 0 0 0 1.0664-1.0684v-6.7402a1.0677 1.0677 0 0 0-1.0664-1.0664z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m93.283 47.357a1.0677 1.0677 0 0 0-0.28516 0.03516 1.0677 1.0677 0 0 0-0.75391 1.3086l1.7441 6.5098a1.0677 1.0677 0 0 0 1.3086 0.75391 1.0677 1.0677 0 0 0 0.75391-1.3066l-1.7441-6.5098a1.0677 1.0677 0 0 0-1.0234-0.79102z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m116.6 47.361a1.0677 1.0677 0 0 0-1.0508 0.79102l-1.7441 6.5098a1.0677 1.0677 0 0 0 0.75586 1.3066 1.0677 1.0677 0 0 0 1.3066-0.75391l1.7441-6.5098a1.0677 1.0677 0 0 0-0.7539-1.3086 1.0677 1.0677 0 0 0-0.25781-0.03516z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-   <path d="m81.002 48.977a1.0677 1.0677 0 0 0-0.72461 0.3125 1.0677 1.0677 0 0 0 0 1.5098l4.7656 4.7656a1.0677 1.0677 0 0 0 1.5098 0 1.0677 1.0677 0 0 0 0-1.5098l-4.7656-4.7656a1.0677 1.0677 0 0 0-0.78516-0.3125z"
-         dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
+   <path d="m123.33 73.355a1.0677 1.0677 0 0 0-1.0684 1.0684 1.0677 1.0677 0 0 0 1.0684 1.0684h6.7402a1.0677 1.0677 0 0 0 1.0684-1.0684 1.0677 1.0677 0 0 0-1.0684-1.0684z"/>
+   <path d="m129.96 61.701a1.0677 1.0677 0 0 0-0.2832 0.03516l-6.5117 1.7441a1.0677 1.0677 0 0 0-0.75391 1.3086 1.0677 1.0677 0 0 0 1.3066 0.75586l6.5117-1.7461a1.0677 1.0677 0 0 0 0.75391-1.3066 1.0677 1.0677 0 0 0-1.0234-0.79102z"/>
+   <path d="m123.46 83.266a1.0677 1.0677 0 0 0-1.0508 0.79102 1.0677 1.0677 0 0 0 0.7539 1.3086l6.5117 1.7441a1.0677 1.0677 0 0 0 1.3066-0.75586 1.0677 1.0677 0 0 0-0.7539-1.3066l-6.5117-1.7441a1.0677 1.0677 0 0 0-0.25586-0.03711z"/>
+   <path d="m128.3 49.459a1.0677 1.0677 0 0 0-0.72461 0.31055l-4.7656 4.7656a1.0677 1.0677 0 0 0 0 1.5117 1.0677 1.0677 0 0 0 1.5098 0l4.7656-4.7656a1.0677 1.0677 0 0 0 0-1.5117 1.0677 1.0677 0 0 0-0.78515-0.31055z"/>
+   <path d="m114.37 94.203a1.0677 1.0677 0 0 0-0.28321 0.04687 1.0677 1.0677 0 0 0-0.70117 1.3379l1.3027 4.1777a1.0677 1.0677 0 0 0 1.3359 0.70118 1.0677 1.0677 0 0 0 0.70313-1.3359l-1.3027-4.1797a1.0677 1.0677 0 0 0-1.0547-0.74805z"/>
+   <path d="m123.16 91.996a1.0677 1.0677 0 0 0-0.72461 0.3125 1.0677 1.0677 0 0 0 0 1.5098l4.7656 4.7656a1.0677 1.0677 0 0 0 1.5098 0 1.0677 1.0677 0 0 0 0-1.5098l-4.7656-4.7656a1.0677 1.0677 0 0 0-0.78516-0.3125z"/>
+   <path d="m104.93 47.242a1.0677 1.0677 0 0 0-1.0684 1.0664v6.7402a1.0677 1.0677 0 0 0 1.0684 1.0684 1.0677 1.0677 0 0 0 1.0664-1.0684v-6.7402a1.0677 1.0677 0 0 0-1.0664-1.0664z"/>
+   <path d="m93.283 47.357a1.0677 1.0677 0 0 0-0.28516 0.03516 1.0677 1.0677 0 0 0-0.75391 1.3086l1.7441 6.5098a1.0677 1.0677 0 0 0 1.3086 0.75391 1.0677 1.0677 0 0 0 0.75391-1.3066l-1.7441-6.5098a1.0677 1.0677 0 0 0-1.0234-0.79102z"/>
+   <path d="m116.6 47.361a1.0677 1.0677 0 0 0-1.0508 0.79102l-1.7441 6.5098a1.0677 1.0677 0 0 0 0.75586 1.3066 1.0677 1.0677 0 0 0 1.3066-0.75391l1.7441-6.5098a1.0677 1.0677 0 0 0-0.7539-1.3086 1.0677 1.0677 0 0 0-0.25781-0.03516z"/>
+   <path d="m81.002 48.977a1.0677 1.0677 0 0 0-0.72461 0.3125 1.0677 1.0677 0 0 0 0 1.5098l4.7656 4.7656a1.0677 1.0677 0 0 0 1.5098 0 1.0677 1.0677 0 0 0 0-1.5098l-4.7656-4.7656a1.0677 1.0677 0 0 0-0.78516-0.3125z"/>
   </g>
   <path d="m89.938 59.432v10.852c3.4258-0.39375 6.9291 0.9376 7.9922 4.6094 0.40346-0.21278 0.35849-0.19025 0.44531-0.23633 8.3721-3.8563 11.803 4.5742 8.5703 9.4219 4.2397 0.20726 6.1905 2.2386 6.7266 4.4609h5.375v-29.107zm8.6211 15.486c-65.706-49.945-32.853-24.973 0 0z"/>
   <path d="m91.104 71.066c-1.1528-0.01129-2.3479 0.19839-3.4434 0.61524-2.1909 0.83369-3.8886 2.4144-4.3047 4.4219-0.41608 2.0074 0.34439 4.7108 3.793 8.0312a1.071 1.071 0 0 1 0.0293 1.5137 1.071 1.071 0 0 1-1.5137 0.0293c-1.2149-1.1697-2.1466-2.3208-2.8555-3.4453-4.7346-1.035-7.5122 0.63769-8.7578 3.0234-1.2206 2.3379-0.85898 5.4819 1.291 7.7988h36.109c0.84689-0.74667 1.5903-2.6029 1.1738-4.2891-0.41806-1.6926-1.724-3.2474-5.1953-3.5625-0.95461 1.2047-2.2927 2.1692-4.041 2.6699a1.071 1.071 0 0 1-1.3242-0.73438 1.071 1.071 0 0 1 0.73438-1.3242c1.4086-0.40342 2.4445-1.1778 3.1465-2.1387a1.071 1.071 0 0 1 0.2461-0.36523c1e-3 -2e-3 3e-3 -0.0039 4e-3 -0.0059 0.92582-1.506 1.1077-3.3797 0.65625-5.0039-0.3953-1.4223-1.2601-2.5773-2.5371-3.1543-1.2102-0.54682-2.8829-0.61578-5.123 0.33008 0.12671 0.75629 0.18427 1.5621 0.12695 2.4375a1.071 1.071 0 0 1-1.1387 0.99805 1.071 1.071 0 0 1-0.99805-1.1387c0.21826-3.3336-1.0422-5.0613-2.8906-5.9961-0.92423-0.46739-2.0347-0.69965-3.1875-0.71094z"/>
-  <path d="m86.346 96.055a1.071 1.071 0 0 0-0.87891 0.53516l-2.5059 4.3398a1.0711 1.0711 0 0 0 0.73242 1.5879l1.8926 0.35156-3.3848 5.8613a1.071 1.071 0 0 0 0.39258 1.4629 1.071 1.071 0 0 0 1.4629-0.39258l4.1406-7.1719a1.0711 1.0711 0 0 0-0.73242-1.5879l-1.8906-0.35157 1.748-3.0293a1.071 1.071 0 0 0-0.39258-1.4629 1.071 1.071 0 0 0-0.58398-0.14258z"
-        dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-  <path d="m101.81 96.055a1.071 1.071 0 0 0-0.8789 0.53516l-2.5059 4.3398a1.0711 1.0711 0 0 0 0.73242 1.5879l1.8926 0.35156-3.3848 5.8613a1.071 1.071 0 0 0 0.39258 1.4629 1.071 1.071 0 0 0 1.4629-0.39258l4.1406-7.1719a1.0711 1.0711 0 0 0-0.73243-1.5879l-1.8906-0.35157 1.748-3.0293a1.071 1.071 0 0 0-0.39258-1.4629 1.071 1.071 0 0 0-0.58399-0.14258z"
-        dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
+  <path d="m86.346 96.055a1.071 1.071 0 0 0-0.87891 0.53516l-2.5059 4.3398a1.0711 1.0711 0 0 0 0.73242 1.5879l1.8926 0.35156-3.3848 5.8613a1.071 1.071 0 0 0 0.39258 1.4629 1.071 1.071 0 0 0 1.4629-0.39258l4.1406-7.1719a1.0711 1.0711 0 0 0-0.73242-1.5879l-1.8906-0.35157 1.748-3.0293a1.071 1.071 0 0 0-0.39258-1.4629 1.071 1.071 0 0 0-0.58398-0.14258z"/>
+  <path d="m101.81 96.055a1.071 1.071 0 0 0-0.8789 0.53516l-2.5059 4.3398a1.0711 1.0711 0 0 0 0.73242 1.5879l1.8926 0.35156-3.3848 5.8613a1.071 1.071 0 0 0 0.39258 1.4629 1.071 1.071 0 0 0 1.4629-0.39258l4.1406-7.1719a1.0711 1.0711 0 0 0-0.73243-1.5879l-1.8906-0.35157 1.748-3.0293a1.071 1.071 0 0 0-0.39258-1.4629 1.071 1.071 0 0 0-0.58399-0.14258z"/>
  </g>
 </svg>
diff --git a/src/assets/icons/settings.svg b/src/assets/icons/settings.svg
index 92a1892..777ed37 100644
--- a/src/assets/icons/settings.svg
+++ b/src/assets/icons/settings.svg
@@ -5,9 +5,7 @@
   </g>
  </g>
  <g transform="translate(-1.9759 -2.1017)">
-  <path transform="scale(.75)" d="m157.58 3.8496c-23.877-4.7258-54.145 6.9326-67.816 27.07-10.455 15.4 13.18 42.8-0.10156 55.84-13.522 13.276-40.962-11.282-56.842-0.94141-20.884 13.598-34.17 44.463-29.105 68.863 3.8783 18.687 41.317 20.427 41.436 39.512 0.11742 18.852-36.923 21.016-40.441 39.537-4.5645 24.031 9.5938 53.49 30.008 66.965 15.287 10.091 41.768-11.772 54.943 0.95313 12.697 12.264-7.5852 38.581 2.7578 52.887 13.738 19.001 42.454 29.487 65.559 25.494 17-2.9376 21.893-33.853 39.145-33.857 17.243-4e-3 22.148 30.895 39.141 33.82 23.096 3.9759 51.774-6.5427 65.508-25.533 10.332-14.288-9.8705-40.567 2.8066-52.822 13.145-12.707 39.591 9.0337 54.838-1.0547 20.357-13.469 34.456-42.85 29.926-66.836-3.4901-18.481-40.368-20.734-40.25-39.541 0.11959-19.041 37.398-20.87 41.25-39.518 5.0316-24.361-8.195-55.153-29.025-68.75-15.839-10.339-43.245 14.09-56.736 0.83398-13.261-13.03 10.282-40.393-0.16211-55.773-13.666-20.125-43.888-31.821-67.754-27.113-18.015 3.5531-21.179 38.356-39.541 38.352-18.37-0.004206-21.521-34.82-39.541-38.387zm39.541 105.36c46.944 0 85 38.056 85 85s-38.056 85-85 85-85-38.056-85-85 38.056-85 85-85z" color="#000000"
-        dominant-baseline="auto" solid-color="#000000" stop-color="#000000" />
-  <path d="m147.84 81.887c-35.217 2e-6 -63.766 28.551-63.766 63.768 3e-6 35.217 28.549 63.766 63.766 63.766 35.212 0 63.757-28.54 63.766-63.75v-0.0156-0.0176c-0.01-35.209-28.555-63.75-63.766-63.75zm0 0.0332c35.194 0 63.725 28.525 63.734 63.717v0.0176 0.0156c-9e-3 35.192-28.54 63.717-63.734 63.717-35.2 0-63.734-28.533-63.734-63.732-1e-6 -35.2 28.535-63.734 63.734-63.734z" color="#000000"
-        dominant-baseline="auto" fill="#fff" opacity=".66452" solid-color="#000000" stop-color="#000000" />
+  <path transform="scale(.75)" d="m157.58 3.8496c-23.877-4.7258-54.145 6.9326-67.816 27.07-10.455 15.4 13.18 42.8-0.10156 55.84-13.522 13.276-40.962-11.282-56.842-0.94141-20.884 13.598-34.17 44.463-29.105 68.863 3.8783 18.687 41.317 20.427 41.436 39.512 0.11742 18.852-36.923 21.016-40.441 39.537-4.5645 24.031 9.5938 53.49 30.008 66.965 15.287 10.091 41.768-11.772 54.943 0.95313 12.697 12.264-7.5852 38.581 2.7578 52.887 13.738 19.001 42.454 29.487 65.559 25.494 17-2.9376 21.893-33.853 39.145-33.857 17.243-4e-3 22.148 30.895 39.141 33.82 23.096 3.9759 51.774-6.5427 65.508-25.533 10.332-14.288-9.8705-40.567 2.8066-52.822 13.145-12.707 39.591 9.0337 54.838-1.0547 20.357-13.469 34.456-42.85 29.926-66.836-3.4901-18.481-40.368-20.734-40.25-39.541 0.11959-19.041 37.398-20.87 41.25-39.518 5.0316-24.361-8.195-55.153-29.025-68.75-15.839-10.339-43.245 14.09-56.736 0.83398-13.261-13.03 10.282-40.393-0.16211-55.773-13.666-20.125-43.888-31.821-67.754-27.113-18.015 3.5531-21.179 38.356-39.541 38.352-18.37-0.004206-21.521-34.82-39.541-38.387zm39.541 105.36c46.944 0 85 38.056 85 85s-38.056 85-85 85-85-38.056-85-85 38.056-85 85-85z" color="#000000"/>
+  <path d="m147.84 81.887c-35.217 2e-6 -63.766 28.551-63.766 63.768 3e-6 35.217 28.549 63.766 63.766 63.766 35.212 0 63.757-28.54 63.766-63.75v-0.0156-0.0176c-0.01-35.209-28.555-63.75-63.766-63.75zm0 0.0332c35.194 0 63.725 28.525 63.734 63.717v0.0176 0.0156c-9e-3 35.192-28.54 63.717-63.734 63.717-35.2 0-63.734-28.533-63.734-63.732-1e-6 -35.2 28.535-63.734 63.734-63.734z" color="#000000" fill="#fff" opacity=".66452"/>
  </g>
 </svg>
diff --git a/src/components/SvgIcon.vue b/src/components/SvgIcon.vue
index a27f32b..a19b06d 100644
--- a/src/components/SvgIcon.vue
+++ b/src/components/SvgIcon.vue
@@ -17,7 +17,7 @@
 <template>
   <svg :class="className" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
     <title v-if="title">{{ title }}</title>
-    <use :xlink:href="iconPath" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+    <use :xlink:href="iconPath"/>
   </svg>
 </template>
 
diff --git a/src/components/map/MapContextMenu.vue b/src/components/map/MapContextMenu.vue
index b67d270..eb59e49 100644
--- a/src/components/map/MapContextMenu.vue
+++ b/src/components/map/MapContextMenu.vue
@@ -3,12 +3,14 @@
 		<div tabindex="0" ref="focusMover" class="focus-mover" aria-label="Context menu"></div>
 		<ul class="menu" role="menu">
 			<li role="none">
+				<!--suppress HtmlUnknownAttribute -->
 				<button type="button" role="menuitem" v-clipboard:copy="locationCopy"
 				        v-clipboard:success="copySuccess"
 				        v-clipboard:error="copyError">{{ locationLabel }}
 				</button>
 			</li>
 			<li role="none">
+				<!--suppress HtmlUnknownAttribute -->
 				<button type="button" role="menuitem"
 				        v-clipboard:copy="url"
 				        v-clipboard:success="copySuccess"
diff --git a/src/components/map/marker/GenericMarker.vue b/src/components/map/marker/GenericMarker.vue
deleted file mode 100644
index 7930121..0000000
--- a/src/components/map/marker/GenericMarker.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<!--
-  - Copyright 2020 James Lyne
-  -
-  -    Licensed under the Apache License, Version 2.0 (the "License");
-  -    you may not use this file except in compliance with the License.
-  -    You may obtain a copy of the License at
-  -
-  -      http://www.apache.org/licenses/LICENSE-2.0
-  -
-  -    Unless required by applicable law or agreed to in writing, software
-  -    distributed under the License is distributed on an "AS IS" BASIS,
-  -    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  -    See the License for the specific language governing permissions and
-  -    limitations under the License.
-  -->
-
-<script lang="ts">
-import {defineComponent, computed, ref} from "@vue/runtime-core";
-import {LayerGroup, Marker} from 'leaflet';
-import {DynmapMarker} from "@/dynmap";
-import {useStore} from "@/store";
-import {DynmapIcon} from "@/leaflet/icon/DynmapIcon";
-
-export default defineComponent({
-	props: {
-		options: {
-			type: Object as () => DynmapMarker,
-			required: true
-		},
-		layerGroup: {
-			type: Object as () => LayerGroup,
-			required: true
-		}
-	},
-
-	setup(props) {
-		const store = useStore(),
-			markerSettings = computed(() => store.state.components.markers),
-			currentProjection = computed(() => store.state.currentProjection),
-			projectedPosition = computed(() => store.state.currentProjection.locationToLatLng(props.options.location)),
-			visible = ref(false),
-
-			marker = undefined as Marker | undefined;
-
-		return {
-			marker,
-			visible,
-			projectedPosition,
-			markerSettings,
-			currentProjection,
-		}
-	},
-
-	watch: {
-		currentProjection() {
-			this.marker!.setLatLng(this.currentProjection.locationToLatLng(this.options.location));
-		}
-	},
-
-	mounted() {
-		this.marker = new Marker(this.currentProjection.locationToLatLng(this.options.location), {
-			icon: new DynmapIcon({
-				icon: this.options.icon,
-				label: this.options.label,
-				iconSize: this.options.dimensions,
-				showLabel: true,
-				isHtml: this.options.isHTML,
-			}),
-			// maxZoom: this.options.maxZoom,
-			// minZoom: this.options.minZoom,
-		});
-
-		this.layerGroup.addLayer(this.marker);
-	},
-
-	unmounted() {
-		if(this.marker) {
-			this.layerGroup.removeLayer(this.marker);
-		}
-	},
-
-	render() {
-		return null;
-	}
-})
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/dynmap.d.ts b/src/dynmap.d.ts
index 736f8ce..a1181d9 100644
--- a/src/dynmap.d.ts
+++ b/src/dynmap.d.ts
@@ -21,6 +21,7 @@ import {ClockControlOptions} from "@/leaflet/control/ClockControl";
 import {LiveAtlasMessageConfig} from "@/index";
 
 declare global {
+	// noinspection JSUnusedGlobalSymbols
 	interface Window {
 		config: { url: DynmapUrlConfig };
 		liveAtlasConfig: any,
diff --git a/src/index.d.ts b/src/index.d.ts
index 97a85e1..a71493d 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -1,4 +1,4 @@
-import {State, Store} from "@/store";
+import {State} from "@/store";
 import {DynmapUrlConfig} from "@/dynmap";
 
 declare module "*.png" {
@@ -12,13 +12,6 @@ declare module '*.vue' {
   export default component
 }
 
-declare module '@vue/runtime-core' {
-	// provide typings for `this.$store`
-	interface ComponentCustomProperties {
-		$store: Store<State>
-	}
-}
-
 interface LiveAtlasServerDefinition {
 	id: string
 	label?: string
diff --git a/src/leaflet/DynmapMap.ts b/src/leaflet/DynmapMap.ts
index 9ca6910..803445c 100644
--- a/src/leaflet/DynmapMap.ts
+++ b/src/leaflet/DynmapMap.ts
@@ -33,6 +33,7 @@ export default class DynmapMap extends Map {
 		return this._layerManager;
 	}
 
+	// noinspection JSUnusedGlobalSymbols
 	_initControlPos() {
 		const corners: any = this._controlCorners = {},
 			l = 'leaflet-',
@@ -52,8 +53,4 @@ export default class DynmapMap extends Map {
 		createCorner('bottom', 'left');
 		createCorner('bottom', 'right');
 	}
-
-	getUrl() {
-
-	}
 }
diff --git a/src/leaflet/control/ChatControl.ts b/src/leaflet/control/ChatControl.ts
index a7deb15..1a6a6e7 100644
--- a/src/leaflet/control/ChatControl.ts
+++ b/src/leaflet/control/ChatControl.ts
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-import {Control, ControlOptions, DomUtil, Map} from 'leaflet';
+import {Control, ControlOptions, DomUtil} from 'leaflet';
 import {useStore} from "@/store";
 import {MutationTypes} from "@/store/mutation-types";
 import {watch} from "@vue/runtime-core";
@@ -29,7 +29,7 @@ export class ChatControl extends Control {
 		super(options);
 	}
 
-	onAdd(map: Map) {
+	onAdd() {
 		const chatButton = DomUtil.create('button', 'leaflet-control-chat') as HTMLButtonElement;
 
 		chatButton.type = 'button';
diff --git a/src/leaflet/control/ClockControl.ts b/src/leaflet/control/ClockControl.ts
index 150b7c0..6ea9214 100644
--- a/src/leaflet/control/ClockControl.ts
+++ b/src/leaflet/control/ClockControl.ts
@@ -17,7 +17,7 @@
  *    limitations under the License.
  */
 
-import {ControlOptions, DomUtil, Util, Map, Control} from 'leaflet';
+import {ControlOptions, DomUtil, Util, Control} from 'leaflet';
 import {getMinecraftTime} from '@/util';
 import {DynmapWorldState} from "@/dynmap";
 
@@ -55,7 +55,7 @@ export class ClockControl extends Control {
 		Util.setOptions(this, options);
 	}
 
-	onAdd(map: Map) {
+	onAdd() {
 		const digital = !this.options.showTimeOfDay && !this.options.showWeather && this.options.showDigitalClock,
 			worldState = useStore().state.currentWorldState;
 
@@ -86,7 +86,7 @@ export class ClockControl extends Control {
 		return this._container;
 	}
 
-	onRemove(map: Map) {
+	onRemove() {
 		if(this._unwatchHandler) {
 			this._unwatchHandler();
 		}
diff --git a/src/leaflet/control/DynmapLayerControl.ts b/src/leaflet/control/DynmapLayerControl.ts
index 5278362..fe6cdc0 100644
--- a/src/leaflet/control/DynmapLayerControl.ts
+++ b/src/leaflet/control/DynmapLayerControl.ts
@@ -34,6 +34,7 @@ export class DynmapLayerControl extends Control.Layers {
 	private _layerPositions: Map<Layer, number>;
 
 	constructor(baseLayers?: LayersObject, overlays?: LayersObject, options?: LayersOptions) {
+		// noinspection JSUnusedGlobalSymbols
 		super(baseLayers, overlays, Object.assign(options, {
 			sortLayers: true,
 			sortFunction: (layer1: Layer, layer2: Layer, name1: string, name2: string) => {
@@ -103,6 +104,7 @@ export class DynmapLayerControl extends Control.Layers {
 		return super.removeLayer(layer);
 	}
 
+	// noinspection JSUnusedGlobalSymbols
 	_addItem(obj: any) {
 		const container = obj.overlay ? this._overlaysList : this._baseLayersList,
 			item = document.createElement('label'),
diff --git a/src/leaflet/control/LinkControl.ts b/src/leaflet/control/LinkControl.ts
index e312378..b90ffc4 100644
--- a/src/leaflet/control/LinkControl.ts
+++ b/src/leaflet/control/LinkControl.ts
@@ -17,7 +17,7 @@
  *    limitations under the License.
  */
 
-import {Control, ControlOptions, DomUtil, Map} from 'leaflet';
+import {Control, ControlOptions, DomUtil} from 'leaflet';
 import {useStore} from "@/store";
 import '@/assets/icons/link.svg';
 import { toClipboard } from '@soerenmartius/vue3-clipboard';
@@ -27,13 +27,11 @@ export class LinkControl extends Control {
 	// @ts-ignore
 	options: ControlOptions
 
-	private _map ?: Map;
-
 	constructor(options: ControlOptions) {
 		super(options);
 	}
 
-	onAdd(map: Map) {
+	onAdd() {
 		const linkButton = DomUtil.create('button', 'leaflet-control-link') as HTMLButtonElement;
 
 		linkButton.type = 'button';
diff --git a/src/leaflet/control/LoadingControl.ts b/src/leaflet/control/LoadingControl.ts
index e7d0b86..7c3c662 100644
--- a/src/leaflet/control/LoadingControl.ts
+++ b/src/leaflet/control/LoadingControl.ts
@@ -132,8 +132,8 @@ export class LoadingControl extends Control {
 		// Check for a target 'layer' that contains multiple layers, such as
 		// L.LayerGroup. This will happen if you have an L.LayerGroup in an
 		// L.Control.Layers.
-		if (e.layer && e.layer.eachLayer && typeof e.layer.eachLayer === 'function') {
-			e.layer.eachLayer((layer: Layer) => {
+		if (e.propagatedFrom && e.propagatedFrom.eachLayer && typeof e.propagatedFrom.eachLayer === 'function') {
+			e.propagatedFrom.eachLayer((layer: Layer) => {
 				this._handleBaseLayerChange({ layer: layer } as LeafletEvent);
 			});
 		}
@@ -153,35 +153,35 @@ export class LoadingControl extends Control {
 	}
 
 	_layerAdd(e: LeafletEvent) {
-		if(!(e.layer instanceof TileLayer)) {
+		if(!(e.propagatedFrom instanceof TileLayer)) {
 			return;
 		}
 
 		try {
-			if(e.layer.isLoading()) {
-				this.addLoader((e.layer as any)._leaflet_id);
+			if(e.propagatedFrom.isLoading()) {
+				this.addLoader((e.propagatedFrom as any)._leaflet_id);
 			}
 
-			e.layer.on('loading', this._handleLoading, this);
-			e.layer.on('load', this._handleLoad, this);
+			e.propagatedFrom.on('loading', this._handleLoading, this);
+			e.propagatedFrom.on('load', this._handleLoad, this);
 		} catch (exception) {
 			console.warn('L.Control.Loading: Tried and failed to add ' +
-				' event handlers to layer', e.layer);
+				' event handlers to layer', e.propagatedFrom);
 			console.warn('L.Control.Loading: Full details', exception);
 		}
 	}
 
 	_layerRemove(e: LeafletEvent) {
-		if(!(e.layer instanceof TileLayer)) {
+		if(!(e.propagatedFrom instanceof TileLayer)) {
 			return;
 		}
 
 		try {
-			e.layer.off('loading', this._handleLoading, this);
-			e.layer.off('load', this._handleLoad, this);
+			e.propagatedFrom.off('loading', this._handleLoading, this);
+			e.propagatedFrom.off('load', this._handleLoad, this);
 		} catch (exception) {
 			console.warn('L.Control.Loading: Tried and failed to remove ' +
-				'event handlers from layer', e.layer);
+				'event handlers from layer', e.propagatedFrom);
 			console.warn('L.Control.Loading: Full details', exception);
 		}
 	}
diff --git a/src/leaflet/control/LogoControl.ts b/src/leaflet/control/LogoControl.ts
index 63a53c0..ed29c8c 100644
--- a/src/leaflet/control/LogoControl.ts
+++ b/src/leaflet/control/LogoControl.ts
@@ -33,7 +33,7 @@ export class LogoControl extends Control {
 		super(options);
 	}
 
-	onAdd(map: L.Map) {
+	onAdd() {
 		const container = DomUtil.create('div', 'leaflet-control-logo');
 		let link;
 
diff --git a/src/leaflet/marker/GenericMarker.ts b/src/leaflet/marker/GenericMarker.ts
index 1e67e87..8edf062 100644
--- a/src/leaflet/marker/GenericMarker.ts
+++ b/src/leaflet/marker/GenericMarker.ts
@@ -27,6 +27,7 @@ export class GenericMarker extends Marker {
 		Util.setOptions(this, options);
 	}
 
+	// noinspection JSUnusedGlobalSymbols
 	_resetZIndex() {
 		//Don't change the zindex
 	}
diff --git a/src/leaflet/marker/PlayerMarker.ts b/src/leaflet/marker/PlayerMarker.ts
index 4f1ad11..bead04e 100644
--- a/src/leaflet/marker/PlayerMarker.ts
+++ b/src/leaflet/marker/PlayerMarker.ts
@@ -58,6 +58,7 @@ export class PlayerMarker extends Marker {
 		});
 	}
 
+	// noinspection JSUnusedGlobalSymbols
 	_resetZIndex() {
 		//Don't change the zindex
 	}
diff --git a/src/leaflet/projection/DynmapProjection.ts b/src/leaflet/projection/DynmapProjection.ts
index 109637b..8e08612 100644
--- a/src/leaflet/projection/DynmapProjection.ts
+++ b/src/leaflet/projection/DynmapProjection.ts
@@ -32,6 +32,7 @@ export interface DynmapProjection {
 	latLngToLocation(latLng: LatLng, y: number): Coordinate;
 }
 
+// noinspection JSUnusedGlobalSymbols
 export class DynmapProjection extends Class {
 
 	constructor(options: DynmapProjectionOptions) {
diff --git a/src/leaflet/tileLayer/DynmapTileLayer.ts b/src/leaflet/tileLayer/DynmapTileLayer.ts
index ba8b34f..b77295a 100644
--- a/src/leaflet/tileLayer/DynmapTileLayer.ts
+++ b/src/leaflet/tileLayer/DynmapTileLayer.ts
@@ -259,7 +259,7 @@ export class DynmapTileLayer extends TileLayer {
 		// zoomoutlevel: izoom < mapzoomin -> 0, else -> izoom - mapzoomin (which ranges from 0 till mapzoomout)
 		const izoom = this._getZoomForUrl(),
 			zoomoutlevel = Math.max(0, izoom - this._mapSettings.extraZoomLevels),
-			scale = 1 << zoomoutlevel,
+			scale = (1 << zoomoutlevel),
 			x = scale * coords.x,
 			y = scale * coords.y;