diff --git a/content.py b/content.py
index 532668ffe..0782d0ed0 100644
--- a/content.py
+++ b/content.py
@@ -181,6 +181,29 @@ def dangerousMarkup(content: str) -> bool:
     return False
 
 
+def dangerousCSS(filename: str) -> bool:
+    """Returns true is the css file contains code which
+    can create security problems
+    """
+    if not os.path.isfile(filename):
+        return False
+
+    with open(filename, 'r') as fp:
+        content = fp.read().lower()
+
+        cssMatches = ('behavior:', ':expression', '?php', '.php',
+                      'google')
+        for match in cssMatches:
+            if match in content:
+                return True
+
+        # an attacker can include html inside of the css
+        # file as a comment and this may then be run from the html
+        if dangerousMarkup(content):
+            return True
+    return False
+
+
 def switchWords(baseDir: str, nickname: str, domain: str, content: str) -> str:
     """Performs word replacements. eg. Trump -> The Orange Menace
     """
diff --git a/daemon.py b/daemon.py
index 3a7fb640b..4fd08b73c 100644
--- a/daemon.py
+++ b/daemon.py
@@ -4839,10 +4839,11 @@ class PubServer(BaseHTTPRequestHandler):
         if path.endswith('.png'):
             mediaStr = path.split('/icons/')[1]
             if '/' not in mediaStr:
-                self._404()
-                return
-            theme = mediaStr.split('/')[0]
-            iconFilename = mediaStr.split('/')[1]
+                theme = 'default'
+                iconFilename = mediaStr
+            else:
+                theme = mediaStr.split('/')[0]
+                iconFilename = mediaStr.split('/')[1]
             mediaFilename = \
                 baseDir + '/theme/' + theme + '/icons/' + iconFilename
             if self._etag_exists(mediaFilename):
diff --git a/epicyon-blog.css b/epicyon-blog.css
index 0e78fa287..277a9710a 100644
--- a/epicyon-blog.css
+++ b/epicyon-blog.css
@@ -44,6 +44,7 @@
     --timeline-border-radius: 30px;
     --focus-color: white;
     --line-spacing: 130%;
+    --header-font: 'Bedstead';
 }
 
 @font-face {
@@ -77,7 +78,7 @@ body, html {
 a, u {
     color: var(--main-fg-color);
 }
-
+  
 a:visited{
     color: var(--main-visited-color);
     background: var(--link-bg-color);
@@ -94,6 +95,10 @@ a:focus {
     border: 2px solid var(--focus-color);
 }
 
+h1 {
+    font-family: var(--header-font);
+}
+
 .cwText {
     display: none;
 }
diff --git a/epicyon-calendar.css b/epicyon-calendar.css
index 989f08adb..c51568bbe 100644
--- a/epicyon-calendar.css
+++ b/epicyon-calendar.css
@@ -21,11 +21,13 @@
     --font-size-calendar-day: 1rem;
     --font-size-calendar-cell: 2rem;
     --font-size-calendar-cell-mobile: 4rem;
+    --calendar-header-font: 'Montserrat';
+    --calendar-header-font-style: italic;
 }
 
 @font-face {
   font-family: 'Bedstead';
-  font-style: italic;
+  font-style: var(--calendar-header-font-style);
   font-weight: normal;
   font-display: block;
   src: url('./fonts/bedstead.otf') format('opentype');
@@ -95,6 +97,7 @@ a:focus {
     background-color: var(--title-background);
     color: var(--title-text);
     display: inline-block;
+    font-family: var(--calendar-header-font);
     font-size: var(--font-size-calendar-header);
     font-weight: 400;
     letter-spacing: 0.1em;
diff --git a/epicyon-links.css b/epicyon-links.css
index d942bc773..849c2cf90 100644
--- a/epicyon-links.css
+++ b/epicyon-links.css
@@ -182,23 +182,6 @@ a:focus {
     border: 2px solid var(--focus-color);
 }
 
-.timeline-banner {
-    background-image: linear-gradient(rgba(0, 0, 0, 0.0), rgba(0, 0, 0, 0.5)), url("banner.png");
-    height: 15%;
-    background-repeat: no-repeat;
-    background-size: 100vw;
-    position: relative;
-}
-
-.hero-image {
-    background-image: linear-gradient(rgba(0, 0, 0, 0.0), rgba(0, 0, 0, 0.5)), url("image.png");
-    height: 50%;
-    background-position: center;
-    background-repeat: no-repeat;
-    background-size: cover;
-    position: relative;
-}
-
 .rssfeed img {
     width: 5%;
     float: right;
@@ -231,10 +214,6 @@ a:focus {
     transform: translateY(30%) scaleX(-1);
 }
 
-.hero-image img {
-    width: 50%;
-}
-
 .new-post-text {
     font-size: var(--font-size2);
     font-family: Arial, Helvetica, sans-serif;
@@ -262,30 +241,6 @@ a:focus {
     background-color: var(--main-bg-color);
 }
 
-.hero-text img.emoji {
-    width: 50px;
-    padding: 0 0;
-    margin: 0 0;
-    float: none;
-}
-
-.hero-text button {
-    border: none;
-    outline: 0;
-    display: inline-block;
-    padding: 10px 25px;
-    color: black;
-    background-color: #ddd;
-    text-align: center;
-    cursor: pointer;
-    font-family: Arial, Helvetica, sans-serif;
-}
-
-.hero-text button:hover {
-    background-color: var(--button-background);
-    color: var(--button-text);
-}
-
 .timelineIcon {
     width: 10%;
 }
@@ -408,16 +363,6 @@ a:focus {
     vertical-align: middle;
 }
 
-.hero-text img.emojiprofile {
-    float: none;
-    width: 50px;
-    margin-left: 0px;
-    margin-right: 0px;
-    padding-right: 0px;
-    border-radius: 0px;
-    vertical-align: middle;
-}
-
 .containericons {
     padding: 0px 0px;
     margin: 0px 0px;
@@ -960,8 +905,9 @@ aside .toggle-inside li {
         width: 100vw;
     }
     .timeline-banner {
+        object-fit: cover;
         width: 98vw;
-        height: var(--banner-height);
+        max-height: var(--banner-height);
     }
     .column-left {
         width: var(--column-left-width);
@@ -1337,26 +1283,6 @@ aside .toggle-inside li {
         font-family: Arial, Helvetica, sans-serif;
         opacity: 0.7;
     }
-    .hero-text {
-        text-align: center;
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        width: 70%;
-        transform: translate(-50%, -50%);
-        color: var(--font-color-header);
-        font-size: var(--font-size-header);
-        font-family: Arial, Helvetica, sans-serif;
-    }
-    .hero-text img.qrcode {
-        border-radius: 1%;
-        width: 5%;
-        min-width: 20px;
-    }
-    .hero-text img.title {
-        border-radius: 1%;
-        width: 15%;
-    }
     #msgscope label img {
         width: 46px;
         height: 46px;
@@ -1449,6 +1375,7 @@ aside .toggle-inside li {
         width: 100vw;
     }
     .timeline-banner {
+        object-fit: cover;
         width: 98vw;
         height: var(--banner-height-mobile);
     }
@@ -1826,26 +1753,6 @@ aside .toggle-inside li {
         font-family: Arial, Helvetica, sans-serif;
         opacity: 0.7;
     }
-    .hero-text {
-        text-align: center;
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        width: 70%;
-        transform: translate(-50%, -50%);
-        color: var(--font-color-header);
-        font-size: var(--font-size-header-mobile);
-        font-family: Arial, Helvetica, sans-serif;
-    }
-    .hero-text img.qrcode {
-        border-radius: 1%;
-        width: 15%;
-        min-width: 20px;
-    }
-    .hero-text img.title {
-        border-radius: 1%;
-        width: 25%;
-    }
     #msgscope label  img {
         width: 64px;
         height: 64px;
diff --git a/epicyon-options.css b/epicyon-options.css
index 9e27a2bc1..330f108cf 100644
--- a/epicyon-options.css
+++ b/epicyon-options.css
@@ -140,7 +140,8 @@ a:focus {
     input[type=text] {
         width: var(--follow-text-entry-width);
         clear: both;
-	min-width: var(--petname-width-chars);
+        max-width: 30%;
+        min-width: var(--petname-width-chars);
         font-size: 24px;
         text-align: center;
         color: var(--text-entry-foreground);
@@ -218,7 +219,8 @@ a:focus {
         clear: both;
         font-size: 40px;
         text-align: center;
-	min-width: var(--petname-width-chars);
+        max-width: 50%;
+        min-width: var(--petname-width-chars);
         color: var(--text-entry-foreground);
         background-color: var(--text-entry-background);
         font-family: Arial, Helvetica, sans-serif;
diff --git a/epicyon-profile.css b/epicyon-profile.css
index c93286079..94545124d 100644
--- a/epicyon-profile.css
+++ b/epicyon-profile.css
@@ -123,6 +123,7 @@
     --likes-count-offset: 5px;
     --likes-count-offset-mobile: 10px;
     --publish-button-vertical-offset: 10px;
+    --publish-button-bottom-offset: 10px;
     --banner-height: 15vh;
     --banner-height-mobile: 10vh;
     --post-separator-margin-top: 0;
@@ -132,11 +133,14 @@
     --header-vertical-offset: 0;
     --profile-background-height: 25vw;
     --profile-text-align: left;
+    --verticals-width: 0;
+    --italic-font-style: italic;
+    --header-font: 'Bedstead';
 }
 
 @font-face {
   font-family: 'Bedstead';
-  font-style: italic;
+  font-style: var(--italic-font-style);
   font-weight: normal;
   font-display: block;
   src: url('./fonts/bedstead.otf') format('opentype');
@@ -218,6 +222,7 @@ blockquote p {
 }
 
 h1 {
+    font-family: var(--header-font);
     color: var(--title-color);
 }
 
@@ -391,7 +396,7 @@ a:focus {
 }
 
 .button span {
-    font-family: Arial, Helvetica, sans-serif;
+    font-family: var(--header-font);
     cursor: pointer;
     display: inline-block;
     position: relative;
@@ -399,7 +404,7 @@ a:focus {
 }
 
 .button span:after {
-    font-family: Arial, Helvetica, sans-serif;
+    font-family: var(--header-font);
     content: '\00bb';
     position: absolute;
     opacity: 0;
@@ -419,7 +424,7 @@ a:focus {
 }
 
 .buttonselected span {
-    font-family: Arial, Helvetica, sans-serif;
+    font-family: var(--header-font);
     cursor: pointer;
     display: inline-block;
     position: relative;
@@ -427,7 +432,7 @@ a:focus {
 }
 
 .buttonselected span:after {
-    font-family: Arial, Helvetica, sans-serif;
+    font-family: var(--header-font);
     content: '\00bb';
     position: absolute;
     opacity: 0;
@@ -752,6 +757,7 @@ input[type=submit]:hover {
   padding: 6px 0px;
   color: var(--dropdown-fg-color);
   font-size: var(--font-size-dropdown-header);
+  font-family: var(--header-font);
   line-height: 1.5em;
   text-decoration: none;
   border: 0;
@@ -945,6 +951,7 @@ div.container {
     h3.linksHeader {
         background-color: var(--column-left-header-background);
         color: var(--column-left-header-color);
+        font-family: var(--header-font);
         font-size: var(--column-left-header-size);
         text-transform: var(--column-left-header-style);
         padding: 4px;
@@ -1038,6 +1045,10 @@ div.container {
     .col-center {
         width: var(--column-center-width);
         background-color: var(--main-bg-color);
+        border-bottom: none;
+        border-top: none;
+        border-left: var(--verticals-width) solid var(--tab-border-color);
+        border-right: var(--verticals-width) solid var(--tab-border-color);
     }
     .col-right a:link {
         background: var(--column-left-color);
@@ -1238,7 +1249,7 @@ div.container {
         color: var(--button-text);
         text-align: center;
         font-size: var(--font-size-header);
-        font-family: Arial, Helvetica, sans-serif;
+        font-family: var(--header-font);
         padding: var(--button-height-padding);
         width: 10%;
         margin: 5px;
@@ -1256,7 +1267,7 @@ div.container {
         color: var(--button-text);
         text-align: center;
         font-size: var(--font-size-header);
-        font-family: Arial, Helvetica, sans-serif;
+        font-family: var(--header-font);
         padding: var(--button-height-padding);
         width: 10%;
         margin: 5px;
@@ -1284,6 +1295,7 @@ div.container {
         cursor: pointer;
         margin: 0 0px;
         margin-top: var(--publish-button-vertical-offset);
+        margin-bottom: var(--publish-button-bottom-offset);
     }
     .buttonhighlighted {
         border-radius: var(--button-corner-radius);
@@ -1307,7 +1319,7 @@ div.container {
         color: var(--button-selected-text);
         text-align: center;
         font-size: var(--font-size-header);
-        font-family: Arial, Helvetica, sans-serif;
+        font-family: var(--header-font);
         padding: var(--button-height-padding);
         width: 10%;
         margin: 5px;
@@ -1326,7 +1338,7 @@ div.container {
         color: var(--button-text);
         text-align: center;
         font-size: var(--font-size-header);
-        font-family: Arial, Helvetica, sans-serif;
+        font-family: var(--header-font);
         padding: var(--button-height-padding);
         width: 10%;
         max-width: 100px;
@@ -1571,6 +1583,7 @@ div.container {
     h3.linksHeader {
         background-color: var(--column-left-header-background);
         color: var(--column-left-header-color);
+        font-family: var(--header-font);
         font-size: var(--column-left-header-size-mobile);
         text-transform: var(--column-left-header-style);
         padding: 4px;
@@ -1829,7 +1842,7 @@ div.container {
         color: var(--button-text);
         text-align: center;
         font-size: var(--font-size-button-mobile);
-        font-family: Arial, Helvetica, sans-serif;
+        font-family: var(--header-font);
         padding: var(--button-height-padding-mobile);
         width: 20%;
         min-width: var(--button-width-chars);
@@ -1921,7 +1934,7 @@ div.container {
         color: var(--button-selected-text);
         text-align: center;
         font-size: var(--font-size-button-mobile);
-        font-family: Arial, Helvetica, sans-serif;
+        font-family: var(--header-font);
         padding: var(--button-height-padding-mobile);
         width: 20%;
         min-width: var(--button-width-chars);
@@ -1940,7 +1953,7 @@ div.container {
         color: var(--button-text);
         text-align: center;
         font-size: var(--font-size-button-mobile);
-        font-family: Arial, Helvetica, sans-serif;
+        font-family: var(--header-font);
         padding: var(--button-height-padding-mobile);
         width: 20%;
         max-width: 400px;
diff --git a/fonts/LICENSE-CC0.txt b/fonts/LICENSE-CC0.txt
new file mode 100644
index 000000000..0e259d42c
--- /dev/null
+++ b/fonts/LICENSE-CC0.txt
@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.
diff --git a/fonts/LICENSE-OFL.txt b/fonts/LICENSE-OFL.txt
new file mode 100644
index 000000000..ad1f9ac76
--- /dev/null
+++ b/fonts/LICENSE-OFL.txt
@@ -0,0 +1,86 @@
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/fonts/LICENSE-apache2.txt b/fonts/LICENSE-apache2.txt
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/fonts/LICENSE-apache2.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/fonts/LICENSES b/fonts/LICENSES
index 80bd7eedd..d5b038e9b 100644
--- a/fonts/LICENSES
+++ b/fonts/LICENSES
@@ -1,4 +1,4 @@
-Font Licenses
+# Font Licenses
 
 Absortile is under GPL. See https://www.ffonts.net/Absortile.font
 Bedstead is under CC0. See below and https://fontlibrary.org/en/font/bedstead
@@ -13,132 +13,22 @@ Judges is under GPL. See https://webfonts.ffonts.net/Judges.font
 LinBiolinum is under GPLv2. See https://www.1001fonts.com/linux-biolinum-font.html
 LcdSolid is public domain. See https://www.fontspace.com/lcd-solid-font-f11346
 MarginaliaRegular is public domain. See https://www.fontspace.com/marginalia-font-f32466
+Montserrat is under OFL and came from CCC Rc3 style guide https://styleguide.rc3.world
 Nimbus Sans L is GPL. See https://www.fontsquirrel.com/fonts/nimbus-sans-l
 Octavius is created by Jack Oatley and described as "100% free to use, though credit is appreciated" https://www.dafont.com/octavius.font
+Orbitron is under OFL and came from CCC Rc3 style guide https://styleguide.rc3.world
 RailModel is GPL. See https://www.fontspace.com/rail-model-font-f10741
 Solidaric by Bob Mottram is under AGPL
 SubZER0 is under GPL. See http://www.free-fonts-download.com/Techno/subzer0-font
 SundownerRegular is public domain. See https://www.fontspace.com/sundowner-font-f40837
 Warenhaus-Standard is public domain. See https://fontlibrary.org/en/font/warenhaus-typenhebel
 
-Creative Commons Legal Code
+# Note
 
-CC0 1.0 Universal
+There are varying opinions out there on the internets about the compatibility of Open Font License with GPL projects. However, gnu.org does list it as compatible - or at least not incompatible - when bundled with other software, which in practice is the case here. It writes:
 
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-    HEREUNDER.
+SIL Open Font License 1.1
 
-Statement of Purpose
+The Open Font License (including its original release, version 1.0) is a free copyleft license for fonts. Its only unusual requirement is that when selling the font, you must redistribute it bundled with some software, rather than alone. Since a simple Hello World program will satisfy the requirement, it is harmless. Neither we nor SIL recommend the use of this license for anything other than fonts.
 
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
-
-  i. the right to reproduce, adapt, distribute, perform, display,
-     communicate, and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
-     likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
-     subject to the limitations in paragraph 4(a), below;
-  v. rights protecting the extraction, dissemination, use and reuse of data
-     in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
-     European Parliament and of the Council of 11 March 1996 on the legal
-     protection of databases, and under any national implementation
-     thereof, including any amended or successor version of such
-     directive); and
-vii. other similar, equivalent or corresponding rights throughout the
-     world based on applicable law or treaty, and any national
-     implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason
-be judged legally invalid or ineffective under applicable law, then the
-Waiver shall be preserved to the maximum extent permitted taking into
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
-    surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
-    warranties of any kind concerning the Work, express, implied,
-    statutory or otherwise, including without limitation warranties of
-    title, merchantability, fitness for a particular purpose, non
-    infringement, or the absence of latent or other defects, accuracy, or
-    the present or absence of errors, whether or not discoverable, all to
-    the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
-    that may apply to the Work or any use thereof, including without
-    limitation any person's Copyright and Related Rights in the Work.
-    Further, Affirmer disclaims responsibility for obtaining any necessary
-    consents, permissions or other rights required for any use of the
-    Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
-    party to this document and has no duty or obligation with respect to
-    this CC0 or use of the Work.
+https://www.gnu.org/licenses/license-list.html#Fonts
\ No newline at end of file
diff --git a/fonts/Montserrat-Regular.ttf b/fonts/Montserrat-Regular.ttf
new file mode 100644
index 000000000..8d443d5d5
Binary files /dev/null and b/fonts/Montserrat-Regular.ttf differ
diff --git a/fonts/Orbitron.ttf b/fonts/Orbitron.ttf
new file mode 100644
index 000000000..f3277675b
Binary files /dev/null and b/fonts/Orbitron.ttf differ
diff --git a/tests.py b/tests.py
index 0431387a0..893fc036d 100644
--- a/tests.py
+++ b/tests.py
@@ -1952,6 +1952,11 @@ def testDangerousMarkup():
         '.innerHTML = "evil";</script></p>'
     assert(dangerousMarkup(content))
 
+    content = '<p>This html contains more than you expected... ' + \
+        '<script language="javascript">document.getElementById("abc")' + \
+        '.innerHTML = "def";</script></p>'
+    assert(dangerousMarkup(content))
+
     content = '<p>This is a valid-looking message. But wait... ' + \
         '<script src="https://evilsite/payload.js" /></p>'
     assert(dangerousMarkup(content))
diff --git a/theme.py b/theme.py
index 8492060ac..20e3b1ef9 100644
--- a/theme.py
+++ b/theme.py
@@ -10,6 +10,7 @@ import os
 from utils import loadJson
 from utils import saveJson
 from shutil import copyfile
+from content import dangerousCSS
 
 
 def getThemeFiles() -> []:
@@ -27,9 +28,11 @@ def getThemesList(baseDir: str) -> []:
     themes = []
     for subdir, dirs, files in os.walk(baseDir + '/theme'):
         for themeName in dirs:
-            if '~' not in themeName and themeName != 'icons':
+            if '~' not in themeName and \
+               themeName != 'icons' and themeName != 'fonts':
                 themes.append(themeName.title())
         break
+    themes.sort()
     print('Themes available: ' + str(themes))
     return themes
 
@@ -157,6 +160,14 @@ def setCSSparam(css: str, param: str, value: str) -> str:
         s = css.split(searchStr)
     newcss = ''
     for sectionStr in s:
+        # handle font-family which is a variable
+        nextSection = sectionStr
+        if ';' in nextSection:
+            nextSection = nextSection.split(';')[0] + ';'
+        if searchStr == 'font-family:' and "var(--" in nextSection:
+            newcss += searchStr + ' ' + sectionStr
+            continue
+
         if not newcss:
             if sectionStr:
                 newcss = sectionStr
@@ -185,7 +196,10 @@ def setThemeFromDict(baseDir: str, name: str,
             templateFilename = \
                 baseDir + '/theme/' + name + '/epicyon-profile.css'
 
-        if not os.path.isfile(templateFilename):
+        # Ensure that any custom CSS is mostly harmless.
+        # If not then just use the defaults
+        if dangerousCSS(templateFilename) or \
+           not os.path.isfile(templateFilename):
             # use default css
             templateFilename = baseDir + '/epicyon-' + filename
             if filename == 'epicyon.css':
@@ -411,34 +425,46 @@ def setThemeHighVis(baseDir: str):
     setThemeFromDict(baseDir, name, themeParams, bgParams)
 
 
+def setThemeFonts(baseDir: str, themeName: str) -> None:
+    """Adds custom theme fonts
+    """
+    themeNameLower = themeName.lower()
+    fontsDir = baseDir + '/fonts'
+    themeFontsDir = \
+        baseDir + '/theme/' + themeNameLower + '/fonts'
+    if not os.path.isdir(themeFontsDir):
+        return
+    for subdir, dirs, files in os.walk(themeFontsDir):
+        for filename in files:
+            if filename.endswith('.woff2') or \
+               filename.endswith('.woff') or \
+               filename.endswith('.ttf') or \
+               filename.endswith('.otf'):
+                destFilename = fontsDir + '/' + filename
+                if os.path.isfile(destFilename):
+                    # font already exists in the destination location
+                    continue
+                copyfile(themeFontsDir + '/' + filename,
+                         destFilename)
+        break
+
+
 def setThemeImages(baseDir: str, name: str) -> None:
     """Changes the profile background image
     and banner to the defaults
     """
     themeNameLower = name.lower()
 
-    if themeNameLower == 'default':
-        profileImageFilename = \
-            baseDir + '/theme/default/image.png'
-        bannerFilename = \
-            baseDir + '/theme/default/banner.png'
-        searchBannerFilename = \
-            baseDir + '/theme/default/search_banner.png'
-        leftColImageFilename = \
-            baseDir + '/theme/default/left_col_image.png'
-        rightColImageFilename = \
-            baseDir + '/theme/default/right_col_image.png'
-    else:
-        profileImageFilename = \
-            baseDir + '/theme/' + themeNameLower + '/image.png'
-        bannerFilename = \
-            baseDir + '/theme/' + themeNameLower + '/banner.png'
-        searchBannerFilename = \
-            baseDir + '/theme/' + themeNameLower + '/search_banner.png'
-        leftColImageFilename = \
-            baseDir + '/theme/' + themeNameLower + '/left_col_image.png'
-        rightColImageFilename = \
-            baseDir + '/theme/' + themeNameLower + '/right_col_image.png'
+    profileImageFilename = \
+        baseDir + '/theme/' + themeNameLower + '/image.png'
+    bannerFilename = \
+        baseDir + '/theme/' + themeNameLower + '/banner.png'
+    searchBannerFilename = \
+        baseDir + '/theme/' + themeNameLower + '/search_banner.png'
+    leftColImageFilename = \
+        baseDir + '/theme/' + themeNameLower + '/left_col_image.png'
+    rightColImageFilename = \
+        baseDir + '/theme/' + themeNameLower + '/right_col_image.png'
 
     backgroundNames = ('login', 'shares', 'delete', 'follow',
                        'options', 'block', 'search', 'calendar')
@@ -572,6 +598,7 @@ def setTheme(baseDir: str, name: str, domain: str) -> bool:
                     # change the banner and profile image
                     # to the default for the theme
                     setThemeImages(baseDir, name)
+                    setThemeFonts(baseDir, name)
             result = True
 
     if not result:
diff --git a/theme/blue/icons/agpl.png b/theme/blue/icons/agpl.png
new file mode 100644
index 000000000..c2d94b2e6
Binary files /dev/null and b/theme/blue/icons/agpl.png differ
diff --git a/theme/blue/theme.json b/theme/blue/theme.json
index cdbfdb20c..e47b82426 100644
--- a/theme/blue/theme.json
+++ b/theme/blue/theme.json
@@ -26,6 +26,7 @@
     "hashtag-vertical-spacing3": "100px",
     "hashtag-vertical-spacing4": "150px",
     "time-vertical-align": "-10px",
+    "header-font": "'Domestic_Manners'",
     "*font-family": "'Domestic_Manners'",
     "*src": "url('./fonts/Domestic_Manners.woff2') format('woff2')"
 }
diff --git a/theme/hacker/icons/agpl.png b/theme/hacker/icons/agpl.png
new file mode 100644
index 000000000..c2d94b2e6
Binary files /dev/null and b/theme/hacker/icons/agpl.png differ
diff --git a/theme/hacker/theme.json b/theme/hacker/theme.json
index 73ded44bb..14adc6f5f 100644
--- a/theme/hacker/theme.json
+++ b/theme/hacker/theme.json
@@ -31,6 +31,7 @@
     "button-small-text": "#00ff00",
     "button-corner-radius": "4px",
     "timeline-border-radius": "4px",
+    "header-font": "'Bedstead'",
     "*font-family": "'Bedstead'",
     "*src": "url('./fonts/bedstead.otf') format('opentype')",
     "color: #FFFFFE;": "color: green;",
diff --git a/theme/henge/icons/agpl.png b/theme/henge/icons/agpl.png
new file mode 100644
index 000000000..c2d94b2e6
Binary files /dev/null and b/theme/henge/icons/agpl.png differ
diff --git a/theme/henge/theme.json b/theme/henge/theme.json
index eddde97d7..7d5bae9f6 100644
--- a/theme/henge/theme.json
+++ b/theme/henge/theme.json
@@ -50,6 +50,7 @@
     "timeline-border-radius": "20px",
     "image-corners": "8%",
     "quote-right-margin": "0.1em",
+    "header-font": "'bgrove'",
     "*font-family": "'bgrove'",
     "*src": "url('fonts/bgrove.woff2') format('woff2')"
 }
diff --git a/theme/indymediaclassic/icons/agpl.png b/theme/indymediaclassic/icons/agpl.png
new file mode 100644
index 000000000..c2d94b2e6
Binary files /dev/null and b/theme/indymediaclassic/icons/agpl.png differ
diff --git a/theme/indymediamodern/icons/agpl.png b/theme/indymediamodern/icons/agpl.png
new file mode 100644
index 000000000..c2d94b2e6
Binary files /dev/null and b/theme/indymediamodern/icons/agpl.png differ
diff --git a/theme/indymediamodern/theme.json b/theme/indymediamodern/theme.json
index f5449b119..3c754d4af 100644
--- a/theme/indymediamodern/theme.json
+++ b/theme/indymediamodern/theme.json
@@ -1,9 +1,10 @@
 {
+    "verticals-width": "3px",
     "newswire-publish-icon": "False",
     "full-width-timeline-buttons": "False",
-    "icons-as-buttons": "False",
-    "rss-icon-at-top": "True",
-    "publish-button-at-top": "False",
+    "icons-as-buttons": "True",
+    "rss-icon-at-top": "False",
+    "publish-button-at-top": "True",
     "follow-text-size1": "14px",
     "follow-text-size2": "30px",
     "hashtag-size1": "20px",
@@ -32,7 +33,7 @@
     "post-separator-margin-bottom": "1%",
     "post-separator-width": "95%",
     "post-separator-height": "1px",
-    "column-left-border-width": "1px",
+    "column-left-border-width": "0px",
     "column-right-border-width": "0px",
     "column-left-border-color": "black",
     "column-left-header-color": "black",
@@ -111,6 +112,7 @@
     "title-text": "#282c37",
     "title-background": "#ccc",
     "gallery-text-color": "black",
+    "header-font": "'NimbusSanL'",
     "*font-family": "'NimbusSanL'",
     "*src": "url('./fonts/NimbusSanL.otf') format('opentype')",
     "**src": "url('./fonts/NimbusSanL-italic.otf') format('opentype')"
diff --git a/theme/lcd/icons/agpl.png b/theme/lcd/icons/agpl.png
new file mode 100644
index 000000000..c2d94b2e6
Binary files /dev/null and b/theme/lcd/icons/agpl.png differ
diff --git a/theme/lcd/theme.json b/theme/lcd/theme.json
index fe9d36cac..d17864ec3 100644
--- a/theme/lcd/theme.json
+++ b/theme/lcd/theme.json
@@ -67,6 +67,7 @@
     "time-color": "#33390d",
     "place-color": "#33390d",
     "event-color": "#33390d",
+    "header-font": "'LcdSolid'",
     "*font-family": "'LcdSolid'",
     "*src": "url('./fonts/LcdSolid.woff2') format('woff2')"
 }
diff --git a/theme/light/icons/agpl.png b/theme/light/icons/agpl.png
new file mode 100644
index 000000000..c2d94b2e6
Binary files /dev/null and b/theme/light/icons/agpl.png differ
diff --git a/theme/light/theme.json b/theme/light/theme.json
index b20ba2a33..76fe70ba2 100644
--- a/theme/light/theme.json
+++ b/theme/light/theme.json
@@ -55,6 +55,7 @@
     "title-text": "#282c37",
     "title-background": "#ccc",
     "gallery-text-color": "black",
+    "header-font": "'ElectrumADFExp-Regular'",
     "*font-family": "'ElectrumADFExp-Regular'",
     "*src": "url('./fonts/ElectrumADFExp-Regular.otf') format('opentype')"
 }
diff --git a/theme/night/icons/agpl.png b/theme/night/icons/agpl.png
new file mode 100644
index 000000000..c2d94b2e6
Binary files /dev/null and b/theme/night/icons/agpl.png differ
diff --git a/theme/night/theme.json b/theme/night/theme.json
index 7d48d6242..32b61aa98 100644
--- a/theme/night/theme.json
+++ b/theme/night/theme.json
@@ -50,6 +50,7 @@
     "event-background": "#00014a",
     "quote-right-margin": "0",
     "line-spacing": "150%",
+    "header-font": "'solidaric'",
     "*font-family": "'solidaric'",
     "*src": "url('./fonts/solidaric.woff2') format('woff2')",
     "**src": "url('./fonts/solidaric-italic.woff2') format('woff2')"
diff --git a/theme/purple/icons/agpl.png b/theme/purple/icons/agpl.png
new file mode 100644
index 000000000..c2d94b2e6
Binary files /dev/null and b/theme/purple/icons/agpl.png differ
diff --git a/theme/purple/theme.json b/theme/purple/theme.json
new file mode 100644
index 000000000..8e3c6456c
--- /dev/null
+++ b/theme/purple/theme.json
@@ -0,0 +1,56 @@
+{
+    "newswire-publish-icon": "True",
+    "full-width-timeline-buttons": "False",
+    "icons-as-buttons": "False",
+    "rss-icon-at-top": "True",
+    "publish-button-at-top": "False",
+    "search-banner-height": "25vh",
+    "search-banner-height-mobile": "10vh",
+    "font-size-button-mobile": "26px",
+    "font-size": "32px",
+    "font-size2": "26px",
+    "font-size3": "40px",
+    "font-size4": "24px",
+    "font-size5": "22px",
+    "main-bg-color": "#1f152d",
+    "column-left-color": "#1f152d",
+    "link-bg-color": "#1f152d",
+    "main-bg-color-reply": "#1a142d",
+    "main-bg-color-report": "#12152d",
+    "main-header-color-roles": "#1f192d",
+    "main-fg-color": "#f98bb0",
+    "column-left-fg-color": "#f98bb0",
+    "border-color": "#3f2145",
+    "main-link-color": "#ff42a0",
+    "main-link-color-hover": "white",
+    "title-color": "white",
+    "main-visited-color": "#f93bb0",
+    "button-selected": "#c042a0",
+    "button-background-hover": "#af42a0",
+    "button-text-hover": "#f98bb0",
+    "publish-button-background": "#ff42a0",
+    "button-background": "#ff42a0",
+    "button-small-background": "#ff42a0",
+    "button-text": "white",
+    "button-selected-text": "white",
+    "publish-button-text": "white",
+    "button-small-text": "white",
+    "color: #FFFFFE;": "color: #1f152d;",
+    "calendar-bg-color": "#1f152d",
+    "lines-color": "#ff42a0",
+    "day-number": "#f98bb0",
+    "day-number2": "lightgrey",
+    "today-foreground": "white",
+    "today-circle": "red",
+    "event-background": "#444",
+    "event-foreground": "white",
+    "title-text": "white",
+    "title-background": "#ff42a0",
+    "gallery-text-color": "#ccc",
+    "time-color": "#f98bb0",
+    "place-color": "#f98bb0",
+    "event-color": "#f98bb0",
+    "header-font": "'CheGuevaraTextSans-Regular'",
+    "*font-family": "'CheGuevaraTextSans-Regular'",
+    "*src": "url('./fonts/CheGuevaraTextSans-Regular.woff2') format('woff2')"
+}
diff --git a/theme/rc3/banner.png b/theme/rc3/banner.png
new file mode 100644
index 000000000..207980396
Binary files /dev/null and b/theme/rc3/banner.png differ
diff --git a/theme/rc3/icons/add.png b/theme/rc3/icons/add.png
new file mode 100644
index 000000000..0d42e0c79
Binary files /dev/null and b/theme/rc3/icons/add.png differ
diff --git a/theme/rc3/icons/agpl.png b/theme/rc3/icons/agpl.png
new file mode 100644
index 000000000..c2d94b2e6
Binary files /dev/null and b/theme/rc3/icons/agpl.png differ
diff --git a/theme/rc3/icons/avatar_news.png b/theme/rc3/icons/avatar_news.png
new file mode 100644
index 000000000..467c365d6
Binary files /dev/null and b/theme/rc3/icons/avatar_news.png differ
diff --git a/theme/rc3/icons/bookmark.png b/theme/rc3/icons/bookmark.png
new file mode 100644
index 000000000..1df20b17b
Binary files /dev/null and b/theme/rc3/icons/bookmark.png differ
diff --git a/theme/rc3/icons/bookmark_inactive.png b/theme/rc3/icons/bookmark_inactive.png
new file mode 100644
index 000000000..f6ab01ad6
Binary files /dev/null and b/theme/rc3/icons/bookmark_inactive.png differ
diff --git a/theme/rc3/icons/calendar.png b/theme/rc3/icons/calendar.png
new file mode 100644
index 000000000..9513e2aaa
Binary files /dev/null and b/theme/rc3/icons/calendar.png differ
diff --git a/theme/rc3/icons/calendar_notify.png b/theme/rc3/icons/calendar_notify.png
new file mode 100644
index 000000000..0bfafad34
Binary files /dev/null and b/theme/rc3/icons/calendar_notify.png differ
diff --git a/theme/rc3/icons/delete.png b/theme/rc3/icons/delete.png
new file mode 100644
index 000000000..a2e1be7de
Binary files /dev/null and b/theme/rc3/icons/delete.png differ
diff --git a/theme/rc3/icons/dm.png b/theme/rc3/icons/dm.png
new file mode 100644
index 000000000..f8393ed7a
Binary files /dev/null and b/theme/rc3/icons/dm.png differ
diff --git a/theme/rc3/icons/download.png b/theme/rc3/icons/download.png
new file mode 100644
index 000000000..fec6534fa
Binary files /dev/null and b/theme/rc3/icons/download.png differ
diff --git a/theme/rc3/icons/edit.png b/theme/rc3/icons/edit.png
new file mode 100644
index 000000000..d2fb98753
Binary files /dev/null and b/theme/rc3/icons/edit.png differ
diff --git a/theme/rc3/icons/edit_notify.png b/theme/rc3/icons/edit_notify.png
new file mode 100644
index 000000000..3004a5706
Binary files /dev/null and b/theme/rc3/icons/edit_notify.png differ
diff --git a/theme/rc3/icons/favicon.ico b/theme/rc3/icons/favicon.ico
new file mode 100644
index 000000000..f9c76d599
Binary files /dev/null and b/theme/rc3/icons/favicon.ico differ
diff --git a/theme/rc3/icons/like.png b/theme/rc3/icons/like.png
new file mode 100644
index 000000000..981f63f15
Binary files /dev/null and b/theme/rc3/icons/like.png differ
diff --git a/theme/rc3/icons/like_inactive.png b/theme/rc3/icons/like_inactive.png
new file mode 100644
index 000000000..59db210fb
Binary files /dev/null and b/theme/rc3/icons/like_inactive.png differ
diff --git a/theme/rc3/icons/links.png b/theme/rc3/icons/links.png
new file mode 100644
index 000000000..a22fd6eec
Binary files /dev/null and b/theme/rc3/icons/links.png differ
diff --git a/theme/rc3/icons/logorss.png b/theme/rc3/icons/logorss.png
new file mode 100644
index 000000000..d855d6147
Binary files /dev/null and b/theme/rc3/icons/logorss.png differ
diff --git a/theme/rc3/icons/logout.png b/theme/rc3/icons/logout.png
new file mode 100644
index 000000000..90045478b
Binary files /dev/null and b/theme/rc3/icons/logout.png differ
diff --git a/theme/rc3/icons/mute.png b/theme/rc3/icons/mute.png
new file mode 100644
index 000000000..927656898
Binary files /dev/null and b/theme/rc3/icons/mute.png differ
diff --git a/theme/rc3/icons/new.png b/theme/rc3/icons/new.png
new file mode 100644
index 000000000..981f63f15
Binary files /dev/null and b/theme/rc3/icons/new.png differ
diff --git a/theme/rc3/icons/newpost.png b/theme/rc3/icons/newpost.png
new file mode 100644
index 000000000..e0ae05c85
Binary files /dev/null and b/theme/rc3/icons/newpost.png differ
diff --git a/theme/rc3/icons/newswire.png b/theme/rc3/icons/newswire.png
new file mode 100644
index 000000000..23c3a5149
Binary files /dev/null and b/theme/rc3/icons/newswire.png differ
diff --git a/theme/rc3/icons/pagedown.png b/theme/rc3/icons/pagedown.png
new file mode 100644
index 000000000..79363393c
Binary files /dev/null and b/theme/rc3/icons/pagedown.png differ
diff --git a/theme/rc3/icons/pageup.png b/theme/rc3/icons/pageup.png
new file mode 100644
index 000000000..0b7c335a2
Binary files /dev/null and b/theme/rc3/icons/pageup.png differ
diff --git a/theme/rc3/icons/person.png b/theme/rc3/icons/person.png
new file mode 100644
index 000000000..87b3357c2
Binary files /dev/null and b/theme/rc3/icons/person.png differ
diff --git a/theme/rc3/icons/prev.png b/theme/rc3/icons/prev.png
new file mode 100644
index 000000000..66d80630f
Binary files /dev/null and b/theme/rc3/icons/prev.png differ
diff --git a/theme/rc3/icons/publish.png b/theme/rc3/icons/publish.png
new file mode 100644
index 000000000..3c3ec5031
Binary files /dev/null and b/theme/rc3/icons/publish.png differ
diff --git a/theme/rc3/icons/qrcode.png b/theme/rc3/icons/qrcode.png
new file mode 100644
index 000000000..933a2671c
Binary files /dev/null and b/theme/rc3/icons/qrcode.png differ
diff --git a/theme/rc3/icons/repeat.png b/theme/rc3/icons/repeat.png
new file mode 100644
index 000000000..89f75efa1
Binary files /dev/null and b/theme/rc3/icons/repeat.png differ
diff --git a/theme/rc3/icons/repeat_inactive.png b/theme/rc3/icons/repeat_inactive.png
new file mode 100644
index 000000000..d1730699e
Binary files /dev/null and b/theme/rc3/icons/repeat_inactive.png differ
diff --git a/theme/rc3/icons/reply.png b/theme/rc3/icons/reply.png
new file mode 100644
index 000000000..4478a3a7c
Binary files /dev/null and b/theme/rc3/icons/reply.png differ
diff --git a/theme/rc3/icons/rss3.png b/theme/rc3/icons/rss3.png
new file mode 100644
index 000000000..83521cd1b
Binary files /dev/null and b/theme/rc3/icons/rss3.png differ
diff --git a/theme/rc3/icons/scope_blog.png b/theme/rc3/icons/scope_blog.png
new file mode 100644
index 000000000..376c54f30
Binary files /dev/null and b/theme/rc3/icons/scope_blog.png differ
diff --git a/theme/rc3/icons/scope_dm.png b/theme/rc3/icons/scope_dm.png
new file mode 100644
index 000000000..0e0a7d013
Binary files /dev/null and b/theme/rc3/icons/scope_dm.png differ
diff --git a/theme/rc3/icons/scope_event.png b/theme/rc3/icons/scope_event.png
new file mode 100644
index 000000000..0b22d9560
Binary files /dev/null and b/theme/rc3/icons/scope_event.png differ
diff --git a/theme/rc3/icons/scope_followers.png b/theme/rc3/icons/scope_followers.png
new file mode 100644
index 000000000..ecf27f86e
Binary files /dev/null and b/theme/rc3/icons/scope_followers.png differ
diff --git a/theme/rc3/icons/scope_public.png b/theme/rc3/icons/scope_public.png
new file mode 100644
index 000000000..7cb6928d0
Binary files /dev/null and b/theme/rc3/icons/scope_public.png differ
diff --git a/theme/rc3/icons/scope_question.png b/theme/rc3/icons/scope_question.png
new file mode 100644
index 000000000..ab57da11d
Binary files /dev/null and b/theme/rc3/icons/scope_question.png differ
diff --git a/theme/rc3/icons/scope_reminder.png b/theme/rc3/icons/scope_reminder.png
new file mode 100644
index 000000000..617d60ca9
Binary files /dev/null and b/theme/rc3/icons/scope_reminder.png differ
diff --git a/theme/rc3/icons/scope_report.png b/theme/rc3/icons/scope_report.png
new file mode 100644
index 000000000..b580b8531
Binary files /dev/null and b/theme/rc3/icons/scope_report.png differ
diff --git a/theme/rc3/icons/scope_share.png b/theme/rc3/icons/scope_share.png
new file mode 100644
index 000000000..5db996f42
Binary files /dev/null and b/theme/rc3/icons/scope_share.png differ
diff --git a/theme/rc3/icons/scope_unlisted.png b/theme/rc3/icons/scope_unlisted.png
new file mode 100644
index 000000000..063438500
Binary files /dev/null and b/theme/rc3/icons/scope_unlisted.png differ
diff --git a/theme/rc3/icons/search.png b/theme/rc3/icons/search.png
new file mode 100644
index 000000000..05b14c073
Binary files /dev/null and b/theme/rc3/icons/search.png differ
diff --git a/theme/rc3/icons/showhide.png b/theme/rc3/icons/showhide.png
new file mode 100644
index 000000000..490def568
Binary files /dev/null and b/theme/rc3/icons/showhide.png differ
diff --git a/theme/rc3/icons/unmute.png b/theme/rc3/icons/unmute.png
new file mode 100644
index 000000000..2c8d77421
Binary files /dev/null and b/theme/rc3/icons/unmute.png differ
diff --git a/theme/rc3/icons/vote.png b/theme/rc3/icons/vote.png
new file mode 100644
index 000000000..c810092b0
Binary files /dev/null and b/theme/rc3/icons/vote.png differ
diff --git a/theme/rc3/image.png b/theme/rc3/image.png
new file mode 100644
index 000000000..094df86c1
Binary files /dev/null and b/theme/rc3/image.png differ
diff --git a/theme/rc3/left_col_image.png b/theme/rc3/left_col_image.png
new file mode 100644
index 000000000..fc356c991
Binary files /dev/null and b/theme/rc3/left_col_image.png differ
diff --git a/theme/rc3/login_background.jpg b/theme/rc3/login_background.jpg
new file mode 100644
index 000000000..a62326804
Binary files /dev/null and b/theme/rc3/login_background.jpg differ
diff --git a/theme/rc3/options_background.jpg b/theme/rc3/options_background.jpg
new file mode 100644
index 000000000..a40eff162
Binary files /dev/null and b/theme/rc3/options_background.jpg differ
diff --git a/theme/rc3/right_col_image.png b/theme/rc3/right_col_image.png
new file mode 100644
index 000000000..73136c3c5
Binary files /dev/null and b/theme/rc3/right_col_image.png differ
diff --git a/theme/rc3/search_banner.png b/theme/rc3/search_banner.png
new file mode 100644
index 000000000..c63297c2f
Binary files /dev/null and b/theme/rc3/search_banner.png differ
diff --git a/theme/rc3/theme.json b/theme/rc3/theme.json
new file mode 100644
index 000000000..08edd84e0
--- /dev/null
+++ b/theme/rc3/theme.json
@@ -0,0 +1,80 @@
+{
+    "calendar-header-font-style": "normal",
+    "italic-font-style": "normal",
+    "calendar-header-font": "'Orbitron'",
+    "header-font": "'Orbitron'",
+    "search-banner-height": "50vh",
+    "button-approve": "#160afe",
+    "button-deny": "#fd294f",
+    "button-highlighted": "#0481f5",
+    "button-selected-highlighted": "#0481f5",
+    "button-fg-highlighted": "white",
+    "login-button-color": "#6800e7",
+    "login-button-fg-color": "white",
+    "verticals-width": "16px",
+    "tab-border-color": "#6800e7",
+    "timeline-border-radius": "0",
+    "button-corner-radius": "0",
+    "newswire-publish-icon": "True",
+    "full-width-timeline-buttons": "False",
+    "icons-as-buttons": "False",
+    "rss-icon-at-top": "True",
+    "publish-button-at-top": "False",
+    "main-visited-color": "#46eed5",
+    "post-separator-margin-top": "9%",
+    "post-separator-margin-bottom": "9%",
+    "post-separator-width": "80%",
+    "post-separator-height": "10%",
+    "column-left-header-background": "#6800e7",
+    "banner-height": "15vh",
+    "banner-height-mobile": "10vh",
+    "focus-color": "blue",
+    "font-size-header": "14px",
+    "font-size-header-mobile": "24px",
+    "font-size-button-mobile": "24px",
+    "font-size-links": "12px",
+    "font-size-newswire": "12px",
+    "font-size": "22px",
+    "font-size2": "16px",
+    "font-size3": "30px",
+    "font-size4": "14px",
+    "font-size5": "12px",
+    "font-size-likes": "10px",    
+    "main-bg-color": "#100e23",
+    "column-left-color": "#0f0d10",
+    "text-entry-background": "#0f0d10",
+    "link-bg-color": "#0f0d10",
+    "main-link-color": "#05b9ec",
+    "main-link-color-hover": "#46eed5",
+    "main-fg-color": "white",
+    "column-left-fg-color": "#05b9ec",
+    "main-bg-color-dm": "#0b0a0a",
+    "border-color": "#6800e7",
+    "border-width": "0px",
+    "border-width-header": "0px",
+    "main-bg-color-reply": "#0f0d10",
+    "main-bg-color-report": "#0f0d10",
+    "hashtag-vertical-spacing3": "100px",
+    "hashtag-vertical-spacing4": "150px",
+    "button-background-hover": "#0481f5",
+    "button-text-hover": "white",
+    "publish-button-background": "#07447c",
+    "button-background": "#6800e7",
+    "button-selected": "#b239ff",
+    "calendar-bg-color": "#100e23",
+    "lines-color": "#b239ff",
+    "day-number": "white",
+    "day-number2": "white",
+    "time-color": "#0481f5",
+    "time-vertical-align": "10px",
+    "time-vertical-align-mobile": "25px",
+    "place-color": "#0481f5",
+    "event-color": "#0481f5",
+    "event-background": "#00014a",
+    "quote-right-margin": "0",    
+    "line-spacing": "150%",
+    "*font-family": "'Montserrat-Regular'",
+    "*src": "url('./fonts/Montserrat-Regular.ttf') format('truetype')",
+    "**font-family": "'Orbitron'",
+    "**src": "url('./fonts/Orbitron.ttf') format('truetype')"
+}
diff --git a/theme/solidaric/icons/agpl.png b/theme/solidaric/icons/agpl.png
new file mode 100644
index 000000000..c2d94b2e6
Binary files /dev/null and b/theme/solidaric/icons/agpl.png differ
diff --git a/theme/solidaric/theme.json b/theme/solidaric/theme.json
index 6ee533b26..8e59a2b3c 100644
--- a/theme/solidaric/theme.json
+++ b/theme/solidaric/theme.json
@@ -65,6 +65,7 @@
     "gallery-text-color": "black",
     "quote-right-margin": "0",
     "line-spacing": "150%",
+    "header-font": "'solidaric'",
     "*font-family": "'solidaric'",
     "*src": "url('./fonts/solidaric.woff2') format('woff2')",
     "**src": "url('./fonts/solidaric-italic.woff2') format('woff2')"
diff --git a/theme/starlight/icons/agpl.png b/theme/starlight/icons/agpl.png
new file mode 100644
index 000000000..c2d94b2e6
Binary files /dev/null and b/theme/starlight/icons/agpl.png differ
diff --git a/theme/starlight/theme.json b/theme/starlight/theme.json
index 71ccfe17b..33eb6a095 100644
--- a/theme/starlight/theme.json
+++ b/theme/starlight/theme.json
@@ -56,6 +56,7 @@
     "event-color": "#ffc4bc",
     "image-corners": "2%",
     "quote-right-margin": "0.1em",
+    "header-font": "'bgrove'",
     "*font-family": "'bgrove'",
     "*src": "url('fonts/bgrove.woff2') format('woff2')"
 }
diff --git a/theme/zen/icons/agpl.png b/theme/zen/icons/agpl.png
new file mode 100644
index 000000000..c2d94b2e6
Binary files /dev/null and b/theme/zen/icons/agpl.png differ
diff --git a/translations/ar.json b/translations/ar.json
index c6cbe91be..3d19e6d50 100644
--- a/translations/ar.json
+++ b/translations/ar.json
@@ -327,5 +327,7 @@
     "Settings": "إعدادات",
     "Citations": "اقتباسات",
     "Choose newswire items referenced in your article": "اختر العناصر الإخبارية المشار إليها في مقالتك",
-    "RSS feed for your blog": "تغذية RSS لمدونتك"
+    "RSS feed for your blog": "تغذية RSS لمدونتك",
+    "Create a new shared item": "إنشاء عنصر مشترك جديد",
+    "Rc3": "Rc3"
 }
diff --git a/translations/ca.json b/translations/ca.json
index a92bacdbc..741887da8 100644
--- a/translations/ca.json
+++ b/translations/ca.json
@@ -327,5 +327,7 @@
     "Settings": "Configuració",
     "Citations": "Cites",
     "Choose newswire items referenced in your article": "Trieu articles de newswire als quals faci referència el vostre article",
-    "RSS feed for your blog": "Feed RSS del vostre bloc"
+    "RSS feed for your blog": "Feed RSS del vostre bloc",
+    "Create a new shared item": "Creeu un element compartit nou",
+    "Rc3": "Rc3"
 }
diff --git a/translations/cy.json b/translations/cy.json
index d1a91120b..8f16d5969 100644
--- a/translations/cy.json
+++ b/translations/cy.json
@@ -327,5 +327,7 @@
     "Settings": "Gosodiadau",
     "Citations": "Dyfyniadau",
     "Choose newswire items referenced in your article": "Dewiswch eitemau newyddion y cyfeirir atynt yn eich erthygl",
-    "RSS feed for your blog": "Porthiant RSS ar gyfer eich blog"
+    "RSS feed for your blog": "Porthiant RSS ar gyfer eich blog",
+    "Create a new shared item": "Creu eitem newydd a rennir",
+    "Rc3": "Rc3"
 }
diff --git a/translations/de.json b/translations/de.json
index adec65a4e..e0bb78ea0 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -327,5 +327,7 @@
     "Settings": "Einstellungen",
     "Citations": "Zitate",
     "Choose newswire items referenced in your article": "Wählen Sie Newswire-Artikel aus, auf die in Ihrem Artikel verwiesen wird",
-    "RSS feed for your blog": "RSS-Feed für Ihr Blog"
+    "RSS feed for your blog": "RSS-Feed für Ihr Blog",
+    "Create a new shared item": "Erstellen Sie ein neues freigegebenes Element",
+    "Rc3": "Rc3"
 }
diff --git a/translations/en.json b/translations/en.json
index 17c38723a..74ffd65d0 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -327,5 +327,7 @@
     "Settings": "Settings",
     "Citations": "Citations",
     "Choose newswire items referenced in your article": "Choose newswire items referenced in your article",
-    "RSS feed for your blog": "RSS feed for your blog"
+    "RSS feed for your blog": "RSS feed for your blog",
+    "Create a new shared item": "Create a new shared item",
+    "Rc3": "Rc3"
 }
diff --git a/translations/es.json b/translations/es.json
index e96a84911..427ce582e 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -327,5 +327,7 @@
     "Settings": "Configuraciones",
     "Citations": "Citas",
     "Choose newswire items referenced in your article": "Elija elementos de Newswire a los que se hace referencia en su artículo",
-    "RSS feed for your blog": "Fuente RSS para tu blog"
+    "RSS feed for your blog": "Fuente RSS para tu blog",
+    "Create a new shared item": "Crea un nuevo elemento compartido",
+    "Rc3": "Rc3"
 }
diff --git a/translations/fr.json b/translations/fr.json
index e480f72c9..d9e10c0af 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -327,5 +327,7 @@
     "Settings": "Réglages",
     "Citations": "Citations",
     "Choose newswire items referenced in your article": "Choisissez les éléments de fil d'actualité référencés dans votre article",
-    "RSS feed for your blog": "Flux RSS pour votre blog"
+    "RSS feed for your blog": "Flux RSS pour votre blog",
+    "Create a new shared item": "Créer un nouvel élément partagé",
+    "Rc3": "Rc3"
 }
diff --git a/translations/ga.json b/translations/ga.json
index 458543919..cbfe07da5 100644
--- a/translations/ga.json
+++ b/translations/ga.json
@@ -327,5 +327,7 @@
     "Settings": "Socruithe",
     "Citations": "Citations",
     "Choose newswire items referenced in your article": "Roghnaigh míreanna sreanga nuachta dá dtagraítear i d’alt",
-    "RSS feed for your blog": "Fotha RSS do do bhlag"
+    "RSS feed for your blog": "Fotha RSS do do bhlag",
+    "Create a new shared item": "Cruthaigh mír nua roinnte",
+    "Rc3": "Rc3"
 }
diff --git a/translations/hi.json b/translations/hi.json
index 93ab89538..8875da63c 100644
--- a/translations/hi.json
+++ b/translations/hi.json
@@ -327,5 +327,7 @@
     "Settings": "समायोजन",
     "Citations": "उद्धरण",
     "Choose newswire items referenced in your article": "अपने लेख में संदर्भित newswire आइटम चुनें",
-    "RSS feed for your blog": "RSS आपके ब्लॉग के लिए फ़ीड करता है"
+    "RSS feed for your blog": "RSS आपके ब्लॉग के लिए फ़ीड करता है",
+    "Create a new shared item": "एक नया साझा आइटम बनाएं",
+    "Rc3": "Rc3"
 }
diff --git a/translations/it.json b/translations/it.json
index eb44ee305..e72c14aa7 100644
--- a/translations/it.json
+++ b/translations/it.json
@@ -327,5 +327,7 @@
     "Settings": "impostazioni",
     "Citations": "Citazioni",
     "Choose newswire items referenced in your article": "Scegli gli articoli del newswire a cui fa riferimento il tuo articolo",
-    "RSS feed for your blog": "Feed RSS per il tuo blog"
+    "RSS feed for your blog": "Feed RSS per il tuo blog",
+    "Create a new shared item": "Crea un nuovo elemento condiviso",
+    "Rc3": "Rc3"
 }
diff --git a/translations/ja.json b/translations/ja.json
index 5953b82cb..1d0881313 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -327,5 +327,7 @@
     "Settings": "設定",
     "Citations": "引用",
     "Choose newswire items referenced in your article": "あなたの記事で参照されているニュースワイヤーアイテムを選択してください",
-    "RSS feed for your blog": "ブログのRSSフィード"
+    "RSS feed for your blog": "ブログのRSSフィード",
+    "Create a new shared item": "新しい共有アイテムを作成する",
+    "Rc3": "Rc3"
 }
diff --git a/translations/oc.json b/translations/oc.json
index cf0b3460f..3e954109b 100644
--- a/translations/oc.json
+++ b/translations/oc.json
@@ -323,5 +323,7 @@
     "Settings": "Settings",
     "Citations": "Citations",
     "Choose newswire items referenced in your article": "Choose newswire items referenced in your article",
-    "RSS feed for your blog": "RSS feed for your blog"
+    "RSS feed for your blog": "RSS feed for your blog",
+    "Create a new shared item": "Create a new shared item",
+    "Rc3": "Rc3"
 }
diff --git a/translations/pt.json b/translations/pt.json
index 3359b7e01..fc9c721a1 100644
--- a/translations/pt.json
+++ b/translations/pt.json
@@ -327,5 +327,7 @@
     "Settings": "Definições",
     "Citations": "Citações",
     "Choose newswire items referenced in your article": "Escolha os itens de notícias mencionados em seu artigo",
-    "RSS feed for your blog": "Feed RSS para o seu blog"
+    "RSS feed for your blog": "Feed RSS para o seu blog",
+    "Create a new shared item": "Crie um novo item compartilhado",
+    "Rc3": "Rc3"
 }
diff --git a/translations/ru.json b/translations/ru.json
index 960bd2ae1..e8a39c26b 100644
--- a/translations/ru.json
+++ b/translations/ru.json
@@ -327,5 +327,7 @@
     "Settings": "Настройки",
     "Citations": "Цитаты",
     "Choose newswire items referenced in your article": "Выберите элементы ленты новостей, на которые есть ссылки в вашей статье",
-    "RSS feed for your blog": "RSS-канал для вашего блога"
+    "RSS feed for your blog": "RSS-канал для вашего блога",
+    "Create a new shared item": "Создать новый общий элемент",
+    "Rc3": "Rc3"
 }
diff --git a/translations/zh.json b/translations/zh.json
index acd29c8fc..d0e26f6fc 100644
--- a/translations/zh.json
+++ b/translations/zh.json
@@ -327,5 +327,7 @@
     "Settings": "设定值",
     "Citations": "引文",
     "Choose newswire items referenced in your article": "选择文章中引用的新闻专栏文章",
-    "RSS feed for your blog": "您博客的RSS供稿"
+    "RSS feed for your blog": "您博客的RSS供稿",
+    "Create a new shared item": "创建一个新的共享项目",
+    "Rc3": "Rc3"
 }
diff --git a/webapp_column_left.py b/webapp_column_left.py
index 471f243c3..66e1f3d38 100644
--- a/webapp_column_left.py
+++ b/webapp_column_left.py
@@ -124,12 +124,8 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str,
     # if showHeaderImage:
     #     htmlStr += '<br>'
 
-    htmlStr += \
-        '<p class="login-text"><a href="/about">' + \
-        translate['About this Instance'] + '</a></p>'
-    htmlStr += \
-        '<p class="login-text"><a href="/terms">' + \
-        translate['Terms of Service'] + '</a></p>'
+    # flag used not to show the first separator
+    firstSeparatorAdded = False
 
     linksFilename = baseDir + '/accounts/links.txt'
     linksFileContainsEntries = False
@@ -170,7 +166,9 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str,
                 else:
                     if lineStr.startswith('#') or lineStr.startswith('*'):
                         lineStr = lineStr[1:].strip()
-                        htmlStr += separatorStr
+                        if firstSeparatorAdded:
+                            htmlStr += separatorStr
+                        firstSeparatorAdded = True
                         htmlStr += \
                             '      <h3 class="linksHeader">' + \
                             lineStr + '</h3>\n'
@@ -179,8 +177,18 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str,
                             '      <p>' + lineStr + '</p>\n'
                     linksFileContainsEntries = True
 
+    if firstSeparatorAdded:
+        htmlStr += separatorStr
+    htmlStr += \
+        '<p class="login-text"><a href="/about">' + \
+        translate['About this Instance'] + '</a></p>'
+    htmlStr += \
+        '<p class="login-text"><a href="/terms">' + \
+        translate['Terms of Service'] + '</a></p>'
+
     if linksFileContainsEntries and not rssIconAtTop:
         htmlStr += '<br><div class="columnIcons">' + rssIconStr + '</div>'
+
     return htmlStr
 
 
diff --git a/webapp_timeline.py b/webapp_timeline.py
index eed526c0d..05a60a33e 100644
--- a/webapp_timeline.py
+++ b/webapp_timeline.py
@@ -312,6 +312,20 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
                 '<a href="' + usersPath + '/newevent">' + \
                 '<button class="button"><span>' + \
                 translate['Post'] + '</span></button></a>'
+    elif boxName == 'tlshares':
+        if not iconsAsButtons:
+            newPostButtonStr += \
+                '<a class="imageAnchor" href="' + usersPath + \
+                '/newshare"><img loading="lazy" src="/' + \
+                iconsPath + '/newpost.png" title="' + \
+                translate['Create a new shared item'] + '" alt="| ' + \
+                translate['Create a new shared item'] + \
+                '" class="timelineicon"/></a>\n'
+        else:
+            newPostButtonStr += \
+                '<a href="' + usersPath + '/newshare">' + \
+                '<button class="button"><span>' + \
+                translate['Post'] + '</span></button></a>'
     else:
         if not manuallyApproveFollowers:
             if not iconsAsButtons:
@@ -998,8 +1012,6 @@ def headerButtonsTimeline(defaultTimeline: str,
             '/links.png" title="' + translate['Edit Links'] + \
             '" alt="| ' + translate['Edit Links'] + \
             '" class="timelineicon"/></a>'
-        # end of headericons div
-        tlStr += '</div>'
     else:
         # NOTE: deliberately no \n at end of line
         tlStr += \
@@ -1015,6 +1027,10 @@ def headerButtonsTimeline(defaultTimeline: str,
             '<button class="buttonDesktop">' + \
             '<span>' + translate['Settings'] + '</span></button></a>'
 
+    if not iconsAsButtons:
+        # end of headericons div
+        tlStr += '</div>'
+
     if not newsHeader:
         tlStr += followApprovals
     # end of the button header with inbox, outbox, etc