diff --git a/addons/website_forum_doc/__openerp__.py b/addons/website_forum_doc/__openerp__.py
index d1aa177ecd3..e40c7d67009 100644
--- a/addons/website_forum_doc/__openerp__.py
+++ b/addons/website_forum_doc/__openerp__.py
@@ -33,7 +33,6 @@ Documentation based on question and pertinent answers of Forum
     ],
     'data': [
         'data/doc_data.xml',
-        'data/cron.xml',
         'security/ir.model.access.csv',
         'security/doc_security.xml',
         'views/doc.xml',
diff --git a/addons/website_forum_doc/data/cron.xml b/addons/website_forum_doc/data/cron.xml
deleted file mode 100644
index 13afba8a1fb..00000000000
--- a/addons/website_forum_doc/data/cron.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <record forcecreate="True" id="ir_cron_check_challenge" model="ir.cron">
-            <field name="name">Run Moderator Checker</field>
-            <field name="interval_number">1</field>
-            <field name="interval_type">days</field>
-            <field name="numbercall">-1</field>
-            <field name="doall" eval="False" />
-            <field name="model">res.users</field>
-            <field name="function">_cron_moderator_access_update</field>
-            <field name="args">()</field>
-        </record>
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/website_forum_doc/data/doc_data.xml b/addons/website_forum_doc/data/doc_data.xml
index 124fb68a83b..66c8c7067de 100644
--- a/addons/website_forum_doc/data/doc_data.xml
+++ b/addons/website_forum_doc/data/doc_data.xml
@@ -4,7 +4,7 @@
 
         <record id="menu_questions" model="website.menu">
             <field name="name">Documentation</field>
-            <field name="url" eval="'/doc'"/>
+            <field name="url" eval="'/forum/how-to'"/>
             <field name="parent_id" ref="website.main_menu"/>
             <field name="sequence" type="int">65</field>
         </record>
@@ -13,12 +13,34 @@
         <record id="action_open_documentation" model="ir.actions.act_url">
             <field name="name">Documentation</field>
             <field name="target">self</field>
-            <field name="url" eval="'/doc'"/>
+            <field name="url" eval="'/forum/how-to'"/>
         </record>
         <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_open_documentation"/>
             <field name="state">open</field>
         </record>
 
+        <!-- Stages -->
+
+        <record id="stage_draft" model="forum.post">
+            <field name="name">Ideas</field>
+            <field name="sequence">1</field>
+        </record>
+
+        <record id="stage_draft" model="forum.post">
+            <field name="name">Draft</field>
+            <field name="sequence">2</field>
+        </record>
+
+        <record id="stage_draft" model="forum.post">
+            <field name="name">Review</field>
+            <field name="sequence">3</field>
+        </record>
+
+        <record id="stage_draft" model="forum.post">
+            <field name="name">Publish</field>
+            <field name="sequence">4</field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/website_forum_doc/data/doc_demo.xml b/addons/website_forum_doc/data/doc_demo.xml
index d2f1fb4ab03..fe245e1aa33 100644
--- a/addons/website_forum_doc/data/doc_demo.xml
+++ b/addons/website_forum_doc/data/doc_demo.xml
@@ -57,10 +57,10 @@
 
         <!-- Questions -->
         <record id="website_forum.question_0" model="forum.post">
-            <field name="toc_id" ref="toc_hrm_contract"/>
+            <field name="documentation_toc_id" ref="toc_hrm_contract"/>
         </record>
         <record id="website_forum.question_1" model="forum.post">
-            <field name="toc_id" ref="toc_cms_ecommerce"/>
+            <field name="documentation_toc_id" ref="toc_cms_ecommerce"/>
         </record>
 
     </data>
diff --git a/addons/website_forum_doc/models/documentation.py b/addons/website_forum_doc/models/documentation.py
index 581a60824f3..25c12b8dea5 100644
--- a/addons/website_forum_doc/models/documentation.py
+++ b/addons/website_forum_doc/models/documentation.py
@@ -13,8 +13,8 @@ class Documentation(osv.Model):
     _columns = {
         'sequence': fields.integer('Sequence'),
         'name': fields.char('Name', required=True, translate=True),
-        'parent_id': fields.many2one('documentation.toc', 'Parent Table Of Content'),
-        'child_ids': fields.one2many('documentation.toc', 'parent_id', 'Children Table Of Content'),
+        'parent_id': fields.many2one('forum.documentation.toc', 'Parent Table Of Content'),
+        'child_ids': fields.one2many('forum.documentation.toc', 'parent_id', 'Children Table Of Content'),
         'parent_left': fields.integer('Left Parent', select=True),
         'parent_right': fields.integer('Right Parent', select=True),
         'post_ids': fields.one2many('forum.post', 'documentation_toc_id', 'Posts'),
@@ -38,6 +38,7 @@ class Post(osv.Model):
     _inherit = 'forum.post'
     _columns = {
         'documentation_toc_id': fields.many2one('forum.documentation.toc', 'Documentation ToC'),
-        'documentation_stage_id': fields.many2one('forum.documentation.stage', 'Documentation Stage')
+        'documentation_stage_id': fields.many2one('forum.documentation.stage', 'Documentation Stage'),
+        'color': fields.integer('Color Index')
     }
 
diff --git a/addons/website_forum_doc/security/doc_security.xml b/addons/website_forum_doc/security/doc_security.xml
deleted file mode 100644
index 7dde0d946f1..00000000000
--- a/addons/website_forum_doc/security/doc_security.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="1">
-
-    <record id="group_documentaion_moderator" model="res.groups">
-        <field name="name">Documentaion Moderator</field>
-        <field name="category_id" ref="base.module_category_website"/>
-        <field name="comment">the user will have access to add Table of content on questions to manage documentation.</field>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
-    </record>
-
-    <record id="base.group_website_publisher" model="res.groups">
-        <field name="implied_ids" eval="[(4, ref('group_documentaion_moderator'))]"/>
-    </record>
-
-</data>
-</openerp>
diff --git a/addons/website_forum_doc/security/ir.model.access.csv b/addons/website_forum_doc/security/ir.model.access.csv
index 49767b2a203..64995ad7081 100644
--- a/addons/website_forum_doc/security/ir.model.access.csv
+++ b/addons/website_forum_doc/security/ir.model.access.csv
@@ -1,3 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_documentation_toc,documentation.toc,model_documentation_toc,,1,0,0,0
-
+all_documentation_toc,forum.documentation.toc,model_forum_documentation_toc,,1,0,0,0
+users_documentation_toc,forum.documentation.toc,model_forum_documentation_toc,base.group_user,1,1,1,1
+users_documentation_stage,forum.documentation.stage,model_forum_documentation_stage,base.group_user,1,1,1,1
diff --git a/addons/website_forum_doc/views/doc.xml b/addons/website_forum_doc/views/doc.xml
index 28b42ce1406..177caf0445a 100644
--- a/addons/website_forum_doc/views/doc.xml
+++ b/addons/website_forum_doc/views/doc.xml
@@ -5,8 +5,8 @@
         <!-- DOCUMENTATION TOC VIEWS -->
 
         <record id="view_documentation_toc_list" model="ir.ui.view">
-            <field name="name">documentation.toc.list</field>
-            <field name="model">documentation.toc</field>
+            <field name="name">forum.documentation.toc.list</field>
+            <field name="model">forum.documentation.toc</field>
             <field name="arch" type="xml">
                 <tree string="Documentation TOC" editable="bottom">
                     <field name="sequence" widget="handle"/>
@@ -17,7 +17,7 @@
         </record>
         <record id="action_documentation_toc" model="ir.actions.act_window">
             <field name="name">Documentation</field>
-            <field name="res_model">documentation.toc</field>
+            <field name="res_model">forum.documentation.toc</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
         </record>
@@ -27,8 +27,8 @@
 
 
         <record id="view_documentation_toc_list" model="ir.ui.view">
-            <field name="name">documentation.toc.list</field>
-            <field name="model">documentation.toc</field>
+            <field name="name">forum.documentation.toc.list</field>
+            <field name="model">forum.documentation.toc</field>
             <field name="arch" type="xml">
                 <tree string="Documentation TOC" editable="bottom">
                     <field name="sequence" widget="handle"/>
@@ -39,7 +39,7 @@
         </record>
         <record id="action_documentation_toc" model="ir.actions.act_window">
             <field name="name">Documentation</field>
-            <field name="res_model">documentation.toc</field>
+            <field name="res_model">forum.documentation.toc</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
         </record>
@@ -54,7 +54,7 @@
             <field name="model">forum.post</field>
             <field name="arch" type="xml">
                 <kanban default_group_by="documentation_stage_id" >
-                    <field name="stage_id"/>
+                    <field name="documentation_stage_id"/>
                     <field name="create_uid"/>
                     <field name="color"/>
                     <templates>
@@ -71,9 +71,7 @@
 
                             <div class="oe_kanban_content">
                                 <div><b><field name="name"/></b></div>
-                                <div>
-                                    <field name="documentation_toc_id"/>
-                                </div>
+                                <field name="documentation_toc_id"/>
                                 <div class="oe_kanban_bottom_right">
                                     <img t-att-src="kanban_image('res.users', 'image_small', record.create_id.raw_value)" t-att-title="record.create_uid.value" width="24" height="24" class="oe_kanban_avatar"/>
                                 </div>
@@ -84,8 +82,7 @@
                     </templates>
                 </kanban>
             </field>
-         </record>
-
+        </record>
 
         <record id="action_forum_doc_post" model="ir.actions.act_window">
             <field name="name">Documentation Posts</field>
@@ -95,7 +92,7 @@
             <field name="domain">[('documentation_toc_id','&lt;&gt;', False)]</field>
         </record>
         <menuitem id="menu_forum_doc_posts"
-            parent="menu_website_forum" name="Documentation Posts"
+            parent="website_forum.menu_website_forum" name="Documentation Posts"
             action="action_forum_doc_post" sequence="25"/>