diff --git a/source/CNAME b/source/CNAME
index 3f03175..23d54e3 100644
--- a/source/CNAME
+++ b/source/CNAME
@@ -1 +1 @@
-docs.status.im
+nimbus.status.im
diff --git a/source/_data/templates.yml b/source/_data/templates.yml
deleted file mode 100644
index cf0a2df..0000000
--- a/source/_data/templates.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-- name: Embark Vortex Template
-  description: A React Application showing what can be done with Vortex when using Embark.
-  link: https://github.com/Horyus/vortex-demo-embark/
-  tags:
-    - react
-
-- name: Solidity Gas Golfing Contest Template
-  description: Boilerplate and tests for the first Solidity Gas Golfing Contest
-  link: https://github.com/embark-framework/sggc
-  tags:
-    - solidity
-    - tests
-    - fun
-
-- name: Vyper Template
-  description: Template to demonstrate the use of the Vyper contracts
-  link: https://github.com/embark-framework/embark-vyper-template
-  tags:
-    - vyper
-    - contracts
-
-- name: Bamboo Template
-  description: Template to demonstrate use of the Bamboo contracts
-  link: https://github.com/embark-framework/embark-bamboo-template
-  tags:
-    - bamboo
-    - contracts
-
diff --git a/source/_data/wip.yml b/source/_data/wip.yml
deleted file mode 100644
index 6880eff..0000000
--- a/source/_data/wip.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- name: PFS
-  description: Perfect Forward Secrecy and Group Chats
-  link: https://github.com/status-im/status-react/pull/5646
-  thumbnail: secrecy.jpg
-  tags:
-    - security
-    - key exchange
-    - privacy
-    - secrecy
-    - communication
-    - chat
-- name: Mail Servers
-  description: Cryptoeconomics and Whisper Messages, oh my!
-  link: https://github.com/status-im/ideas/tree/master/ideas/280-discoverable-trusted-server-nodes
-  thumbnail: mail.jpg
-  tags:
-    - chat
-    - NFTs
-    - collectibles
-- name: Add back an option to run LES on Ropsten
-  description: Make the Light Ethereum Service great again and let us run it on our phones!
-  link: https://github.com/status-im/status-react/pull/6007
-  thumbnail: light_client.jpg
-  tags:
-      - light client
-      - decentralization
diff --git a/source/chat/index.md b/source/chat/index.md
deleted file mode 100644
index 01c00f6..0000000
--- a/source/chat/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
-title: Chat
-layout: chat
----
-
-<p>
-  Join us at <a href="https://gitter.im/embark-framework/Lobby">gitter.im/embark-framework/Lobby</a>
-</p>
-<iframe src="https://gitter.im/embark-framework/Lobby/~embed" style="width: 100%; height: 800px; border: 1px solid black"></iframe>
-
diff --git a/source/extensions/thumbnails/cryptokitty.jpg b/source/extensions/thumbnails/cryptokitty.jpg
deleted file mode 100644
index 65cd185..0000000
Binary files a/source/extensions/thumbnails/cryptokitty.jpg and /dev/null differ
diff --git a/source/extensions/thumbnails/pluto.jpg b/source/extensions/thumbnails/pluto.jpg
deleted file mode 100644
index 75d32ce..0000000
Binary files a/source/extensions/thumbnails/pluto.jpg and /dev/null differ
diff --git a/source/extensions/thumbnails/status.png b/source/extensions/thumbnails/status.png
deleted file mode 100644
index 4cd8623..0000000
Binary files a/source/extensions/thumbnails/status.png and /dev/null differ
diff --git a/source/index.md b/source/index.md
index a435361..a605b1c 100644
--- a/source/index.md
+++ b/source/index.md
@@ -1,3 +1,3 @@
-title: Status Docs
+title: Nimbus
 layout: index
 ---
diff --git a/source/templates/index.md b/source/templates/index.md
deleted file mode 100644
index 268eb61..0000000
--- a/source/templates/index.md
+++ /dev/null
@@ -1,6 +0,0 @@
-layout: templates
-title: Templates
-data: templates
-partial: template
-comments: false
----
diff --git a/source/wip/index.md b/source/wip/index.md
deleted file mode 100644
index 7e2809b..0000000
--- a/source/wip/index.md
+++ /dev/null
@@ -1,6 +0,0 @@
-layout: wip
-title: WIP Features
-data: wip
-partial: wip
-comments: false
----
diff --git a/source/wip/thumbnails/light_client.jpg b/source/wip/thumbnails/light_client.jpg
deleted file mode 100644
index 7d0b47e..0000000
Binary files a/source/wip/thumbnails/light_client.jpg and /dev/null differ
diff --git a/source/wip/thumbnails/mail.jpg b/source/wip/thumbnails/mail.jpg
deleted file mode 100644
index 3c7026d..0000000
Binary files a/source/wip/thumbnails/mail.jpg and /dev/null differ
diff --git a/source/wip/thumbnails/secrecy.jpg b/source/wip/thumbnails/secrecy.jpg
deleted file mode 100644
index 92f2076..0000000
Binary files a/source/wip/thumbnails/secrecy.jpg and /dev/null differ
diff --git a/themes/navy/languages/en.yml b/themes/navy/languages/en.yml
index ae303a9..11008e5 100644
--- a/themes/navy/languages/en.yml
+++ b/themes/navy/languages/en.yml
@@ -1,10 +1,8 @@
 menu:
   docs: Docs
-  news: News
   plugins: Plugins
   themes: Themes
   search: Search
-  chat: Chat
   blog: Blog
   tutorials: Tutorials
 
diff --git a/themes/navy/layout/index.swig b/themes/navy/layout/index.swig
index 8d4b990..54d6fc6 100644
--- a/themes/navy/layout/index.swig
+++ b/themes/navy/layout/index.swig
@@ -2,7 +2,8 @@
     <div class="header">
         <div class="header-left">
             <div class="logo-wrap">
-                <a class="logo" href="/"></a>
+                <span class="logo-span"><a class="logo" href="/"></a></span>
+                <span class="logo-span"><a class="logo-text" href="/">nimbus</a></span>
             </div>
 
             <ul class="main-nav">
diff --git a/themes/navy/layout/partial/template.swig b/themes/navy/layout/partial/template.swig
deleted file mode 100644
index 0732001..0000000
--- a/themes/navy/layout/partial/template.swig
+++ /dev/null
@@ -1,9 +0,0 @@
-<li class="plugin on">
-  <a href="{{ template.link }}" class="plugin-name" target="_blank">{{ template.name }}</a>
-  <p class="plugin-desc">{{ template.description }}</p>
-  <div class="plugin-tag-list">
-    {% for tag in template.tags %}
-      <a href="#{{ tag }}" class="plugin-tag">{{ tag }}</a>
-    {% endfor %}
-  </div>
-</li>
diff --git a/themes/navy/layout/partial/wip.swig b/themes/navy/layout/partial/wip.swig
deleted file mode 100644
index ef60064..0000000
--- a/themes/navy/layout/partial/wip.swig
+++ /dev/null
@@ -1,10 +0,0 @@
-<li class="plugin on">
-  <img src="/wip/thumbnails/{{ wip.thumbnail }}" style="display: block; width: 200px; height: 200px; margin-bottom: 20px;" />
-  <a href="{{ wip.link }}" class="plugin-name" target="_blank">{{ wip.name }}</a>
-  <p class="plugin-desc">{{ wip.description }}</p>
-  <div class="plugin-tag-list">
-    {% for tag in wip.tags %}
-      <a href="#{{ tag }}" class="plugin-tag">{{ tag }}</a>
-    {% endfor %}
-  </div>
-</li>
diff --git a/themes/navy/layout/wip.swig b/themes/navy/layout/wip.swig
deleted file mode 100644
index 6290eed..0000000
--- a/themes/navy/layout/wip.swig
+++ /dev/null
@@ -1,14 +0,0 @@
-<div id="content-wrap">
-  <div class="wrapper">
-    <div class="inner">
-      <header id="plugin-list-header">
-        <h1 id="plugin-list-title">{{ page.title }}</h1>
-      </header>
-      <ul id="plugin-list">
-        {% for wip in site.data[page.data] %}
-          {{ partial('partial/' + page.partial, {wip: wip}) }}
-        {% endfor %}
-      </ul>
-    </div>
-  </div>
-</div>
diff --git a/themes/navy/source/css/_partial/main.styl b/themes/navy/source/css/_partial/main.styl
index 0aa1030..b1c4760 100644
--- a/themes/navy/source/css/_partial/main.styl
+++ b/themes/navy/source/css/_partial/main.styl
@@ -201,25 +201,37 @@ select[multiple] {
 
 .logo-wrap {
   display: block;
-  width: 116px;
+  width: 160px;
   height: 26px;
   position: relative;
 }
 
+.logo-span {
+  float: left;
+  margin-left: 10px;
+}
+
 .logo {
   display: block;
-  width: 40px;
-  height: 40px;
-  background-image: url(../img/status_logo.svg);
+  width: 56px;
+  height: 56px;
+  background-image: url(../img/logo_ogn.png);
   text-decoration: none;
-  margin: -4px 0 0 30px;
-  background-color: rgba(0,0,0,0.1);
+  margin: -12px 0 0 -20px;
+  background-color: #ffffff;
   border-radius: 50%;
   background-size: 22px;
   background-position: center;
   background-repeat: no-repeat;
 }
 
+.logo-text {
+  font-size: 27px;
+  font-weight: bold;
+  color: #ffffff;
+  text-decoration: none;
+}
+
 .logo-sign {
   display: block;
   position: absolute;
diff --git a/themes/navy/source/img/logo_ogn.png b/themes/navy/source/img/logo_ogn.png
new file mode 100644
index 0000000..e06b234
Binary files /dev/null and b/themes/navy/source/img/logo_ogn.png differ