From edb9264d78b055f6a0e8f2a3fa0c16c69fa1ef27 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Mon, 28 Dec 2020 16:46:08 -0800
Subject: [PATCH] Many small fixes to theme & inline logo

---
 .../dashboard/dashboard.component.html        |  5 +-
 src-ui/src/assets/logo-dark.svg               | 96 +------------------
 src-ui/src/theme_dark.scss                    | 95 ++++++++++++++----
 3 files changed, 87 insertions(+), 109 deletions(-)

diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html
index 5b76dd242..50bd44a4e 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.html
+++ b/src-ui/src/app/components/dashboard/dashboard.component.html
@@ -1,5 +1,8 @@
 <app-page-header title="Dashboard" [subTitle]="subtitle" i18n-title>
-  <img src="assets/logo.svg" height="80" class="m-2 d-none d-md-block">
+  <svg class="logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2897.4 896.64" height="100%" width="auto">
+    <path class="leaf" d="M730.71,0C616.3,266.24,66.21,299.25,242.24,728.31c2.2,5.5-40.71,63.81-69.31,112.22-6.6-24.21-14.3-50.61-13.2-52.81C302.75,618.29,57.41,522.58,44.21,384-17.4,494-39.4,686.5,146.53,797.62c1.1,0,9.9,41.81,14.3,62.71-4.4,8.8-8.8,17.6-11,24.2-4.4,11,28.6,9.91,28.6,12.11,3.3-1.1,81.41-138.63,83.61-139.73C704.31,655.7,782.42,257.44,730.71,0ZM105.82,544.58C145.43,580.89,211.44,692,155.33,756.91,168.53,727.21,172.93,660.1,105.82,544.58ZM269.74,670C200.43,506.08,404,325.65,505.18,280.54,298.35,465.37,263.14,602.89,269.74,670Z" transform="translate(0)" style="fill:#17541f"/>
+    <path class="text" style="fill:#000" d="M1169.27,231.44q.7,17.06.71,38.73t-.71,38a112,112,0,0,1-6.76,38A100.16,100.16,0,0,1,1142.25,380a93.87,93.87,0,0,1-33.76,23.46q-20.25,8.54-46.56,8.53h-36.25V597.5q0,9.94,2.85,14.57c1.89,3.08,3.79,4.86,5.68,5.33a10.54,10.54,0,0,0,9.24,0v18.48h-86V617.4q5.68,2.13,8.53,0,3.56-.71,7.1-5.33t3.56-14.57V166q0-10.66-3.56-15.28t-7.1-6q-2.85-1.42-8.53,0V127.66h104.48q26.31,0,46.56,8.53a93.75,93.75,0,0,1,33.76,23.46,101,101,0,0,1,20.26,33.4A111.05,111.05,0,0,1,1169.27,231.44ZM1118.8,215.8q0-18.48-6-32t-14.22-21.32a74.68,74.68,0,0,0-17.06-12.44q-8.88-4.62-15.28-4.62h-40.52V392.79h40.52q6.39,0,15.28-3.56t17.06-12.44a86,86,0,0,0,14.22-21.67q6-12.8,6-32Zm337.63,389.52a27.35,27.35,0,0,1-2.85,11.72,40.58,40.58,0,0,1-8.17,11.38,54.8,54.8,0,0,1-13.5,9.59,40.07,40.07,0,0,1-18.84,4.27,60,60,0,0,1-30.57-7.82q-13.5-7.82-18.48-20.61a56.12,56.12,0,0,1-6.39-16.35q-9.24,19.18-28.08,32a72.42,72.42,0,0,1-41.58,12.8q-28.44,0-49.76-20.61-12.07-10.67-19.9-27.73t-9.24-39.09q-.71-2.13-.71-8.53v-.71a124.43,124.43,0,0,1,4.26-25.23,113.22,113.22,0,0,1,11-26.3,149.46,149.46,0,0,1,17.77-24.88,128.6,128.6,0,0,1,22.39-20.26,17.39,17.39,0,0,0,4.62-3.2,28.53,28.53,0,0,1,5.33-3.91l2.13-1.06,2.14-1.07q12.8-7.81,22.39-14.22t17.41-12.08a97.25,97.25,0,0,0,8.53-6.4c2.84-2.37,5.93-4.73,9.24-7.1a79.43,79.43,0,0,0,12.09-10,36.51,36.51,0,0,0,8.53-13.5q4.26-7.11,4.26-17.06a67.74,67.74,0,0,0-2.13-17.77,49.09,49.09,0,0,0-14.57-27q-11.73-11.37-26-14.93a38.26,38.26,0,0,0-12.08-2.13q-19.9,0-34.12,7.11-9.24,4.26-13.51,9.59t-4.62,10a10.73,10.73,0,0,0,1.78,7.46,12.91,12.91,0,0,0,5.69,4.26,6,6,0,0,0,1.78.71,6.28,6.28,0,0,1,1.77.72,32.21,32.21,0,0,1,15.28,12.43,34,34,0,0,1,6,19.55,32.78,32.78,0,0,1-32.7,32.7,33.53,33.53,0,0,1-24.17-9.6,30.94,30.94,0,0,1-10-23.1,106.83,106.83,0,0,1,3.2-25.23,84.65,84.65,0,0,1,9.6-23.81q13.5-19.91,32.34-28.79a96.24,96.24,0,0,1,41.58-8.89,93.82,93.82,0,0,1,33.76,6.4,96.18,96.18,0,0,1,29.86,18.13,103.38,103.38,0,0,1,22,28.07q8.88,16.35,8.88,37.68v209q0,12.79.36,16.7t.36,5.34h0q0,9.24,5.68,14.92a18.45,18.45,0,0,0,13.51,5.69q9.24,0,14.92-5.33a20.62,20.62,0,0,0,6.4-13.86Zm-111.6-17.77a52.58,52.58,0,0,0,6.76-21.33q1.07-11.37,1.06-21.32V413.4a63.92,63.92,0,0,1-6,5.33,74,74,0,0,0-6.75,6q-20.62,14.93-35.19,27.37a164.06,164.06,0,0,0-24.52,25.59,113,113,0,0,0-15.64,28.07,121,121,0,0,0-7.11,34.12v10.67q.72,27,14.58,42.29t39.44,15.28a38.56,38.56,0,0,0,20.62-5.69q9.24-6.39,12.79-14.92Zm244.52-304.23q40.51.72,64.68,24.53t24.17,75.7V542.77q0,51.88-24.17,75.34T1589.35,643h-2.13a80.27,80.27,0,0,1-22-2.84h-.71a.63.63,0,0,1-.71-.71,91.74,91.74,0,0,1-28.43-15.64l-6.76-6.76-5.33-7.46v118q0,10,2.85,14.58c1.89,3.08,3.79,5.09,5.68,6a10.54,10.54,0,0,0,9.24,0V766h-86V748.19q5.68,2.13,8.53,0,3.56-1.43,6.75-6t3.2-14.58V326.68q0-9.94-3.2-14.57t-6.75-6q-2.85-1.43-8.53,0V289h68.23v27.72a68.68,68.68,0,0,1,12.09-14.21,75.62,75.62,0,0,1,28.43-15.64.63.63,0,0,1,.71-.71h.71a90.55,90.55,0,0,1,22-2.85Zm35.54,84.59v-.71q-.72-36.26-8.89-51.18t-26.65-16.35a63.12,63.12,0,0,0-24.17,3.2,48,48,0,0,0-19.9,13.15q-8.54,9.24-14.22,24.88t-7.82,37V548.45q2.13,22,7.82,37.32t14.22,24.17a53.23,53.23,0,0,0,19.9,13.15,58.92,58.92,0,0,0,24.17,3.55q18.48-1.42,26.65-16.35t8.89-51.18V367.91Zm179.83-84.59a105.36,105.36,0,0,1,33.41,5.69,86.38,86.38,0,0,1,30.56,17.77,88.06,88.06,0,0,1,21.68,30.57q8.18,18.48,8.18,44.06v90.28H1757.1V544.9q0,44.07,15.28,62.9t38,18.13a113.94,113.94,0,0,0,26.65-4.62,54.83,54.83,0,0,0,22.75-13.15q9.59-9.24,16-26.3t6.4-44.78h16.35V547a153.56,153.56,0,0,1-4.27,36.61A72,72,0,0,1,1852,634.1q-16.71,7.47-40.87,8.18a102.25,102.25,0,0,1-34.83-6.4,96,96,0,0,1-32-19.19,108.91,108.91,0,0,1-23.45-30.21q-9.24-17.41-9.25-39.45v-16.7s-.11-9.12-.35-27.37-.36-29.5-.36-33.76-.11-16-.35-35.19-.36-29.49-.36-30.92v-21q0-25.59,8.89-44.43t22-30.56A90.72,90.72,0,0,1,1771,289.37a98.55,98.55,0,0,1,33.76-6.05Zm46.2,169.89V397.05q0-27-3.55-45.13t-9.6-29.15q-6-11-14.57-15.28a42.36,42.36,0,0,0-19.19-4.26q-22.76,0-34.48,19.9t-11.72,73.92v56.16Zm279.35-113.73a42.31,42.31,0,0,0,.71,5.68,17.92,17.92,0,0,1,0,7.11q-.72,14.93-10.31,24.52a33,33,0,0,1-46.91-.35,33.52,33.52,0,0,1-9.6-24.17q0-17.76,13.51-27a8.33,8.33,0,0,0,1.77-1.06l1.07-1.07a16.22,16.22,0,0,0,6.4-10.31q1.41-6.75-8.53-11.73a26.26,26.26,0,0,0-12.8-3.55q-21.32-1.43-37.67,12.8t-22,49.75V597.5q0,9.94,2.84,14.57t5.69,5.33a10.54,10.54,0,0,0,9.24,0v18.48h-86V617.4q5.68,2.13,8.53,0,3.55-.71,7.11-5.33t3.55-14.57V326.68q0-9.94-3.55-14.57t-7.11-6q-2.85-1.43-8.53,0V288.3h68.24v29.14q5-7.81,9.95-14.57a48.44,48.44,0,0,1,11.72-11.37,59.79,59.79,0,0,1,15.64-7.46q8.89-2.85,22.39-2.85,20.61,0,38.39,14.93t26.3,43.36Zm95.95,258q0,9.94,3.2,14.57c2.13,3.08,4.15,4.86,6,5.33q3.55,2.13,9.24,0v18.48h-86V617.4q5.68,2.13,10,0,2.13-.71,5.69-5.33t3.55-14.57V166.75q0-10.65-3.55-15.28a28.82,28.82,0,0,0-5.69-6q-4.26-2.13-10,0V128.37h67.52V597.5Zm154.25-314.18a105.25,105.25,0,0,1,33.4,5.69,86.33,86.33,0,0,1,30.57,17.77,88.19,88.19,0,0,1,21.68,30.57q8.18,18.48,8.17,44.06v90.28H2332.84V544.9q0,44.07,15.29,62.9t38,18.13a113.93,113.93,0,0,0,26.66-4.62,54.79,54.79,0,0,0,22.74-13.15q9.6-9.24,16-26.3t6.39-44.78h16.35V547a153.56,153.56,0,0,1-4.26,36.61,72,72,0,0,1-42.29,50.46q-16.71,7.47-40.88,8.18a102.24,102.24,0,0,1-34.82-6.4,96,96,0,0,1-32-19.19,108.94,108.94,0,0,1-23.46-30.21q-9.24-17.41-9.24-39.45v-16.7s-.12-9.12-.35-27.37-.36-29.5-.36-33.76-.12-16-.35-35.19-.36-29.49-.36-30.92v-21q0-25.59,8.89-44.43t22-30.56a90.78,90.78,0,0,1,29.85-17.77,98.6,98.6,0,0,1,33.77-6.05Zm46.2,169.89V397.05q0-27-3.56-45.13t-9.59-29.15q-6-11-14.57-15.28a42.39,42.39,0,0,0-19.19-4.26q-22.76,0-34.48,19.9t-11.73,73.92v56.16Zm213.24,178.41c-.48.47-.83.71-1.07.71s-.59.23-1.06.71l-.71.71c-1,.47-2,1-3.2,1.42s-2.25,1-3.2,1.42q-14.93,6.4-34.83,6.4a48.79,48.79,0,0,1-22-5.33q-10.65-5.34-18.48-8.89t-13.15-3.2q-5.33.36-5.33,10.31h-13.5V550.59h17.06q-1.43,22.74,5,39.09,4.27,14.22,16.71,26.65t37.31,12.44q16.35,0,27-5.68,18.48-9.24,25.24-22A45.92,45.92,0,0,0,2657,574.4q-1.42-13.86-10.31-27.37A126,126,0,0,0,2625,522.15q-8.52-6.39-17.77-13.5t-18.48-14.93q-24.87-19.91-39.45-35.89T2526.89,428a98.76,98.76,0,0,1-10.66-26.3,119.09,119.09,0,0,1-2.84-26.65,106,106,0,0,1,1.06-15.64q1.07-7.11,2.49-12.79a102.69,102.69,0,0,1,7.11-23.46,63,63,0,0,1,14.21-20.26A73.7,73.7,0,0,1,2561,288.3q13.5-5.69,32.7-5.69a53.27,53.27,0,0,1,21.32,4.62q10.66,4.62,19.19,8.53t13.51,3.56q5-.36,5-11h13.51v88.14h-18.48q.7-21.33-5-38.38a67,67,0,0,0-17.41-27Q2612.89,299,2588.73,299q-19.18,0-31.27,8.53-6.4,5-11,14.57a55.84,55.84,0,0,0-5.33,21,66.08,66.08,0,0,0,3.55,24.52q4.26,13.15,17.06,24.53a21.32,21.32,0,0,0,3.91,4.26,26.5,26.5,0,0,0,5.33,3.56,23,23,0,0,1,3.56,2.84l2.84,2.84q7.82,6.41,16,12.8t16.71,12.79a449.06,449.06,0,0,1,33.05,30.92,276.13,276.13,0,0,1,22,25.94,104.57,104.57,0,0,1,13.15,22.75,69,69,0,0,1,5,20.61q7.11,32.7-2.49,55.09t-24.52,35.19h-.71a1.26,1.26,0,0,1-1.43,1.42,11,11,0,0,1-2.84,2.13l-4.26,2.84-4.27,2.13v.72a3.1,3.1,0,0,0-1.42.35,3.12,3.12,0,0,1-1.42.36Zm211.11,0c-.48.47-.83.71-1.07.71s-.59.23-1.07.71l-.71.71c-.94.47-2,1-3.2,1.42s-2.25,1-3.19,1.42Q2826.84,643,2807,643a48.76,48.76,0,0,1-22-5.33q-10.66-5.34-18.48-8.89t-13.15-3.2q-5.33.36-5.33,10.31h-13.51V550.59h17.06q-1.41,22.74,5,39.09,4.26,14.22,16.7,26.65t37.32,12.44q16.35,0,27-5.68,18.48-9.24,25.23-22a45.93,45.93,0,0,0,5.34-26.65q-1.42-13.86-10.31-27.37a126,126,0,0,0-21.68-24.88q-8.53-6.39-17.77-13.5t-18.48-14.93q-24.89-19.91-39.45-35.89T2738,428a98.76,98.76,0,0,1-10.66-26.3,119.08,119.08,0,0,1-2.85-26.65,105.9,105.9,0,0,1,1.07-15.64q1.07-7.11,2.49-12.79a102.69,102.69,0,0,1,7.11-23.46,62.83,62.83,0,0,1,14.21-20.26,73.58,73.58,0,0,1,22.75-14.57q13.5-5.69,32.69-5.69a53.28,53.28,0,0,1,21.33,4.62q10.67,4.62,19.19,8.53t13.5,3.56q5-.36,5-11h13.51v88.14h-18.49q.72-21.33-5-38.38a67,67,0,0,0-17.42-27Q2824,299,2799.84,299q-19.2,0-31.28,8.53-6.39,5-11,14.57a56,56,0,0,0-5.34,21,66.3,66.3,0,0,0,3.56,24.52q4.26,13.15,17.06,24.53a21.32,21.32,0,0,0,3.91,4.26,26.22,26.22,0,0,0,5.33,3.56,22.83,22.83,0,0,1,3.55,2.84l2.85,2.84q7.82,6.41,16,12.8t16.7,12.79a445,445,0,0,1,33.05,30.92,274.85,274.85,0,0,1,22,25.94,105,105,0,0,1,13.15,22.75,68.69,68.69,0,0,1,5,20.61q7.11,32.7-2.48,55.09t-24.53,35.19h-.71a1.26,1.26,0,0,1-1.42,1.42,11.2,11.2,0,0,1-2.84,2.13l-4.27,2.84-4.26,2.13v.72a3.1,3.1,0,0,0-1.42.35,3.15,3.15,0,0,1-1.42.36Z" transform="translate(0)"/>
+  </svg>
 </app-page-header>
 
 <div class='row'>
diff --git a/src-ui/src/assets/logo-dark.svg b/src-ui/src/assets/logo-dark.svg
index bc8ba2b80..111d8d32f 100644
--- a/src-ui/src/assets/logo-dark.svg
+++ b/src-ui/src/assets/logo-dark.svg
@@ -1,93 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="2897.3997"
-   height="896.63574"
-   id="svg14314"
-   sodipodi:docname="logo-dark.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata14320">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs14318" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     id="namedview14316"
-     showgrid="false"
-     inkscape:zoom="0.46439736"
-     inkscape:cx="1179.9546"
-     inkscape:cy="327.93662"
-     inkscape:window-x="1280"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg14314"
-     inkscape:document-rotation="0" />
-  <g
-     transform="matrix(10.638298,0,0,10.638298,-106.38296,-106.38298)"
-     id="g14312"
-     inkscape:label="g14312">
-    <defs
-       id="SvgjsDefs1018" />
-    <g
-       id="SvgjsG1019"
-       featureKey="root"
-       fill="#ffffff" />
-    <g
-       id="SvgjsG1020"
-       featureKey="symbol1"
-       fill="#ffffff"
-       transform="matrix(0.10341565,0,0,0.10341565,1.2287665,8.3453496)">
-      <defs
-         id="defs14302" />
-      <g
-         id="g14306">
-        <path
-           style="fill:#17541f"
-           d="M 231,798 C 227,779 219,741 218,741 49,640 69,465 125,365 c 12,126 235,213 105,367 -1,2 6,26 12,48 26,-44 65,-97 63,-102 C 145,288 645,258 749,16 c 47,234 -24,596 -426,688 -2,1 -73,126 -76,127 0,-2 -30,-1 -26,-11 2,-6 6,-14 10,-22 z"
-           id="path14304" />
-      </g>
-      <path
-         style="fill:#ffffff"
-         d="M 544,271 C 452,312 267,476 330,625 324,564 356,439 544,271 Z"
-         id="path57" />
-      <path
-         style="fill:#ffffff"
-         d="m 226,704 c 51,-59 -9,-160 -45,-193 61,105 57,166 45,193 z"
-         id="path59" />
-    </g>
-    <g
-       id="SvgjsG1021"
-       featureKey="text1"
-       fill="#ffffff"
-       transform="matrix(3.3407567,0,0,3.3407567,98.195992,2.9576938)">
-      <path
-         d="m 6.5,8.62 q 0.02,0.48 0.02,1.09 0,0.61 -0.02,1.07 0,0.54 -0.19,1.07 Q 6.12,12.38 5.74,12.8 5.36,13.22 4.79,13.46 4.22,13.7 3.48,13.7 H 2.46 v 5.22 q 0,0.28 0.08,0.41 0.08,0.13 0.16,0.15 0.12,0.06 0.26,0 V 20 H 0.54 v -0.52 q 0.16,0.06 0.24,0 0.1,-0.02 0.2,-0.15 0.1,-0.13 0.1,-0.41 V 6.78 Q 1.08,6.48 0.98,6.35 0.88,6.22 0.78,6.18 0.7,6.14 0.54,6.18 V 5.7 H 3.48 Q 4.22,5.7 4.79,5.94 5.36,6.18 5.74,6.6 6.12,7.02 6.31,7.54 6.5,8.06 6.5,8.62 Z M 5.08,8.18 Q 5.08,7.66 4.91,7.28 4.74,6.9 4.51,6.68 4.28,6.46 4.03,6.33 3.78,6.2 3.6,6.2 H 2.46 v 6.96 H 3.6 q 0.18,0 0.43,-0.1 0.25,-0.1 0.48,-0.35 0.23,-0.25 0.4,-0.61 0.17,-0.36 0.17,-0.9 z m 9.5,10.96 q 0,0.16 -0.08,0.33 -0.08,0.17 -0.23,0.32 -0.15,0.15 -0.38,0.27 -0.23,0.12 -0.53,0.12 -0.48,0 -0.86,-0.22 -0.38,-0.22 -0.52,-0.58 -0.12,-0.2 -0.18,-0.46 -0.26,0.54 -0.79,0.9 -0.53,0.36 -1.17,0.36 -0.8,0 -1.4,-0.58 Q 8.1,19.3 7.88,18.82 7.66,18.34 7.62,17.72 7.6,17.66 7.6,17.48 v -0.02 q 0.02,-0.34 0.12,-0.71 0.1,-0.37 0.31,-0.74 0.21,-0.37 0.5,-0.7 Q 8.82,14.98 9.16,14.74 9.24,14.7 9.29,14.65 9.34,14.6 9.44,14.54 L 9.5,14.51 9.56,14.48 q 0.36,-0.22 0.63,-0.4 0.27,-0.18 0.49,-0.34 0.12,-0.08 0.24,-0.18 0.12,-0.1 0.26,-0.2 0.18,-0.12 0.34,-0.28 0.16,-0.16 0.24,-0.38 0.12,-0.2 0.12,-0.48 0,-0.28 -0.06,-0.5 -0.08,-0.44 -0.41,-0.76 -0.33,-0.32 -0.73,-0.42 -0.18,-0.06 -0.34,-0.06 -0.56,0 -0.96,0.2 Q 9.12,10.8 9,10.95 8.88,11.1 8.87,11.23 q -0.01,0.13 0.05,0.21 0.06,0.08 0.16,0.12 0.04,0.02 0.05,0.02 0.01,0 0.05,0.02 0.26,0.1 0.43,0.35 0.17,0.25 0.17,0.55 0,0.38 -0.27,0.65 -0.27,0.27 -0.65,0.27 -0.4,0 -0.68,-0.27 Q 7.9,12.88 7.9,12.5 q 0,-0.34 0.09,-0.71 0.09,-0.37 0.27,-0.67 0.38,-0.56 0.91,-0.81 0.53,-0.25 1.17,-0.25 0.48,0 0.95,0.18 0.47,0.18 0.84,0.51 0.37,0.33 0.62,0.79 Q 13,12 13,12.6 v 5.88 q 0,0.36 0.01,0.47 0.01,0.11 0.01,0.15 v 0 q 0,0.26 0.16,0.42 0.16,0.16 0.38,0.16 0.26,0 0.42,-0.15 0.16,-0.15 0.18,-0.39 z m -3.14,-0.5 q 0.16,-0.28 0.19,-0.6 0.03,-0.32 0.03,-0.6 v -3.7 q -0.08,0.08 -0.17,0.15 -0.09,0.07 -0.19,0.17 -0.58,0.42 -0.99,0.77 -0.41,0.35 -0.69,0.72 -0.28,0.37 -0.44,0.79 -0.16,0.42 -0.2,0.96 v 0.3 q 0.02,0.76 0.41,1.19 0.39,0.43 1.11,0.43 0.32,0 0.58,-0.16 0.26,-0.18 0.36,-0.42 z m 6.88,-8.56 q 1.14,0.02 1.82,0.69 0.68,0.67 0.68,2.13 v 4.48 q 0,1.46 -0.68,2.12 -0.68,0.66 -1.82,0.7 h -0.06 q -0.34,0 -0.62,-0.08 h -0.02 q -0.02,0 -0.02,-0.02 -0.46,-0.16 -0.8,-0.44 l -0.19,-0.19 q 0,0 -0.15,-0.21 v 3.32 q 0,0.28 0.08,0.41 0.08,0.13 0.16,0.17 0.12,0.06 0.26,0 v 0.5 h -2.42 v -0.5 q 0.16,0.06 0.24,0 0.1,-0.04 0.19,-0.17 0.09,-0.13 0.09,-0.41 V 11.3 q 0,-0.28 -0.09,-0.41 -0.09,-0.13 -0.19,-0.17 -0.08,-0.04 -0.24,0 v -0.48 h 1.92 v 0.78 q 0.14,-0.22 0.34,-0.4 0.34,-0.3 0.8,-0.44 0,-0.02 0.02,-0.02 h 0.02 q 0.32,-0.08 0.62,-0.08 z m 1,2.38 V 12.44 Q 19.3,11.42 19.07,11 q -0.23,-0.42 -0.75,-0.46 -0.36,-0.02 -0.68,0.09 -0.32,0.11 -0.56,0.37 -0.24,0.26 -0.4,0.7 -0.16,0.44 -0.22,1.04 v 4.8 q 0.06,0.62 0.22,1.05 0.16,0.43 0.4,0.68 0.24,0.25 0.56,0.37 0.32,0.12 0.68,0.1 0.52,-0.04 0.75,-0.46 0.23,-0.42 0.25,-1.44 v -0.02 z m 5.06,-2.38 q 0.46,0 0.94,0.16 0.48,0.16 0.86,0.5 0.38,0.34 0.61,0.86 0.23,0.52 0.23,1.24 v 2.02 0.06 0.46 h -3.98 v 2.06 q 0,1.24 0.43,1.77 0.43,0.53 1.07,0.51 0.38,-0.02 0.75,-0.13 0.37,-0.11 0.64,-0.37 0.27,-0.26 0.45,-0.74 0.18,-0.48 0.18,-1.26 h 0.46 v 0.28 q 0,0.54 -0.12,1.03 -0.12,0.49 -0.42,0.85 -0.3,0.36 -0.77,0.57 -0.47,0.21 -1.15,0.23 -0.48,0 -0.98,-0.18 -0.5,-0.18 -0.9,-0.54 -0.4,-0.36 -0.66,-0.85 -0.26,-0.49 -0.26,-1.11 v -0.47 q 0,0 -0.01,-0.77 -0.01,-0.77 -0.01,-0.95 0,-0.18 -0.01,-0.99 -0.01,-0.81 -0.01,-0.87 v -0.59 q 0,-0.72 0.25,-1.25 0.25,-0.53 0.62,-0.86 0.37,-0.33 0.84,-0.5 0.47,-0.17 0.95,-0.17 z m 1.3,4.78 v -1.58 q 0,-0.76 -0.1,-1.27 -0.1,-0.51 -0.27,-0.82 -0.17,-0.31 -0.41,-0.43 -0.24,-0.12 -0.54,-0.12 -0.64,0 -0.97,0.56 -0.33,0.56 -0.33,2.08 v 1.58 z m 7.86,-3.2 q 0,0.04 0.02,0.16 0.02,0.12 0,0.2 -0.02,0.42 -0.29,0.69 -0.27,0.27 -0.65,0.27 -0.4,0 -0.67,-0.28 -0.27,-0.28 -0.27,-0.68 0,-0.5 0.38,-0.76 0.04,-0.02 0.05,-0.03 l 0.03,-0.03 q 0.14,-0.1 0.18,-0.29 0.04,-0.19 -0.24,-0.33 -0.18,-0.1 -0.36,-0.1 -0.6,-0.04 -1.06,0.36 -0.46,0.4 -0.62,1.4 v 6.68 q 0,0.28 0.08,0.41 0.08,0.13 0.16,0.15 0.12,0.06 0.26,0 V 20 h -2.42 v -0.52 q 0.16,0.06 0.24,0 0.1,-0.02 0.2,-0.15 0.1,-0.13 0.1,-0.41 V 11.3 q 0,-0.28 -0.1,-0.41 -0.1,-0.13 -0.2,-0.17 -0.08,-0.04 -0.24,0 v -0.5 h 1.92 v 0.82 q 0.14,-0.22 0.28,-0.41 0.14,-0.19 0.33,-0.32 0.19,-0.13 0.44,-0.21 0.25,-0.08 0.63,-0.08 0.58,0 1.08,0.42 0.5,0.42 0.74,1.22 z m 2.7,7.26 q 0,0.28 0.09,0.41 0.09,0.13 0.17,0.15 0.1,0.06 0.26,0 V 20 h -2.42 v -0.52 q 0.16,0.06 0.28,0 0.06,-0.02 0.16,-0.15 0.1,-0.13 0.1,-0.41 V 6.8 q 0,-0.3 -0.1,-0.43 Q 34.68,6.24 34.62,6.2 34.5,6.14 34.34,6.2 V 5.72 h 1.9 V 6.8 Z m 4.34,-8.84 q 0.46,0 0.94,0.16 0.48,0.16 0.86,0.5 0.38,0.34 0.61,0.86 0.23,0.52 0.23,1.24 v 2.02 0.06 0.46 h -3.98 v 2.06 q 0,1.24 0.43,1.77 0.43,0.53 1.07,0.51 0.38,-0.02 0.75,-0.13 0.37,-0.11 0.64,-0.37 0.27,-0.26 0.45,-0.74 0.18,-0.48 0.18,-1.26 h 0.46 v 0.28 q 0,0.54 -0.12,1.03 -0.12,0.49 -0.42,0.85 -0.3,0.36 -0.77,0.57 -0.47,0.21 -1.15,0.23 -0.48,0 -0.98,-0.18 -0.5,-0.18 -0.9,-0.54 -0.4,-0.36 -0.66,-0.85 -0.26,-0.49 -0.26,-1.11 v -0.47 q 0,0 -0.01,-0.77 -0.01,-0.77 -0.01,-0.95 0,-0.18 -0.01,-0.99 -0.01,-0.81 -0.01,-0.87 v -0.59 q 0,-0.72 0.25,-1.25 0.25,-0.53 0.62,-0.86 0.37,-0.33 0.84,-0.5 0.47,-0.17 0.95,-0.17 z m 1.3,4.78 v -1.58 q 0,-0.76 -0.1,-1.27 -0.1,-0.51 -0.27,-0.82 -0.17,-0.31 -0.41,-0.43 -0.24,-0.12 -0.54,-0.12 -0.64,0 -0.97,0.56 -0.33,0.56 -0.33,2.08 v 1.58 z m 6,5.02 q -0.02,0.02 -0.03,0.02 -0.01,0 -0.03,0.02 l -0.02,0.02 q -0.04,0.02 -0.09,0.04 -0.05,0.02 -0.09,0.04 -0.42,0.18 -0.98,0.18 -0.32,0 -0.62,-0.15 Q 45.72,19.9 45.5,19.8 45.28,19.7 45.13,19.71 44.98,19.72 44.98,20 H 44.6 v -2.4 h 0.48 q -0.04,0.64 0.14,1.1 0.12,0.4 0.47,0.75 0.35,0.35 1.05,0.35 0.46,0 0.76,-0.16 0.52,-0.26 0.71,-0.62 0.19,-0.36 0.15,-0.75 -0.04,-0.39 -0.29,-0.77 -0.25,-0.38 -0.61,-0.7 -0.24,-0.18 -0.5,-0.38 -0.26,-0.2 -0.52,-0.42 -0.7,-0.56 -1.11,-1.01 -0.41,-0.45 -0.63,-0.84 -0.22,-0.39 -0.3,-0.74 -0.08,-0.35 -0.08,-0.75 0,-0.24 0.03,-0.44 0.03,-0.2 0.07,-0.36 0.06,-0.34 0.2,-0.66 0.14,-0.32 0.4,-0.57 0.26,-0.25 0.64,-0.41 0.38,-0.16 0.92,-0.16 0.3,0 0.6,0.13 0.3,0.13 0.54,0.24 0.24,0.11 0.38,0.1 0.14,-0.01 0.14,-0.31 h 0.38 V 12.7 H 48.1 q 0.02,-0.6 -0.14,-1.08 -0.14,-0.42 -0.49,-0.76 -0.35,-0.34 -1.03,-0.34 -0.54,0 -0.88,0.24 -0.18,0.14 -0.31,0.41 -0.13,0.27 -0.15,0.59 -0.02,0.32 0.1,0.69 0.12,0.37 0.48,0.69 0.04,0.06 0.11,0.12 0.07,0.06 0.15,0.1 0.06,0.04 0.1,0.08 l 0.08,0.08 q 0.22,0.18 0.45,0.36 0.23,0.18 0.47,0.36 0.56,0.48 0.93,0.87 0.37,0.39 0.62,0.73 0.25,0.34 0.37,0.64 0.12,0.3 0.14,0.58 0.2,0.92 -0.07,1.55 -0.27,0.63 -0.69,0.99 h -0.02 q 0,0.04 -0.04,0.04 -0.04,0.04 -0.08,0.06 l -0.12,0.08 q 0,0 -0.12,0.06 v 0.02 q -0.02,0 -0.04,0.01 -0.02,0.01 -0.04,0.01 z m 5.94,0 q -0.02,0.02 -0.03,0.02 -0.01,0 -0.03,0.02 l -0.02,0.02 q -0.04,0.02 -0.09,0.04 -0.05,0.02 -0.09,0.04 -0.42,0.18 -0.98,0.18 -0.32,0 -0.62,-0.15 -0.3,-0.15 -0.52,-0.25 -0.22,-0.1 -0.37,-0.09 -0.15,0.01 -0.15,0.29 h -0.38 v -2.4 h 0.48 q -0.04,0.64 0.14,1.1 0.12,0.4 0.47,0.75 0.35,0.35 1.05,0.35 0.46,0 0.76,-0.16 0.52,-0.26 0.71,-0.62 0.19,-0.36 0.15,-0.75 -0.04,-0.39 -0.29,-0.77 -0.25,-0.38 -0.61,-0.7 -0.24,-0.18 -0.5,-0.38 -0.26,-0.2 -0.52,-0.42 -0.7,-0.56 -1.11,-1.01 -0.41,-0.45 -0.63,-0.84 -0.22,-0.39 -0.3,-0.74 -0.08,-0.35 -0.08,-0.75 0,-0.24 0.03,-0.44 0.03,-0.2 0.07,-0.36 0.06,-0.34 0.2,-0.66 0.14,-0.32 0.4,-0.57 0.26,-0.25 0.64,-0.41 0.38,-0.16 0.92,-0.16 0.3,0 0.6,0.13 0.3,0.13 0.54,0.24 0.24,0.11 0.38,0.1 0.14,-0.01 0.14,-0.31 h 0.38 v 2.48 h -0.52 q 0.02,-0.6 -0.14,-1.08 -0.14,-0.42 -0.49,-0.76 -0.35,-0.34 -1.03,-0.34 -0.54,0 -0.88,0.24 -0.18,0.14 -0.31,0.41 -0.13,0.27 -0.15,0.59 -0.02,0.32 0.1,0.69 0.12,0.37 0.48,0.69 0.04,0.06 0.11,0.12 0.07,0.06 0.15,0.1 0.06,0.04 0.1,0.08 l 0.08,0.08 q 0.22,0.18 0.45,0.36 0.23,0.18 0.47,0.36 0.56,0.48 0.93,0.87 0.37,0.39 0.62,0.73 0.25,0.34 0.37,0.64 0.12,0.3 0.14,0.58 0.2,0.92 -0.07,1.55 -0.27,0.63 -0.69,0.99 h -0.02 q 0,0.04 -0.04,0.04 -0.04,0.04 -0.08,0.06 l -0.12,0.08 q 0,0 -0.12,0.06 v 0.02 q -0.02,0 -0.04,0.01 -0.02,0.01 -0.04,0.01 z"
-         id="path14309" />
-    </g>
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2897.4 896.64">
+  <path d="M160.83,860.33c-4.4-20.9-13.2-62.71-14.3-62.71C-39.4,686.5-17.4,494,44.21,384c13.2,138.62,258.54,234.33,115.52,403.76-1.1,2.2,6.6,28.6,13.2,52.81,28.6-48.41,71.51-106.72,69.31-112.22C66.21,299.25,616.3,266.24,730.71,0,782.42,257.44,704.31,655.7,262,756.91c-2.2,1.1-80.31,138.63-83.61,139.73,0-2.2-33-1.1-28.6-12.11C152,877.93,156.43,869.13,160.83,860.33Z" transform="translate(0 0)" style="fill:#17541f"/><path d="M505.18,280.54C404,325.65,200.43,506.08,269.74,670,263.14,602.89,298.35,465.37,505.18,280.54Z" transform="translate(0 0)" style="fill:#fff"/>
+  <path d="M155.33,756.91c56.11-64.91-9.9-176-49.51-212.33C172.93,660.1,168.53,727.21,155.33,756.91Z" transform="translate(0 0)" style="fill:#fff"/>
+  <path d="M1169.27,231.44q.7,17.06.71,38.73t-.71,38a112,112,0,0,1-6.76,38A100.16,100.16,0,0,1,1142.25,380a93.87,93.87,0,0,1-33.76,23.46q-20.25,8.54-46.56,8.53h-36.25V597.5q0,9.94,2.85,14.57c1.89,3.08,3.79,4.86,5.68,5.33a10.54,10.54,0,0,0,9.24,0v18.48h-86V617.4q5.68,2.13,8.53,0,3.56-.71,7.1-5.33t3.56-14.57V166q0-10.66-3.56-15.28t-7.1-6q-2.85-1.42-8.53,0V127.66h104.48q26.31,0,46.56,8.53a93.75,93.75,0,0,1,33.76,23.46,101,101,0,0,1,20.26,33.4A111.05,111.05,0,0,1,1169.27,231.44ZM1118.8,215.8q0-18.48-6-32t-14.22-21.32a74.68,74.68,0,0,0-17.06-12.44q-8.88-4.62-15.28-4.62h-40.52V392.79h40.52q6.39,0,15.28-3.56t17.06-12.44a86,86,0,0,0,14.22-21.67q6-12.8,6-32Zm337.63,389.52a27.35,27.35,0,0,1-2.85,11.72,40.58,40.58,0,0,1-8.17,11.38,54.8,54.8,0,0,1-13.5,9.59,40.07,40.07,0,0,1-18.84,4.27,60,60,0,0,1-30.57-7.82q-13.5-7.82-18.48-20.61a56.12,56.12,0,0,1-6.39-16.35q-9.24,19.18-28.08,32a72.42,72.42,0,0,1-41.58,12.8q-28.44,0-49.76-20.61-12.07-10.67-19.9-27.73t-9.24-39.09q-.71-2.13-.71-8.53v-.71a124.43,124.43,0,0,1,4.26-25.23,113.22,113.22,0,0,1,11-26.3,149.46,149.46,0,0,1,17.77-24.88,128.6,128.6,0,0,1,22.39-20.26,17.39,17.39,0,0,0,4.62-3.2,28.53,28.53,0,0,1,5.33-3.91l2.13-1.06,2.14-1.07q12.8-7.81,22.39-14.22t17.41-12.08a97.25,97.25,0,0,0,8.53-6.4c2.84-2.37,5.93-4.73,9.24-7.1a79.43,79.43,0,0,0,12.09-10,36.51,36.51,0,0,0,8.53-13.5q4.26-7.11,4.26-17.06a67.74,67.74,0,0,0-2.13-17.77,49.09,49.09,0,0,0-14.57-27q-11.73-11.37-26-14.93a38.26,38.26,0,0,0-12.08-2.13q-19.9,0-34.12,7.11-9.24,4.26-13.51,9.59t-4.62,10a10.73,10.73,0,0,0,1.78,7.46,12.91,12.91,0,0,0,5.69,4.26,6,6,0,0,0,1.78.71,6.28,6.28,0,0,1,1.77.72,32.21,32.21,0,0,1,15.28,12.43,34,34,0,0,1,6,19.55,32.78,32.78,0,0,1-32.7,32.7,33.53,33.53,0,0,1-24.17-9.6,30.94,30.94,0,0,1-10-23.1,106.83,106.83,0,0,1,3.2-25.23,84.65,84.65,0,0,1,9.6-23.81q13.5-19.91,32.34-28.79a96.24,96.24,0,0,1,41.58-8.89,93.82,93.82,0,0,1,33.76,6.4,96.18,96.18,0,0,1,29.86,18.13,103.38,103.38,0,0,1,22,28.07q8.88,16.35,8.88,37.68v209q0,12.79.36,16.7t.36,5.34h0q0,9.24,5.68,14.92a18.45,18.45,0,0,0,13.51,5.69q9.24,0,14.92-5.33a20.62,20.62,0,0,0,6.4-13.86Zm-111.6-17.77a52.58,52.58,0,0,0,6.76-21.33q1.07-11.37,1.06-21.32V413.4a63.92,63.92,0,0,1-6,5.33,74,74,0,0,0-6.75,6q-20.62,14.93-35.19,27.37a164.06,164.06,0,0,0-24.52,25.59,113,113,0,0,0-15.64,28.07,121,121,0,0,0-7.11,34.12v10.67q.72,27,14.58,42.29t39.44,15.28a38.56,38.56,0,0,0,20.62-5.69q9.24-6.39,12.79-14.92Zm244.52-304.23q40.51.72,64.68,24.53t24.17,75.7V542.77q0,51.88-24.17,75.34T1589.35,643h-2.13a80.27,80.27,0,0,1-22-2.84h-.71a.63.63,0,0,1-.71-.71,91.74,91.74,0,0,1-28.43-15.64l-6.76-6.76-5.33-7.46v118q0,10,2.85,14.58c1.89,3.08,3.79,5.09,5.68,6a10.54,10.54,0,0,0,9.24,0V766h-86V748.19q5.68,2.13,8.53,0,3.56-1.43,6.75-6t3.2-14.58V326.68q0-9.94-3.2-14.57t-6.75-6q-2.85-1.43-8.53,0V289h68.23v27.72a68.68,68.68,0,0,1,12.09-14.21,75.62,75.62,0,0,1,28.43-15.64.63.63,0,0,1,.71-.71h.71a90.55,90.55,0,0,1,22-2.85Zm35.54,84.59v-.71q-.72-36.26-8.89-51.18t-26.65-16.35a63.12,63.12,0,0,0-24.17,3.2,48,48,0,0,0-19.9,13.15q-8.54,9.24-14.22,24.88t-7.82,37V548.45q2.13,22,7.82,37.32t14.22,24.17a53.23,53.23,0,0,0,19.9,13.15,58.92,58.92,0,0,0,24.17,3.55q18.48-1.42,26.65-16.35t8.89-51.18V367.91Zm179.83-84.59a105.36,105.36,0,0,1,33.41,5.69,86.38,86.38,0,0,1,30.56,17.77,88.06,88.06,0,0,1,21.68,30.57q8.18,18.48,8.18,44.06v90.28H1757.1V544.9q0,44.07,15.28,62.9t38,18.13a113.94,113.94,0,0,0,26.65-4.62,54.83,54.83,0,0,0,22.75-13.15q9.59-9.24,16-26.3t6.4-44.78h16.35V547a153.56,153.56,0,0,1-4.27,36.61A72,72,0,0,1,1852,634.1q-16.71,7.47-40.87,8.18a102.25,102.25,0,0,1-34.83-6.4,96,96,0,0,1-32-19.19,108.91,108.91,0,0,1-23.45-30.21q-9.24-17.41-9.25-39.45v-16.7s-.11-9.12-.35-27.37-.36-29.5-.36-33.76-.11-16-.35-35.19-.36-29.49-.36-30.92v-21q0-25.59,8.89-44.43t22-30.56A90.72,90.72,0,0,1,1771,289.37a98.55,98.55,0,0,1,33.76-6.05Zm46.2,169.89V397.05q0-27-3.55-45.13t-9.6-29.15q-6-11-14.57-15.28a42.36,42.36,0,0,0-19.19-4.26q-22.76,0-34.48,19.9t-11.72,73.92v56.16Zm279.35-113.73a42.31,42.31,0,0,0,.71,5.68,17.92,17.92,0,0,1,0,7.11q-.72,14.93-10.31,24.52a33,33,0,0,1-46.91-.35,33.52,33.52,0,0,1-9.6-24.17q0-17.76,13.51-27a8.33,8.33,0,0,0,1.77-1.06l1.07-1.07a16.22,16.22,0,0,0,6.4-10.31q1.41-6.75-8.53-11.73a26.26,26.26,0,0,0-12.8-3.55q-21.32-1.43-37.67,12.8t-22,49.75V597.5q0,9.94,2.84,14.57t5.69,5.33a10.54,10.54,0,0,0,9.24,0v18.48h-86V617.4q5.68,2.13,8.53,0,3.55-.71,7.11-5.33t3.55-14.57V326.68q0-9.94-3.55-14.57t-7.11-6q-2.85-1.43-8.53,0V288.3h68.24v29.14q5-7.81,9.95-14.57a48.44,48.44,0,0,1,11.72-11.37,59.79,59.79,0,0,1,15.64-7.46q8.89-2.85,22.39-2.85,20.61,0,38.39,14.93t26.3,43.36Zm95.95,258q0,9.94,3.2,14.57c2.13,3.08,4.15,4.86,6,5.33q3.55,2.13,9.24,0v18.48h-86V617.4q5.68,2.13,10,0,2.13-.71,5.69-5.33t3.55-14.57V166.75q0-10.65-3.55-15.28a28.82,28.82,0,0,0-5.69-6q-4.26-2.13-10,0V128.37h67.52V597.5Zm154.25-314.18a105.25,105.25,0,0,1,33.4,5.69,86.33,86.33,0,0,1,30.57,17.77,88.19,88.19,0,0,1,21.68,30.57q8.18,18.48,8.17,44.06v90.28H2332.84V544.9q0,44.07,15.29,62.9t38,18.13a113.93,113.93,0,0,0,26.66-4.62,54.79,54.79,0,0,0,22.74-13.15q9.6-9.24,16-26.3t6.39-44.78h16.35V547a153.56,153.56,0,0,1-4.26,36.61,72,72,0,0,1-42.29,50.46q-16.71,7.47-40.88,8.18a102.24,102.24,0,0,1-34.82-6.4,96,96,0,0,1-32-19.19,108.94,108.94,0,0,1-23.46-30.21q-9.24-17.41-9.24-39.45v-16.7s-.12-9.12-.35-27.37-.36-29.5-.36-33.76-.12-16-.35-35.19-.36-29.49-.36-30.92v-21q0-25.59,8.89-44.43t22-30.56a90.78,90.78,0,0,1,29.85-17.77,98.6,98.6,0,0,1,33.77-6.05Zm46.2,169.89V397.05q0-27-3.56-45.13t-9.59-29.15q-6-11-14.57-15.28a42.39,42.39,0,0,0-19.19-4.26q-22.76,0-34.48,19.9t-11.73,73.92v56.16Zm213.24,178.41c-.48.47-.83.71-1.07.71s-.59.23-1.06.71l-.71.71c-1,.47-2,1-3.2,1.42s-2.25,1-3.2,1.42q-14.93,6.4-34.83,6.4a48.79,48.79,0,0,1-22-5.33q-10.65-5.34-18.48-8.89t-13.15-3.2q-5.33.36-5.33,10.31h-13.5V550.59h17.06q-1.43,22.74,5,39.09,4.27,14.22,16.71,26.65t37.31,12.44q16.35,0,27-5.68,18.48-9.24,25.24-22A45.92,45.92,0,0,0,2657,574.4q-1.42-13.86-10.31-27.37A126,126,0,0,0,2625,522.15q-8.52-6.39-17.77-13.5t-18.48-14.93q-24.87-19.91-39.45-35.89T2526.89,428a98.76,98.76,0,0,1-10.66-26.3,119.09,119.09,0,0,1-2.84-26.65,106,106,0,0,1,1.06-15.64q1.07-7.11,2.49-12.79a102.69,102.69,0,0,1,7.11-23.46,63,63,0,0,1,14.21-20.26A73.7,73.7,0,0,1,2561,288.3q13.5-5.69,32.7-5.69a53.27,53.27,0,0,1,21.32,4.62q10.66,4.62,19.19,8.53t13.51,3.56q5-.36,5-11h13.51v88.14h-18.48q.7-21.33-5-38.38a67,67,0,0,0-17.41-27Q2612.89,299,2588.73,299q-19.18,0-31.27,8.53-6.4,5-11,14.57a55.84,55.84,0,0,0-5.33,21,66.08,66.08,0,0,0,3.55,24.52q4.26,13.15,17.06,24.53a21.32,21.32,0,0,0,3.91,4.26,26.5,26.5,0,0,0,5.33,3.56,23,23,0,0,1,3.56,2.84l2.84,2.84q7.82,6.41,16,12.8t16.71,12.79a449.06,449.06,0,0,1,33.05,30.92,276.13,276.13,0,0,1,22,25.94,104.57,104.57,0,0,1,13.15,22.75,69,69,0,0,1,5,20.61q7.11,32.7-2.49,55.09t-24.52,35.19h-.71a1.26,1.26,0,0,1-1.43,1.42,11,11,0,0,1-2.84,2.13l-4.26,2.84-4.27,2.13v.72a3.1,3.1,0,0,0-1.42.35,3.12,3.12,0,0,1-1.42.36Zm211.11,0c-.48.47-.83.71-1.07.71s-.59.23-1.07.71l-.71.71c-.94.47-2,1-3.2,1.42s-2.25,1-3.19,1.42Q2826.84,643,2807,643a48.76,48.76,0,0,1-22-5.33q-10.66-5.34-18.48-8.89t-13.15-3.2q-5.33.36-5.33,10.31h-13.51V550.59h17.06q-1.41,22.74,5,39.09,4.26,14.22,16.7,26.65t37.32,12.44q16.35,0,27-5.68,18.48-9.24,25.23-22a45.93,45.93,0,0,0,5.34-26.65q-1.42-13.86-10.31-27.37a126,126,0,0,0-21.68-24.88q-8.53-6.39-17.77-13.5t-18.48-14.93q-24.89-19.91-39.45-35.89T2738,428a98.76,98.76,0,0,1-10.66-26.3,119.08,119.08,0,0,1-2.85-26.65,105.9,105.9,0,0,1,1.07-15.64q1.07-7.11,2.49-12.79a102.69,102.69,0,0,1,7.11-23.46,62.83,62.83,0,0,1,14.21-20.26,73.58,73.58,0,0,1,22.75-14.57q13.5-5.69,32.69-5.69a53.28,53.28,0,0,1,21.33,4.62q10.67,4.62,19.19,8.53t13.5,3.56q5-.36,5-11h13.51v88.14h-18.49q.72-21.33-5-38.38a67,67,0,0,0-17.42-27Q2824,299,2799.84,299q-19.2,0-31.28,8.53-6.39,5-11,14.57a56,56,0,0,0-5.34,21,66.3,66.3,0,0,0,3.56,24.52q4.26,13.15,17.06,24.53a21.32,21.32,0,0,0,3.91,4.26,26.22,26.22,0,0,0,5.33,3.56,22.83,22.83,0,0,1,3.55,2.84l2.85,2.84q7.82,6.41,16,12.8t16.7,12.79a445,445,0,0,1,33.05,30.92,274.85,274.85,0,0,1,22,25.94,105,105,0,0,1,13.15,22.75,68.69,68.69,0,0,1,5,20.61q7.11,32.7-2.48,55.09t-24.53,35.19h-.71a1.26,1.26,0,0,1-1.42,1.42,11.2,11.2,0,0,1-2.84,2.13l-4.27,2.84-4.26,2.13v.72a3.1,3.1,0,0,0-1.42.35,3.15,3.15,0,0,1-1.42.36Z" transform="translate(0 0)"/>
 </svg>
diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss
index 0603ce4cb..7cb195911 100644
--- a/src-ui/src/theme_dark.scss
+++ b/src-ui/src/theme_dark.scss
@@ -18,34 +18,65 @@ $border-color-dark-mode: #47494f;
     color: $text-color-dark-mode;
   }
 
+  svg.logo {
+    .leaf {
+      color: $primary-dark-mode !important;
+    }
+    .text {
+      fill: $text-color-dark-mode !important;
+    }
+  }
+
   .bg-light {
     background-color: $bg-light-dark-mode !important;
 
     a,
     div {
-      color: $text-color-dark-mode !important;
+      color: $text-color-dark-mode;
     }
   }
 
-  .border,
-  .border-bottom,
-  .border-left,
-  .border-right {
+  .border {
     border-color: $border-color-dark-mode !important;
   }
 
-  .nav-link.active {
-    background-color: $bg-dark-mode;
-    color: $text-color-dark-mode;
-    border-color: $border-color-dark-mode $border-color-dark-mode $bg-dark-mode;
+  .border-right {
+    border-right: 1px solid $border-color-dark-mode !important;
   }
 
-  .nav-link:hover {
-    border-color: $border-color-dark-mode $border-color-dark-mode $bg-dark-mode;
+  .border-left {
+    border-left: 1px solid $border-color-dark-mode !important;
+  }
+
+  .border-bottom {
+    border-bottom: 1px solid $border-color-dark-mode !important;
+  }
+
+  .nav-link {
+    color: $text-color-dark-mode !important;
+
+    &.active {
+      background-color: $bg-dark-mode;
+      color: $text-color-dark-mode;
+      border-color: $border-color-dark-mode $border-color-dark-mode $bg-dark-mode;
+    }
+
+    &:hover {
+      color: $text-color-dark-mode-accent !important;
+      border-color: $border-color-dark-mode $border-color-dark-mode $bg-dark-mode;
+    }
   }
 
   .nav-tabs {
     border-color: $border-color-dark-mode;
+
+    .nav-link {
+      color: $primary-dark-mode !important;
+
+      &.active {
+        color: $text-color-dark-mode !important;
+      }
+    }
   }
 
   .dropdown-menu {
@@ -77,6 +108,10 @@ $border-color-dark-mode: #47494f;
     }
   }
 
+  .text-dark {
+    color: $text-color-dark-mode !important;
+  }
+
   .modal-content, .modal-header, .modal-body, .modal-footer {
     background-color: $bg-light-dark-mode;
     border-color: $border-color-dark-mode;
@@ -93,15 +128,20 @@ $border-color-dark-mode: #47494f;
 
   .doc-img-container {
     border: none !important;
-    border-radius: .25rem;
+    border-top-left-radius: .25rem;
+    border-top-right-radius: .25rem;
     overflow: hidden;
   }
 
   .doc-img {
     mix-blend-mode: normal;
     filter: invert(95%) hue-rotate(180deg);
-    border-color: $border-color-dark-mode;
     border-radius: 0;
+    border-color: $bg-dark-mode;
+
+    &.border-right {
+      border-right: none !important;
+    }
   }
 
   .card-selected .doc-img {
@@ -116,14 +156,23 @@ $border-color-dark-mode: #47494f;
     background-color: opacify($bg-dark-mode, .85);
   }
 
-  a:hover {
-    color: lighten($primary, 10%);
+  a {
+    color: $primary-dark-mode;
+
+    &:hover {
+      color: lighten($primary, 10%);
+    }
   }
 
   table {
-    background-color: $bg-dark-mode;
+    background-color: $bg-light-dark-mode;
     color: $text-color-dark-mode;
     border-color: $border-color-dark-mode;
+
+    tr:hover {
+      background-color: $bg-light-dark-mode;
+      color: $text-color-dark-mode-accent;
+    }
   }
 
   .table td,
@@ -136,6 +185,7 @@ $border-color-dark-mode: #47494f;
   }
 
   .close {
+    color: $text-color-dark-mode;
     text-shadow: 0 1px 0 #666;
   }
 
@@ -168,6 +218,15 @@ $border-color-dark-mode: #47494f;
     }
   }
 
+  .btn-outline-dark {
+    border-color: $border-color-dark-mode;
+    color: $text-color-dark-mode;
+
+    &:hover {
+      color: $text-color-dark-mode-accent;
+    }
+  }
+
   .btn-link:not(:disabled):not(.disabled) {
     color: $primary-dark-mode;
   }
@@ -254,6 +313,10 @@ $border-color-dark-mode: #47494f;
     border-color: $border-color-dark-mode;
     color: $text-color-dark-mode-accent;
   }
+
+  .progress {
+    background-color: $border-color-dark-mode;
+  }
 }
 
 body.dark-mode {