diff --git a/remarkbox_theme_meta/static/theme/meta/css/diff.css b/remarkbox_theme_meta/static/theme/meta/css/diff.css
index 4139ac7..369fe82 100644
--- a/remarkbox_theme_meta/static/theme/meta/css/diff.css
+++ b/remarkbox_theme_meta/static/theme/meta/css/diff.css
@@ -14,10 +14,12 @@ a.button {
     opacity: 1.0;
 }
 
+/*
 button {
     height: 28px;
     line-height: 28px;
 }
+*/
 
 button.link {
     letter-spacing: unset;
@@ -28,7 +30,7 @@ button.link {
     color: #888888;
 }
 
-.common-text-input, #keyword {
+.common-text-input, {
     height: 32px;
     line-height: 32px;
     min-height: 32px;
@@ -47,27 +49,15 @@ button.link {
     min-height: 32px;
 }
 
-#keyword {
-    height: 24px;
-    line-height: 24px;
-    min-height: 24px;
-    min-width: 130px;
-}
-
-.navother {
-    z-index: 98;
+.remarkbox-menu {
     width: 100%;
     position: fixed;
-    top: 93px;
-    padding-top: 15px;
-    padding-bottom: 0px;
+    top: 94px;
     left: 0;
-
     background-color: #fcf9f9;
 }
 
 .searchbox {
-    padding-right: 60px;
 }
 
 #search {
@@ -116,6 +106,7 @@ ul {
   text-align: center;
   color: #ffffff; 
   padding: 6px;
+  padding-top: 10px;
 
   /** not sure **/
   border: 1px;
@@ -155,14 +146,6 @@ ul {
   float: left;
 }
 
-.small-button,
-input.small-button {
-  height: 28px;
-  line-height: 28px;
-  padding-left: 15px;
-  padding-right: 15px;
-}
-
 form.inline {
   display: inline;
 }
@@ -195,7 +178,7 @@ pre, .MathJax_Display {
 }
 
 @media screen and (max-width:750px) {
-  .navother {
+  .remarkbox-menu {
     top: 0px;
   }
   .searchbox {
@@ -215,7 +198,7 @@ pre, .MathJax_Display {
 
 @media screen and (max-width:568px) {
   div.container.main {
-    margin-top: 120px;
+    margin-top: 80px;
   }
 }
 
diff --git a/remarkbox_theme_meta/static/theme/meta/css/meta.css b/remarkbox_theme_meta/static/theme/meta/css/meta.css
index 4a10a05..b27b851 100644
--- a/remarkbox_theme_meta/static/theme/meta/css/meta.css
+++ b/remarkbox_theme_meta/static/theme/meta/css/meta.css
@@ -1,5 +1,13 @@
+:root {
+  --black: 0, 0, 0;
+  --white: 255, 255, 255;
+  --red: 170, 0 , 0;
+  --blue: 0, 170, 170;
+  --green: 0, 170, 85;
+}
+
 h1, h2, h3, h4, h5, h6 {
-    padding-top: 20px;
+    padding-top: 2rem;
 }
 
 a, a:link, a:visited {
@@ -32,7 +40,7 @@ blockquote {
     margin-bottom: 10px;
     margin-left: 15px;
     padding-left: 15px;
-    border-left: 4px solid #AA0000;
+    border-left: 4px solid rgb(var(--red));
 }
 
 li {
@@ -67,7 +75,7 @@ li {
     font-weight: bold;
     width: 100%;
     background-color: #ffffff;
-    border-top: solid 4px #AA0000;
+    border-top: solid 4px rgb(var(--red));
 }
 
 .nav {
@@ -86,7 +94,7 @@ li {
 }
 
 .redline {
-    border-top: solid 4px #AA0000;
+    border-top: solid 4px rgb(var(--red));
 }
 
 .has-docked-nav .navbar {
@@ -134,36 +142,51 @@ span.avoidwrap {
     max-width: 860px;
 }
 
-.small-button {
-    height: 28px;
-    line-height: 28px;
+/* I made a fiddle that could help with buttons and colors */
+/* https://jsfiddle.net/7nL0sfy0/ */
+
+.button-small,
+input.button-small {
+  height: 28px;
+  line-height: 28px;
+  padding-left: 15px;
+  padding-right: 15px;
 }
 
 .green-button {
-    background-color: #289E00;
-    border-color: #289E00;
+    background-color: rgba(var(--green), .8);
+    border-color: rgba(var(--green), .8);
     color: #FFFFFF !important;
 }
 
 .red-button {
-    background-color: #AA0000;
-    border-color: #AA0000;
+    background-color: rgba(var(--red), .8);
+    border-color: rgba(var(--red), .8);
     color: #FFFFFF !important;
 }
 
 .blue-button {
-    background-color: #005C9E;
-    border-color: #005C9E;
+    background-color: rgba(var(--blue), .8);
+    border-color: rgba(var(--blue), .8);
     color: #FFFFFF !important;
 }
 
-button:hover {
-  opacity: .90;
+.button-white {
+  color: rgba(var(--black), .50);
+  border-color: rgba(var(--black), .30);
+  border-width: 1px;
+  background-color: rgba(var(--white), .60);
+}
+
+.button-white:hover {
+  color: rgba(var(--black), 0.8);
+  border-color: rgba(var(--black), 0.6);
+  background-color: rgba(var(--white), 1.0);
 }
 
 #payment-form,
 .payment-card {
-    background-color: #fcf9f9;
+    background-color: rgba(var(--white), .5);
     padding: 10px 12px;
     border-radius: 4px;
   
diff --git a/remarkbox_theme_meta/templates/meta-base.j2 b/remarkbox_theme_meta/templates/meta-base.j2
index 784c0bd..56a27e1 100644
--- a/remarkbox_theme_meta/templates/meta-base.j2
+++ b/remarkbox_theme_meta/templates/meta-base.j2
@@ -52,68 +52,60 @@
 </div>
 {% endif %}
 
-<div class="navother">
-    {% if request.mode != 'embed' %}
-    <div class="searchbox">
-      {% include 'snippets/search.j2' %}
-    </div>
-    {% endif %}
-    
-    <div id="remarkbox-menu">
+<div class="remarkbox-menu">
+  {%- block menu %}
+
+  <div class="home">
     <span class="avoidwrap">
     <a href="{{ domain_marketing }}" class="navlogolink"><img src="/static/img/remarkbox-logo.png" width="16px" class="shown-on-tablet navlogotiny"></a>
-    {%- block menu %}
     &nbsp;
     </span>
 
-  {%- if request.user.authenticated %}
-  <a href="{{ domain_app }}/u/namespaces" onclick="toggle('my-namespaces-div', 'my-namespaces-link', '&#9658 {{ request.namespace.name }}', '&#9662; &nbsp; {{ request.namespace.name }}'); return false;" id="my-namespaces-link"><span class="js-only">&#9658; </span>{{ request.namespace.name }}</a>
+    {{ snippets.namespace_home_uri(request.namespace) }} &nbsp; 
 
-  <div id="my-namespaces-div" class="my-namespaces-div">
+    {%- if request.user.authenticated %}
 
-  {% for namespace in request.user.namespaces %}
-    {% if namespace != request.namespace %}
-      {% if namespace.name == request.domain %}
-      <a href="/">{{ request.domain }}</a>
-      {% else %}
-      <a href="{{ domain_app }}/ns/{{ namespace.name }}">{{ namespace.name }}</a>
-      {% endif %}
+    <a href="{{ domain_app }}/u/namespaces" onclick="toggle('my-namespaces-div', 'my-namespaces-link', '(switch)', '(switch)'); return false;" id="my-namespaces-link">(switch)</a>
+
+    <div id="my-namespaces-div" class="my-namespaces-div">
+
+    {% for namespace in request.user.namespaces %}
+      {% if namespace != request.namespace %}
+      {{ snippets.namespace_home_uri(namespace) }}
       <br/>
-    {% endif %}
-  {% endfor %}
-
-    <br/>
-    <center>
-    <a href="{{ domain_app }}/setup" class="button">setup</a>
-    </center>
-  </div>
-  &nbsp;
-  | 
-  &nbsp;
-
-  <span class="avoidwrap">
-  {{ snippets.user_link(request.user) }} <a href="/log-out">[log out]</a>
-  </span>
-
-  {% else %}
-
-  <a href="{{ domain_app }}/join-or-log-in?return-to={{ request.path_url }}">join-or-log-in</a>
-
-  {%- endif %}
-{%- endblock %}
+      {% endif %}
+    {% endfor %}
 
+      <br/>
+      <center>
+      <a href="{{ domain_app }}/setup" class="button">setup</a>
+      </center>
     </div>
+    &nbsp;
+    {%- endif %}
+
+  </div> <!-- end home -->
+
+  <div class="search">
+  {% if request.mode != 'embed' %}
+    {% include 'snippets/search.j2' %}
+  {% endif %}
+  </div>
+
+  <div class="user">
+  {%- if request.user.authenticated %}
+    <span class="avoidwrap">
+    {{ snippets.user_link(request.user) }} <a href="/log-out">[log out]</a>
+    </span>
+  {% else %}
+    <a href="{{ domain_app }}/join-or-log-in?return-to={{ request.path_url }}">join-or-log-in</a>
+  {%- endif %}
+  </div>
+
+{%- endblock %}
 </div>
 
-<div id="alerts">
-{%- for message, level in request.session.pop_flash() %}
-<div class="alert alert-{{level}}" onclick="this.style.display='none'" name="alert">
-    <label class="close js-only" alt="dismiss" title="Mark as read">X</label>
-    {{message}}
-</div>
-{%- endfor %}
-</div>
-
+{% include 'snippets/flash-alerts.j2' %}
 
 {% if request.mode != 'embed' %}
 
diff --git a/setup.py b/setup.py
index f943bf4..6a044cd 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 # A Remarkbox theme is a python package with the following paths:
-# 
+#
 #   template/<theme_name>-base.j2
 #   static/theme/<theme_name>
 #
@@ -8,25 +8,22 @@
 
 from setuptools import setup, find_packages
 
-setup(name='remarkbox_theme_meta',
-      version='0.2.1',
-      description='remarkbox theme for meta and faq',
-      classifiers=[
+setup(
+    name="remarkbox_theme_meta",
+    version="0.2.1",
+    description="remarkbox theme for meta and faq",
+    classifiers=[
         "Programming Language :: Python",
         "Framework :: Pyramid",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
-        ],
-      author='Russell Ballestrini',
-      author_email='russell@ballestrini.net',
-      url='http://russell.ballestrini.net',
-      keywords='remarkbox theme for meta and faq',
-      packages=find_packages(),
-      include_package_data=True,
-      zip_safe=False,
-      entry_points = {
-        'remarkbox.themes' : [
-            'meta = remarkbox_theme_meta'
-        ],
-      },
+    ],
+    author="Russell Ballestrini",
+    author_email="russell@ballestrini.net",
+    url="http://russell.ballestrini.net",
+    keywords="remarkbox theme for meta and faq",
+    packages=find_packages(),
+    include_package_data=True,
+    zip_safe=False,
+    entry_points={"remarkbox.themes": ["meta = remarkbox_theme_meta"]},
 )