diff --git a/doc/guides.rst b/doc/guides.rst
deleted file mode 100644
index 00fea8dd946..00000000000
--- a/doc/guides.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-======
-Guides
-======
-
-.. toctree::
-    :titlesonly:
-
-    guides/forms
-    guides/themes
-    guides/snippets
-    guides/workflows
-    guides/deployment
diff --git a/doc/guides/deployment.rst b/doc/guides/deployment.rst
deleted file mode 100644
index 65b68fac7cb..00000000000
--- a/doc/guides/deployment.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. _guides/deployment:
-
-=======================
-Deploying to production
-=======================
diff --git a/doc/guides/forms.rst b/doc/guides/forms.rst
deleted file mode 100644
index da09d634cd3..00000000000
--- a/doc/guides/forms.rst
+++ /dev/null
@@ -1,327 +0,0 @@
-.. highlight:: xml
-
-.. _form-view-guidelines:
-
-Form Views Guidelines
-=====================
-
-.. sectionauthor:: Aline Preillon, Raphael Collet
-
-This document presents functional and technical guidelines for
-creating/organizing form views in Odoo. For each item, both the functional and
-technical aspects are explained. The goal of the new style of forms is to make
-Odoo easier to use, and to guide users through the system.
-
-Business Views
---------------
-
-Business views are targeted at regular users, not advanced users.  Examples
-are: Opportunities, Products, Partners, Tasks, Projects, etc.
-
-.. image:: forms/oppreadonly.png
-   :class: img-responsive
-
-In general, a business view is composed of
-
-1. a status bar on top (with technical or business flow),
-2. a sheet in the middle (the form itself),
-3. a bottom part with History and Comments.
-
-Technically, the new form views are structured as follows in XML::
-
-    <form>
-        <header> ... content of the status bar  ... </header>
-        <sheet>  ... content of the sheet       ... </sheet>
-        <div class="oe_chatter"> ... content of the bottom part ... </div>
-    </form>
-
-The Status Bar
-''''''''''''''
-
-The purpose of the status bar is to show the status of the current record and
-the action buttons.
-
-.. image:: forms/status.png
-   :class: img-responsive
-
-The Buttons
-...........
-
-The order of buttons follows the business flow. For instance, in a sale order,
-the logical steps are:
-
-1. Send the quotation
-2. Confirm the quotation
-3. Create the final invoice
-4. Send the goods
-
-Highlighted buttons (in red by default) emphasize the logical next step, to
-help the user. It is usually the first active button. On the other hand,
-:guilabel:`cancel` buttons *must* remain grey (normal).  For instance, in
-Invoice the button :guilabel:`Refund` must never be red.
-
-Technically, buttons are highlighted by adding the class "oe_highlight"::
-
-    <button class="oe_highlight" name="..." type="..." states="..."/>
-
-The Status
-..........
-
-Uses the ``statusbar`` widget, and shows the current state in red. States
-common to all flows (for instance, a sale order begins as a quotation, then we
-send it, then it becomes a full sale order, and finally it is done) should be
-visible at all times but exceptions or states depending on particular sub-flow
-should only be visible when current.
-
-.. image:: forms/status1.png
-   :class: img-responsive
-
-.. image:: forms/status2.png
-   :class: img-responsive
-
-The states are shown following the order used in the field (the list in a
-selection field, etc). States that are always visible are specified with the
-attribute ``statusbar_visible``.
-
-``statusbar_colors`` can be used to give a custom color to specific states.
-
-::
-
-    <field name="state" widget="statusbar"
-        statusbar_visible="draft,sent,progress,invoiced,done"
-        statusbar_colors="{'shipping_except':'red','waiting_date':'blue'}"/>
-
-The Sheet
-'''''''''
-
-All business views should look like a printed sheet:
-
-.. image:: forms/sheet.png
-   :class: img-responsive
-
-1. Elements inside a ``<form>`` or ``<page>`` do not define groups, elements
-   inside them are laid out according to normal HTML rules. They content can
-   be explicitly grouped using ``<group>`` or regular ``<div>`` elements.
-2. By default, the element ``<group>`` defines two columns inside, unless an
-   attribute ``col="n"`` is used.  The columns have the same width (1/n th of
-   the group's width). Use a ``<group>`` element to produce a column of fields.
-3. To give a title to a section, add a ``string`` attribute to a ``<group>`` element::
-
-     <group string="Time-sensitive operations">
-
-   this replaces the former use of ``<separator string="XXX"/>``.
-4. The ``<field>`` element does not produce a label, except as direct children
-   of a ``<group>`` element\ [#backwards-compatibility]_.  Use :samp:`<label
-   for="{field_name}>` to produce a label of a field.
-
-Sheet Headers
-.............
-
-Some sheets have headers with one or more fields, and the labels of those
-fields are only shown in edit mode.
-
-.. list-table::
-   :header-rows: 1
-   
-   * - View mode
-     - Edit mode
-   * - .. image:: forms/header.png
-          :class: img-responsive
-     - .. image:: forms/header2.png
-          :class: img-responsive
-
-Use HTML text, ``<div>``, ``<h1>``, ``<h2>``… to produce nice headers, and
-``<label>`` with the class ``oe_edit_only`` to only display the field's label
-in edit mode. The class ``oe_inline`` will make fields inline (instead of
-blocks): content following the field will be displayed on the same line rather
-than on the line below it. The form above is produced by the following XML::
-
-    <label for="name" class="oe_edit_only"/>
-    <h1><field name="name"/></h1>
-
-    <label for="planned_revenue" class="oe_edit_only"/>
-    <h2>
-        <field name="planned_revenue" class="oe_inline"/>
-        <field name="company_currency" class="oe_inline oe_edit_only"/> at 
-        <field name="probability" class="oe_inline"/> % success rate
-    </h2>
-
-Button Box
-..........
-
-Many relevant actions or links can be displayed in the form. For example, in
-Opportunity form, the actions "Schedule a Call" and "Schedule a Meeting" take
-an important place in the use of the CRM. Instead of placing them in the
-"More" menu, put them directly in the sheet as buttons (on the top right) to
-make them more visible and more easily accessible.
-
-.. image:: forms/header3.png
-   :class: img-responsive
-
-Technically, the buttons are placed inside a <div> to group them as a block on
-the right-hand side of the sheet.
-
-::
-
-    <div class="oe_button_box oe_right">
-        <button string="Schedule/Log Call" name="..." type="action"/>
-        <button string="Schedule Meeting" name="action_makeMeeting" type="object"/>
-    </div>
-
-Groups and Titles
-.................
-
-A column of fields is now produced with a ``<group>`` element, with an
-optional title.
-
-.. image:: forms/screenshot-03.png
-   :class: img-responsive
-
-::
-
-    <group string="Payment Options">
-        <field name="writeoff_amount"/>
-        <field name="payment_option"/>
-    </group>
-
-It is recommended to have two columns of fields on the form. For this, simply
-put the ``<group>`` elements that contain the fields inside a top-level
-``<group>`` element.
-
-To make :ref:`view extension <reference/views/inheritance>` simpler, it is
-recommended to put a ``name`` attribute on ``<group>`` elements, so new fields
-can easily be added at the right place.
-
-Special Case: Subtotals
-~~~~~~~~~~~~~~~~~~~~~~~
-
-Some classes are defined to render subtotals like in invoice forms:
-
-.. image:: forms/screenshot-00.png
-   :class: img-responsive
-
-::
-
-    <group class="oe_subtotal_footer">
-        <field name="amount_untaxed"/>
-        <field name="amount_tax"/>
-        <field name="amount_total" class="oe_subtotal_footer_separator"/>
-        <field name="residual" style="margin-top: 10px"/>
-    </group>
-
-Placeholders and Inline Fields
-..............................
-
-Sometimes field labels make the form too complex. One can omit field labels,
-and instead put a placeholder inside the field. The placeholder text is
-visible only when the field is empty. The placeholder should tell what to
-place inside the field, it *must not* be an example as they are often confused
-with filled data.
-
-One can also group fields together by rendering them "inline" inside an
-explicit block element like `<div>``. This allows grouping semantically
-related fields as if they were a single (composite) fields.
-
-The following example, taken from the *Leads* form, shows both placeholders and
-inline fields (zip and city).
-
-.. list-table::
-   :header-rows: 1
-
-   * - Edit mode
-     - View mode
-   * - .. image:: forms/placeholder.png
-          :class: img-responsive
-     - .. image:: forms/screenshot-01.png
-          :class: img-responsive
-
-::
-
-    <group>
-        <label for="street" string="Address"/>
-        <div>
-            <field name="street" placeholder="Street..."/>
-            <field name="street2"/>
-            <div>
-                <field name="zip" class="oe_inline" placeholder="ZIP"/>
-                <field name="city" class="oe_inline" placeholder="City"/>
-            </div>
-            <field name="state_id" placeholder="State"/>
-            <field name="country_id" placeholder="Country"/>
-        </div>
-    </group>
-
-Images
-......
-
-Images, like avatars, should be displayed on the right of the sheet.  The
-product form looks like:
-
-.. image:: forms/screenshot-02.png
-   :class: img-responsive
-
-The form above contains a <sheet> element that starts with::
-
-    <field name="product_image" widget="image" class="oe_avatar oe_right"/>
-
-Tags
-....
-
-Most :class:`~openerp.fields.Many2many` fields, like categories, are better
-rendered as a list of tags. Use the widget ``many2many_tags`` for this:
-
-.. image:: forms/screenshot-04.png
-   :class: img-responsive
-
-::
-
-    <field name="category_id"
-        widget="many2many_tags"/>
-
-Task-based forms
-----------------
-
-Configuration Forms
-'''''''''''''''''''
-
-Examples of configuration forms: Stages, Leave Type, etc.  This concerns all
-menu items under Configuration of each application (like Sales/Configuration).
-
-.. image:: forms/nosheet.png
-   :class: img-responsive
-
-For those views, the guidelines are:
-
-1. no header (because no state, no workflow, no button)
-2. no sheet
-
-Regular Wizards (dialog)
-''''''''''''''''''''''''
-
-Example: "Schedule a Call" from an opportunity.
-
-.. image:: forms/wizard-popup.png
-   :class: img-responsive
-
-The guidelines are:
-
-1. avoid separators (the title is already in the popup title bar, so another
-   separator is not relevant)
-2. avoid cancel buttons (user generally close the popup window to get the same
-   effect)
-3. action buttons must be highlighted (red)
-4. when there is a text area, use a placeholder instead of a label or a
-   separator
-5. like in regular form views, put buttons in the <header> element
-
-Configuration Wizard
-''''''''''''''''''''
-
-Example: Settings / Configuration / Sales.  The guidelines are:
-
-1. always in line (no popup)
-2. no sheet
-3. keep the cancel button (users cannot close the window)
-4. the button "Apply" must be red
-
-.. [#backwards-compatibility] for backwards compatibility reasons
diff --git a/doc/guides/forms/header2.png b/doc/guides/forms/header2.png
deleted file mode 100644
index e6b163bdb1b..00000000000
Binary files a/doc/guides/forms/header2.png and /dev/null differ
diff --git a/doc/guides/snippets.rst b/doc/guides/snippets.rst
deleted file mode 100644
index 1834ace2f0a..00000000000
--- a/doc/guides/snippets.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-========
-Snippets
-========
diff --git a/doc/guides/workflow/join.png b/doc/guides/workflow/join.png
deleted file mode 100644
index c63e97c809d..00000000000
Binary files a/doc/guides/workflow/join.png and /dev/null differ
diff --git a/doc/guides/workflow/order_0.png b/doc/guides/workflow/order_0.png
deleted file mode 100644
index 98b552da1ba..00000000000
Binary files a/doc/guides/workflow/order_0.png and /dev/null differ
diff --git a/doc/guides/workflow/order_1.png b/doc/guides/workflow/order_1.png
deleted file mode 100644
index 9aba2211022..00000000000
Binary files a/doc/guides/workflow/order_1.png and /dev/null differ
diff --git a/doc/guides/workflow/split.png b/doc/guides/workflow/split.png
deleted file mode 100644
index 329854a656b..00000000000
Binary files a/doc/guides/workflow/split.png and /dev/null differ
diff --git a/doc/guides/themes.rst b/doc/howtos/themes.rst
similarity index 100%
rename from doc/guides/themes.rst
rename to doc/howtos/themes.rst
diff --git a/doc/howtos/website.rst b/doc/howtos/website.rst
index 3d3e06dbf20..b04532f860c 100644
--- a/doc/howtos/website.rst
+++ b/doc/howtos/website.rst
@@ -9,8 +9,6 @@ Building a website
     * This guide assumes `basic knowledge of Python
       <http://docs.python.org/2/tutorial/>`_
     * This guide assumes an installed Odoo
-    * For production deployment, see the :ref:`dedicated deployment guides
-      <guides/deployment>`
 
 Creating a basic module
 =======================
diff --git a/doc/images/inheritance_methods.png b/doc/images/inheritance_methods.png
index 07cb8d7c776..85fdcbcfb39 100644
Binary files a/doc/images/inheritance_methods.png and b/doc/images/inheritance_methods.png differ
diff --git a/doc/images/view-on-github.png b/doc/images/view-on-github.png
index afaabc400b8..65a8d42363d 100644
Binary files a/doc/images/view-on-github.png and b/doc/images/view-on-github.png differ
diff --git a/doc/index.rst b/doc/index.rst
index 2bb0aaafa9b..3c1696020d6 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -21,8 +21,6 @@ The documentation is currently organized in four sections:
 
 * :doc:`tutorials`, aimed at introducing the primary areas of developing Odoo
   modules
-* :doc:`guides`, didactic documents covering more specific and specialized
-  areas of Odoo, trying to solve more specific problems
 * :doc:`reference`, which ought be the complete and canonical documentation
   for Odoo subsystems
 * :doc:`modules`, documenting useful specialized modules and integration
@@ -36,7 +34,6 @@ The documentation is currently organized in four sections:
     :hidden:
 
     tutorials
-    guides
     reference
     modules
 
diff --git a/doc/reference.rst b/doc/reference.rst
index a3dd9783ff8..3e1597db1ef 100644
--- a/doc/reference.rst
+++ b/doc/reference.rst
@@ -19,3 +19,4 @@ Reference
     reference/javascript
 
     reference/reports
+    reference/workflows
diff --git a/doc/guides/forms/header.png b/doc/reference/forms/header.png
similarity index 100%
rename from doc/guides/forms/header.png
rename to doc/reference/forms/header.png
diff --git a/doc/reference/forms/header2.png b/doc/reference/forms/header2.png
new file mode 100644
index 00000000000..0d0dbbf9eca
Binary files /dev/null and b/doc/reference/forms/header2.png differ
diff --git a/doc/guides/forms/header3.png b/doc/reference/forms/header3.png
similarity index 100%
rename from doc/guides/forms/header3.png
rename to doc/reference/forms/header3.png
diff --git a/doc/guides/forms/nosheet.png b/doc/reference/forms/nosheet.png
similarity index 100%
rename from doc/guides/forms/nosheet.png
rename to doc/reference/forms/nosheet.png
diff --git a/doc/guides/forms/oppreadonly.png b/doc/reference/forms/oppreadonly.png
similarity index 100%
rename from doc/guides/forms/oppreadonly.png
rename to doc/reference/forms/oppreadonly.png
diff --git a/doc/guides/forms/placeholder.png b/doc/reference/forms/placeholder.png
similarity index 100%
rename from doc/guides/forms/placeholder.png
rename to doc/reference/forms/placeholder.png
diff --git a/doc/guides/forms/screenshot-00.png b/doc/reference/forms/screenshot-00.png
similarity index 100%
rename from doc/guides/forms/screenshot-00.png
rename to doc/reference/forms/screenshot-00.png
diff --git a/doc/guides/forms/screenshot-01.png b/doc/reference/forms/screenshot-01.png
similarity index 100%
rename from doc/guides/forms/screenshot-01.png
rename to doc/reference/forms/screenshot-01.png
diff --git a/doc/guides/forms/screenshot-02.png b/doc/reference/forms/screenshot-02.png
similarity index 100%
rename from doc/guides/forms/screenshot-02.png
rename to doc/reference/forms/screenshot-02.png
diff --git a/doc/guides/forms/screenshot-03.png b/doc/reference/forms/screenshot-03.png
similarity index 100%
rename from doc/guides/forms/screenshot-03.png
rename to doc/reference/forms/screenshot-03.png
diff --git a/doc/guides/forms/screenshot-04.png b/doc/reference/forms/screenshot-04.png
similarity index 100%
rename from doc/guides/forms/screenshot-04.png
rename to doc/reference/forms/screenshot-04.png
diff --git a/doc/guides/forms/sheet.png b/doc/reference/forms/sheet.png
similarity index 100%
rename from doc/guides/forms/sheet.png
rename to doc/reference/forms/sheet.png
diff --git a/doc/guides/forms/status.png b/doc/reference/forms/status.png
similarity index 100%
rename from doc/guides/forms/status.png
rename to doc/reference/forms/status.png
diff --git a/doc/guides/forms/status1.png b/doc/reference/forms/status1.png
similarity index 100%
rename from doc/guides/forms/status1.png
rename to doc/reference/forms/status1.png
diff --git a/doc/guides/forms/status2.png b/doc/reference/forms/status2.png
similarity index 100%
rename from doc/guides/forms/status2.png
rename to doc/reference/forms/status2.png
diff --git a/doc/guides/forms/wizard-popup.png b/doc/reference/forms/wizard-popup.png
similarity index 100%
rename from doc/guides/forms/wizard-popup.png
rename to doc/reference/forms/wizard-popup.png
diff --git a/doc/reference/images/runner.png b/doc/reference/images/runner.png
index bd48e9d2922..9991fce45a1 100644
Binary files a/doc/reference/images/runner.png and b/doc/reference/images/runner.png differ
diff --git a/doc/reference/images/runner2.png b/doc/reference/images/runner2.png
index 38ea2949cfc..ff8f5bfe722 100644
Binary files a/doc/reference/images/runner2.png and b/doc/reference/images/runner2.png differ
diff --git a/doc/reference/images/tests.png b/doc/reference/images/tests.png
index 84083d9e5ed..bc3ce8b43fc 100644
Binary files a/doc/reference/images/tests.png and b/doc/reference/images/tests.png differ
diff --git a/doc/reference/images/tests2.png b/doc/reference/images/tests2.png
index c8a6f8ae9ee..361fb7fb54b 100644
Binary files a/doc/reference/images/tests2.png and b/doc/reference/images/tests2.png differ
diff --git a/doc/reference/images/tests3.png b/doc/reference/images/tests3.png
index 247f70716af..d323360497d 100644
Binary files a/doc/reference/images/tests3.png and b/doc/reference/images/tests3.png differ
diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index 3b678a37b3c..9eaab61b324 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -1,3 +1,5 @@
+.. highlight:: xml
+
 .. _reference/views:
 
 =====
@@ -6,8 +8,8 @@ Views
 
 .. _reference/views/structure:
 
-Structure
-=========
+Common Structure
+================
 
 View objects expose a number of fields, they are optional unless specified
 otherwise)
@@ -421,6 +423,315 @@ system. Available semantic components are:
 
 .. todo:: widgets?
 
+Business Views guidelines
+-------------------------
+
+.. sectionauthor:: Aline Preillon, Raphael Collet
+
+Business views are targeted at regular users, not advanced users.  Examples
+are: Opportunities, Products, Partners, Tasks, Projects, etc.
+
+.. image:: forms/oppreadonly.png
+   :class: img-responsive
+
+In general, a business view is composed of
+
+1. a status bar on top (with technical or business flow),
+2. a sheet in the middle (the form itself),
+3. a bottom part with History and Comments.
+
+Technically, the new form views are structured as follows in XML::
+
+    <form>
+        <header> ... content of the status bar  ... </header>
+        <sheet>  ... content of the sheet       ... </sheet>
+        <div class="oe_chatter"> ... content of the bottom part ... </div>
+    </form>
+
+The Status Bar
+''''''''''''''
+
+The purpose of the status bar is to show the status of the current record and
+the action buttons.
+
+.. image:: forms/status.png
+   :class: img-responsive
+
+The Buttons
+...........
+
+The order of buttons follows the business flow. For instance, in a sale order,
+the logical steps are:
+
+1. Send the quotation
+2. Confirm the quotation
+3. Create the final invoice
+4. Send the goods
+
+Highlighted buttons (in red by default) emphasize the logical next step, to
+help the user. It is usually the first active button. On the other hand,
+:guilabel:`cancel` buttons *must* remain grey (normal).  For instance, in
+Invoice the button :guilabel:`Refund` must never be red.
+
+Technically, buttons are highlighted by adding the class "oe_highlight"::
+
+    <button class="oe_highlight" name="..." type="..." states="..."/>
+
+The Status
+..........
+
+Uses the ``statusbar`` widget, and shows the current state in red. States
+common to all flows (for instance, a sale order begins as a quotation, then we
+send it, then it becomes a full sale order, and finally it is done) should be
+visible at all times but exceptions or states depending on particular sub-flow
+should only be visible when current.
+
+.. image:: forms/status1.png
+   :class: img-responsive
+
+.. image:: forms/status2.png
+   :class: img-responsive
+
+The states are shown following the order used in the field (the list in a
+selection field, etc). States that are always visible are specified with the
+attribute ``statusbar_visible``.
+
+``statusbar_colors`` can be used to give a custom color to specific states.
+
+::
+
+    <field name="state" widget="statusbar"
+        statusbar_visible="draft,sent,progress,invoiced,done"
+        statusbar_colors="{'shipping_except':'red','waiting_date':'blue'}"/>
+
+The Sheet
+'''''''''
+
+All business views should look like a printed sheet:
+
+.. image:: forms/sheet.png
+   :class: img-responsive
+
+1. Elements inside a ``<form>`` or ``<page>`` do not define groups, elements
+   inside them are laid out according to normal HTML rules. They content can
+   be explicitly grouped using ``<group>`` or regular ``<div>`` elements.
+2. By default, the element ``<group>`` defines two columns inside, unless an
+   attribute ``col="n"`` is used.  The columns have the same width (1/n th of
+   the group's width). Use a ``<group>`` element to produce a column of fields.
+3. To give a title to a section, add a ``string`` attribute to a ``<group>`` element::
+
+     <group string="Time-sensitive operations">
+
+   this replaces the former use of ``<separator string="XXX"/>``.
+4. The ``<field>`` element does not produce a label, except as direct children
+   of a ``<group>`` element\ [#backwards-compatibility]_.  Use :samp:`<label
+   for="{field_name}>` to produce a label of a field.
+
+Sheet Headers
+.............
+
+Some sheets have headers with one or more fields, and the labels of those
+fields are only shown in edit mode.
+
+.. list-table::
+   :header-rows: 1
+
+   * - View mode
+     - Edit mode
+   * - .. image:: forms/header.png
+          :class: img-responsive
+     - .. image:: forms/header2.png
+          :class: img-responsive
+
+Use HTML text, ``<div>``, ``<h1>``, ``<h2>``… to produce nice headers, and
+``<label>`` with the class ``oe_edit_only`` to only display the field's label
+in edit mode. The class ``oe_inline`` will make fields inline (instead of
+blocks): content following the field will be displayed on the same line rather
+than on the line below it. The form above is produced by the following XML::
+
+    <label for="name" class="oe_edit_only"/>
+    <h1><field name="name"/></h1>
+
+    <label for="planned_revenue" class="oe_edit_only"/>
+    <h2>
+        <field name="planned_revenue" class="oe_inline"/>
+        <field name="company_currency" class="oe_inline oe_edit_only"/> at
+        <field name="probability" class="oe_inline"/> % success rate
+    </h2>
+
+Button Box
+..........
+
+Many relevant actions or links can be displayed in the form. For example, in
+Opportunity form, the actions "Schedule a Call" and "Schedule a Meeting" take
+an important place in the use of the CRM. Instead of placing them in the
+"More" menu, put them directly in the sheet as buttons (on the top right) to
+make them more visible and more easily accessible.
+
+.. image:: forms/header3.png
+   :class: img-responsive
+
+Technically, the buttons are placed inside a <div> to group them as a block on
+the right-hand side of the sheet.
+
+::
+
+    <div class="oe_button_box oe_right">
+        <button string="Schedule/Log Call" name="..." type="action"/>
+        <button string="Schedule Meeting" name="action_makeMeeting" type="object"/>
+    </div>
+
+Groups and Titles
+.................
+
+A column of fields is now produced with a ``<group>`` element, with an
+optional title.
+
+.. image:: forms/screenshot-03.png
+   :class: img-responsive
+
+::
+
+    <group string="Payment Options">
+        <field name="writeoff_amount"/>
+        <field name="payment_option"/>
+    </group>
+
+It is recommended to have two columns of fields on the form. For this, simply
+put the ``<group>`` elements that contain the fields inside a top-level
+``<group>`` element.
+
+To make :ref:`view extension <reference/views/inheritance>` simpler, it is
+recommended to put a ``name`` attribute on ``<group>`` elements, so new fields
+can easily be added at the right place.
+
+Special Case: Subtotals
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Some classes are defined to render subtotals like in invoice forms:
+
+.. image:: forms/screenshot-00.png
+   :class: img-responsive
+
+::
+
+    <group class="oe_subtotal_footer">
+        <field name="amount_untaxed"/>
+        <field name="amount_tax"/>
+        <field name="amount_total" class="oe_subtotal_footer_separator"/>
+        <field name="residual" style="margin-top: 10px"/>
+    </group>
+
+Placeholders and Inline Fields
+..............................
+
+Sometimes field labels make the form too complex. One can omit field labels,
+and instead put a placeholder inside the field. The placeholder text is
+visible only when the field is empty. The placeholder should tell what to
+place inside the field, it *must not* be an example as they are often confused
+with filled data.
+
+One can also group fields together by rendering them "inline" inside an
+explicit block element like `<div>``. This allows grouping semantically
+related fields as if they were a single (composite) fields.
+
+The following example, taken from the *Leads* form, shows both placeholders and
+inline fields (zip and city).
+
+.. list-table::
+   :header-rows: 1
+
+   * - Edit mode
+     - View mode
+   * - .. image:: forms/placeholder.png
+          :class: img-responsive
+     - .. image:: forms/screenshot-01.png
+          :class: img-responsive
+
+::
+
+    <group>
+        <label for="street" string="Address"/>
+        <div>
+            <field name="street" placeholder="Street..."/>
+            <field name="street2"/>
+            <div>
+                <field name="zip" class="oe_inline" placeholder="ZIP"/>
+                <field name="city" class="oe_inline" placeholder="City"/>
+            </div>
+            <field name="state_id" placeholder="State"/>
+            <field name="country_id" placeholder="Country"/>
+        </div>
+    </group>
+
+Images
+......
+
+Images, like avatars, should be displayed on the right of the sheet.  The
+product form looks like:
+
+.. image:: forms/screenshot-02.png
+   :class: img-responsive
+
+The form above contains a <sheet> element that starts with:
+
+::
+
+    <field name="product_image" widget="image" class="oe_avatar oe_right"/>
+
+Tags
+....
+
+Most :class:`~openerp.fields.Many2many` fields, like categories, are better
+rendered as a list of tags. Use the widget ``many2many_tags`` for this:
+
+.. image:: forms/screenshot-04.png
+   :class: img-responsive
+
+::
+
+    <field name="category_id" widget="many2many_tags"/>
+
+Configuration forms guidelines
+------------------------------
+
+Examples of configuration forms: Stages, Leave Type, etc.  This concerns all
+menu items under Configuration of each application (like Sales/Configuration).
+
+.. image:: forms/nosheet.png
+   :class: img-responsive
+
+1. no header (because no state, no workflow, no button)
+2. no sheet
+
+Dialog forms guidelines
+-----------------------
+
+Example: "Schedule a Call" from an opportunity.
+
+.. image:: forms/wizard-popup.png
+   :class: img-responsive
+
+1. avoid separators (the title is already in the popup title bar, so another
+   separator is not relevant)
+2. avoid cancel buttons (user generally close the popup window to get the same
+   effect)
+3. action buttons must be highlighted (red)
+4. when there is a text area, use a placeholder instead of a label or a
+   separator
+5. like in regular form views, put buttons in the <header> element
+
+Configuration Wizards guidelines
+--------------------------------
+
+Example: Settings / Configuration / Sales.
+
+1. always in line (no popup)
+2. no sheet
+3. keep the cancel button (users cannot close the window)
+4. the button "Apply" must be red
+
+
 .. _reference/views/graph:
 
 Graphs
@@ -846,7 +1157,7 @@ Possible children elements of the search view are:
        as inclusively composited: they will be composed with ``OR`` rather
        than the usual ``AND``, e.g.
 
-       .. code-block:: xml
+       ::
 
           <filter domain="[('state', '=', 'draft')]"/>
           <filter domain="[('state', '=', 'done')]"/>
@@ -854,7 +1165,7 @@ Possible children elements of the search view are:
        if both filters are selected, will select the records whose ``state``
        is ``draft`` or ``done``, but
 
-       .. code-block:: xml
+       ::
 
           <filter domain="[('state', '=', 'draft')]"/>
           <separator/>
@@ -877,7 +1188,9 @@ Search defaults
 Search fields and filters can be configured through the action's ``context``
 using :samp:`search_default_{name}` keys. For fields, the value should be the
 value to set in the field, for filters it's a boolean value. For instance,
-assuming ``foo`` is a field and ``bar`` is a filter an action context of::
+assuming ``foo`` is a field and ``bar`` is a filter an action context of:
+
+.. code-block:: python
 
   {
     'search_default_foo': 'acro',
@@ -902,6 +1215,7 @@ template's name *must* match the view's complete (including module name)
 :ref:`reference/data/template` should be used as a shortcut to define QWeb
 views.
 
+.. [#backwards-compatibility] for backwards compatibility reasons
 .. [#hasclass] an extension function is added for simpler matching in QWeb
                views: ``hasclass(*classes)`` matches if the context node has
                all the specified classes
diff --git a/doc/guides/workflow/Makefile b/doc/reference/workflow/Makefile
similarity index 100%
rename from doc/guides/workflow/Makefile
rename to doc/reference/workflow/Makefile
diff --git a/doc/guides/workflow/join.dot b/doc/reference/workflow/join.dot
similarity index 100%
rename from doc/guides/workflow/join.dot
rename to doc/reference/workflow/join.dot
diff --git a/doc/reference/workflow/join.png b/doc/reference/workflow/join.png
new file mode 100644
index 00000000000..cdc0bafb2ca
Binary files /dev/null and b/doc/reference/workflow/join.png differ
diff --git a/doc/guides/workflow/join.svg b/doc/reference/workflow/join.svg
similarity index 100%
rename from doc/guides/workflow/join.svg
rename to doc/reference/workflow/join.svg
diff --git a/doc/guides/workflow/order_0.dot b/doc/reference/workflow/order_0.dot
similarity index 100%
rename from doc/guides/workflow/order_0.dot
rename to doc/reference/workflow/order_0.dot
diff --git a/doc/reference/workflow/order_0.png b/doc/reference/workflow/order_0.png
new file mode 100644
index 00000000000..7d16f96dcbc
Binary files /dev/null and b/doc/reference/workflow/order_0.png differ
diff --git a/doc/guides/workflow/order_0.svg b/doc/reference/workflow/order_0.svg
similarity index 100%
rename from doc/guides/workflow/order_0.svg
rename to doc/reference/workflow/order_0.svg
diff --git a/doc/guides/workflow/order_1.dot b/doc/reference/workflow/order_1.dot
similarity index 100%
rename from doc/guides/workflow/order_1.dot
rename to doc/reference/workflow/order_1.dot
diff --git a/doc/reference/workflow/order_1.png b/doc/reference/workflow/order_1.png
new file mode 100644
index 00000000000..0c38acd0413
Binary files /dev/null and b/doc/reference/workflow/order_1.png differ
diff --git a/doc/guides/workflow/order_1.svg b/doc/reference/workflow/order_1.svg
similarity index 100%
rename from doc/guides/workflow/order_1.svg
rename to doc/reference/workflow/order_1.svg
diff --git a/doc/guides/workflow/split.dot b/doc/reference/workflow/split.dot
similarity index 100%
rename from doc/guides/workflow/split.dot
rename to doc/reference/workflow/split.dot
diff --git a/doc/reference/workflow/split.png b/doc/reference/workflow/split.png
new file mode 100644
index 00000000000..d9d512cffa3
Binary files /dev/null and b/doc/reference/workflow/split.png differ
diff --git a/doc/guides/workflow/split.svg b/doc/reference/workflow/split.svg
similarity index 100%
rename from doc/guides/workflow/split.svg
rename to doc/reference/workflow/split.svg
diff --git a/doc/guides/workflows.rst b/doc/reference/workflows.rst
similarity index 99%
rename from doc/guides/workflows.rst
rename to doc/reference/workflows.rst
index 24a79862e2e..210213e5f55 100644
--- a/doc/guides/workflows.rst
+++ b/doc/reference/workflows.rst
@@ -1,4 +1,4 @@
-.. _guides/workflows:
+.. _reference/workflows:
 
 Workflows
 =========
diff --git a/doc/tutorials.rst b/doc/tutorials.rst
index 5cbfec9bae6..a9df0517bc7 100644
--- a/doc/tutorials.rst
+++ b/doc/tutorials.rst
@@ -8,3 +8,4 @@ Tutorials
     howtos/website
     howtos/backend
     howtos/web
+    howtos/themes