From b255fa8d6e7afce01937c643c49b85a1e310ea5e Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Mon, 6 Nov 2017 13:45:14 -0500
Subject: [PATCH] Started adding the possibility to customize colors, app name

---
 app/admin.py                              |  11 +-
 app/boot.py                               |  24 +-
 app/models/__init__.py                    |   3 +
 app/models/setting.py                     |  30 ++
 app/models/theme.py                       |  31 ++
 app/static/app/android-chrome-192x192.png | Bin 2360 -> 0 bytes
 app/static/app/android-chrome-512x512.png | Bin 10524 -> 0 bytes
 app/static/app/apple-touch-icon.png       | Bin 2363 -> 0 bytes
 app/static/app/browserconfig.xml          |   9 -
 app/static/app/css/main.scss              |   6 -
 app/static/app/favicon-16x16.png          | Bin 383 -> 0 bytes
 app/static/app/favicon-32x32.png          | Bin 561 -> 0 bytes
 app/static/app/favicon.ico                | Bin 15086 -> 0 bytes
 app/static/app/img/logo36.png             | Bin 1332 -> 0 bytes
 app/static/app/js/MapView.jsx             |   2 +-
 app/static/app/manifest.json              |  17 -
 app/static/app/mstile-150x150.png         | Bin 1521 -> 0 bytes
 app/static/app/safari-pinned-tab.svg      | 448 ----------------------
 app/templates/app/base.html               |  25 +-
 app/templatetags/settings.py              |  16 +
 nginx/nginx.conf                          |   8 +
 requirements.txt                          |   4 +
 webodm/settings.py                        |   2 +
 webodm/urls.py                            |  15 +-
 24 files changed, 152 insertions(+), 499 deletions(-)
 create mode 100644 app/models/setting.py
 create mode 100644 app/models/theme.py
 delete mode 100644 app/static/app/android-chrome-192x192.png
 delete mode 100644 app/static/app/android-chrome-512x512.png
 delete mode 100644 app/static/app/apple-touch-icon.png
 delete mode 100644 app/static/app/browserconfig.xml
 delete mode 100644 app/static/app/favicon-16x16.png
 delete mode 100644 app/static/app/favicon-32x32.png
 delete mode 100644 app/static/app/favicon.ico
 delete mode 100644 app/static/app/img/logo36.png
 delete mode 100644 app/static/app/manifest.json
 delete mode 100644 app/static/app/mstile-150x150.png
 delete mode 100644 app/static/app/safari-pinned-tab.svg
 create mode 100644 app/templatetags/settings.py

diff --git a/app/admin.py b/app/admin.py
index ef34ef52..be7e5e83 100644
--- a/app/admin.py
+++ b/app/admin.py
@@ -2,7 +2,7 @@ from django.contrib import admin
 from guardian.admin import GuardedModelAdmin
 
 from app.models import Preset
-from .models import Project, Task, ImageUpload
+from .models import Project, Task, ImageUpload, Setting, Theme
 
 admin.site.register(Project, GuardedModelAdmin)
 
@@ -17,3 +17,12 @@ admin.site.register(ImageUpload, ImageUploadAdmin)
 
 admin.site.register(Preset, admin.ModelAdmin)
 
+
+class SettingAdmin(admin.ModelAdmin):
+    def has_add_permission(self, request):
+        # if there's already an entry, do not allow adding
+        count = Setting.objects.all().count()
+        return count == 0
+
+admin.site.register(Setting, SettingAdmin)
+admin.site.register(Theme, admin.ModelAdmin)
\ No newline at end of file
diff --git a/app/boot.py b/app/boot.py
index 5b82a32a..63085ae5 100644
--- a/app/boot.py
+++ b/app/boot.py
@@ -1,15 +1,20 @@
+import os
+
 from django.contrib.auth.models import Permission
 from django.contrib.auth.models import User, Group
 from django.core.exceptions import ObjectDoesNotExist
+from django.core.files import File
 from django.db.utils import ProgrammingError
 from guardian.shortcuts import assign_perm
 
 from app.models import Preset
+from app.models import Theme
 from nodeodm.models import ProcessingNode
 # noinspection PyUnresolvedReferences
+from webodm.settings import MEDIA_ROOT
 from . import scheduler, signals
 import logging
-from .models import Task
+from .models import Task, Setting
 from webodm import settings
 from webodm.wsgi import booted
 
@@ -65,6 +70,23 @@ def boot():
                                                         ])
         Preset.objects.get_or_create(name='Default', system=True, options=[{'name': 'dsm', 'value': True}])
 
+        # Add settings
+        Setting.objects.all().delete()
+        Theme.objects.all().delete()
+
+        default_theme, created = Theme.objects.get_or_create(name='Default')
+        if created:
+            logger.info("Created default theme")
+
+        if Setting.objects.all().count() == 0:
+            s = Setting.objects.create(
+                    app_name='WebODM',
+                    theme=default_theme)
+            default_logo = os.path.join('app', 'static', 'app', 'img', 'logo512.png')
+            s.app_logo.save(os.path.basename(default_logo), File(open(default_logo, 'rb')))
+
+            logger.info("Created settings")
+
         # Unlock any Task that might have been locked
         Task.objects.filter(processing_lock=True).update(processing_lock=False)
 
diff --git a/app/models/__init__.py b/app/models/__init__.py
index 184de3f5..7b510c73 100644
--- a/app/models/__init__.py
+++ b/app/models/__init__.py
@@ -2,3 +2,6 @@ from .image_upload import ImageUpload, image_directory_path
 from .project import Project
 from .task import Task, validate_task_options, gcp_directory_path
 from .preset import Preset
+from .theme import Theme
+from .setting import Setting
+
diff --git a/app/models/setting.py b/app/models/setting.py
new file mode 100644
index 00000000..164cf4a2
--- /dev/null
+++ b/app/models/setting.py
@@ -0,0 +1,30 @@
+import logging
+
+from django.db import models
+from imagekit.models import ImageSpecField
+from imagekit.processors import ResizeToFit
+
+from .theme import Theme
+
+logger = logging.getLogger('app.logger')
+
+
+class Setting(models.Model):
+    app_name = models.CharField(max_length=255, blank=False, null=False, help_text="The name of your application")
+    app_logo = models.ImageField(upload_to="settings/", blank=False, null=False, help_text="A 512x512 logo of your application (.png or .jpeg)")
+    app_logo_36 = ImageSpecField(source='app_logo',
+                                      processors=[ResizeToFit(36, 36)],
+                                      format='PNG',
+                                      options={'quality': 90})
+    app_logo_favicon = ImageSpecField(source='app_logo',
+                                      processors=[ResizeToFit(48, 48)],
+                                      format='PNG',
+                                      options={'quality': 90})
+
+    organization_name = models.CharField(max_length=255, blank=True, null=True, help_text="The name of your organization")
+    organization_website = models.URLField(max_length=255, blank=True, null=True, help_text="The website URL of your organization")
+    theme = models.ForeignKey(Theme, blank=False, null=False, on_delete=models.DO_NOTHING,
+                              help_text="Active theme")
+
+    def __str__(self):
+        return "Application"
\ No newline at end of file
diff --git a/app/models/theme.py b/app/models/theme.py
new file mode 100644
index 00000000..a315083e
--- /dev/null
+++ b/app/models/theme.py
@@ -0,0 +1,31 @@
+import logging
+
+from django.db import models
+from colorfield.fields import ColorField
+
+logger = logging.getLogger('app.logger')
+
+class Theme(models.Model):
+    name = models.CharField(max_length=255, blank=False, null=False, help_text="Name of theme")
+
+    # Similar to how discourse.org does it
+    primary = ColorField(default='#2c3e50', help_text="Most text, icons, and borders.")
+    secondary = ColorField(default='#ffffff', help_text="The main background color, and text color of some buttons.")
+    tertiary = ColorField(default='#18bc9c', help_text="Navigation links.")
+
+    button_primary = ColorField(default='#2c3e50', help_text="Primary button color.")
+    button_default = ColorField(default='#95a5a6', help_text="Default button color.")
+    button_danger = ColorField(default='#95a5a6', help_text="Delete button color.")
+
+    header_background = ColorField(default='#18bc9c', help_text="Background color of the site's header.")
+    header_primary = ColorField(default='#ffffff', help_text="Text and icons in the site's header.")
+    highlight = ColorField(default='#f7f7f7', help_text="The background color of panels.")
+
+    dialog_warning = ColorField(default='#f39c12', help_text="The border color of warning dialogs.")
+
+    failed = ColorField(default='#ffcbcb', help_text="The background color of failed notifications.")
+    success = ColorField(default='#cbffcd', help_text="The background color of success notifications.")
+
+    def __str__(self):
+        return self.name
+
diff --git a/app/static/app/android-chrome-192x192.png b/app/static/app/android-chrome-192x192.png
deleted file mode 100644
index c047cd29471149703d273145f7872071acc53098..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2360
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

diff --git a/app/static/app/android-chrome-512x512.png b/app/static/app/android-chrome-512x512.png
deleted file mode 100644
index 2b0ceb364b0556c00b18f42e26b3ccf7a0eb3216..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10524
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
Ur!Jdzc?GzyWvE%9j(G9^05s*h<p2Nx

diff --git a/app/static/app/apple-touch-icon.png b/app/static/app/apple-touch-icon.png
deleted file mode 100644
index 00f374c7f9a8ac68702fe62a3d1de77e8459d749..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2363
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

diff --git a/app/static/app/browserconfig.xml b/app/static/app/browserconfig.xml
deleted file mode 100644
index 658b5609..00000000
--- a/app/static/app/browserconfig.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-  <msapplication>
-    <tile>
-      <square150x150logo src="/static/app/mstile-150x150.png"/>
-      <TileColor>#00aba9</TileColor>
-    </tile>
-  </msapplication>
-</browserconfig>
diff --git a/app/static/app/css/main.scss b/app/static/app/css/main.scss
index c81fea74..47ae9281 100644
--- a/app/static/app/css/main.scss
+++ b/app/static/app/css/main.scss
@@ -218,9 +218,3 @@ button i.glyphicon{
 	top: 0px;
 	left: 50px;
 }
-
-.navbar-link {
-	position: absolute;
-	top: 0px;
-}
-
diff --git a/app/static/app/favicon-16x16.png b/app/static/app/favicon-16x16.png
deleted file mode 100644
index 4d107580e6635fa3b00fb921b2ed7a6df862e58c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<Nq6*hWMJ6X&;2Kn7072S4sv&5
zSa(k5C6J>Y;1lBNcXq4%!Nn%WR%Kj0P<`vf*4Gc_J-Igd;l(vC?i_mebkCc|cfWq*
z+dH>mb;Dwy7M_wIzu>?B{{8v$`wtNR{xhAc|0z(Mv%n*=n1LY$$V_2iyyYaj4#-OL
zba4#fxSniL?D6r8q~cs-p7u>nm3%FFmlFlFMdFsEYRo%vK&yD!k-ujSGO+a-r^m#c
zo0FMv;gRKy1B%57f`=cfip}0RdvA`!xee;Yd1l%c%?SsVHgqu`=z4hTA={y~4bfc1
zYz&dLW)pc1eBTbVF}x}yq9iD>T%n*SKP@vSRiUJ^AXOo=pd^`rp<>SCPdprjVHz5z
z{7;|pd>X{Stjw*K%q^@e>^)h8Sy;iP!Q^lXv-0K;h0`~#oH%mkh|Cf8(+wUAy!04e
Xi3^r|ax$F?w1UCY)z4*}Q$iB}gcF)f

diff --git a/app/static/app/favicon-32x32.png b/app/static/app/favicon-32x32.png
deleted file mode 100644
index bc4c6c92f6430a6557949f9c0e97b4197c9d7115..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 561
zcmV-10?z%3P)<h;3K|Lk000e1NJLTq001BW001Ba0{{R3fmCP500004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#Do{*RMg9N&AHkzF$E$1A!LaGxOU<<M`}x-M?&kRP
zir&u0@aVto<)h`<551k}P}ds(000eiQchF;{rvj+`~Ca;`uh9%XXO{>00009a7bBm
z003kF003kF0op<xt^fc56iGxuR4C75xQhlDfLJI<7R0=$st6I#EX&vo6uD^KmOcq2
zaJ8W2RKmf#cV*btc(BI;1=KTjFGlmoUOcc>_R_Q>pumB-K;;W;FLMF4-Q>B;aH$Jq
zVu0@zR*<<XbQvylf@}~k6fXqP6KokSGlLknn>6-<XaifAibe^Tic8rbGs5=XP6e5<
zO_$-WgDsHZV0)PbC~=tuXl+EY>|GTO-HQcIcQ2Z?0tGHN)J$n;SadUu!}B<YEyyoA
z4Q!P<+y_dhCvY5s_*OL(=x}!3i=jbx;R1Ija3KUhS~S@mmcq1v4J|8@VS^b8ww5jS
z65LvJhhaD!!*jU2j|d=)AjAk{%xJ)fD2%AYjBHc@0K_LQkli@0R{#J2S9(-fbW&k=
zAaHVTW@&6?Aar?fWguyAbYlPjc%0+%3<z;nC@9KL%gjmTQUC)Z3oc^|6C)E#lN19J
zAVh#P!(;;^vs56<*wo0x%)}hT2g`s+ph_+P>K74o@<KJ000000NkvXXu0mjfbx`P4

diff --git a/app/static/app/favicon.ico b/app/static/app/favicon.ico
deleted file mode 100644
index 8385c33a96c58cd796d47454f521c29827a83251..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15086
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
DWp(}B

diff --git a/app/static/app/img/logo36.png b/app/static/app/img/logo36.png
deleted file mode 100644
index 21de54102a7eb8b880dc8cc0b944035e136d1a44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1332
zcmV-41<U%0P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY319#K319&oB@6`s000McNliru;0O&73=U3XiE;n{1i?u}
zK~z}7rI<}@RaFqj|L64s(;`w@5gJ6OhFTX0s7qNG3(>^t!jC|-HM#*Tig819gSdjm
z6)sGSAZ(yUBPQ5lOO3K*BPJ%)L@E#q(l2bKEwsqb&0I1Z-hJ;rJIT$tXU?4e%(?f>
z%$XBp1So`%yjMwDAZd}LC6b0DjY#?@gfJP)#}r{zOS)T9outK*{*p8%X(EI$l@|-}
z@2>#g0TbL#*MJj18&Dq4i?M)m;B}jGEy9{G9WUKsLuAaCzzsL?Pv9hQ*70rt-vSkB
z1_6~O<FS4>ticGYGv9|1aNLAufy2O(NYNtTATVumU6B#_u%>|nKuv_T6gXnK0J`H<
zy<-D2z-wuWjMoB;n0!Yp2YhT}BfxVpR%CdqGirOntO0&A<}RgBq;#7BjQ~wf<`H1j
z#<r#{D#G1uy8D3|0goBusxp%8pYy=KK)d5_H{N-mq6ECFX2ZIiq>aY^BF%I1xb&=~
zK1n%AtAR40OwwxO^@b2;vtSt=vUX!m(hBSRA}KYtB;>|_w)S30753B_?{tY+r>$L?
zlQd<W>WrUPk^FT@*fV3isw`jIQGzv@lhkjW^(BHlY3(I5WX9h8Sk}d@xAu&H1{bL6
zGVY@lz%Xzf*yQ+|jW+}=&ti;uc|r{Ws(~J3^yZD4w*!;`pP2kP;2tNl&^!#2DJz6!
z?|mlUV|h;knq7eU9GIW7s(HX(x1vw;#HdYfd@nFB1#1DY-(`oVV}UI;coVn;d;m0>
z5f1|I0RvHz90i_o7&)Lfk~wR08w{%vc;9r~G?^`FzoW&J6rv$u7x1g~$APt`ELriC
z{ff&)utt;ga>u@PMlG`ybX$fVw)O<@A+XBiYJnde@P4Q0O_OP~)Nmrg>M|Y6GJ7^q
zWl9%YTb;-FTIUc+a(*TcR&|6`m8LhRxzVJgKU{x8(!~<vS<$$#+&1)a+mOT7_Sxre
zbaM{4gVqmjPi?UAhiy(@gmv6>++S?}yZ~G&vJr=Y9l-aF_pBY@l07vBd}R($h{k}H
zG^4gUw;u#{0;|k>Rs!!vM_GVL;0=dS>%7mq{SJ%n^9*w*aIuivZ*YO}vm$|Uk5l$_
zp0E728}CRv7XkAv2q%HD*?T||%z84Wj(sk5EOat8E_Lk7m^u>Oy+E~qhun&4GbYyu
zTyov)_^+Dlmy%o;`sA9E)NC@}gb+px6@c!<cwW*eNtKeG00IysJ#GiJQz3*4g%%b<
zNU;8vbkx|*IZ4SO{iiIaJVz(3tvACe?fn*3F><;R`KEG7cUfnuM36+jQc}W9Ht=+b
zi%YPoa+1zj=h3W(e51A24oRA|XV`daO2k@Y?SO!F|Dz151TI*~^Oobc&#??zo49Jf
zF?MGx6x&k@#U|s;0^2eciXWNoGq*}^EAWy4)mo&Ke%_s#_T(|P!<Eu4X^XOcn+wS8
zv7&Bg)DfUQ8m|Qoxyy!Q1r&9;%Z7tVd~@UVK&LaND=lhvMpr0<c7@`PuCu_=BG)k$
zd9GsyQm$hT7rP^R*)EgDqa-<P;k`92CFHrVYO~Ygbc8hy90OjA=Y=9ydNq=kO1dm*
qbdFbgwUX|$V)BZl@esmvEdL*i+Pzj9tB`*H0000<MNUMnLSTaU?q>o3

diff --git a/app/static/app/js/MapView.jsx b/app/static/app/js/MapView.jsx
index 0f8bd8a4..51d6dbab 100644
--- a/app/static/app/js/MapView.jsx
+++ b/app/static/app/js/MapView.jsx
@@ -89,7 +89,7 @@ class MapView extends React.Component {
             <button 
               key={mapType.type}
               onClick={this.handleMapTypeButton(mapType.type)}
-              className={"btn btn-sm " + (mapType.type === this.state.selectedMapType ? "btn-default" : "btn-secondary")}>{mapType.label}</button>
+              className={"btn btn-sm " + (mapType.type === this.state.selectedMapType ? "btn-primary" : "btn-default")}>{mapType.label}</button>
           )}
         </div>
 
diff --git a/app/static/app/manifest.json b/app/static/app/manifest.json
deleted file mode 100644
index 325a0752..00000000
--- a/app/static/app/manifest.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"name": "WebODM",
-	"icons": [
-		{
-			"src": "\/static\/app\/android-chrome-192x192.png",
-			"sizes": "192x192",
-			"type": "image\/png"
-		},
-		{
-			"src": "\/static\/app\/android-chrome-512x512.png",
-			"sizes": "512x512",
-			"type": "image\/png"
-		}
-	],
-	"theme_color": "#ffffff",
-	"display": "standalone"
-}
diff --git a/app/static/app/mstile-150x150.png b/app/static/app/mstile-150x150.png
deleted file mode 100644
index 9ddd5d0d3cac67aed0c45b50ec3b5190d9fe5b79..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1521
zcmZXUdpOez7{}+Ca>}LH9-YcqDU}ckWjm=+a<`dF%<W8QQf6C>9BNNVn1g<txu(vN
zEfX3|^Aur~ZSJ>3$7NznVlFjucK+-+@AJIR`+nZ{eZKF1-!xBmN6qbfwu3+*O{WVE
z7!XKB>%UY5D<}6#C-am=HR7z>SrDi?OMN|bi;`7H7)KO{Bi5Ty!d_2T>^axV#4n09
zqc_Zs#aSm|ZNiYC{PTw$jm4Xrn?!Z^pUN{eGREBtB$v<0q|<0nI-pej;pA`@8~;I8
z$io;~?7TzWLX#Ch_r?fc-}1VOc^!grN0e}hNJ*<zR-=C4qo^nvFgeQFbV)&@zxNSf
zBRO?-O5LAg&^$dEZ2JIgYh8)|@^xv6)T^*BZe&wtCa7dss~4L!L^X)VLVZ*Da{NwT
z!5mZPz8!8~tG!YBOB)Ny3CsSIsC#OaScneJk?1?47hr3a(Jh7-Xw^Ps@omE9B7orV
zNEnIzkicAZwct9p6A!@nzVEXH?E)LKBLiePb>>}zJT3qF`1C(h(<MtPwof<xthXLn
zOVw7?tUla(;F(r9o%57h+NWTV^~`s7<L~Vf!9yuR0?Fi>Ydx;QuKe+Yn81*@slt+K
zH*Uxe2Zt3u-Z4pQOKz6N_amz=$8x9@;U-;~pT;Q9uI@%G^*hh%l7b4^^lhw(_Jyqy
zi{>rQgEg}lssqGuw_P=CKQ~uNy|;gyH{u1oVmQPH!A`3vGQp85QL~3F%LC%wK6P8t
zosE)q`U!AWBdj#Hisdlrld$u9)cU_lERgIpMwxX68}q~C0*u>p>P|$kpxK}2WeW+m
zm!5<qHO5TcO^f_CIAXN@=<VL>>n)Pz;qjj3j?$ng(>otC!Lxp*d{d6;t68p(tgVdV
zIzn~M$c^UUXS(*aC?7<Pac>kRW|a@<)^}!~5g4r7OD{|qbo>EhEcSF)8H!#MrxAx&
zO-blBS>?cDGQ%VFV+Be&xLmj95)f<@6cw%1=oualv?v`|Qq&Fjmus&W@H(^^$-0b=
zOobAT2fK+@BBUe(o|Afm9V~&s%9Oi^{oL#OjPsjT-*xEwURha4>Zn7@#%R)o-WJq)
zbxlUJ8PoC!-3WPnkBM<aj*<9@#F!=xv4SB&u>n!*^$<!d5IQk;9FY^Qz2Q)snXMUu
zjz^&Qc2&ZZQt!W~?l-@uFFX~UJb(JGWNfrj?=jiE<T)W081RPVtMxa1FN1!&0@R9@
z^-6>?-2q0w$4$zDD~=jFG`q~f{?6Fzz&!Et5oP9}$06r{+u{KIyZmW!S6QBu$cpqA
zvnqSByfq!D*sy?BhEGLaWEyjSMOKMY@A`DzHh&9q(JinnY=ZpYkHL>0Eg;g&Nn}@s
zBucoHKYRYIxKX(NIc`6Vmpu43J}Xh5$r}F_UBVGfYSgbjPR~d<ZIftA;QAkWbdw6*
zuhY=lH{2kfo-k^nUaBtHx3zBeI-j|%!|j-`HZQaIQ!I^aolF<zy;^Cb2y0o3jzdlx
zSdIymV8?B%#6?O@TlKx*PF07OiE_pG6~0*51+-tSp^gN7UPB>tl`Tbladr9j^&uDT
zJVNmR&+D|L=`la3ol>B<orF90ULCuym?Ys#g}%BJ@J(6n>cjcm4WhkZp$JN(+0b*;
zW#<56`l0}U{np^2<NJMLuBVr14e-GLQUl;a0VFJ&e-J>L0eou!X$O#Y7=J#46}LVq
zf?!VBv{J1v!Vb&_dh$|Hk{~T0(HT1*jphl?OM(o5L^^gpDTk-#A_+1F61%bUnYlbi
z4@sa35T_e9TI@+pwVw*q0pk3_Mk~=&f#XylenafVpVW(%7awB8RmEp%z&gK{PXFXf
z|A%*LnoG}jN^tvmtIDNs0@ja=35|ot#9j-(eB~0HOpUn&zZ^rxgFx{`6N?(Z5Pc3G
ze(%vPbdq2|U_*5?ygI}X;*tvmL*Nc6C*FjC4QsLR_QBq_Ey5PP7Pa=23lE&lK+;{>
V<VBQ~(riH>r*rNO98}1ye*wGu<xT(q

diff --git a/app/static/app/safari-pinned-tab.svg b/app/static/app/safari-pinned-tab.svg
deleted file mode 100644
index 86ec3f00..00000000
--- a/app/static/app/safari-pinned-tab.svg
+++ /dev/null
@@ -1,448 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="560.000000pt" height="560.000000pt" viewBox="0 0 560.000000 560.000000"
- preserveAspectRatio="xMidYMid meet">
-<metadata>
-Created by potrace 1.11, written by Peter Selinger 2001-2013
-</metadata>
-<g transform="translate(0.000000,560.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M0 2800 l0 -2800 2800 0 2800 0 0 2800 0 2800 -2800 0 -2800 0 0
--2800z m1498 2473 c-21 -2 -57 -2 -80 0 -24 2 -7 4 37 4 44 0 63 -2 43 -4z
-m2690 0 c-21 -2 -57 -2 -80 0 -24 2 -7 4 37 4 44 0 63 -2 43 -4z m-2865 -10
-c-7 -2 -21 -2 -30 0 -10 3 -4 5 12 5 17 0 24 -2 18 -5z m290 0 c-7 -2 -21 -2
--30 0 -10 3 -4 5 12 5 17 0 24 -2 18 -5z m2400 0 c-7 -2 -21 -2 -30 0 -10 3
--4 5 12 5 17 0 24 -2 18 -5z m290 0 c-7 -2 -19 -2 -25 0 -7 3 -2 5 12 5 14 0
-19 -2 13 -5z m-3046 -9 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z
-m420 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m2270 0 c-3 -3
--12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m420 0 c-3 -3 -12 -4 -19 -1
--8 3 -5 6 6 6 11 1 17 -2 13 -5z m-3160 -10 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6
-6 11 1 17 -2 13 -5z m520 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13
--5z m2690 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m-3250 -10
-c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m600 0 c-3 -3 -12 -4
--19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m2690 0 c-3 -3 -12 -4 -19 -1 -8 3 -5
-6 6 6 11 1 17 -2 13 -5z m193 -69 c14 -8 21 -14 15 -14 -5 0 -21 6 -35 14 -14
-8 -20 14 -15 14 6 0 21 -6 35 -14z m-3681 1 c-10 -9 -89 -46 -89 -41 0 6 72
-44 84 45 5 0 7 -2 5 -4z m1001 -6 c8 -5 11 -10 5 -10 -5 0 -17 5 -25 10 -8 5
--10 10 -5 10 6 0 17 -5 25 -10z m1689 6 c-10 -9 -89 -46 -89 -41 0 6 72 44 84
-45 5 0 7 -2 5 -4z m-1629 -42 c0 -2 -9 0 -20 6 -11 6 -20 13 -20 16 0 2 9 0
-20 -6 11 -6 20 -13 20 -16z m2690 0 c0 -2 -9 0 -20 6 -11 6 -20 13 -20 16 0 2
-9 0 20 -6 11 -6 20 -13 20 -16z m-2540 -100 c0 -3 -13 4 -30 16 -16 12 -30 24
--30 26 0 3 14 -4 30 -16 17 -12 30 -24 30 -26z m-1420 22 c0 -2 -8 -10 -17
--17 -16 -13 -17 -12 -4 4 13 16 21 21 21 13z m2690 0 c0 -2 -8 -10 -17 -17
--16 -13 -17 -12 -4 4 13 16 21 21 21 13z m1411 -13 c13 -16 12 -17 -3 -4 -17
-13 -22 21 -14 21 2 0 10 -8 17 -17z m-4141 -16 c0 -2 -17 -19 -37 -38 l-38
--34 34 38 c33 34 41 42 41 34z m1510 -32 c19 -19 32 -35 29 -35 -3 0 -20 16
--39 35 -19 19 -32 35 -29 35 3 0 20 -16 39 -35z m1180 32 c0 -2 -15 -16 -32
--33 l-33 -29 29 33 c28 30 36 37 36 29z m1500 -22 c13 -14 21 -25 18 -25 -2 0
--15 11 -28 25 -13 14 -21 25 -18 25 2 0 15 -11 28 -25z m-3477 -32 c-13 -2
--35 -2 -50 0 -16 2 -5 4 22 4 28 0 40 -2 28 -4z m105 0 c-16 -2 -40 -2 -55 0
--16 2 -3 4 27 4 30 0 43 -2 28 -4z m2580 0 c-16 -2 -40 -2 -55 0 -16 2 -3 4
-27 4 30 0 43 -2 28 -4z m110 0 c-16 -2 -40 -2 -55 0 -16 2 -3 4 27 4 30 0 43
--2 28 -4z m-2911 -9 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z
-m300 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m2390 0 c-3 -3
--12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m300 0 c-3 -3 -12 -4 -19 -1
--8 3 -5 6 6 6 11 1 17 -2 13 -5z m-3040 -10 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6
-6 11 1 17 -2 13 -5z m400 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13
--5z m2290 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m400 0 c-3
--3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m-2577 -34 c8 -5 11 -10 5
--10 -5 0 -17 5 -25 10 -8 5 -10 10 -5 10 6 0 17 -5 25 -10z m-1190 -23 c0 -2
--12 -14 -27 -28 l-28 -24 24 28 c23 25 31 32 31 24z m1760 -22 c13 -14 21 -25
-18 -25 -2 0 -15 11 -28 25 -13 14 -21 25 -18 25 2 0 15 -11 28 -25z m930 22
-c0 -2 -12 -14 -27 -28 l-28 -24 24 28 c23 25 31 32 31 24z m1760 -22 c13 -14
-21 -25 18 -25 -2 0 -15 11 -28 25 -13 14 -21 25 -18 25 2 0 15 -11 28 -25z
-m-4010 -10 c0 -2 -10 -9 -22 -15 -22 -11 -22 -10 -4 4 21 17 26 19 26 11z
-m890 -21 c0 -2 -9 0 -20 6 -11 6 -20 13 -20 16 0 2 9 0 20 -6 11 -6 20 -13 20
--16z m1800 21 c0 -2 -10 -9 -22 -15 -22 -11 -22 -10 -4 4 21 17 26 19 26 11z
-m890 -21 c0 -2 -9 0 -20 6 -11 6 -20 13 -20 16 0 2 9 0 20 -6 11 -6 20 -13 20
--16z m-4070 -8 c0 -2 -8 -10 -17 -17 -16 -13 -17 -12 -4 4 13 16 21 21 21 13z
-m1851 -13 c13 -16 12 -17 -3 -4 -17 13 -22 21 -14 21 2 0 10 -8 17 -17z m839
-13 c0 -2 -8 -10 -17 -17 -16 -13 -17 -12 -4 4 13 16 21 21 21 13z m1851 -13
-c13 -16 12 -17 -3 -4 -17 13 -22 21 -14 21 2 0 10 -8 17 -17z m-4131 -7 c0 -2
--8 -10 -17 -17 -16 -13 -17 -12 -4 4 13 16 21 21 21 13z m1031 -13 c13 -16 12
--17 -3 -4 -10 7 -18 15 -18 17 0 8 8 3 21 -13z m1659 13 c0 -2 -8 -10 -17 -17
--16 -13 -17 -12 -4 4 13 16 21 21 21 13z m1035 -16 c10 -11 16 -20 13 -20 -3
-0 -13 9 -23 20 -10 11 -16 20 -13 20 3 0 13 -9 23 -20z m-4165 -4 c0 -2 -8
--10 -17 -17 -16 -13 -17 -12 -4 4 13 16 21 21 21 13z m1911 -13 c13 -16 12
--17 -3 -4 -17 13 -22 21 -14 21 2 0 10 -8 17 -17z m753 -23 c-15 -22 -29 -40
--31 -40 -5 0 3 15 29 53 30 43 31 32 2 -13z m1959 -9 c27 -46 14 -38 -18 12
--16 23 -22 37 -14 30 8 -6 22 -25 32 -42z m-4223 36 c0 -1 -30 -32 -67 -67
-l-68 -65 65 68 c60 62 70 72 70 64z m1155 -57 c33 -33 57 -60 54 -60 -2 0 -31
-27 -64 60 -33 33 -57 60 -54 60 2 0 31 -27 64 -60z m1535 57 c0 -1 -30 -32
--67 -67 l-68 -65 65 68 c60 62 70 72 70 64z m1160 -62 c30 -30 52 -55 49 -55
--2 0 -29 25 -59 55 -30 30 -52 55 -49 55 2 0 29 -25 59 -55z m-4290 15 c-6
--11 -13 -20 -16 -20 -2 0 0 9 6 20 6 11 13 20 16 20 2 0 0 -9 -6 -20z m1980 0
-c6 -11 8 -20 6 -20 -3 0 -10 9 -16 20 -6 11 -8 20 -6 20 3 0 10 -9 16 -20z
-m-2010 -50 c-6 -11 -13 -20 -16 -20 -2 0 0 9 6 20 6 11 13 20 16 20 2 0 0 -9
--6 -20z m2045 -10 c9 -16 13 -30 11 -30 -3 0 -12 14 -21 30 -9 17 -13 30 -11
-30 3 0 12 -13 21 -30z m2685 10 c6 -11 8 -20 6 -20 -3 0 -10 9 -16 20 -6 11
--8 20 -6 20 3 0 10 -9 16 -20z m-4759 -53 c-10 -9 -11 -8 -5 6 3 10 9 15 12
-12 3 -3 0 -11 -7 -18z m1739 -2 c14 -19 14 -19 -2 -6 -10 7 -18 18 -18 24 0 6
-1 8 3 6 1 -2 9 -13 17 -24z m951 2 c-10 -9 -11 -8 -5 6 3 10 9 15 12 12 3 -3
-0 -11 -7 -18z m-2321 9 c0 -2 -8 -10 -17 -17 -16 -13 -17 -12 -4 4 13 16 21
-21 21 13z m2668 -26 c-22 -30 -35 -41 -22 -17 9 16 36 47 41 47 2 0 -6 -13
--19 -30z m1413 -12 c15 -28 5 -21 -21 15 -15 20 -17 27 -6 18 9 -8 22 -23 27
--33z m-2347 16 c3 -8 2 -12 -4 -9 -6 3 -10 10 -10 16 0 14 7 11 14 -7z m2715
--59 c0 -5 -6 1 -14 15 -8 14 -14 30 -14 35 0 6 6 -1 14 -15 8 -14 14 -29 14
--35z m-4495 20 c-9 -14 -18 -25 -21 -25 -5 0 5 18 20 38 17 22 18 13 1 -13z
-m1456 -6 c15 -28 5 -23 -15 7 -9 15 -12 23 -6 20 6 -4 16 -16 21 -27z m-1809
--6 c-12 -20 -14 -14 -5 12 4 9 9 14 11 11 3 -2 0 -13 -6 -23z m2159 -8 c0 -5
--5 -3 -10 5 -5 8 -10 20 -10 25 0 6 5 3 10 -5 5 -8 10 -19 10 -25z m531 8
-c-12 -20 -14 -14 -5 12 4 9 9 14 11 11 3 -2 0 -13 -6 -23z m-511 -58 c0 -5 -5
--3 -10 5 -5 8 -10 20 -10 25 0 6 5 3 10 -5 5 -8 10 -19 10 -25z m833 20 c-3
--9 -8 -14 -10 -11 -3 3 -2 9 2 15 9 16 15 13 8 -4z m1857 -20 c0 -5 -5 -3 -10
-5 -5 8 -10 20 -10 25 0 6 5 3 10 -5 5 -8 10 -19 10 -25z m-4567 -20 c-9 -19
--18 -33 -21 -31 -4 5 26 66 33 66 3 0 -3 -16 -12 -35z m1552 4 c9 -17 15 -33
-13 -35 -3 -2 -12 12 -21 31 -21 43 -13 47 8 4z m2690 0 c9 -17 15 -33 13 -35
--3 -2 -12 12 -21 31 -21 43 -13 47 8 4z m-1557 -14 c-6 -14 -13 -23 -15 -21
--5 5 15 46 22 46 3 0 -1 -11 -7 -25z m-3038 -52 c-11 -17 -11 -17 -6 0 3 10 6
-24 7 30 0 9 2 9 5 0 3 -7 0 -20 -6 -30z m2257 -15 c-3 -8 -6 -5 -6 6 -1 11 2
-17 5 13 3 -3 4 -12 1 -19z m430 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4
--12 1 -19z m2260 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z
-m-4960 -40 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m2280 0 c-3
--8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m410 0 c-3 -8 -6 -5 -6 6 -1
-11 2 17 5 13 3 -3 4 -12 1 -19z m2280 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3
--3 4 -12 1 -19z m-4980 -50 c-3 -7 -5 -2 -5 12 0 14 2 19 5 13 2 -7 2 -19 0
--25z m2300 10 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m390 -10
-c-3 -7 -5 -2 -5 12 0 14 2 19 5 13 2 -7 2 -19 0 -25z m2300 10 c-3 -8 -6 -5
--6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m-4680 -20 c-3 -8 -6 -5 -6 6 -1 11 2
-17 5 13 3 -3 4 -12 1 -19z m1680 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4
--12 1 -19z m1010 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z
-m1680 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m-4690 -50 c-3
--7 -5 -2 -5 12 0 14 2 19 5 13 2 -7 2 -19 0 -25z m310 0 c-3 -7 -5 -2 -5 12 0
-14 2 19 5 13 2 -7 2 -19 0 -25z m1700 0 c-3 -7 -5 -2 -5 12 0 14 2 19 5 13 2
--7 2 -19 0 -25z m310 0 c-3 -7 -5 -2 -5 12 0 14 2 19 5 13 2 -7 2 -19 0 -25z
-m370 10 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m310 -10 c-3 -7
--5 -2 -5 12 0 14 2 19 5 13 2 -7 2 -19 0 -25z m1700 0 c-3 -7 -5 -2 -5 12 0
-14 2 19 5 13 2 -7 2 -19 0 -25z m310 -5 c-3 -10 -5 -4 -5 12 0 17 2 24 5 18 2
--7 2 -21 0 -30z m-4710 -60 c-3 -10 -5 -4 -5 12 0 17 2 24 5 18 2 -7 2 -21 0
--30z m1720 0 c-3 -10 -5 -4 -5 12 0 17 2 24 5 18 2 -7 2 -21 0 -30z m970 0
-c-3 -10 -5 -4 -5 12 0 17 2 24 5 18 2 -7 2 -21 0 -30z m-3000 -35 c-2 -13 -4
--3 -4 22 0 25 2 35 4 23 2 -13 2 -33 0 -45z m2340 -15 c-2 -16 -4 -3 -4 27 0
-30 2 43 4 28 2 -16 2 -40 0 -55z m350 15 c-2 -13 -4 -3 -4 22 0 25 2 35 4 23
-2 -13 2 -33 0 -45z m2030 30 c-3 -7 -5 -2 -5 12 0 14 2 19 5 13 2 -7 2 -19 0
--25z m310 -20 c-2 -13 -4 -5 -4 17 -1 22 1 32 4 23 2 -10 2 -28 0 -40z m0 -50
-c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m-2340 -105 c-2 -16 -4
--5 -4 22 0 28 2 40 4 28 2 -13 2 -35 0 -50z m-2690 -10 c-2 -16 -4 -5 -4 22 0
-28 2 40 4 28 2 -13 2 -35 0 -50z m2340 5 c-2 -13 -4 -5 -4 17 -1 22 1 32 4 23
-2 -10 2 -28 0 -40z m2690 0 c-2 -13 -4 -5 -4 17 -1 22 1 32 4 23 2 -10 2 -28
-0 -40z m-4720 -25 c-3 -10 -5 -2 -5 17 0 19 2 27 5 18 2 -10 2 -26 0 -35z
-m1720 0 c-3 -10 -5 -2 -5 17 0 19 2 27 5 18 2 -10 2 -26 0 -35z m970 0 c-3
--10 -5 -2 -5 17 0 19 2 27 5 18 2 -10 2 -26 0 -35z m1720 0 c-3 -10 -5 -2 -5
-17 0 19 2 27 5 18 2 -10 2 -26 0 -35z m-2390 -60 c-3 -10 -5 -4 -5 12 0 17 2
-24 5 18 2 -7 2 -21 0 -30z m-2320 -5 c-3 -7 -5 -2 -5 12 0 14 2 19 5 13 2 -7
-2 -19 0 -25z m310 10 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z
-m1700 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m680 -10 c-3 -7
--5 -2 -5 12 0 14 2 19 5 13 2 -7 2 -19 0 -25z m310 10 c-3 -8 -6 -5 -6 6 -1
-11 2 17 5 13 3 -3 4 -12 1 -19z m1700 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3
--3 4 -12 1 -19z m310 -10 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z
-m-4690 -40 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m1680 0 c-3
--8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m2690 0 c-3 -8 -6 -5 -6 6
--1 11 2 17 5 13 3 -3 4 -12 1 -19z m-4680 -10 c-3 -8 -6 -5 -6 6 -1 11 2 17 5
-13 3 -3 4 -12 1 -19z m2300 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1
--19z m390 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m2300 0 c-3
--8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m-4980 -50 c-3 -8 -6 -5 -6
-6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m2280 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5
-13 3 -3 4 -12 1 -19z m410 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1
--19z m2280 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m-4627 -53
-c0 -5 -5 -3 -10 5 -5 8 -10 20 -10 25 0 6 5 3 10 -5 5 -8 10 -19 10 -25z
-m2690 0 c0 -5 -5 -3 -10 5 -5 8 -10 20 -10 25 0 6 5 3 10 -5 5 -8 10 -19 10
--25z m1601 8 c-12 -20 -14 -14 -5 12 4 9 9 14 11 11 3 -2 0 -13 -6 -23z
-m-4602 -53 c0 -10 -3 -8 -9 5 -12 27 -12 43 0 25 5 -8 9 -22 9 -30z m2222 9
-c-5 -13 -10 -19 -10 -12 -1 15 10 45 15 40 3 -2 0 -15 -5 -28z m2690 0 c-5
--13 -10 -19 -10 -12 -1 15 10 45 15 40 3 -2 0 -15 -5 -28z m-4493 -149 l33
--45 -33 37 c-18 20 -41 51 -51 70 -17 32 -17 32 0 8 10 -13 33 -45 51 -70z
-m2690 3 c17 -24 32 -46 32 -49 0 -11 -65 74 -84 109 -16 31 -16 31 1 7 10 -13
-33 -44 51 -67z m1432 68 c-5 -11 -15 -23 -21 -27 -6 -3 -3 5 6 20 20 30 30 35
-15 7z m-2710 -30 c-5 -11 -15 -23 -21 -27 -6 -3 -3 5 6 20 20 30 30 35 15 7z
-m-1771 -46 c0 -5 -6 1 -14 15 -8 14 -14 30 -14 35 0 6 6 -1 14 -15 8 -14 14
--29 14 -35z m2097 -4 c-15 -28 -28 -51 -31 -51 -3 0 7 25 22 55 15 30 29 53
-31 51 2 -2 -8 -27 -22 -55z m598 2 c14 -29 24 -53 21 -53 -5 0 -55 95 -55 106
-0 12 6 2 34 -53z m2092 -2 c-15 -28 -28 -51 -31 -51 -3 0 7 25 22 55 15 30 29
-53 31 51 2 -2 -8 -27 -22 -55z m-3063 -15 c-10 -13 -20 -22 -22 -20 -4 4 29
-44 36 44 2 0 -4 -11 -14 -24z m2690 0 c-10 -13 -20 -22 -22 -20 -4 4 29 44 36
-44 2 0 -4 -11 -14 -24z m-4393 -16 c6 -11 8 -20 6 -20 -3 0 -10 9 -16 20 -6
-11 -8 20 -6 20 3 0 10 -9 16 -20z m410 -45 c13 -14 21 -25 18 -25 -2 0 -15 11
--28 25 -13 14 -21 25 -18 25 2 0 15 -11 28 -25z m1260 22 c0 -2 -17 -19 -37
--38 l-38 -34 34 38 c33 34 41 42 41 34z m1440 -32 c19 -19 32 -35 29 -35 -3 0
--20 16 -39 35 -19 19 -32 35 -29 35 3 0 20 -16 39 -35z m1250 32 c0 -2 -17
--19 -37 -38 l-38 -34 34 38 c33 34 41 42 41 34z m-4330 -27 c6 -11 8 -20 6
--20 -3 0 -10 9 -16 20 -6 11 -8 20 -6 20 3 0 10 -9 16 -20z m2000 0 c-6 -11
--13 -20 -16 -20 -2 0 0 9 6 20 6 11 13 20 16 20 2 0 0 -9 -6 -20z m2690 0 c-6
--11 -13 -20 -16 -20 -2 0 0 9 6 20 6 11 13 20 16 20 2 0 0 -9 -6 -20z m-1980
--31 c15 -28 5 -23 -15 7 -9 15 -12 23 -6 20 6 -4 16 -16 21 -27z m-1150 -12
-c0 -2 -10 -12 -22 -23 l-23 -19 19 23 c18 21 26 27 26 19z m2690 -5 c0 -4 -10
--13 -22 -21 -23 -14 -23 -14 -4 8 20 22 26 25 26 13z m-3775 -30 c34 -30 25
--27 -19 6 -16 12 -25 22 -20 22 5 0 23 -13 39 -28z m2725 -29 c0 -7 -58 36
--66 49 -4 7 9 -1 29 -16 20 -16 37 -30 37 -33z m-3149 30 c13 -16 12 -17 -3
--4 -10 7 -18 15 -18 17 0 8 8 3 21 -13z m2514 -215 l190 187 -190 -192 c-104
--106 -190 -191 -192 -190 -14 11 -384 382 -403 404 -13 15 72 -68 190 -184
-l215 -213 190 188z m2085 228 c0 -2 -8 -10 -17 -17 -16 -13 -17 -12 -4 4 13
-16 21 21 21 13z m-3140 -20 c0 -2 -8 -10 -17 -17 -16 -13 -17 -12 -4 4 13 16
-21 21 21 13z m2690 0 c0 -2 -8 -10 -17 -17 -16 -13 -17 -12 -4 4 13 16 21 21
-21 13z m-4119 -33 c13 -16 12 -17 -3 -4 -17 13 -22 21 -14 21 2 0 10 -8 17
--17z m4539 13 c0 -2 -8 -10 -17 -17 -16 -13 -17 -12 -4 4 13 16 21 21 21 13z
-m-4001 -62 c14 -12 -19 -1 -35 12 -18 14 -18 14 6 3 14 -6 27 -13 29 -15z
-m787 11 c-11 -8 -25 -15 -30 -15 -6 1 0 7 14 15 32 19 40 18 16 0z m1920 -23
-c-5 -4 -66 26 -66 33 0 3 16 -3 35 -12 19 -9 33 -18 31 -21z m784 33 c0 -6
--56 -35 -67 -35 -4 1 8 9 27 20 39 22 40 22 40 15z m400 -78 l-74 -72 69 75
-c39 42 72 74 75 72 2 -1 -29 -35 -70 -75z m-4335 3 c38 -38 67 -70 64 -70 -2
-0 -36 32 -74 70 -38 39 -67 70 -64 70 2 0 36 -31 74 -70z m480 32 c-3 -3 -11
-0 -18 7 -9 10 -8 11 6 5 10 -3 15 -9 12 -12z m700 8 c-3 -5 -12 -10 -18 -10
--7 0 -6 4 3 10 19 12 23 12 15 0z m2645 -20 c-8 -5 -19 -10 -25 -10 -5 0 -3 5
-5 10 8 5 20 10 25 10 6 0 3 -5 -5 -10z m-3253 -16 c-3 -3 -12 -4 -19 -1 -8 3
--5 6 6 6 11 1 17 -2 13 -5z m503 -4 c-8 -5 -22 -9 -30 -9 -10 0 -8 3 5 9 27
-12 43 12 25 0z m2187 4 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z
-m520 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m-3130 -20 c-3
--3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m360 0 c-3 -3 -12 -4 -19
--1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m-304 -11 c-7 -2 -19 -2 -25 0 -7 3 -2 5
-12 5 14 0 19 -2 13 -5z m250 0 c-7 -2 -19 -2 -25 0 -7 3 -2 5 12 5 14 0 19 -2
-13 -5z m2440 0 c-7 -2 -21 -2 -30 0 -10 3 -4 5 12 5 17 0 24 -2 18 -5z m260 0
-c-7 -2 -21 -2 -30 0 -10 3 -4 5 12 5 17 0 24 -2 18 -5z m-2795 -10 c-21 -2
--55 -2 -75 0 -21 2 -4 4 37 4 41 0 58 -2 38 -4z m2685 0 c-18 -2 -48 -2 -65 0
--18 2 -4 4 32 4 36 0 50 -2 33 -4z m-3448 -53 c10 -11 16 -20 13 -20 -3 0 -13
-9 -23 20 -10 11 -16 20 -13 20 3 0 13 -9 23 -20z m1680 -187 l206 -207 -198
--198 c-109 -109 -200 -198 -203 -198 -3 0 83 89 192 198 l198 197 -204 204
--204 204 -38 -28 -39 -27 35 30 c19 18 38 32 42 32 3 0 99 -93 213 -207z
-m2470 197 c-3 -5 -20 -19 -38 -30 -32 -22 -32 -22 3 9 37 32 45 37 35 21z
-m-1639 -210 l-191 -190 180 -180 c104 -104 186 -178 193 -175 7 3 10 0 7 -5
--3 -6 -10 -10 -14 -10 -6 0 -317 307 -371 366 -4 5 371 384 380 384 4 0 -80
--85 -184 -190z m-2336 84 c0 -2 -13 2 -30 11 -16 9 -30 18 -30 21 0 2 14 -2
-30 -11 17 -9 30 -18 30 -21z m1150 31 c0 -2 -10 -9 -22 -15 -22 -11 -22 -10
--4 4 21 17 26 19 26 11z m1520 -21 c0 -2 -9 0 -20 6 -11 6 -20 13 -20 16 0 2
-9 0 20 -6 11 -6 20 -13 20 -16z m1170 21 c0 -2 -10 -9 -22 -15 -22 -11 -22
--10 -4 4 21 17 26 19 26 11z m-2740 -29 c0 -2 -7 -7 -16 -10 -8 -3 -12 -2 -9
-4 6 10 25 14 25 6z m1605 -6 c3 -6 -1 -7 -9 -4 -18 7 -21 14 -7 14 6 0 13 -4
-16 -10z m1085 6 c0 -2 -7 -7 -16 -10 -8 -3 -12 -2 -9 4 6 10 25 14 25 6z
-m-3755 -16 c3 -6 -1 -7 -9 -4 -18 7 -21 14 -7 14 6 0 13 -4 16 -10z m45 -20
-c8 -5 11 -10 5 -10 -5 0 -17 5 -25 10 -8 5 -10 10 -5 10 6 0 17 -5 25 -10z
-m2690 0 c8 -5 11 -10 5 -10 -5 0 -17 5 -25 10 -8 5 -10 10 -5 10 6 0 17 -5 25
--10z m950 0 c-8 -5 -19 -10 -25 -10 -5 0 -3 5 5 10 8 5 20 10 25 10 6 0 3 -5
--5 -10z m-3453 -66 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z
-m580 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m2110 0 c-3 -3
--12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m580 0 c-3 -3 -12 -4 -19 -1
--8 3 -5 6 6 6 11 1 17 -2 13 -5z m-2740 -10 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6
-6 11 1 17 -2 13 -5z m2690 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2
-13 -5z m-3114 -11 c-7 -2 -21 -2 -30 0 -10 3 -4 5 12 5 17 0 24 -2 18 -5z
-m374 1 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m2306 -1 c-7 -2
--19 -2 -25 0 -7 3 -2 5 12 5 14 0 19 -2 13 -5z m384 1 c-3 -3 -12 -4 -19 -1
--8 3 -5 6 6 6 11 1 17 -2 13 -5z m-2979 -11 c-10 -2 -28 -2 -40 0 -13 2 -5 4
-17 4 22 1 32 -1 23 -4z m225 0 c-7 -2 -21 -2 -30 0 -10 3 -4 5 12 5 17 0 24
--2 18 -5z m2450 0 c-7 -2 -21 -2 -30 0 -10 3 -4 5 12 5 17 0 24 -2 18 -5z
-m235 0 c-10 -2 -28 -2 -40 0 -13 2 -5 4 17 4 22 1 32 -1 23 -4z m-2910 -270
-c-10 -2 -28 -2 -40 0 -13 2 -5 4 17 4 22 1 32 -1 23 -4z m220 0 c-10 -2 -26
--2 -35 0 -10 3 -2 5 17 5 19 0 27 -2 18 -5z m2455 0 c-7 -2 -21 -2 -30 0 -10
-3 -4 5 12 5 17 0 24 -2 18 -5z m235 0 c-10 -2 -26 -2 -35 0 -10 3 -2 5 17 5
-19 0 27 -2 18 -5z m-2995 -10 c-7 -2 -21 -2 -30 0 -10 3 -4 5 12 5 17 0 24 -2
-18 -5z m380 0 c-7 -2 -19 -2 -25 0 -7 3 -2 5 12 5 14 0 19 -2 13 -5z m2294 1
-c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m396 -1 c-7 -2 -21 -2
--30 0 -10 3 -4 5 12 5 17 0 24 -2 18 -5z m-3176 -19 c-3 -3 -12 -4 -19 -1 -8
-3 -5 6 6 6 11 1 17 -2 13 -5z m580 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1
-17 -2 13 -5z m2110 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z
-m580 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m163 -54 c8 -5
-11 -10 5 -10 -5 0 -17 5 -25 10 -8 5 -10 10 -5 10 6 0 17 -5 25 -10z m-3620
--10 c-8 -5 -19 -10 -25 -10 -5 0 -3 5 5 10 8 5 20 10 25 10 6 0 3 -5 -5 -10z
-m960 -5 c14 -8 21 -14 15 -14 -5 0 -21 6 -35 14 -14 8 -20 14 -15 14 6 0 21
--6 35 -14z m1074 -181 l186 -186 -21 -29 c-11 -16 -23 -29 -25 -29 -3 0 4 13
-15 28 l20 28 -185 185 -184 184 -200 -200 c-135 -135 -198 -205 -195 -215 5
--12 4 -13 -7 -2 -10 10 26 51 192 217 113 113 208 205 211 205 4 0 90 -84 193
--186z m-2099 156 c-3 -5 -12 -10 -18 -10 -7 0 -6 4 3 10 19 12 23 12 15 0z
-m2690 0 c-3 -5 -12 -10 -18 -10 -7 0 -6 4 3 10 19 12 23 12 15 0z m1080 -8
-c-3 -3 -11 0 -18 7 -9 10 -8 11 6 5 10 -3 15 -9 12 -12z m-2635 -28 c0 -2 -13
-2 -30 11 -16 9 -30 18 -30 21 0 2 14 -2 30 -11 17 -9 30 -18 30 -21z m-1170
-21 c0 -2 -10 -9 -22 -15 -22 -11 -22 -10 -4 4 21 17 26 19 26 11z m2690 0 c0
--2 -10 -9 -22 -15 -22 -11 -22 -10 -4 4 21 17 26 19 26 11z m1170 -21 c0 -2
--9 0 -20 6 -11 6 -20 13 -20 16 0 2 9 0 20 -6 11 -6 20 -13 20 -16z m-3970
--48 c0 -3 -15 -14 -32 -26 l-33 -22 30 26 c31 27 35 29 35 22z m1416 -48 c4
--7 -9 1 -29 16 -20 16 -37 30 -37 33 0 7 58 -36 66 -49z m2679 12 c10 -11 16
--20 13 -20 -3 0 -13 9 -23 20 -10 11 -16 20 -13 20 3 0 13 -9 23 -20z m-4182
--35 c-11 -8 -56 -52 -99 -97 -43 -46 -70 -72 -59 -58 35 46 159 170 169 170 6
-0 1 -7 -11 -15z m4282 -55 c38 -38 67 -70 64 -70 -2 0 -36 32 -74 70 -38 39
--67 70 -64 70 2 0 36 -31 74 -70z m-3492 33 c-18 -2 -48 -2 -65 0 -18 2 -4 4
-32 4 36 0 50 -2 33 -4z m2705 0 c-16 -2 -40 -2 -55 0 -16 2 -3 4 27 4 30 0 43
--2 28 -4z m-2841 -9 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z
-m256 -1 c-7 -2 -21 -2 -30 0 -10 3 -4 5 12 5 17 0 24 -2 18 -5z m2430 0 c-7
--2 -21 -2 -30 0 -10 3 -4 5 12 5 17 0 24 -2 18 -5z m250 0 c-7 -2 -19 -2 -25
-0 -7 3 -2 5 12 5 14 0 19 -2 13 -5z m-3046 -19 c-3 -3 -12 -4 -19 -1 -8 3 -5
-6 6 6 11 1 17 -2 13 -5z m3150 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17
--2 13 -5z m-2660 -10 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z
-m-567 -14 c-8 -5 -19 -10 -25 -10 -5 0 -3 5 5 10 8 5 20 10 25 10 6 0 3 -5 -5
--10z m-61 -24 c-10 -9 -69 -36 -69 -32 0 7 52 35 64 36 5 0 7 -2 5 -4z m751
--11 c17 -9 30 -18 30 -21 0 -4 -59 23 -69 32 -10 9 13 3 39 -11z m1939 11
-c-10 -9 -69 -36 -69 -32 0 7 52 35 64 36 5 0 7 -2 5 -4z m751 -11 c17 -9 30
--18 30 -21 0 -4 -59 23 -69 32 -10 9 13 3 39 -11z m530 -50 c13 -14 21 -25 18
--25 -2 0 -15 11 -28 25 -13 14 -21 25 -18 25 2 0 15 -11 28 -25z m-3109 -22
-c13 -16 12 -17 -3 -4 -10 7 -18 15 -18 17 0 8 8 3 21 -13z m2735 -35 c4 -7 -9
-1 -29 16 -20 16 -37 30 -37 33 0 7 58 -36 66 -49z m-4176 28 c0 -2 -8 -10 -17
--17 -16 -13 -17 -12 -4 4 13 16 21 21 21 13z m420 1 c0 -2 -10 -12 -22 -23
-l-23 -19 19 23 c18 21 26 27 26 19z m2690 0 c0 -2 -10 -12 -22 -23 l-23 -19
-19 23 c18 21 26 27 26 19z m-1616 -36 c-2 -3 -12 3 -22 13 -16 17 -16 18 5 5
-12 -7 20 -15 17 -18z m3101 3 c9 -15 12 -23 6 -20 -11 7 -35 46 -28 46 3 0 12
--12 22 -26z m-4235 -17 c0 -2 -19 -21 -42 -42 l-43 -40 40 43 c36 39 45 47 45
-39z m1195 -37 c21 -22 37 -40 34 -40 -3 0 -23 18 -44 40 -21 22 -37 40 -34 40
-3 0 23 -18 44 -40z m1495 37 c0 -2 -19 -21 -42 -42 l-43 -40 40 43 c36 39 45
-47 45 39z m1195 -37 c21 -22 37 -40 34 -40 -3 0 -23 18 -44 40 -21 22 -37 40
--34 40 3 0 23 -18 44 -40z m-2305 0 c6 -11 8 -20 6 -20 -3 0 -10 9 -16 20 -6
-11 -8 20 -6 20 3 0 10 -9 16 -20z m690 0 c-6 -11 -13 -20 -16 -20 -2 0 0 9 6
-20 6 11 13 20 16 20 2 0 0 -9 -6 -20z m2000 0 c6 -11 8 -20 6 -20 -3 0 -10 9
--16 20 -6 11 -8 20 -6 20 3 0 10 -9 16 -20z m-4725 -60 c-9 -16 -18 -30 -21
--30 -2 0 2 14 11 30 9 17 18 30 21 30 2 0 -2 -13 -11 -30z m2081 -21 c14 -28
-24 -53 22 -55 -2 -2 -16 21 -31 51 -15 30 -25 55 -22 55 3 0 16 -23 31 -51z
-m609 21 c-9 -16 -18 -30 -21 -30 -2 0 2 14 11 30 9 17 18 30 21 30 2 0 -2 -13
--11 -30z m2065 10 c6 -11 8 -20 6 -20 -3 0 -10 9 -16 20 -6 11 -8 20 -6 20 3
-0 10 -9 16 -20z m-4413 -43 c-17 -23 -40 -54 -50 -67 -17 -24 -17 -24 0 8 18
-34 71 102 79 102 2 0 -11 -19 -29 -43z m1368 23 c10 -11 16 -20 13 -20 -3 0
--13 9 -23 20 -10 11 -16 20 -13 20 3 0 13 -9 23 -20z m1355 17 c0 -2 -10 -12
--22 -23 l-23 -19 19 23 c18 21 26 27 26 19z m1362 -52 c11 -21 8 -18 -32 30
--24 29 -24 29 -2 10 13 -11 28 -29 34 -40z m367 -30 c0 -5 -6 1 -14 15 -8 14
--14 30 -14 35 0 6 6 -1 14 -15 8 -14 14 -29 14 -35z m-4828 8 c-12 -20 -14
--14 -5 12 4 9 9 14 11 11 3 -2 0 -13 -6 -23z m1802 -22 c27 -46 14 -38 -18 12
--16 23 -22 37 -14 30 8 -6 22 -25 32 -42z m888 22 c-12 -20 -14 -14 -5 12 4 9
-9 14 11 11 3 -2 0 -13 -6 -23z m353 2 c-9 -14 -18 -25 -21 -25 -5 0 5 18 20
-38 17 22 18 13 1 -13z m1456 -36 c15 -28 5 -23 -15 7 -9 15 -12 23 -6 20 6 -4
-16 -16 21 -27z m-1507 -44 c-3 -9 -8 -14 -10 -11 -3 3 -2 9 2 15 9 16 15 13 8
--4z m-3032 -22 c-12 -20 -14 -14 -5 12 4 9 9 14 11 11 3 -2 0 -13 -6 -23z
-m4909 -8 c0 -5 -5 -3 -10 5 -5 8 -10 20 -10 25 0 6 5 3 10 -5 5 -8 10 -19 10
--25z m-4577 10 c-3 -9 -8 -14 -10 -11 -3 3 -2 9 2 15 9 16 15 13 8 -4z m4245
--10 c-3 -3 -9 2 -12 12 -6 14 -5 15 5 6 7 -7 10 -15 7 -18z m-1898 -22 c-11
--17 -11 -17 -6 0 3 10 6 24 7 30 0 9 2 9 5 0 3 -7 0 -20 -6 -30z m-2693 -15
-c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m2240 0 c-3 -8 -6 -5 -6
-6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m-2260 -70 c-3 -8 -6 -5 -6 6 -1 11 2 17
-5 13 3 -3 4 -12 1 -19z m2280 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12
-1 -19z m410 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m2280 0
-c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m-4980 -50 c-3 -8 -6 -5
--6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m2300 0 c-3 -8 -6 -5 -6 6 -1 11 2 17
-5 13 3 -3 4 -12 1 -19z m390 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12
-1 -19z m2300 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m-4680
--10 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m-320 -50 c-3 -7 -5
--2 -5 12 0 14 2 19 5 13 2 -7 2 -19 0 -25z m2320 0 c-3 -7 -5 -2 -5 12 0 14 2
-19 5 13 2 -7 2 -19 0 -25z m370 0 c-3 -7 -5 -2 -5 12 0 14 2 19 5 13 2 -7 2
--19 0 -25z m2010 0 c-3 -7 -5 -2 -5 12 0 14 2 19 5 13 2 -7 2 -19 0 -25z m310
-0 c-3 -7 -5 -2 -5 12 0 14 2 19 5 13 2 -7 2 -19 0 -25z m-4700 0 c-3 -8 -6 -5
--6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m1700 0 c-3 -8 -6 -5 -6 6 -1 11 2 17
-5 13 3 -3 4 -12 1 -19z m990 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12
-1 -19z m-3010 -90 c-2 -13 -4 -5 -4 17 -1 22 1 32 4 23 2 -10 2 -28 0 -40z
-m310 15 c-3 -10 -5 -4 -5 12 0 17 2 24 5 18 2 -7 2 -21 0 -30z m1720 0 c-3
--10 -5 -4 -5 12 0 17 2 24 5 18 2 -7 2 -21 0 -30z m970 0 c-3 -10 -5 -4 -5 12
-0 17 2 24 5 18 2 -7 2 -21 0 -30z m1720 0 c-3 -10 -5 -4 -5 12 0 17 2 24 5 18
-2 -7 2 -21 0 -30z m-2380 -55 c-2 -18 -4 -6 -4 27 0 33 2 48 4 33 2 -15 2 -42
-0 -60z m350 20 c-2 -13 -4 -3 -4 22 0 25 2 35 4 23 2 -13 2 -33 0 -45z m2340
-0 c-2 -13 -4 -3 -4 22 0 25 2 35 4 23 2 -13 2 -33 0 -45z m-5030 -30 c-3 -8
--6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m2690 -110 c-2 -18 -4 -6 -4 27
-0 33 2 48 4 33 2 -15 2 -42 0 -60z m-2690 -5 c-2 -16 -4 -3 -4 27 0 30 2 43 4
-28 2 -16 2 -40 0 -55z m2340 -5 c-2 -13 -4 -3 -4 22 0 25 2 35 4 23 2 -13 2
--33 0 -45z m2690 0 c-2 -13 -4 -3 -4 22 0 25 2 35 4 23 2 -13 2 -33 0 -45z
-m-4720 -10 c-3 -7 -5 -2 -5 12 0 14 2 19 5 13 2 -7 2 -19 0 -25z m1720 -5 c-3
--10 -5 -4 -5 12 0 17 2 24 5 18 2 -7 2 -21 0 -30z m970 0 c-3 -10 -5 -4 -5 12
-0 17 2 24 5 18 2 -7 2 -21 0 -30z m1720 5 c-3 -7 -5 -2 -5 12 0 14 2 19 5 13
-2 -7 2 -19 0 -25z m300 -65 c-3 -10 -5 -4 -5 12 0 17 2 24 5 18 2 -7 2 -21 0
--30z m-5010 -5 c-3 -7 -5 -2 -5 12 0 14 2 19 5 13 2 -7 2 -19 0 -25z m310 0
-c-3 -7 -5 -2 -5 12 0 14 2 19 5 13 2 -7 2 -19 0 -25z m1700 0 c-3 -7 -5 -2 -5
-12 0 14 2 19 5 13 2 -7 2 -19 0 -25z m680 0 c-3 -7 -5 -2 -5 12 0 14 2 19 5
-13 2 -7 2 -19 0 -25z m310 0 c-3 -7 -5 -2 -5 12 0 14 2 19 5 13 2 -7 2 -19 0
--25z m1700 0 c-3 -7 -5 -2 -5 12 0 14 2 19 5 13 2 -7 2 -19 0 -25z m-2380 0
-c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m-2000 -40 c-3 -8 -6 -5
--6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m1680 0 c-3 -8 -6 -5 -6 6 -1 11 2 17
-5 13 3 -3 4 -12 1 -19z m1010 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12
-1 -19z m1680 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m-4680
--20 c-3 -7 -5 -2 -5 12 0 14 2 19 5 13 2 -7 2 -19 0 -25z m2300 0 c-3 -7 -5
--2 -5 12 0 14 2 19 5 13 2 -7 2 -19 0 -25z m390 0 c-3 -7 -5 -2 -5 12 0 14 2
-19 5 13 2 -7 2 -19 0 -25z m2300 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4
--12 1 -19z m-4980 -40 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z
-m2280 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m410 0 c-3 -8
--6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m2280 0 c-3 -8 -6 -5 -6 6 -1
-11 2 17 5 13 3 -3 4 -12 1 -19z m-4960 -40 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13
-3 -3 4 -12 1 -19z m2260 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1
--19z m430 0 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m2260 0 c-3
--8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m-4593 -65 c9 -18 14 -33 12
--33 -6 0 -36 55 -36 66 0 11 5 3 24 -33z m1557 14 c-10 -9 -11 -8 -5 6 3 10 9
-15 12 12 3 -3 0 -11 -7 -18z m1128 -7 c11 -24 11 -24 -3 -6 -9 11 -16 24 -16
-30 0 12 5 7 19 -24z m1556 -9 c-21 -43 -29 -39 -8 4 9 19 18 33 21 31 2 -2 -4
--18 -13 -35z m-2704 -24 c-10 -9 -11 -8 -5 6 3 10 9 15 12 12 3 -3 0 -11 -7
--18z m839 -22 c0 -5 -5 -3 -10 5 -5 8 -10 20 -10 25 0 6 5 3 10 -5 5 -8 10
--19 10 -25z m334 9 c3 -8 2 -12 -4 -9 -6 3 -10 10 -10 16 0 14 7 11 14 -7z
-m-3004 -59 c0 -5 -5 -3 -10 5 -5 8 -10 20 -10 25 0 6 5 3 10 -5 5 -8 10 -19
-10 -25z m1800 16 c-5 -11 -15 -23 -21 -27 -6 -3 -3 5 6 20 20 30 30 35 15 7z
-m336 -18 c-8 -15 -15 -25 -16 -21 0 12 23 58 27 54 3 -2 -2 -17 -11 -33z m563
--18 c0 -5 -6 1 -14 15 -8 14 -14 30 -14 35 0 6 6 -1 14 -15 8 -14 14 -29 14
--35z m2132 28 c-12 -20 -14 -14 -5 12 4 9 9 14 11 11 3 -2 0 -13 -6 -23z
-m-4450 -50 c13 -16 12 -17 -3 -4 -10 7 -18 15 -18 17 0 8 8 3 21 -13z m1389
-13 c0 -2 -8 -10 -17 -17 -16 -13 -17 -12 -4 4 13 16 21 21 21 13z m1309 -30
-c-3 -3 -11 5 -18 17 -13 21 -12 21 5 5 10 -10 16 -20 13 -22z m1381 30 c0 -2
--8 -10 -17 -17 -16 -13 -17 -12 -4 4 13 16 21 21 21 13z m-2347 -21 c-3 -9 -8
--14 -10 -11 -3 3 -2 9 2 15 9 16 15 13 8 -4z m2690 0 c-3 -9 -8 -14 -10 -11
--3 3 -2 9 2 15 9 16 15 13 8 -4z m-3063 -18 c0 -1 -28 -29 -62 -62 l-63 -60
-60 63 c55 58 65 67 65 59z m2690 0 c0 -1 -28 -29 -62 -62 l-63 -60 60 63 c55
-58 65 67 65 59z m-4380 -27 c6 -11 8 -20 6 -20 -3 0 -10 9 -16 20 -6 11 -8 20
--6 20 3 0 10 -9 16 -20z m410 -35 c30 -30 52 -55 49 -55 -2 0 -29 25 -59 55
--30 30 -52 55 -49 55 2 0 29 -25 59 -55z m1630 35 c-6 -11 -13 -20 -16 -20 -2
-0 0 9 6 20 6 11 13 20 16 20 2 0 0 -9 -6 -20z m650 0 c6 -11 8 -20 6 -20 -3 0
--10 9 -16 20 -6 11 -8 20 -6 20 3 0 10 -9 16 -20z m500 -119 c8 -8 -3 -1 -25
-16 -22 17 -60 53 -85 79 -34 37 -29 34 25 -16 39 -35 77 -70 85 -79z m1540
-119 c-6 -11 -13 -20 -16 -20 -2 0 0 9 6 20 6 11 13 20 16 20 2 0 0 -9 -6 -20z
-m-4685 -72 c16 -24 22 -38 14 -31 -15 12 -53 73 -46 73 2 0 17 -19 32 -42z
-m1958 11 c-10 -17 -24 -36 -32 -42 -8 -7 -2 7 14 31 32 49 45 57 18 11z m717
-11 c6 -11 8 -20 6 -20 -3 0 -10 9 -16 20 -6 11 -8 20 -6 20 3 0 10 -9 16 -20z
-m1980 0 c-6 -11 -13 -20 -16 -20 -2 0 0 9 6 20 6 11 13 20 16 20 2 0 0 -9 -6
--20z m-1949 -47 c13 -16 12 -17 -3 -4 -10 7 -18 15 -18 17 0 8 8 3 21 -13z
-m1929 13 c0 -2 -8 -10 -17 -17 -16 -13 -17 -12 -4 4 13 16 21 21 21 13z
-m-4185 -26 c10 -11 16 -20 13 -20 -3 0 -13 9 -23 20 -10 11 -16 20 -13 20 3 0
-13 -9 23 -20z m1065 16 c0 -2 -8 -10 -17 -17 -16 -13 -17 -12 -4 4 13 16 21
-21 21 13z m2690 0 c0 -2 -8 -10 -17 -17 -16 -13 -17 -12 -4 4 13 16 21 21 21
-13z m-4159 -43 c13 -16 12 -17 -3 -4 -10 7 -18 15 -18 17 0 8 8 3 21 -13z
-m1429 13 c0 -2 -8 -10 -17 -17 -16 -13 -17 -12 -4 4 13 16 21 21 21 13z m412
--33 c-16 -21 -40 -47 -53 -58 -13 -11 -1 6 26 38 55 64 73 77 27 20z m2278 33
-c0 -2 -8 -10 -17 -17 -16 -13 -17 -12 -4 4 13 16 21 21 21 13z m440 0 c0 -2
--8 -10 -17 -17 -16 -13 -17 -12 -4 4 13 16 21 21 21 13z m-4060 -52 c0 -2 -9
-0 -20 6 -11 6 -20 13 -20 16 0 2 9 0 20 -6 11 -6 20 -13 20 -16z m890 21 c0
--2 -10 -9 -22 -15 -22 -11 -22 -10 -4 4 21 17 26 19 26 11z m1345 -35 l30 -35
--32 29 c-18 17 -33 34 -33 40 0 5 1 7 3 5 1 -2 16 -20 32 -39z m455 14 c0 -2
--9 0 -20 6 -11 6 -20 13 -20 16 0 2 9 0 20 -6 11 -6 20 -13 20 -16z m890 21
-c0 -2 -10 -9 -22 -15 -22 -11 -22 -10 -4 4 21 17 26 19 26 11z m-4040 -30 c13
--14 21 -25 18 -25 -2 0 -15 11 -28 25 -13 14 -21 25 -18 25 2 0 15 -11 28 -25z
-m4490 22 c0 -2 -17 -19 -37 -38 l-38 -34 34 38 c33 34 41 42 41 34z m-3875
--77 c13 -6 15 -9 5 -9 -8 0 -22 4 -30 9 -18 12 -2 12 25 0z m565 0 c-8 -5 -19
--10 -25 -10 -5 0 -3 5 5 10 8 5 20 10 25 10 6 0 3 -5 -5 -10z m2647 -16 c-3
--3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m-3130 -10 c-3 -3 -12 -4
--19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m400 0 c-3 -3 -12 -4 -19 -1 -8 3 -5
-6 6 6 11 1 17 -2 13 -5z m2290 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17
--2 13 -5z m400 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z
-m-3597 -102 c0 -7 -74 55 -95 79 -11 13 6 1 38 -26 31 -27 57 -51 57 -53z
-m557 92 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m300 0 c-3 -3
--12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m2390 0 c-3 -3 -12 -4 -19 -1
--8 3 -5 6 6 6 11 1 17 -2 13 -5z m300 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6
-11 1 17 -2 13 -5z m-2879 -11 c-16 -2 -40 -2 -55 0 -16 2 -3 4 27 4 30 0 43
--2 28 -4z m110 0 c-16 -2 -40 -2 -55 0 -16 2 -3 4 27 4 30 0 43 -2 28 -4z
-m702 -8 c-7 -9 -32 -30 -54 -47 -35 -26 -34 -24 9 15 52 48 67 58 45 32z
-m1146 -17 l29 -33 -32 29 c-31 28 -38 36 -30 36 2 0 16 -15 33 -32z m732 25
-c-16 -2 -40 -2 -55 0 -16 2 -3 4 27 4 30 0 43 -2 28 -4z m105 0 c-13 -2 -35
--2 -50 0 -16 2 -5 4 22 4 28 0 40 -2 28 -4z m717 4 c0 -2 -15 -16 -32 -33
-l-33 -29 29 33 c28 30 36 37 36 29z m-1460 -103 c0 -3 -13 4 -30 16 -16 12
--30 24 -30 26 0 3 14 -4 30 -16 17 -12 30 -24 30 -26z m1390 42 c0 -2 -8 -10
--17 -17 -16 -13 -17 -12 -4 4 13 16 21 21 21 13z m-4050 -63 c0 -7 -39 17 -46
-28 -3 6 5 3 20 -6 14 -10 26 -19 26 -22z m50 -29 c0 -2 -9 0 -20 6 -11 6 -20
-13 -20 16 0 2 9 0 20 -6 11 -6 20 -13 20 -16z m96 -52 c-5 -4 -86 36 -86 43 0
-3 20 -5 45 -17 24 -12 43 -23 41 -26z m1064 43 c0 -6 -97 -55 -107 -55 -4 1
-17 14 47 30 61 32 60 32 60 25z m1626 -43 c-5 -4 -86 36 -86 43 0 3 20 -5 45
--17 24 -12 43 -23 41 -26z m1064 43 c0 -6 -76 -45 -87 -45 -4 1 12 12 37 25
-50 27 50 27 50 20z m-1000 -65 c8 -5 11 -10 5 -10 -5 0 -17 5 -25 10 -8 5 -10
-10 -5 10 6 0 17 -5 25 -10z m-2553 -46 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11
-1 17 -2 13 -5z m600 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z
-m2090 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m600 0 c-3 -3
--12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m-3250 -10 c-3 -3 -12 -4 -19
--1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m520 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6
-6 11 1 17 -2 13 -5z m2170 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2
-13 -5z m520 0 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m-3160
--10 c-3 -3 -12 -4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m420 0 c-3 -3 -12
--4 -19 -1 -8 3 -5 6 6 6 11 1 17 -2 13 -5z m2276 -1 c-7 -2 -19 -2 -25 0 -7 3
--2 5 12 5 14 0 19 -2 13 -5z m410 0 c-7 -2 -19 -2 -25 0 -7 3 -2 5 12 5 14 0
-19 -2 13 -5z m-3040 -10 c-7 -2 -19 -2 -25 0 -7 3 -2 5 12 5 14 0 19 -2 13 -5z
-m290 0 c-7 -2 -19 -2 -25 0 -7 3 -2 5 12 5 14 0 19 -2 13 -5z m2400 0 c-7 -2
--19 -2 -25 0 -7 3 -2 5 12 5 14 0 19 -2 13 -5z m290 0 c-7 -2 -19 -2 -25 0 -7
-3 -2 5 12 5 14 0 19 -2 13 -5z m-2805 -10 c-21 -2 -57 -2 -80 0 -24 2 -7 4 37
-4 44 0 63 -2 43 -4z m2690 0 c-21 -2 -57 -2 -80 0 -24 2 -7 4 37 4 44 0 63 -2
-43 -4z"/>
-</g>
-</svg>
diff --git a/app/templates/app/base.html b/app/templates/app/base.html
index d7ece283..96180dbc 100644
--- a/app/templates/app/base.html
+++ b/app/templates/app/base.html
@@ -1,21 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    {% load i18n static %}
+    {% load i18n static settings %}
+    {% get_settings as settings %}
+
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="Web OpenDroneMap. Open Source Aerial Imagery Processing Platform">
-    <meta name="author" content="">
-    <link rel="apple-touch-icon" sizes="180x180" href="/static/app/apple-touch-icon.png">
-    <link rel="icon" type="image/png" href="/static/app/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="/static/app/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="/static/app/manifest.json">
-    <link rel="mask-icon" href="/static/app/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="/static/app/favicon.ico">
-    <meta name="msapplication-config" content="/static/app/browserconfig.xml">
-    <meta name="theme-color" content="#ffffff">
-    
+    <meta name="author" content="WebODM Contributors">
+    <link rel="icon" type="image/png" href="{% settings_image_url 'app_logo_favicon' %}" sizes="32x32">
+
     <link rel="stylesheet" type="text/css" href="{% static 'app/css/bootstrap.min.css' %}" />
 
     <link href="{% static 'app/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
@@ -29,7 +23,8 @@
     {% load render_bundle from webpack_loader %}
     {% render_bundle 'main' %}
 
-    <title>{{title|default:"Login"}} - WebODM</title>
+    <title>{{title|default:"Login"}} - {{ settings.app_name }}</title>
+
 </head>
 <body data-admin-utc-offset="{% now "Z" %}">
     <!--[if lt IE 8]>
@@ -62,8 +57,8 @@
                     <span class="icon-bar"></span>
                 </button>
                 {% block navbar-top-links %}{% endblock %}
-                <a class="navbar-brand" href="/"><img src="{% static 'app/img/logo36.png' %}" alt="WebODM" /></a>
-                <a class="navbar-link" href="/"><p class="navbar-text">WebODM</a></p>
+                <a class="navbar-brand" href="/"><img src="{% settings_image_url 'app_logo_36' %}" alt="{{ settings.app_name }}" /></a>
+                <a class="navbar-link" href="/"><p class="navbar-text">{{ settings.app_name }}</a></p>
             </div>
 
             {% block navbar-sidebar %}{% endblock %}
diff --git a/app/templatetags/settings.py b/app/templatetags/settings.py
new file mode 100644
index 00000000..5485d0e9
--- /dev/null
+++ b/app/templatetags/settings.py
@@ -0,0 +1,16 @@
+from django import template
+
+from app.models import Setting
+from webodm import settings
+
+register = template.Library()
+
+
+@register.assignment_tag()
+def get_settings():
+    return Setting.objects.first()
+
+
+@register.assignment_tag()
+def settings_image_url(image):
+    return "/media/" + getattr(Setting.objects.first(), image).url
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index c23d817b..74e2102f 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -44,6 +44,14 @@ http {
       root /webodm/build;
     }
 
+    # path for certain media files that don't need permissions enforced
+    location /media/CACHE {
+      root /webodm/app/media/CACHE;
+    }
+    location /media/settings {
+      root /webodm/app/media/settings;
+    }
+
     location / {
       # CORS settings
 
diff --git a/requirements.txt b/requirements.txt
index a9cacc9c..a126d2a7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,10 +3,13 @@ appdirs==1.4.0
 APScheduler==3.2.0
 coreapi==2.0.9
 Django==1.11.1
+django-appconf==1.0.2
+django-colorfield==0.1.14
 django-cors-headers==2.0.2
 django-debug-toolbar==1.6
 django-filter==1.0.4
 django-guardian==1.4.6
+django-imagekit==4.0.1
 django-webpack-loader==0.3.3
 djangorestframework==3.6.3
 djangorestframework-jwt==1.9.0
@@ -18,6 +21,7 @@ itypes==1.1.0
 Markdown==2.6.7
 openapi-codec==1.1.7
 packaging==16.8
+pilkit==2.0
 Pillow==3.3.1
 pip-autoremove==0.9.0
 psycopg2==2.6.2
diff --git a/webodm/settings.py b/webodm/settings.py
index 4bc1fe7c..9d9d32b6 100644
--- a/webodm/settings.py
+++ b/webodm/settings.py
@@ -69,6 +69,8 @@ INSTALLED_APPS = [
     'rest_framework_nested',
     'webpack_loader',
     'corsheaders',
+    'colorfield',
+    'imagekit',
 #    'debug_toolbar',
     'app',
     'nodeodm',
diff --git a/webodm/urls.py b/webodm/urls.py
index d195adf7..e3fbd905 100644
--- a/webodm/urls.py
+++ b/webodm/urls.py
@@ -13,9 +13,12 @@ Including another URLconf
     1. Import the include() function: from django.conf.urls import url, include
     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
+import os
+
 from django.conf.urls import include, url
 from django.contrib import admin
 from . import settings
+from django.views.static import serve
 
 admin.site.site_header = 'WebODM Administration'
 
@@ -29,7 +32,17 @@ if settings.DEBUG:
     import debug_toolbar
     urlpatterns += [
         url(r'^__debug__/', include(debug_toolbar.urls)),
+
+        # Expose imagekit generated files and settings file uploads
+        url(r'^media/CACHE/(?P<path>.*)$', serve, {
+            'document_root': os.path.join(settings.MEDIA_ROOT, 'CACHE')
+        }),
+        url(r'^media/settings/(?P<path>.*)$', serve, {
+            'document_root': os.path.join(settings.MEDIA_ROOT, 'settings')
+        }),
+
     ]
 
+
 #from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-#urlpatterns += staticfiles_urlpatterns()
\ No newline at end of file
+#urlpatterns += staticfiles_urlpatterns()