diff --git a/source/_static/images/import_documentation/Widgets-API-Developers.png b/source/_static/images/import_documentation/Widgets-API-Developers.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5c2b17b19b692dcd069d31fb3382463608a3d72
Binary files /dev/null and b/source/_static/images/import_documentation/Widgets-API-Developers.png differ
diff --git a/source/import_documentation/Components/SiB-Display.rst b/source/import_documentation/Components/SiB-Display.rst
index 4c8be35646264e73689efa539ae0f7a03ec2148b..ddd1ee582491068b0da7d15df2ed25edfec822b2 100644
--- a/source/import_documentation/Components/SiB-Display.rst
+++ b/source/import_documentation/Components/SiB-Display.rst
@@ -53,7 +53,7 @@ Attributes
 Widgets
 -------
 By default, the widget used is ``<solid-display-div>``. Cf the
-`Display widgets <display-widgets>`__ page for more info.
+`Widget <https://docs.startinblox.com/import_documentation/Widgets/Reference.html>`__ page for more info.
 
 
 Events
@@ -61,4 +61,4 @@ Events
 
 ``resourceSelect``
 ~~~~~~~~~~~~~~~~~~~
-   Triggered when an event is clicked on the calendar
+   Triggered when an resource is clicked.
diff --git a/source/import_documentation/Components/SiB-Form-Search.rst b/source/import_documentation/Components/SiB-Form-Search.rst
new file mode 100644
index 0000000000000000000000000000000000000000..f5b510e6f82fe6d2b4908208db6f181a83c535c1
--- /dev/null
+++ b/source/import_documentation/Components/SiB-Form-Search.rst
@@ -0,0 +1,60 @@
+solid-form-search
+=================
+
+Allows you to filter the contents of a component that uses the ``filter-mixin`` such as ``solid-display`` or ``solid-map``.
+This must have a ``filtered-by`` attribute set to the id of the current ``solid-form-search``.
+.. code:: html
+
+   <solid-form-search
+      id="my-filter"
+      fields="email"
+      label-email="search by email"
+   ></solid-form-search>
+
+   <solid-display
+      data-src="http://example.com/users"
+      fields="username, last_name, email"
+      filtered-by="my-filter"
+   ></solid-display>
+
+
+Mixins
+------
+
+This component uses the following mixins:
+
+- `widget-mixin <https://docs.startinblox.com/import_documentation/Mixins/widget-mixin.html>`__
+
+Please check their documentation to know more about their capabilities.
+
+Attributes
+----------
+
+``fields``
+~~~~~~~~~~
+   List of fields used to perform the search.
+
+``label-xyz``
+~~~~~~~~~~~~~
+   When displaying a form, the default labels are the fields names of the model.
+   If you want something fancier, you can set this attribute.
+   i.e. ``label-username="Your name"``
+
+``range-xyz``
+~~~~~~~~~~~~~
+   URL of a container which list the accepted values
+   for the field ``xyz``. It’s particularly useful with a dropdown
+   field.
+
+Widgets
+-------
+By default, the widget used is ``<solid-form-label-text>``. Cf the
+`Widget Form <https://docs.startinblox.com/import_documentation/Widgets/form-widgets.html>`__ page for more info.
+
+
+Events
+-------
+
+``formChange``
+~~~~~~~~~~~~~~
+   Triggered when the form values change
diff --git a/source/import_documentation/Components/SiB-Form.rst b/source/import_documentation/Components/SiB-Form.rst
index d6c334963f31678c4af1d34f5f24b3eefb84949c..c05fc801dd87d8631836c084e588907d4a287313 100644
--- a/source/import_documentation/Components/SiB-Form.rst
+++ b/source/import_documentation/Components/SiB-Form.rst
@@ -59,7 +59,7 @@ Attributes
 Widgets
 -------
 By default, the widget used is ``<solid-form-label-text>``. Cf the
-`Widget Form <https://docs.startinblox.com/import_documentation/Widgets/form-widgets.html>`__ page for more info.
+`Widget <https://docs.startinblox.com/import_documentation/Widgets/Reference.html>`__ page for more info.
 
 
 Events
diff --git a/source/import_documentation/Mixins/filter-mixin.rst b/source/import_documentation/Mixins/filter-mixin.rst
index d86047145813e33a8ab462b1ced4b7c8899774be..1c2b984c59d48c6b9676080a3aa6297edc712d1f 100644
--- a/source/import_documentation/Mixins/filter-mixin.rst
+++ b/source/import_documentation/Mixins/filter-mixin.rst
@@ -14,8 +14,34 @@ Used by:
 Attributes
 ----------
 
-``search-fields``
+``filtered-by``
 ~~~~~~~~~~~~~~~
+
+    Target a `<sib-form-search>` used to filter current list of resource.
+
+    example:
+
+    .. code:: html
+    
+        <solid-form-search
+            id="my-filter"
+            fields="email"
+            label-email="search by email"
+        ></solid-form-search>
+
+        <solid-display
+            data-src="http://example.com/users"
+            fields="username, last_name, email"
+            filtered-by="my-filter"
+        ></solid-display>
+
+
+
+``search-fields`` **deprecated**
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+
     The properties you want to use to filter the list of resources.
     You can add multiple fields, separated by a comma.
 
diff --git a/source/import_documentation/Mixins/widget-mixin.rst b/source/import_documentation/Mixins/widget-mixin.rst
index fc90f75417cf2898d7dbbb7b4d98f8fadc333bcd..2f43d50d98ae94fa806f9e6ca2ff768c6e65c86a 100644
--- a/source/import_documentation/Mixins/widget-mixin.rst
+++ b/source/import_documentation/Mixins/widget-mixin.rst
@@ -39,7 +39,7 @@ Attributes
             fields="fullName(first_name, last_name), email"
         ></solid-display>
 
-    You can customize the group widget, see the `Sets widgets <other-widgets>`__
+    You can customize the group widget, see the `Sets widgets <https://docs.startinblox.com/import_documentation/Widgets/Reference.html>`__
     page for more info.
 
 
@@ -61,7 +61,11 @@ Attributes
 
 ``widget-[field]``
 ~~~~~~~~~~~~~~~~~~
-   The widget to be used to display the ``[field]``
+   The widget to be used to display the ``[field]``. This widget can be:
+
+   - A core widget. More informations on the `widget reference <https://docs.startinblox.com/import_documentation/Widgets/Reference.html>`__ page
+   - A custom widget. More informations on the `solid-widget <https://docs.startinblox.com/import_documentation/Components/SiB-Widget.html>`__ page
+   - A native HTML tag (ie: ``h1``). The value will be inserted as text content of the tag.
 
 ``default-widget``
 ~~~~~~~~~~~~~~~~~~
@@ -85,17 +89,15 @@ Attributes
 
 ``editable-[field]``
 ~~~~~~~~~~~~~~~~~~~~
-    *Does not work with ``solid-form``*
+    *Works only with display widgets*
 
     Add an “edit” button next to the ``[field]`` to let the user edit it.
     The changes are saved as soon as the field loses focus.
 
-    The editable attribute works with the following widgets:
+    The editable attribute works with the following templates:
 
-    - ``solid-display-div``
-    - ``solid-display-labelled-div``
-    - ``solid-display-mailto``
-    - ``solid-display-tel``
+    - ``display-div``
+    - ``display-link``
 
 ``multiple-[field]``
 ~~~~~~~~~~~~~~~~~~~~
@@ -104,9 +106,7 @@ Attributes
 
     Multiple widget can be specified, example:
     ``multiple-skills="my-custom-multiple-widget"``. If argument is used
-    without value, default multiple widget is used. Cf the `Multiple
-    widgets <multiple-widgets>`__ page below for more info.
-
+    without value, default multiple widget is used.
 
     All attributes starting by ``each`` will be applied on each child, 
     without the prefix ``each``.
@@ -120,8 +120,10 @@ Attributes
 
     ``multiple-[field]-add-label``
     ++++++++++++++++++++++++++++++
+
         Text of the “+” button used to add an element
 
     ``multiple-[field]-remove-label``
     +++++++++++++++++++++++++++++++++
+
         Text of the “x” button used to remove an element
diff --git a/source/import_documentation/Store-doc.rst b/source/import_documentation/Store-doc.rst
index 5f3b1372d8923db6ede3c1db1d92c1649f5ffddb..de75371b3166126bb3215ae2f7936ea82e24e346 100644
--- a/source/import_documentation/Store-doc.rst
+++ b/source/import_documentation/Store-doc.rst
@@ -123,6 +123,17 @@ Manually remove a resource from the cache
 * ``id``: uri of the resource to remove from the cache
 
 
+``selectLanguage``
+^^^^^^^^^^^^^^^^^^
+
+Select the language to use to fetch data. If the data is not available, English is served by default.
+
+**parameters**
+
+* ``language``: code of the language. ie: ``fr``
+
+
+
 Store reactivity
 ----------------
 
diff --git a/source/import_documentation/Widgets/Examples.rst b/source/import_documentation/Widgets/Examples.rst
new file mode 100644
index 0000000000000000000000000000000000000000..c8d2d8da2820b877363631e8f9f895ceaf798041
--- /dev/null
+++ b/source/import_documentation/Widgets/Examples.rst
@@ -0,0 +1,176 @@
+Examples
+=========
+
+Create your widget
+~~~~~~~~~~~~~~~~~~
+
+To display a field in a ``div`` tag, create your widget like this:
+
+   - ``solid-``: all the widgets of the core start with ``solid`` keyword
+   - ``display-``: to use the display directory of templates
+   - ``div``: to use the ``div`` template
+
+Which gives us:
+
+.. code:: html
+
+   <solid-display
+      bind-resource
+      fields="name"
+      widget-name="solid-display-div"
+   ></solid-display>
+
+This code generates:
+
+.. code:: html
+
+   <solid-display
+      bind-resource
+      fields="name"
+      widget-name="solid-display-div"
+   >
+      <!-- auto generated part -->
+      <div>
+         <solid-display-div name="name" value="John Doe">
+            <div name="name">John Doe</div>
+         </solid-display-div>
+      </div>
+      <!-- /auto generated part -->
+   </solid-display>
+
+
+Add a feature
+~~~~~~~~~~~~~~~
+
+If you want to add a label, just add ``-label`` to your widget name
+
+.. code:: html
+
+   <solid-display
+      bind-resource
+      fields="name"
+      widget-name="solid-display-div-label"
+   >
+      <!-- auto generated part -->
+      <div>
+         <solid-display-div-label name="name" value="John Doe">
+            <label>name</label>
+            <div name="name">John Doe</div>
+         </solid-display-div-label>
+      </div>
+      <!-- /auto generated part -->
+   </solid-display>
+
+
+Mix keyword order
+~~~~~~~~~~~~~~~~~
+
+You can mix the order of the keywords, for the same result. For example, you can replace ``solid-display-div-label`` by ``solid-label-div-display``:
+
+.. warning::
+
+   Be careful because the generated widget will also have the name you give him. It can also have impact on CSS if you target widgets by their names.
+
+
+.. code:: html
+
+   <solid-display
+      bind-resource
+      fields="name"
+      widget-name="solid-label-div-display"
+   >
+      <!-- auto generated part -->
+      <div>
+         <solid-label-div-display name="name" value="John Doe">
+            <label>name</label>
+            <div name="name">John Doe</div>
+         </solid-label-div-display>
+      </div>
+      <!-- /auto generated part -->
+   </solid-display>
+
+
+Customize the label
+~~~~~~~~~~~~~~~~~~~
+
+To customize the label, you can set the ``label-name`` attribute on the ``solid-display``
+
+.. code:: html
+
+   <solid-display
+      bind-resource
+      fields="name"
+      widget-name="solid-label-div-display"
+      label-name="User name:"
+   >
+      <!-- auto generated part -->
+      <div>
+         <solid-label-div-display name="name" value="John Doe">
+            <label>User name:</label>
+            <div name="name">John Doe</div>
+         </solid-label-div-display>
+      </div>
+      <!-- /auto generated part -->
+   </solid-display>
+
+
+Handle multiples
+~~~~~~~~~~~~~~~~
+
+In the case of a form, you may have to handle a field where you need to add or delete values. It can be done like this:
+
+.. code:: html
+
+   <solid-form
+      bind-user
+      fields="skills"
+      multiple-skills
+   ></solid-form>
+
+As ``skills`` is a container, you will see each line as a text input, containing the id of the resource.
+You will also have the ability to add or remove lines. The default multiple widget used is ``solid-form-multiple``.
+
+
+Add a dropdown
+~~~~~~~~~~~~~~
+
+If you want to limit the selection of the skills to a list, add a ``range-skills`` attribute.
+
+.. code:: html
+
+   <solid-form
+      bind-user
+      fields="skills"
+      multiple-skills
+      range-skills="http://ldpserver/skills"
+   ></solid-form>
+
+Your text inputs will be replaced by dropdowns showing the available options.
+
+
+Customize the multiple widget
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you need to have only one dropdown to select multiple values, you can change the multiple widget:
+
+.. code:: html
+
+   <solid-form
+      bind-user
+      fields="skills"
+      multiple-skills="solid-form-multipleselect"
+      range-skills="http://ldpserver/skills"
+   ></solid-form>
+
+Like for other widgets, you can choose to add features by adding them to the widget name.
+The following example will add a label before the widget, and initialize the SlimSelect plugin used for autocompletion.
+
+.. code:: html
+
+   <solid-form
+      bind-user
+      fields="skills"
+      multiple-skills="solid-form-multipleselect-autocompletion-label"
+      range-skills="http://ldpserver/skills"
+   ></solid-form>
+
diff --git a/source/import_documentation/Widgets/Reference.rst b/source/import_documentation/Widgets/Reference.rst
new file mode 100644
index 0000000000000000000000000000000000000000..f29596cc00bd1ad1793c31c9c251a6c69e6302b1
--- /dev/null
+++ b/source/import_documentation/Widgets/Reference.rst
@@ -0,0 +1,85 @@
+Widgets API Reference
+==================
+
+Widgets are created at the moment you ask for it for the first time.
+The name of the widget is analyzed to build a widget which uses the features and template you want.
+
+Here is a schema of how it works:
+
+.. figure:: ../_static/images/import_documentation/Widgets-API-Developers.png
+   :alt: SiB overview
+
+
+A widget is built like this.
+
+``solid-[type]-[template]-[features]``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+*All the keywords must be separated by ``-`` but can be put in any order.*
+
+``type``
+++++++++
+   Can be ``display`` , ``form`` or ``set``. Will select the directory of template to use.
+
+
+``template``
+++++++++++++
+
+   Name of the template to use. Available templates:
+
+   -  ``display`` directory
+
+      -  ``value``: displays ``value`` directly in the widget tag.
+      -  ``div``: displays ``value`` inside a ``<div>`` tag
+      -  ``link``: displays ``value`` as an ``href`` attribute in a ``<a>`` tag
+      -  ``img``: displays ``value`` as a ``src``  attribute in a ``<img>`` tag
+      -  ``boolean``: displays label (or name) in a ``<label>`` tag if ``value  == true``
+
+   -  ``form`` directory
+
+      -  ``text``: set ``value`` in an ``<input>`` of type ``text``
+      -  ``textarea``: set ``value`` in a ``<textarea>``
+      -  ``checkbox``: create a checkbox, which is checked if ``value == true``
+      -  ``date``: set ``value`` in an ``<input>`` of type ``date``
+      -  ``rangedate``: set 2 values in 2 ``<input>`` of type ``date``. Used for filtering with min and max.
+      -  ``number``: set ``value`` in an ``<input>`` of type ``number``
+      -  ``rangenumber``: set 2 values in 2 ``<input>`` of type ``number``. Used for filtering with min and max.
+      -  ``hidden``: set ``value`` in an ``<input>`` of type ``hidden``
+      -  ``dropdown``: set ``value`` in a ``<select>``. The list is provided via the ``range`` attribute, which expects a container’s URL.
+      -  ``radio``: set ``value`` in a list of radio buttons. The list is provided via the ``range`` attribute, which expects a container’s URL.
+      -  ``multiple``: Accept a container URI as a ``value``, and inserts one widget per resource with a “remove” button for each widget, and an “add” button.
+      -  ``multipleselect``: Accept a container URI as a ``value``, and inserts a dropdown widget with the ``multiple`` attribute.
+      -  ``file``: Inserts an ``<input/>`` and an ``<input type="file"/>``.
+         When a file is selected it’s uploaded, URL of file is returned by request and set as the ``<input/>`` value.
+         The upload URL is provided via the ``upload-url`` attribute.
+      -  ``image``: Works like ``file`` but allow only images in the input, and create a preview of the image when selected by the user.
+
+   -  ``set``
+
+      -  ``default``: inserts widgets directly in the set tag.
+      -  ``div``: inserts widgets in a ``<div>`` tag
+      -  ``ul``: inserts widgets in a ``<ul>`` tag
+
+   -  default (no template keyword defined)
+
+      -  ``action``: Displays a link inside a ``<solid-link>`` tag with ``src`` for the ``data-src`` attribute,
+         ``value`` for the ``next`` attribute and ``label`` as text content.
+      -  ``multiple``: insert a ``solid-display`` with the ``@id`` of a container as ``data-src``.
+         The fields to display are chosen with the ``fields`` attribute.
+
+
+``features``
+++++++++++++
+   Features to add to the widget. You can choose as many as you want
+
+   -  ``label``: adds a ``label`` before the template. Uses the attribute ``name`` if ``label`` is not defined
+   -  ``labellast``: adds a ``label`` after the template. Uses the attribute ``name`` if ``label`` is not defined
+   -  ``autocompletion``: initializes the ``SlimSelect`` plugin. Works only with dropdowns
+   -  ``autolink``: analyzes widget content, and transforms all links in anchor.
+   -  ``mailto``: adds ``mailto:`` at the beginning of an ``href`` attribute. Works only with links
+   -  ``tel``: adds ``tel:`` at the beginning of an ``href`` attribute. Works only with links
+   -  ``blank``: adds an attribute ``target="_blank"``. Works only with links
+   -  ``placeholder``: adds a placeholder in the input. Uses the attribute ``name`` or ``label`` if ``placeholder`` is not defined. Works only with input widgets.
+   -  ``date``: transforms the value in a date, in the browser’s default locale format.
+   -  ``datetime``: transforms the value in a date and time, in the browser’s default locale format.
+   -  ``multiline``: Shows a value on multiple lines (replace ``\n`` by ``<br>``)
+
diff --git a/source/import_documentation/Widgets/display-widgets.rst b/source/import_documentation/Widgets/display-widgets.rst
deleted file mode 100644
index 5c140b7dda019cef891db19e23268097d5790735..0000000000000000000000000000000000000000
--- a/source/import_documentation/Widgets/display-widgets.rst
+++ /dev/null
@@ -1,48 +0,0 @@
-Display widgets
-===============
-
-Startin'blox provides a list of default widgets to display content:
-
-``solid-display-value``
-~~~~~~~~~~~~~~~~~~~~~~~
-   Displays the value.
-
-``solid-display-div``
-~~~~~~~~~~~~~~~~~~~~~
-   Displays the ``value`` inside a ``<div>`` HTML tag.
-
-``solid-display-labelled-div``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   Displays the ``value`` inside a ``<div>`` HTML tag, after the ``label`` contained in a ``<label>`` HTML tag.
-
-``solid-display-multiline``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   Displays the ``value`` inside a ``<div>``, ``\n`` are replaced by ``<br>``.
-
-``solid-display-labelled-boolean``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Displays the ``label`` inside a ``<label>`` HTML tag if the ``value`` is true.
-
-``solid-display-img``
-~~~~~~~~~~~~~~~~~~~~~
-   Inserts the ``value`` as the src attribute value of an ``<img>`` HTML tag.
-
-``solid-display-mailto``
-~~~~~~~~~~~~~~~~~~~~~~~~~
-   Displays a link inside a ``<a>`` HTML tag with a ``mailto:value`` as path. If a label is defined for this field, it’s displayed as the content of the link.
-
-``solid-display-tel``
-~~~~~~~~~~~~~~~~~~~~~
-   Displays a link inside a ``<a>`` HTML tag with a ``tel:value`` as path.
-
-``solid-display-link``
-~~~~~~~~~~~~~~~~~~~~~~
-   Displays a link inside a ``<a>`` HTML tag with the value as path, and the label as text content.
-
-``solid-display-date``
-~~~~~~~~~~~~~~~~~~~~~~
-   Displays a date in the browser’s default locale format.
-
-``solid-display-date-time``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   Displays a date and a time in the browser’s default locale format.
diff --git a/source/import_documentation/Widgets/form-widgets.rst b/source/import_documentation/Widgets/form-widgets.rst
deleted file mode 100644
index 5c68c06f25ab64f018e15b4c8127dd1f86e7434d..0000000000000000000000000000000000000000
--- a/source/import_documentation/Widgets/form-widgets.rst
+++ /dev/null
@@ -1,67 +0,0 @@
-Form widgets
-===============
-
-Startin'blox provides a list of default widgets to use in a form:
-
-``solid-form-label-text``
-~~~~~~~~~~~~~~~~~~~~~~~~~
-   Inserts an ``<input/>`` HTML tag of type “text”, in a ``<label>`` HTML tag.
-
-``solid-form-checkbox``
-~~~~~~~~~~~~~~~~~~~~~~~
-   Inserts an ``<input/>`` HTML tag of type “checkbox”, in a ``<label>`` HTML tag.
-
-``solid-form-date``
-~~~~~~~~~~~~~~~~~~~
-   Inserts an ``<input/>`` HTML tag of type “date”, in a ``<label>`` HTML tag.
-
-``solid-form-range-date``
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-``solid-form-json``
-~~~~~~~~~~~~~~~~~~~
-   Inserts an ``<input/>`` HTML tag of type “text”, in a ``<label>`` HTML tag, and with its ``value`` converted from JSON to string
-
-``solid-form-placeholder-text``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   Inserts an ``<input/>`` HTML tag of type “text”, with the ``label`` as placeholder.
-
-``solid-form-textarea``
-~~~~~~~~~~~~~~~~~~~~~~~
-   Inserts an ``<textarea>`` HTML tag in a ``<label>`` HTML tag.
-
-``solid-form-dropdown``
-~~~~~~~~~~~~~~~~~~~~~~~
-   Inserts a ``<select>`` HTML tag to select a unique value from a list.
-   The list is provided via the ``range-xyz``, which expects a container’s URL.
-   **xyz** is the name of the field using the ``solid-form-dropdown`` widget.
-
-``solid-form-placeholder-dropdown``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   Inserts a ``<select>`` HTML tag to select a unique value from a list.
-   It has no label but a default disabled value as a label
-
-``solid-form-auto-completion``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   Inserts a ``<input />`` HTML tag and load an autocomplete plugin.
-   The list is provided via the ``range-xyz``, which expects a container’s URL.
-   **xyz** is the name of the field using the ``solid-form-auto-completion`` widget.
-
-``solid-form-number``
-~~~~~~~~~~~~~~~~~~~~~
-   Inserts an ``<input/>`` HTML tag of type “number”, in a ``<label>`` HTML tag.
-
-``solid-form-range-number``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-``solid-form-file``
-~~~~~~~~~~~~~~~~~~~
-   Inserts an ``<input/>`` and an ``<input type="file"/>``.
-   When a file is selected it’s uploaded, URL of file is returned by request and set as the ``<input/>`` value.
-   The upload URL is provided via the ``upload-url`` attribute.
-
-``solid-form-hidden``
-~~~~~~~~~~~~~~~~~~~~~
-   Inserts an ``<input/>`` HTML tag of type “hidden”, in a ``<label>`` HTML tag.
\ No newline at end of file
diff --git a/source/import_documentation/Widgets/multiple-widgets.rst b/source/import_documentation/Widgets/multiple-widgets.rst
deleted file mode 100644
index 94871e07027e7be1ae4c07bc2286c187ce3a658b..0000000000000000000000000000000000000000
--- a/source/import_documentation/Widgets/multiple-widgets.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-Multiple widgets
-===============
-
-Startin'blox provides a list of default widgets to handle multiples:
-
-``solid-multiple``
-~~~~~~~~~~~~~~~~~~
-   *default for display*
-
-   Inserts all the widgets in a ``<solid-multiple>`` tag.
-
-``solid-multiple-form``
-~~~~~~~~~~~~~~~~~~~~~~~
-   *default for forms*
-
-   Inserts all the widgets in a ``<solid-multiple-form>`` tag, with a “remove” button for each widget, and an “add” button.
-
-``solid-multiple-select``
-~~~~~~~~~~~~~~~~~~~~~~~~~
-    Inserts all the values as ``<option>`` in a ``<select>`` tag with a ``multiple`` attribute.
diff --git a/source/import_documentation/Widgets/other-widgets.rst b/source/import_documentation/Widgets/other-widgets.rst
deleted file mode 100644
index 1e0db52e58c93ea5589e9a5dcab0c5bd363c18f9..0000000000000000000000000000000000000000
--- a/source/import_documentation/Widgets/other-widgets.rst
+++ /dev/null
@@ -1,32 +0,0 @@
-Other widgets
-===============
-
-Set widgets
-~~~~~~~~~~~
-
-``solid-set-default``
-+++++++++++++++++++++
-   *default*
-
-   Inserts content directly in the set tag.
-
-``solid-set-div``
-+++++++++++++++++
-   Inserts content in a ``<div/>`` HTML tag.
-
-``solid-set-ul``
-++++++++++++++++
-   Inserts content in a ``<ul/>`` HTML tag.
-
-``solid-set-fieldset``
-++++++++++++++++++++++
-   Inserts content in a ``<fieldset/>`` HTML tag.
-
-
-Actions widgets
-~~~~~~~~~~~~~~~
-
-``solid-action``
-++++++++++++++++
-   Displays a link inside a ``<solid-link>`` tag with ``src`` for the ``data-src`` attribute,
-   ``value`` for the ``next`` attribute and ``label`` as text content.
diff --git a/source/index.rst b/source/index.rst
index 81750a330e7d56988f980fe359eed04200d18185..849aec510bd3915c793cc3b4783c9a5c6f469ccf 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -70,10 +70,8 @@ Welcome to Startinblox's documentation!
    :maxdepth: 2
    :caption: Widget:
 
-   import_documentation/Widgets/display-widgets
-   import_documentation/Widgets/form-widgets
-   import_documentation/Widgets/multiple-widgets
-   import_documentation/Widgets/other-widgets
+   import_documentation/Widgets/Reference
+   import_documentation/Widgets/Examples
 
 .. toctree::
    :maxdepth: 2