diff --git a/i2p2www/pages/global/layout.html b/i2p2www/pages/global/layout.html
index 3f03fbd3..a1cda128 100644
--- a/i2p2www/pages/global/layout.html
+++ b/i2p2www/pages/global/layout.html
@@ -13,6 +13,7 @@
     {%- block headextra %}{% endblock %}
   </head>
   <body>
+{%- if g.theme == "duck" %}
     <div class="hide"><a href="#content" title="Skip navigation" accesskey="2">{{ _('Skip navigation') }}</a></div>
     <div id="branding">
       <h1 id="logo"><a href="{{ site_url() }}"><img src="{{ url_for('static', filename='images/logo_medium.png') }}" alt="I2P" /></a></h1>
@@ -38,5 +39,43 @@
     <div id="footer">
       {% include "global/footer.html" %}
     </div>
+{%- else %}
+    <div class="topbar">
+      <div class="topbar-inner">
+        <div class="container-fluid">
+          <a class="brand" href="{{ site_url() }}"><img src="{{ url_for('static', filename='images/i2plogo.png') }}" alt="I2P Logo" title="Invisible Internet Project (I2P)" /></a>
+          <div class="pull-right">
+            <h6>{{ self.title() }}</h6>
+            {% include "global/lang.html" %}
+         </div>
+
+        </div>
+      </div>
+    </div>
+
+    <div class="container-fluid">
+      <div class="sidebar">
+        <div class="alert-message block-message warning news">
+          <h2>{% trans %}News &amp; Updates{% endtrans %}</h2>
+            {% include "blog/latest.html" %}
+        </div>
+
+        <div class="well">
+          {% include "global/nav.html" %}
+        </div>
+      </div>
+      <div class="content well">
+        {%- if self.content() %}
+        {{ self.content() }}
+        {%- else %}
+        {{ self.content_outer() }}
+        {%- endif %}
+        <footer>
+          <p>{{ _("See <a href=\"licenses.html\">license") }}</a>.</p>
+
+        </footer>
+      </div>
+    </div>
+{%- endif %}
   </body>
 </html>
