diff --git a/_shared_assets/themes/owncloud_org/layout.html b/_shared_assets/themes/owncloud_org/layout.html
index c90132b5b..cdaf8387e 100644
--- a/_shared_assets/themes/owncloud_org/layout.html
+++ b/_shared_assets/themes/owncloud_org/layout.html
@@ -168,43 +168,40 @@
 
 {%- block footer %}
 <footer class="content-info" role="contentinfo">
-<div class="container">   
+<div class="container">
    <div class="row">
-     <div class="col-sm-4">
+     <div class="col-sm-2 col-sm-offset-1">
         <div class="footer-nav">
           <h4>About ownCloud</h4>
           <ul id="menu-about" class="menu">
-            <li class="menu-contact"><a href="http://owncloud.org//contact/">Contact</a></li>
-            <li class="menu-history"><a href="http://owncloud.org//history/">History</a></li>
+            <li class="menu-contact"><a href="https://owncloud.org/contact/">People</a></li>
+            <li class="menu-history"><a href="https://owncloud.org/history/">History</a></li>
+            <li class="menu-events"><a href="https://owncloud.org/events/">Events</a></li>
+            <li class="menu-press"><a href="https://owncloud.org/press">Press</a></li>
           </ul>
         </div>
      </div>
-     <div class="col-sm-4">
+     <div class="col-sm-2 col-sm-offset-2">
         <div class="footer-nav">
-          <h4>Support &#38; Documentation</h4>
+          <h4>Resources</h4>
           <ul id="menu-support-and-documentation" class="menu">
-            <li class="menu-admin-manual"><a href="http://doc.owncloud.org/server/6.0/admin_manual/">Admin manual</a></li>
-            <li class="menu-user-manual"><a href="http://doc.owncloud.org/server/6.0/user_manual/">User manual</a></li>
-            <li class="menu-security"><a href="http://owncloud.org//security/">Security</a></li>
-            <li class="dropdown menu-resources"><a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">Resources <b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                <li class="menu-irc-channel"><a href="http://webchat.freenode.net/?channels=owncloud">IRC Channel</a></li>
-                <li class="menu-mailing-list"><a href="https://mail.kde.org/mailman/listinfo/owncloud">Mailing List</a></li>
-                <li class="menu-forums"><a href="http://forum.owncloud.org/">Forums</a></li>
-                <li class="menu-bug-tracker"><a href="https://github.com/owncloud/core/issues">Bug Tracker</a></li>
-              </ul>
-            </li>
+            <li class="menu-admin-manual"><a href="https://doc.owncloud.org">Documentation</a></li>
+            <li class="menu-faq"><a href="https://owncloud.org/faq/">FAQ</a></li>
+            <li class="menu-security"><a href="https://owncloud.org/security/">Security</a></li>
+            <li class="menu-store"><a href="http://www.cafepress.com/owncloudshop">ownCloud Store</a></li>
           </ul>
         </div>
-     </div> 
-     <div class="col-sm-4">
+     </div>
+     <div class="col-sm-2 col-sm-offset-2">
         <div class="footer-nav">
-          <h4>Developer Resources</h4>
-          <ul id="menu-developer" class="menu">
-            <li class="menu-contribute"><a href="http://owncloud.org//contribute/">Contribute</a></li>
-            <li class="menu-security"><a href="http://owncloud.org//security/">Security</a></li>
-            <li class="menu-design"><a href="http://owncloud.org//contribute/design/">Design</a></li>
-            <li class="menu-developer-docs"><a href="http://doc.owncloud.org/server/6.0/developer_manual/">Developer docs</a></li>
+          <h4>Interact</h4>
+          <ul id="menu-interact" class="menu">
+            <li class="menu-irc-channel"><a href="https://webchat.freenode.net/?channels=owncloud">IRC Channel</a></li>
+            <li class="menu-mailing-list"><a href="https://mailman.owncloud.org/mailman/listinfo/">Mailing List</a></li>
+            <li class="menu-forums"><a href="https://forum.owncloud.org/">Forums</a></li>
+            <li class="menu-bug-tracker"><a href="https://owncloud.org/contribute">Get involved</a></li>
+            <li class="menu-promote"><a href="/promote/">Spread the word</a></li>
+
           </ul>
         </div>
      </div>