diff --git a/doc/Makefile b/doc/Makefile
index a8ff959ab00..8afc4d9c0c2 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -48,6 +48,7 @@ html:
 
 dirhtml:
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	sed -i '/-99999/d' _build/dirhtml/_static/flasky.css
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
 
diff --git a/doc/_templates/sidebarintro.html b/doc/_templates/sidebarintro.html
index 7605f5a551d..9b5980d310d 100644
--- a/doc/_templates/sidebarintro.html
+++ b/doc/_templates/sidebarintro.html
@@ -1,14 +1,16 @@
-<h3>About OpenERP</h3>
-<p>
-OpenERP is both a flexible development framework written in Python and an
-extensive suite of business applications built on the framework. The framework
-uses a three-tier architecture. It provides an ORM on top of PostgreSQL, a
-modular application server, and a feature-packed web client.
-</p>
+<p class="logo"><a href="http://thu.openerp.com/doc/">
+  <img class="logo" src="{{ pathto('_static/openerp.png', 1) }}" alt="Logo"/>
+</a></p>
+
+<h3>Other Docs</h3>
+<ul>
+  <li><a href="http://thu.openerp.com/doc/users">OpenERP Developers Documentation</a></li>
+  <li><a href="http://thu.openerp.com/doc/users">OpenERP Web Developers Documentation</a></li>
+  <li><a href="http://thu.openerp.com/doc/users">OpenERP Users Documentation</a></li>
+</ul>
 
 <h3>Useful Links</h3>
 <ul>
   <li><a href="http://www.openerp.com/">The OpenERP website</a></li>
-  <li><a href="http://doc.openerp.com/">OpenERP functional documentation</a></li>
   <li><a href="http://python.org/">The Python programming language</a></li>
 </ul>
diff --git a/doc/_themes/flask/static/flasky.css_t b/doc/_themes/flask/static/flasky.css_t
index 870cb9738c9..0280e159455 100644
--- a/doc/_themes/flask/static/flasky.css_t
+++ b/doc/_themes/flask/static/flasky.css_t
@@ -6,8 +6,8 @@
  * :license: Flask Design License, see LICENSE for details.
  */
 
-{% set page_width = '960px' %}
-{% set sidebar_width = '220px' %}
+{% set page_width = '80em' %}
+{% set sidebar_width = '16em' %}
  
 @import url("basic.css");
  
@@ -15,7 +15,7 @@
  
 body {
     font-family: 'Georgia', serif;
-    font-size: 17px;
+    font-size: 15px;
     background-color: white;
     color: #000;
     margin: 0;
@@ -47,7 +47,7 @@ hr {
 div.body {
     background-color: #ffffff;
     color: #3E4349;
-    padding: 0 30px 0 30px;
+    padding: 0 0px 0 0px;
 }
 
 img.floatingflask {
@@ -58,7 +58,7 @@ img.floatingflask {
 div.footer {
     width: {{ page_width }};
     margin: 20px auto 30px auto;
-    font-size: 14px;
+    font-size: 12px;
     color: #888;
     text-align: right;
 }
@@ -82,12 +82,12 @@ div.sphinxsidebar a:hover {
 }
  
 div.sphinxsidebar {
-    font-size: 14px;
+    font-size: 12px;
     line-height: 1.5;
 }
 
 div.sphinxsidebarwrapper {
-    padding: 18px 10px;
+    padding: 0px 10px;
 }
 
 div.sphinxsidebarwrapper p.logo {
@@ -100,14 +100,14 @@ div.sphinxsidebar h3,
 div.sphinxsidebar h4 {
     font-family: 'Garamond', 'Georgia', serif;
     color: #444;
-    font-size: 24px;
+    font-size: 22px;
     font-weight: normal;
     margin: 0 0 5px 0;
     padding: 0;
 }
 
 div.sphinxsidebar h4 {
-    font-size: 20px;
+    font-size: 18px;
 }
  
 div.sphinxsidebar h3 a {
@@ -212,7 +212,7 @@ dd div.admonition {
 div.admonition p.admonition-title {
     font-family: 'Garamond', 'Georgia', serif;
     font-weight: normal;
-    font-size: 24px;
+    font-size: 22px;
     margin: 0 0 10px 0;
     padding: 0;
     line-height: 1;
diff --git a/doc/conf.py b/doc/conf.py
index eea377ab5c4..764e0c1d169 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -18,6 +18,7 @@ import sys, os
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #sys.path.insert(0, os.path.abspath('.'))
 sys.path.append(os.path.abspath('_themes'))
+sys.path.append(os.path.abspath('..'))
 
 # -- General configuration -----------------------------------------------------
 
diff --git a/doc/index.rst b/doc/index.rst
index 7d6dcc9f00e..5d5b4f8e0bd 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -1,17 +1,6 @@
 :orphan:
 
-OpenERP Server Technical Documentation
-======================================
-
-.. image:: _static/openerp.png
-   :alt: OpenERP framework logo
-   :class: floatingflask
-
-Welcome to OpenERP Server technical documentation. Here you will find
-documentation pertaining to the Server project. For all the OpenERP projects
-(including this one), please refer to the global OpenERP Technical
-Documentation.
-
-.. TODO link to the global doc
+OpenERP Server Developers Documentation
+=======================================
 
 .. include:: index.rst.inc
diff --git a/doc/index.rst.inc b/doc/index.rst.inc
index 8b3a485f16e..8b137891791 100644
--- a/doc/index.rst.inc
+++ b/doc/index.rst.inc
@@ -1,14 +1 @@
 
-API Reference
--------------
-
-This part of the documentation gives information on all OpenERP core modules,
-functions, classes, and method.
-
-.. toctree::
-   :maxdepth: 2
-
-   api/core
-   api/startup
-   api/models
-