diff --git a/_includes/head.html b/_includes/head.html
index 3d32667258..c0e309551d 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -3,7 +3,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>Go Ethereum</title>
+    <title>{% if page.title %}{{ page.title }} | {% endif %}Go Ethereum</title>
     {% if site.google_analytics %}
     <!-- Google Analytics -->
     <script>
diff --git a/_layouts/default.html b/_layouts/default.html
index 44ea4dca65..fa9c05862b 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -39,7 +39,6 @@ common-js:
         </div>
       </div>
     </nav>
-
     {{ content }}
     <hr/>
     <footer>
diff --git a/_layouts/sidebar.html b/_layouts/sidebar.html
index 3105c9759a..b4a77b7c1b 100644
--- a/_layouts/sidebar.html
+++ b/_layouts/sidebar.html
@@ -15,8 +15,11 @@ layout: default
             {% endfor %}
           </div>
           <div class="col-md-9" id="content">
-              {{ content }}
+            {% if page.title %}
+            <h1 class="featurette-heading">{{ page.title }}</h1>
+            {% endif %}
+
+            {{ content }}
           </div>
     </div>
-
 </div>
\ No newline at end of file
diff --git a/docs/Accounts---key-storage-specification.md b/docs/Accounts---key-storage-specification.md
index 456637c787..15ddd892da 100644
--- a/docs/Accounts---key-storage-specification.md
+++ b/docs/Accounts---key-storage-specification.md
@@ -1,3 +1,6 @@
+---
+title: Accounts
+---
 **THIS PAGE IS PARTLY OUTDATED! TODO: REFACTOR OR DELETE**
 
 # Accounts / key storage specification
diff --git a/docs/Achieving-Darkness.md b/docs/Achieving-Darkness.md
index 67cae3f937..7b171bee74 100644
--- a/docs/Achieving-Darkness.md
+++ b/docs/Achieving-Darkness.md
@@ -1,3 +1,6 @@
+---
+title: Achieving Darkness
+---
 Whisper is designed to be a building block in the next generation of unstoppable ÐApps. It was designed to provide resilience and privacy at considerable expense. At its most secure mode of operation Whisper can theoretically deliver complete darkness. Whisper should also allow the users to configure the level of privacy (how much information it leaks concerning the ÐApp content and ultimately, user activities) as a trade-off for performance. In this article we will discuss the strategy of achieving complete darkness.
 
 ### Adversary
diff --git a/docs/Active-go-ethereum-projects.md b/docs/Active-go-ethereum-projects.md
index 4109a7f033..ee093e4f37 100644
--- a/docs/Active-go-ethereum-projects.md
+++ b/docs/Active-go-ethereum-projects.md
@@ -1,4 +1,7 @@
-# Direction of development until the end of 2018
+---
+title: Active go-ethereum projects
+---
+## Direction of development until the end of 2018
 
 - Clef: move account management out of geth to clef
 - Constantinople - Tools for testing
diff --git a/docs/Backup--restore.md b/docs/Backup--restore.md
index ddcd5cae59..df6512092f 100644
--- a/docs/Backup--restore.md
+++ b/docs/Backup--restore.md
@@ -1,3 +1,6 @@
+---
+title: Backup & restore
+---
 **DO NOT FORGET YOUR PASSWORD** and **BACKUP YOUR KEYSTORE**
 
 # Backup & restore
diff --git a/docs/Building-Ethereum.md b/docs/Building-Ethereum.md
index 6e4498f5fa..b33e674904 100644
--- a/docs/Building-Ethereum.md
+++ b/docs/Building-Ethereum.md
@@ -1,3 +1,6 @@
+---
+title: Building Ethereum
+---
 ## Installation Instructions
 
 Follow the appropriate link below to find installation instructions for
diff --git a/docs/Code-Review-Guidelines.md b/docs/Code-Review-Guidelines.md
index d2d6682b03..b346c03f86 100644
--- a/docs/Code-Review-Guidelines.md
+++ b/docs/Code-Review-Guidelines.md
@@ -1,3 +1,6 @@
+---
+title: Code Review Guidelines
+---
 The only way to get code into go-ethereum is to send a pull request. Those pull requests
 need to be reviewed by someone. This document is a guide that explains our expectations
 around PRs for both authors and reviewers.
diff --git a/docs/Command-Line-Options.md b/docs/Command-Line-Options.md
index bdf8409adf..04f729d10e 100644
--- a/docs/Command-Line-Options.md
+++ b/docs/Command-Line-Options.md
@@ -1,3 +1,6 @@
+---
+title: Commandline options
+---
 ```
 $ geth help
 NAME:
diff --git a/docs/Connecting-to-the-network.md b/docs/Connecting-to-the-network.md
index 64fc793c2a..ff60bf0d0e 100644
--- a/docs/Connecting-to-the-network.md
+++ b/docs/Connecting-to-the-network.md
@@ -1,3 +1,6 @@
+---
+title: Connecting to the network
+---
 ## How Peers Are Found
 
 Geth continuously attempts to connect to other nodes on the network
diff --git a/docs/Contract-Tutorial.md b/docs/Contract-Tutorial.md
index 74d3d6eaec..2fab511cbd 100644
--- a/docs/Contract-Tutorial.md
+++ b/docs/Contract-Tutorial.md
@@ -1,3 +1,6 @@
+---
+title: Contract tutorial
+---
 ## Introduction
 
 Now that you mastered the basics on how to get started and how to send ether, it's time to get your hands dirty in what really makes ethereum stand out of the crowd: smart contracts. Smart contracts are pieces of code that live on the blockchain and execute commands exactly how they were told to. They can read other contracts, make decisions, send ether and execute other contracts. Contracts will exist and run as long as the whole network exists, and will only stop if they run out of gas or if they were programmed to self destruct.
diff --git a/docs/Creating-your-own-Ethereum-apps-using-Eth-go.md b/docs/Creating-your-own-Ethereum-apps-using-Eth-go.md
index d5777578f0..f24c9b20d5 100644
--- a/docs/Creating-your-own-Ethereum-apps-using-Eth-go.md
+++ b/docs/Creating-your-own-Ethereum-apps-using-Eth-go.md
@@ -1,3 +1,6 @@
+---
+title: Creating your own Ethereum apps using Eth go
+---
 The modular nature of Go and the Ethereum Go implementation, [eth-go](https://github.com/ethereum/eth-go), make it very easy to build your own Ethereum native applications. 
 
 This post will cover the minimal steps required to build an native Ethereum application.
diff --git a/docs/Cross-compiling-Ethereum.md b/docs/Cross-compiling-Ethereum.md
index 4faa52044e..9cb8852f44 100644
--- a/docs/Cross-compiling-Ethereum.md
+++ b/docs/Cross-compiling-Ethereum.md
@@ -1,3 +1,6 @@
+---
+title: Cross-compiling Ethereum
+---
 **Note: All of these and much more have been merged into the project Makefile.
 You can cross build via `make geth-<os>-<platform>` without needing to know any
 of these details from below.**
diff --git a/docs/Developer-Guide.md b/docs/Developer-Guide.md
index e922ab2c74..113857acf3 100644
--- a/docs/Developer-Guide.md
+++ b/docs/Developer-Guide.md
@@ -1,3 +1,6 @@
+---
+title: Developer guide
+---
 ### Native DApps
 
 [Introduction and packages](Native:-Introduction)
diff --git a/docs/Developers-Guide.md b/docs/Developers-Guide.md
index 3cf55c7e1a..b21543cb9e 100644
--- a/docs/Developers-Guide.md
+++ b/docs/Developers-Guide.md
@@ -1,3 +1,6 @@
+---
+title: Developers' guide
+---
 **NOTE: These instructions are for people who want to contribute Go source code changes.
 If you just want to run ethereum, use the normal [Installation Instructions](Building-Ethereum)**
 
diff --git a/docs/Diagnostic-Tool-wnode.md b/docs/Diagnostic-Tool-wnode.md
index 087afdcd84..de1e2ae4a8 100644
--- a/docs/Diagnostic-Tool-wnode.md
+++ b/docs/Diagnostic-Tool-wnode.md
@@ -1,3 +1,6 @@
+---
+title: Diagnostic tool wnode
+---
 ## Wnode
 
 Wnode (whisper node) is a command-line diagnostic tool. It does not have a nice user interface, because its main purpose is diagnostic, and it's meant to be very light-weight rather than beautiful. Wnode might be used for different purposes, including:
diff --git a/docs/Disclaimer.md b/docs/Disclaimer.md
index 7b0c48512d..98e1cf9610 100644
--- a/docs/Disclaimer.md
+++ b/docs/Disclaimer.md
@@ -1,4 +1,6 @@
-# Disclaimer 
+---
+title: Disclaimer
+---
 
 Safety caveats
 
diff --git a/docs/Ethereum-Specification.md b/docs/Ethereum-Specification.md
index b44b9b3511..c0c5047453 100644
--- a/docs/Ethereum-Specification.md
+++ b/docs/Ethereum-Specification.md
@@ -1,3 +1,6 @@
+---
+title: Ethereum specification
+---
 Specifications of all ethereum technologies, languages, protocols, etc.
 
 ### Whitepapers and design rationale
diff --git a/docs/Ethereum-on-Android.md b/docs/Ethereum-on-Android.md
index c53fba442f..d433d340af 100644
--- a/docs/Ethereum-on-Android.md
+++ b/docs/Ethereum-on-Android.md
@@ -1,3 +1,6 @@
+---
+title: Ethereum on Android
+---
 Building Geth for Android is a non trivial task, as it requires cross compiling external C dependencies ([GNU Arithmetic Library](https://gmplib.org/)); internal C dependencies ([ethash](https://github.com/ethereum/ethash)); as well as the entire CGO enabled Go code-base to Android. This is further complicated by the Position Independent Executables (PIE) security feature introduced since Android 4.1 Jelly Bean, requiring different compiler and linker options based on the target Android platform version.
 
 To cope with all the build issues, the [`xgo`](https://github.com/karalabe/xgo) CGO enabled Go cross compiler is used, which assembles an entire multi-platform cross compiler suite into a single mega docker container. Details about using `xgo` can be found in the project's [README](https://github.com/karalabe/xgo/blob/master/README.md), with Ethereum specifics on the go-ethereum cross compilation [wiki page](Cross-compiling-Ethereum).
diff --git a/docs/FAQ.md b/docs/FAQ.md
index 2031c73390..72a502290a 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -1,3 +1,6 @@
+---
+title: FAQ
+---
 ***
 **Q.**  I noticed my peercount slowly decrease, and now it is at 0.  Restarting doesn't get any peers.
 
diff --git a/docs/Gas-Price-Oracle.md b/docs/Gas-Price-Oracle.md
index 2aaa7ac055..7b0c9f3498 100644
--- a/docs/Gas-Price-Oracle.md
+++ b/docs/Gas-Price-Oracle.md
@@ -1,3 +1,6 @@
+---
+title: Gas price oracle
+---
 The gas price oracle is a helper function of the Geth client that tries to find an appropriate default gas price when sending transactions. It can be parametrized with the following command line options:
 
 - gpomin: lower limit of suggested gas price. This should be set at least as high as the "gasprice" setting usually used by miners so that your transactions will not be rejected automatically because of a too low price.
diff --git a/docs/How-to-Whisper.md b/docs/How-to-Whisper.md
index 9fe76c21ef..fd057c6b0f 100644
--- a/docs/How-to-Whisper.md
+++ b/docs/How-to-Whisper.md
@@ -1,3 +1,6 @@
+---
+title: How to Whisper
+---
 Whisper is a pure identity-based messaging system. Whisper provides a low-level (non-application-specific) but easily-accessible API without being based upon or prejudiced by the low-level hardware attributes and characteristics, particularly the notion of singular endpoints.
 
 This tutorial assumes you've read [p2p 101](Peer-to-Peer). If you haven't read it I suggest you read it. This tutorial will guide you to setting up a full p2p server with whisper capabilities.
diff --git a/docs/Installation-Instructions-for-ARM.md b/docs/Installation-Instructions-for-ARM.md
index e10186216c..0b96185372 100644
--- a/docs/Installation-Instructions-for-ARM.md
+++ b/docs/Installation-Instructions-for-ARM.md
@@ -1,4 +1,6 @@
-# Installation Instructions for ARM
+---
+title: Installation instructions for ARM
+---
 
 Geth is built for ARM using cross-compilation. See [Cross compiling Ethereum](Cross-compiling-Ethereum) for more details.
 
diff --git a/docs/Installation-Instructions-for-Arch.md b/docs/Installation-Instructions-for-Arch.md
index 7524f6a3e3..aa9f016bb7 100644
--- a/docs/Installation-Instructions-for-Arch.md
+++ b/docs/Installation-Instructions-for-Arch.md
@@ -1,3 +1,6 @@
+---
+title: Installation instructions for Arch
+---
 ## Installing using pacman
 
 The `geth` package is available from the [community repo](https://www.archlinux.org/packages/community/x86_64/geth/).
diff --git a/docs/Installation-Instructions-for-FreeBSD.md b/docs/Installation-Instructions-for-FreeBSD.md
index c0c1e1a841..fd9e29e347 100644
--- a/docs/Installation-Instructions-for-FreeBSD.md
+++ b/docs/Installation-Instructions-for-FreeBSD.md
@@ -1,3 +1,6 @@
+---
+title: Installation instructions for FreeBSD
+---
 ## Building from source
 
 ### Installing binary package
diff --git a/docs/Installation-Instructions-for-Mac.md b/docs/Installation-Instructions-for-Mac.md
index 92f8ad6c58..b3b1c7ce7d 100644
--- a/docs/Installation-Instructions-for-Mac.md
+++ b/docs/Installation-Instructions-for-Mac.md
@@ -1,3 +1,6 @@
+---
+title: Installation instructions for Mac
+---
 ## Installing with Homebrew
 
 By far the easiest way to install go-ethereum is to use our
diff --git a/docs/Installation-Instructions-for-Ubuntu.md b/docs/Installation-Instructions-for-Ubuntu.md
index 7962b4fd1a..345fe763c8 100644
--- a/docs/Installation-Instructions-for-Ubuntu.md
+++ b/docs/Installation-Instructions-for-Ubuntu.md
@@ -1,3 +1,6 @@
+---
+title: Installation instructions for Ubuntu
+---
 ## Installing from PPA
 
 ```shell
diff --git a/docs/Installation-instructions-for-Windows.md b/docs/Installation-instructions-for-Windows.md
index 194715f4d0..1e121ed1bb 100644
--- a/docs/Installation-instructions-for-Windows.md
+++ b/docs/Installation-instructions-for-Windows.md
@@ -1,3 +1,6 @@
+---
+title: Installation instructions for Windows
+---
 # Binaries
 
 ## Download stable binaries
diff --git a/docs/Installing-Geth.md b/docs/Installing-Geth.md
index 0c96726128..704db609da 100644
--- a/docs/Installing-Geth.md
+++ b/docs/Installing-Geth.md
@@ -1,3 +1,6 @@
+---
+title: Installing Geth
+---
 The Go implementation of Ethereum can be installed using a variety of ways. These include obtaining it as part of Mist; installing it via your favorite package manager; downloading a standalone pre-built bundle; running as a docker container; or building it yourself. This document will detail all of these possibilities to get you quickly joining the Ethereum network using whatever means you prefer.
 
  * [Install from a package manager](#install-from-a-package-manager)
diff --git a/docs/Installing-Go.md b/docs/Installing-Go.md
index 5c3b3bd5f0..2873bcdbdf 100644
--- a/docs/Installing-Go.md
+++ b/docs/Installing-Go.md
@@ -1,3 +1,6 @@
+---
+title: Installing Go
+---
 ### Windows 
 
 Download and run the installer found at http://golang.org/doc/install
diff --git a/docs/Issue-handling-workflow.md b/docs/Issue-handling-workflow.md
index e7c4c85960..bc936260ad 100644
--- a/docs/Issue-handling-workflow.md
+++ b/docs/Issue-handling-workflow.md
@@ -1,3 +1,6 @@
+---
+title: Issue handling workflow
+---
 ### (Draft proposal)
 Keep the number of open issues under 820
 
diff --git a/docs/Japanese-Contracts-and-Transactions.md b/docs/Japanese-Contracts-and-Transactions.md
index c32e55a383..13729cd12c 100644
--- a/docs/Japanese-Contracts-and-Transactions.md
+++ b/docs/Japanese-Contracts-and-Transactions.md
@@ -1,3 +1,6 @@
+---
+title: Contracts and transactions (Japanese)
+---
 THIS WIKI IS BEING EDITED AND REVIEWED NOW. PLEASE DO NOT RELY ON IT.
 
 # Account types and transactions
diff --git a/docs/JavaScript-Console.md b/docs/JavaScript-Console.md
index 6190f7e612..9e2c7107ba 100644
--- a/docs/JavaScript-Console.md
+++ b/docs/JavaScript-Console.md
@@ -1,3 +1,6 @@
+---
+title: JavaScript console
+---
 Ethereum implements a **javascript runtime environment** (JSRE) that can be used in either interactive (console) or non-interactive (script) mode.
  
 Ethereum's Javascript console exposes the full [web3 JavaScript Dapp API](https://github.com/ethereum/wiki/wiki/JavaScript-API) and the [admin API](JavaScript-Console#javascript-console-api).
diff --git a/docs/Management-APIs.md b/docs/Management-APIs.md
index 9d024979ce..af79833544 100644
--- a/docs/Management-APIs.md
+++ b/docs/Management-APIs.md
@@ -1,3 +1,6 @@
+---
+title: Management APIs
+---
 Beside the official [DApp APIs](https://github.com/ethereum/wiki/wiki/JSON-RPC) interface go-ethereum
 has support for additional management APIs. Similar to the DApp APIs, these are also provided using
 [JSON-RPC](http://www.jsonrpc.org/specification) and follow exactly the same conventions. Geth comes
diff --git a/docs/Managing-your-accounts.md b/docs/Managing-your-accounts.md
index a2878e3396..2cd70b01c1 100644
--- a/docs/Managing-your-accounts.md
+++ b/docs/Managing-your-accounts.md
@@ -1,3 +1,6 @@
+---
+title: Managing your accounts
+---
 **WARNING**
 Remember your password. 
 
diff --git a/docs/Metrics-and-Monitoring.md b/docs/Metrics-and-Monitoring.md
index aaaf94e021..03a1923f57 100644
--- a/docs/Metrics-and-Monitoring.md
+++ b/docs/Metrics-and-Monitoring.md
@@ -1,3 +1,6 @@
+---
+title: Metrics and monitoring
+---
 Geth has quite a nice logging system, capable of creating leveled log entries tagged with various parts of the system. This helps enormously during debugging to see exactly what the system is doing, what branches it's taking, etc. However, logs are not particularly useful when the system does work correctly, just not very optimally: one - or even a  handful - of logged events is not really statistically relevant, and tracing more in log files can quickly become unwieldy.
 
 The goal of the Geth metrics system is that - similar to logs - we should be able to add arbitrary metric collection to any part of the code without requiring fancy constructs to analyze them (counter variables, public interfaces, crossing over the APIs, console hooks, etc). Instead, we should just "update" metrics whenever and wherever needed, and have them automatically collected, surfaced through the APIs, queryable and visualizable for analysis.
diff --git a/docs/Mining.md b/docs/Mining.md
index 29a8c1bf72..c79d6c03af 100644
--- a/docs/Mining.md
+++ b/docs/Mining.md
@@ -1,3 +1,6 @@
+---
+title: Mining
+---
 * [Introduction to Ethereum mining](https://github.com/ethereum/wiki/wiki/Mining#introduction) _(main wiki)_
 
 # CPU Mining with Geth
diff --git a/docs/Mobile-Clients/Libraries-and-Inproc-Ethereum-Nodes.md b/docs/Mobile-Clients/Libraries-and-Inproc-Ethereum-Nodes.md
index 04b452bca8..e787d1f945 100644
--- a/docs/Mobile-Clients/Libraries-and-Inproc-Ethereum-Nodes.md
+++ b/docs/Mobile-Clients/Libraries-and-Inproc-Ethereum-Nodes.md
@@ -1,3 +1,6 @@
+---
+title: Mobile Clients
+---
 **This page has been obsoleted. An new guide is in the progress at [[Mobile: Introduction]]**
 
 ---
diff --git a/docs/Mobile/Account-management.md b/docs/Mobile/Account-management.md
index 4ebcb33940..a21da03f3e 100644
--- a/docs/Mobile/Account-management.md
+++ b/docs/Mobile/Account-management.md
@@ -1,3 +1,6 @@
+---
+title: Mobile / Account management
+---
 To provide Ethereum integration for your mobile applications, the very first thing you should be interested in doing is account management.
 
 Although all current leading Ethereum implementations provide account management built in, it is ill advised to keep accounts in any location that is shared between multiple applications and/or multiple people. The same way you do not entrust your ISP (who is after all your gateway into the internet) with your login credentials; you should not entrust an Ethereum node (who is your gateway into the Ethereum network) with your credentials either. 
diff --git a/docs/Mobile/Introduction.md b/docs/Mobile/Introduction.md
index 52f41149db..70ca707a0b 100644
--- a/docs/Mobile/Introduction.md
+++ b/docs/Mobile/Introduction.md
@@ -1,3 +1,6 @@
+---
+title: Mobile / Introduction
+---
 The Ethereum blockchain along with its two extension protocols Whisper and Swarm was originally conceptualized to become the supporting pillar of web3, providing the consensus, messaging and storage backbone for a new generation of distributed (actually, decentralized) applications called DApps.
 
 The first incarnation towards this dream of web3 was a command line client providing an RPC interface into the peer-to-peer protocols. The client was soon enough extended with a web-browser-like graphical user interface, permitting developers to write DApps based on the tried and proven HTML/CSS/JS technologies.
diff --git a/docs/Native-DApps/Go-bindings-to-Ethereum-contracts.md b/docs/Native-DApps/Go-bindings-to-Ethereum-contracts.md
index c1653c5879..a86dcebdfb 100644
--- a/docs/Native-DApps/Go-bindings-to-Ethereum-contracts.md
+++ b/docs/Native-DApps/Go-bindings-to-Ethereum-contracts.md
@@ -1,3 +1,6 @@
+---
+title: Native DApps / Go bindings to Ethereum contracts
+---
 **[Please note, events are not yet implemented as they need some RPC subscription
 features that are still under review.]**
 
diff --git a/docs/Native/Account-management.md b/docs/Native/Account-management.md
index 6e547acf61..cd5b74bf31 100644
--- a/docs/Native/Account-management.md
+++ b/docs/Native/Account-management.md
@@ -1,3 +1,6 @@
+---
+title: Native / Account management
+---
 To provide Ethereum integration for your native applications, the very first thing you should be interested in doing is account management.
 
 Although all current leading Ethereum implementations provide account management built in, it is ill advised to keep accounts in any location that is shared between multiple applications and/or multiple people. The same way you do not entrust your ISP (who is after all your gateway into the internet) with your login credentials; you should not entrust an Ethereum node (who is your gateway into the Ethereum network) with your credentials either. 
diff --git a/docs/Native/Introduction.md b/docs/Native/Introduction.md
index 6b647e198e..866abe19ab 100644
--- a/docs/Native/Introduction.md
+++ b/docs/Native/Introduction.md
@@ -1,3 +1,6 @@
+---
+title: Native / Introduction
+---
 The Ethereum blockchain along with its two extension protocols Whisper and Swarm was originally conceptualized to become the supporting pillar of web3, providing the consensus, messaging and storage backbone for a new generation of distributed (actually, decentralized) applications called DApps.
 
 The first incarnation towards this dream of web3 was a command line client providing an RPC interface into the peer-to-peer protocols. The client was soon enough extended with a web-browser-like graphical user interface, permitting developers to write DApps based on the tried and proven HTML/CSS/JS technologies.
diff --git a/docs/Peer-to-Peer.md b/docs/Peer-to-Peer.md
index 81acc2fed6..58cb2a3f9d 100644
--- a/docs/Peer-to-Peer.md
+++ b/docs/Peer-to-Peer.md
@@ -1,3 +1,6 @@
+---
+title: Peer-to-peer
+---
 The peer to peer package ([go-ethereum/p2p](https://github.com/ethereum/go-ethereum/tree/develop/p2p)) allows you to rapidly and easily add peer to peer networking to any type of application. The p2p package is set up in a modular structure and extending the p2p with your own additional sub protocols is easy and straight forward.
 
 Starting the p2p service only requires you setup a `p2p.Server{}` with a few settings:
diff --git a/docs/Private-network.md b/docs/Private-network.md
index f4d0f8ac1e..45eedcf8a9 100644
--- a/docs/Private-network.md
+++ b/docs/Private-network.md
@@ -1,3 +1,6 @@
+---
+title: Private network
+---
 An Ethereum network is a private network if the nodes are not connected to the main
 network nodes. In this context private only means reserved or isolated, rather than
 protected or secure.
diff --git a/docs/Provisional-JS-API.md b/docs/Provisional-JS-API.md
index 7c18263704..c679680daa 100644
--- a/docs/Provisional-JS-API.md
+++ b/docs/Provisional-JS-API.md
@@ -1,3 +1,6 @@
+---
+title: Provisional JS API
+---
 The *provisional* JavaScript API is a purposed API for all things JavaScript. JavaScript technologies can be embedded within Qt(QML) technologies, local web and remote web and therefor the purposed API is written in a ASYNC fashion so that it may be used across all implementations. Hereby it should be known that all functions, unless explicitly specified, take a callback as last function argument which will be called when the operation has been completed.
 
 Please note that the provisional JavaScript API tries to leverage existing JS idioms as much as possible.
diff --git a/docs/RPC-PUB-SUB.md b/docs/RPC-PUB-SUB.md
index e02729c726..0a42df5ba5 100644
--- a/docs/RPC-PUB-SUB.md
+++ b/docs/RPC-PUB-SUB.md
@@ -1,3 +1,6 @@
+---
+title: RPS pub-sub
+---
 # Introduction
 
 From version 1.4 geth has **_experimental_** support for pub/sub using subscriptions as defined in the JSON-RPC 2.0 specification. This allows clients to wait for events instead of polling for them.
diff --git a/docs/Running-in-Docker.md b/docs/Running-in-Docker.md
index 6529ff5709..9dfc5e26bd 100644
--- a/docs/Running-in-Docker.md
+++ b/docs/Running-in-Docker.md
@@ -1,4 +1,6 @@
-# Running in Docker
+---
+title: Running in Docker
+---
 
 We keep a Docker image with recent snapshot builds from the `develop` branch [on DockerHub](https://hub.docker.com/r/ethereum/client-go/). In addition to the container based on [Ubuntu](http://www.ubuntu.com) (158 MB), there is a smaller image using [Alpine Linux](https://alpinelinux.org) (35 MB). To use the alpine [tag](https://hub.docker.com/r/ethereum/client-go/tags), replace `ethereum/client-go` with `ethereum/client-go:alpine` in the examples below.
 
diff --git a/docs/Sending-ether.md b/docs/Sending-ether.md
index d48207995e..c083bb85b8 100644
--- a/docs/Sending-ether.md
+++ b/docs/Sending-ether.md
@@ -1,4 +1,6 @@
-# Sending ether
+---
+title: Sending ether
+---
 
 The basic way of sending a simple transaction of ether with the console is as follows:
 ```js
diff --git a/docs/Setting-up-Ethereum-Native.md b/docs/Setting-up-Ethereum-Native.md
index 373106ce10..1971f55bf9 100644
--- a/docs/Setting-up-Ethereum-Native.md
+++ b/docs/Setting-up-Ethereum-Native.md
@@ -1,3 +1,6 @@
+---
+title: Setting up Ethereum Native
+---
 ## Dream API
 
 i.e., something I'm envisioning for *soon*(tm)
diff --git a/docs/Setting-up-monitoring-on-local-cluster.md b/docs/Setting-up-monitoring-on-local-cluster.md
index deff1106f0..435803b85b 100644
--- a/docs/Setting-up-monitoring-on-local-cluster.md
+++ b/docs/Setting-up-monitoring-on-local-cluster.md
@@ -1,3 +1,6 @@
+---
+title: Setting up monitoring on local cluster
+---
 This page describes how to set up a monitoring site, [like this one](http://eth-netstats.herokuapp.com/), for your private network. It builds upon [this wiki article](Setting-up-private-network-or-local-cluster) and assumes you've created a local cluster using [this script (gethcluster.sh)](https://github.com/ethersphere/eth-utils).
 
 The monitoring system consists of two components:
diff --git a/docs/Setting-up-private-network-or-local-cluster.md b/docs/Setting-up-private-network-or-local-cluster.md
index a0fe22dab1..3cfb4447cd 100644
--- a/docs/Setting-up-private-network-or-local-cluster.md
+++ b/docs/Setting-up-private-network-or-local-cluster.md
@@ -1,3 +1,6 @@
+---
+title: Setting up private network or local cluster
+---
 This page describes how to set up a local cluster of nodes, advise how to make it private, and how to hook up your nodes on the eth-netstat network monitoring app. 
 A fully controlled ethereum network is useful as a backend for network integration testing (core developers working on issues related to networking/blockchain synching/message propagation, etc or DAPP developers testing multi-block and multi-user scenarios).
 
diff --git a/docs/Swarm---TODO.md b/docs/Swarm---TODO.md
index 9d46ef916c..d979d20437 100644
--- a/docs/Swarm---TODO.md
+++ b/docs/Swarm---TODO.md
@@ -1,3 +1,6 @@
+---
+title: Swarm TODO
+---
 # Sprint plan
 
 # scope
diff --git a/docs/Swarm---distributed-preimage-archive.md b/docs/Swarm---distributed-preimage-archive.md
index cddd96b54e..6c648c459e 100644
--- a/docs/Swarm---distributed-preimage-archive.md
+++ b/docs/Swarm---distributed-preimage-archive.md
@@ -1,3 +1,6 @@
+---
+title: Swarm - distributed preimage archive
+---
 # Resources
 
 ## Swarm, the name
diff --git a/docs/Swarm-Channels,-Namereg-resolution-draft.md b/docs/Swarm-Channels,-Namereg-resolution-draft.md
index 906a73bc3c..f9a38e80aa 100644
--- a/docs/Swarm-Channels,-Namereg-resolution-draft.md
+++ b/docs/Swarm-Channels,-Namereg-resolution-draft.md
@@ -1,3 +1,6 @@
+---
+title: Swarm channels, namereg-resolution draft
+---
 # Channels and streams
 
 a *swarm chain* is an ordered list of content that are linked as a forkless chain.
diff --git a/docs/Swarm-Contract.md b/docs/Swarm-Contract.md
index 83c8e99692..2607e000df 100644
--- a/docs/Swarm-Contract.md
+++ b/docs/Swarm-Contract.md
@@ -1,3 +1,6 @@
+---
+title: Swarm contract
+---
 This one contract regulates the incentive structure of Swarm.
 
 The corresponding solidity code can be browsed [here](https://github.com/ethersphere/go-ethereum/blob/bzz/bzz/bzzcontract/swarm.sol).
diff --git a/docs/Tracing/Introduction.md b/docs/Tracing/Introduction.md
index 1ec9c355a9..9af19396ee 100644
--- a/docs/Tracing/Introduction.md
+++ b/docs/Tracing/Introduction.md
@@ -1,3 +1,6 @@
+---
+title: Tracing / Introduction
+---
 There are two different types of transactions in Ethereum: plain value transfers and contract executions. A plain value transfer just moves Ether from one account to another and as such is uninteresting from this guide's perspective. If however the recipient of a transaction is a contract account with associated EVM (Ethereum Virtual Machine) bytecode - beside transferring any Ether - the code will also be executed as part of the transaction.
 
 Having code associated with Ethereum accounts permits transactions to do arbitrarilly complex data storage and enables them to act on the previously stored data by further transacting internally with outside accounts and contracts. This creates an intertwined ecosystem of contracts, where a single transaction can interact with tens or hunderds of accounts.
diff --git a/docs/URL-Scheme.md b/docs/URL-Scheme.md
index 517d58f4c3..b091605c3c 100644
--- a/docs/URL-Scheme.md
+++ b/docs/URL-Scheme.md
@@ -1,3 +1,6 @@
+---
+title: URL Scheme
+---
 # URLs in DAPP browsers 
 
 URLs should contain all allowable urls in browsers and _all_ `http(s)` urls that resolve in a usual browser must resolve the same way. 
diff --git a/docs/Whisper-Overview.md b/docs/Whisper-Overview.md
index 8e6a8129c3..858c0485b1 100644
--- a/docs/Whisper-Overview.md
+++ b/docs/Whisper-Overview.md
@@ -1,3 +1,6 @@
+---
+title: Whisper overview
+---
 ## Whisper Overview
 
 Whisper is a pure identity-based messaging system. Whisper provides a simple low-level API without being based upon or influenced by the low-level hardware attributes and characteristics. Peer-to-peer communication between the nodes of Whisper network uses the underlying [ÐΞVp2p Wire Protocol](https://github.com/ethereum/wiki/wiki/%C3%90%CE%9EVp2p-Wire-Protocol). Whisper was not designed to provide a connection-oriented system, nor for simply delivering data between a pair of particular network endpoints. However, this might be necessary in some very specific cases (e.g. delivering the expired messages in case they were missed), and Whisper protocol will accommodate for that. Whisper is designed for easy and efficient broadcasting, and also for low-level asynchronous communications. It is designed to be a building block in next generation of unstoppable ÐApps. It was designed to provide resilience and privacy at considerable expense. At its most secure mode of operation, Whisper can theoretically deliver 100% darkness. Whisper should also allow the users to configure the level of privacy (how much information it leaks concerning the ÐApp content and ultimately, user activities) as a trade-off for performance. 
diff --git a/docs/Whisper-js-example.md b/docs/Whisper-js-example.md
index 68ccfb3f50..85c7c8acd1 100644
--- a/docs/Whisper-js-example.md
+++ b/docs/Whisper-js-example.md
@@ -1,4 +1,6 @@
-# Javascript example
+---
+title: Whisper JavaScript example
+---
 
 [This link](https://github.com/gballet/whisper-chat-example) contains a full-fledged example of how to use Whisper in a small chat application.
 
diff --git a/docs/Whisper-v5-RPC-API.md b/docs/Whisper-v5-RPC-API.md
index 18afd52c9b..2f26363f99 100644
--- a/docs/Whisper-v5-RPC-API.md
+++ b/docs/Whisper-v5-RPC-API.md
@@ -1,4 +1,6 @@
-# Whisper RPC API 5.0
+---
+title: Whisper RPC API 5.0
+---
 
 This is the proposed API for whisper v5.
 
diff --git a/docs/Whisper-v6-RPC-API.md b/docs/Whisper-v6-RPC-API.md
index cc4ba26327..70aa01953f 100644
--- a/docs/Whisper-v6-RPC-API.md
+++ b/docs/Whisper-v6-RPC-API.md
@@ -1,4 +1,6 @@
-# Whisper RPC API 6.0
+---
+title: Whisper RPC API 6.0
+---
 
 This is the proposed API for whisper v6.
 
diff --git a/docs/Whisper.md b/docs/Whisper.md
index 0611238f60..9364a9ce3d 100644
--- a/docs/Whisper.md
+++ b/docs/Whisper.md
@@ -1,4 +1,6 @@
-## Whisper v6
+---
+title: Whisper v6
+---
 
 [Whisper Overview](Whisper-Overview)
 
diff --git a/docs/geth.md b/docs/geth.md
index 72531bfe77..7801f10816 100644
--- a/docs/geth.md
+++ b/docs/geth.md
@@ -1,3 +1,6 @@
+---
+title: Geth
+---
 `geth` is the the command line interface for running a full ethereum node implemented in Go. 
 It is the main deliverable of the [Frontier Release](https://ethereum.gitbooks.io/frontier-guide/content/frontier.html)
 
diff --git a/docs/index.md b/docs/index.md
index 63562db30e..0bb8774fe2 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,3 +1,6 @@
+---
+title: Documentation
+---
 * User documentation can be found at our [Ethereum User Guide and reference manual](http://ethereum.gitbooks.io/frontier-guide/content/).
 * For the API reference and developer documentation head over to the auto generated [GoDoc](https://godoc.org/github.com/ethereum/go-ethereum) documentation.
 
diff --git a/docs/other-documents.md b/docs/other-documents.md
index 015b7b6867..d47b6f62fc 100644
--- a/docs/other-documents.md
+++ b/docs/other-documents.md
@@ -1,3 +1,6 @@
+---
+title: Other documents
+---
 - [Accounts key-storage specification](/docs/Accounts---key-storage-specification)
 - [Connecting to the network](/docs/Connecting-to-the-network)
 - [Creating your own Ethereum apps using Eth go](/docs/Creating-your-own-Ethereum-apps-using-Eth-go)
diff --git a/docs/swarm---POC-series.md b/docs/swarm---POC-series.md
index ddf464b4ac..e28be3da79 100644
--- a/docs/swarm---POC-series.md
+++ b/docs/swarm---POC-series.md
@@ -1,3 +1,6 @@
+---
+title: Swarm POC series
+---
 now project features and POC milestones are managed under
 https://github.com/ethereum/go-ethereum/projects/6
 
diff --git a/downloads.html b/downloads.html
index e843ddec11..9c70c6a3bd 100644
--- a/downloads.html
+++ b/downloads.html
@@ -1,5 +1,6 @@
 --- 
 layout: default 
+title: Downloads
 css:
 - /static/styles/custom/downloads.css
 js: