move logo to menu bar, tweak links/menu
diff --git a/content/css/default.css b/content/css/default.css
index e8c305c..924688b 100644
--- a/content/css/default.css
+++ b/content/css/default.css
@@ -4490,7 +4490,7 @@
 }
 #menubar {
     font-size: 20pt;
-    background: #74828F;
+    background: #444;
     padding-top: 5px;
 }
 #menubar ul {
@@ -4516,18 +4516,32 @@
 #menubar span {
     font-size: 10pt;
     font-family: cursive;
-    color: #FFD;
 }
 #menubar a {
-    color: #FFA;
+    color: #FF7;
+    margin-bottom: 3px;
+    display: inline-block;
+    height: 48px;
+    padding-top: 3px;
+    padding-left: 3px;
+    padding-right: 3px;
+    border-radius: 5px;
 }
 #menubar a:hover {
-    color: #FF7;
-    text-shadow: 0px 0px 1px rgba(255,150,50,0.75);
+    color: #4F4;
+    border-radius: 5px;
+    border: 1px outset #222;
+    display: inline-block;
+    padding-top: 2px;
+    padding-left: 2px;
+    padding-right: 2px;
+    background: #222;
+    transition: all 0.15s;
+    
 }
 #titlebar {
     margin: -10px;
-    background: #525564;
+    background: #444;
     color: #EEE;
     margin-bottom: 20px;
     text-align: center;
diff --git a/source/template.html b/source/template.html
index 9ae077d..9ecc408 100644
--- a/source/template.html
+++ b/source/template.html
@@ -20,7 +20,8 @@
 <meta name="theme-color" content="#ffffff">
 </head><body>
 <div id="titlebar">
-    <a href="/contribute.html"><img align='left' style="width: 150px; height: 145px; position: relative; left: -6px; top: -6px; border: 0;" src="/images/devme.png" alt="Fork/Hack on Pony Mail"></a>
+    <a href="/contribute.html"><img align='left' style="width: 130px; height: 125px; position: relative; left: -6px; top: -6px; border: 0;" src="/images/devme.png" alt="Fork/Hack on Pony Mail"></a>
+    <img src="/images/ponymail.svg" style="width: 110px; margin-left: -10px; margin-right: 20px; height: auto;" align="left"/>
     <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail&trade; (Incubating)</a></h1>
     <div id="menubar">
         <ul>