diff --git a/UPGRADE.md b/UPGRADE.md
index cdb668d8a..2f1c06fdf 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -14,10 +14,70 @@
 ## ⚠ Twig breaking changes
 
 - Removed bulk confirmation templates (`bulk_base.html.twig`, `bulk_delete.html.twig`), use `admin/confirm_action.html.twig` instead
-- Moved `widgets/tree/rz_tree_wrapper_auto.html.twig` to `widgets/rz_tree_wrapper_auto.html.twig`; it now renders node, tag and folder trees alike
-- Removed `widgets/rz_tree_wrapper.html.twig`, `widgets/nodeTree/rz_node_tree_wrapper.html.twig`, `widgets/tagTree/rz_tag_tree_wrapper.html.twig` and `widgets/folderTree/rz_folder_tree_wrapper.html.twig`, use `widgets/rz_tree_wrapper_auto.html.twig` instead
-
-For Twig templates using `@RoadizRozier/admin/base.html.twig` as parent template, make sure to update
+- Moved `widgets/tree/rz_tree_wrapper_auto.html.twig` to `components/rz_tree.html.twig`; it now renders node, tag and folder trees alike
+- Removed `widgets/rz_tree_wrapper.html.twig`, `widgets/nodeTree/rz_node_tree_wrapper.html.twig`, `widgets/tagTree/rz_tag_tree_wrapper.html.twig` and `widgets/folderTree/rz_folder_tree_wrapper.html.twig`, use `components/rz_tree.html.twig` instead
+
+### Templates moved to the role-based tree
+
+Shared templates now live in `layouts/`, `patterns/`, `components/` (one file per `rz-*` element), `form/`, `macros/` and `includes/`. `layout.html.twig`, `forms.html.twig` and `dashboard/index.html.twig` do not move. Update every `include`, `embed`, `import`, `extends` and every override under `templates/bundles/RoadizRozierBundle/`:
+
+| Old path | New path |
+|----------|----------|
+| `admin/base.html.twig` | `layouts/admin.html.twig` |
+| `base.html.twig` | `layouts/base.html.twig` |
+| `admin/head.html.twig` | `layouts/head.html.twig` |
+| `login/base.html.twig` | `layouts/login.html.twig` |
+| `admin/meta-icon.html.twig` | `layouts/meta_icon.html.twig` |
+| `simple.html.twig` | `layouts/simple.html.twig` |
+| `widgets/rz_aside.html.twig` | `patterns/aside.html.twig` |
+| `dashboard/navBar.html.twig` | `patterns/dashboard_nav.html.twig` |
+| `dashboard/panel.html.twig` | `patterns/dashboard_panel.html.twig` |
+| `admin/rz_header.html.twig` | `patterns/header.html.twig` |
+| `macros/rz_menu_bar.html.twig` | `patterns/menu_bar.html.twig` |
+| `macros/rz_actions_menu.html.twig` | `components/rz_actions_menu.html.twig` |
+| `macros/rz_badge.html.twig` | `components/rz_badge.html.twig` |
+| `includes/rz_breadcrumb_item.html.twig` | `components/rz_breadcrumb.html.twig` (its `item` macro) |
+| `macros/rz_breadcrumb.html.twig` | `components/rz_breadcrumb.html.twig` |
+| `macros/rz_bulk.html.twig` | `components/rz_bulk_actions.html.twig` |
+| `widgets/rz_bulk_actions.html.twig` | `components/rz_bulk_actions.html.twig` |
+| `macros/rz_button.html.twig` | `components/rz_button.html.twig` |
+| `macros/rz_card.html.twig` | `components/rz_card.html.twig` |
+| `includes/rz_color_scheme_switcher.html.twig` | `components/rz_color_scheme_switcher.html.twig` |
+| `macros/rz_dialog.html.twig` | `components/rz_dialog.html.twig` |
+| `widgets/drawer.html.twig` | `components/rz_drawer.html.twig` |
+| `includes/rz_dropdown.html.twig` | `components/rz_dropdown.html.twig` |
+| `macros/rz_dropdown_menu.html.twig` | `components/rz_dropdown.html.twig` |
+| `macros/rz_filters_bar.html.twig` | `components/rz_filters_bar.html.twig` |
+| `widgets/rz_filters_bar.html.twig` | `components/rz_filters_bar.html.twig` |
+| `macros/rz_form_field.html.twig` | `components/rz_form_field.html.twig` |
+| `widgets/rz_geotag_field.html.twig` | `components/rz_geotag.html.twig` |
+| `macros/rz_header.html.twig` | `components/rz_header_nav_item.html.twig` |
+| `widgets/rz_language_switcher.html.twig` | `components/rz_language_switcher.html.twig` |
+| `macros/rz_link.html.twig` | `components/rz_link.html.twig` |
+| `macros/rz_node_badge.html.twig` | `components/rz_node_badge.html.twig` |
+| `macros/rz_overflow_list.html.twig` | `components/rz_overflow_list.html.twig` |
+| `macros/rz_page_header.html.twig` | `components/rz_page_header.html.twig` |
+| `macros/rz_progress.html.twig` | `components/rz_progress.html.twig` |
+| `widgets/rz_repeatable.html.twig` | `components/rz_repeatable.html.twig` |
+| `macros/rz_repeatable.html.twig` (embedded, `inner_body` block) | `components/rz_repeatable.html.twig` (`item(options)` macro, `content` option) |
+| `includes/rz_table.html.twig` | `components/rz_table.html.twig` |
+| `includes/rz_table_actions.html.twig` | `components/rz_table_actions.html.twig` |
+| `widgets/rz_tree_wrapper_auto.html.twig` | `components/rz_tree.html.twig` |
+| `widgets/rz_tree_item_inner.html.twig` | `components/rz_tree_item.html.twig` |
+| `widgets/documentAlignment.html.twig` | `form/document_alignment.html.twig` |
+| `horizontalForms.html.twig` | `form/horizontal_forms.html.twig` |
+| `includes/rz_meta_item_table.html.twig` | `includes/meta_item_table.html.twig` |
+| `includes/translateAssistantUsage.html.twig` | `includes/translate_assistant_usage.html.twig` |
+
+Merged templates:
+
+- `includes/rz_dropdown.html.twig` (popover + trigger) and `macros/rz_dropdown_menu.html.twig` (menu) are one embed: pass `target_options` to `components/rz_dropdown.html.twig` to get the trigger, `targetId` instead of `id`, and `popover_attributes` instead of the popover `attributes`. Drop the nested `popover` block, override `items` directly.
+- The `rz_bulk` macros (`select_input`, `select_all_input`, `select_all_button`, `deselect_all_button`) are imported from `components/rz_bulk_actions.html.twig`.
+- The `rz_filters_bar` macros are part of `components/rz_filters_bar.html.twig`.
+
+Removed templates, unused by the backoffice: `admin/blocks/adminImage.html.twig`, `admin/blocks/loginImage.html.twig`, `custom-form-fields/ajaxEditBase.html.twig`, `documents/backLink.html.twig`, `documents/itemPerPage.html.twig`, `login/check.html.twig`, `nodes/redirection_table.html.twig`, `nodes/widgets/node-header.html.twig`, `tags/navBack.html.twig`, `widgets/backlink.html.twig`, `widgets/countFiltersBar.html.twig`, `widgets/itemPerPage.html.twig`, `widgets/versionItem.html.twig`.
+
+For Twig templates using `@RoadizRozier/layouts/admin.html.twig` as parent template, make sure to update
 - `content_title`
 - `content_count_filters`
 - `content_header_nav`
@@ -27,7 +87,7 @@ blocks to use new `header` block instead.
 Example:
 ```twig
 {%- block header -%}
-    {% include '@RoadizRozier/admin/head.html.twig' with {
+    {% include '@RoadizRozier/layouts/head.html.twig' with {
         title: 'my_entities'|trans,
         filters: filters,
         buttons: [
@@ -41,11 +101,11 @@ Example:
 {%- endblock -%}
 ```
 
-You need to update your `content_filters` block to use new `widgets/rz_filters_bar.html.twig` inside this block.
+You need to update your `content_filters` block to use new `components/rz_filters_bar.html.twig` inside this block.
 
 Example:
 ```twig
-{% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+{% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
     filters: filters,
     display_select_all_button: true,
 } only %}
@@ -211,13 +271,13 @@ These classes are no longer `Throwable` in ORM 3. Remove any `@throws` PHPDoc an
 ## ⚠ Rozier session and health check dialogs
 
 The session expiration and health check warning modals no longer use Vue: they are plain
-`<dialog is="rz-dialog">` elements rendered in `@RoadizRozier/base.html.twig` by the new
-`@RoadizRozier/macros/rz_dialog.html.twig` component and opened by `LoginCheckService`. The session expired dialog no longer shows the splash screen image.
+`<dialog is="rz-dialog">` elements rendered in `@RoadizRozier/layouts/base.html.twig` by the new
+`@RoadizRozier/components/rz_dialog.html.twig` component and opened by `LoginCheckService`. The session expired dialog no longer shows the splash screen image.
 
 Removed from the Rozier front-end:
 
 - `app/components/WarningModal.vue` and `app/containers/ModalContainer.vue`, the `<modal-container>`
-  element in `base.html.twig`, and the `vue-js-modal` dependency
+  element in `layouts/base.html.twig`, and the `vue-js-modal` dependency
 - `app/api/SplashScreenApi.js` and its `getImage()` function
 - `connected` and `healthChecked` Vuex state, and the `LOGIN_CHECK_*` / `HEALTH_CHECK_*` mutation types
 - `sessionExpireTitle`, `sessionExpireContent`, `healthCheckedFailedTitle` and
@@ -226,7 +286,7 @@ Removed from the Rozier front-end:
 Overriding those messages from JavaScript no longer has any effect. Override the
 `session.expire.title`, `session.expire.content`, `health_check.failed.title` and
 `health_check.failed.content` translation keys in your project catalogue instead, or override
-`templates/bundles/RoadizRozierBundle/macros/rz_dialog.html.twig` to change the markup.
+`templates/bundles/RoadizRozierBundle/components/rz_dialog.html.twig` to change the markup.
 
 ## ⚠ Rozier dead Vue containers and components removed
 
@@ -239,16 +299,16 @@ now renders `<rz-drawer>`), and are removed:
 - the `vue-multiselect` dependency
 
 If a project template still renders `<drawer-container data-vuejs>` (copied from the v2.7
-`widgets/drawer.html.twig`) or `<tags-editor-container>`, it renders nothing anymore: migrate it to
-`<rz-drawer>`, as `@RoadizRozier/widgets/drawer.html.twig` does.
+`components/rz_drawer.html.twig`) or `<tags-editor-container>`, it renders nothing anymore: migrate it to
+`<rz-drawer>`, as `@RoadizRozier/components/rz_drawer.html.twig` does.
 
 ## New admin templates
 
 New reusable templates for building back-office pages:
-- `admin/head.html.twig` - Page header with title, breadcrumb, buttons
+- `layouts/head.html.twig` - Page header with title, breadcrumb, buttons
 - `admin/confirm_action.html.twig` - Generic confirmation page
-- `macros/rz_breadcrumb.html.twig` - Breadcrumb trail. Fed by a `breadcrumb` variable
-  `{ parents, current }`, rendered automatically by `admin/head.html.twig` as soon as that
+- `components/rz_breadcrumb.html.twig` - Breadcrumb trail. Fed by a `breadcrumb` variable
+  `{ parents, current }`, rendered automatically by `layouts/head.html.twig` as soon as that
   variable is in context. Ancestors are either `{label, url}` hashes or entities resolved by a
   `BreadcrumbsItemFactory`; past three of them the middle ones fold into a popover.
 - `breadcrumb_root('<section>')` Twig function, backed by the `BreadcrumbRoots` service - the single
@@ -258,8 +318,8 @@ New reusable templates for building back-office pages:
   tree entity — root, ancestors, then the item — which confirmation pages show above their own title.
   It covers the sections Rozier ships; a project's own section writes its root inline. See
   `docs/developer/contributing/contributing.md` and `docs/extensions/custom_backoffice_entry.md`.
-- `widgets/rz_filters_bar.html.twig` - Filter bar widget
-- `widgets/rz_bulk_actions.html.twig` - Bulk actions widget
+- `components/rz_filters_bar.html.twig` - Filter bar widget
+- `components/rz_bulk_actions.html.twig` - Bulk actions widget
 - New macros: `rz_button`, `rz_badge`, `rz_actions_menu`, `rz_card`
 
 # Upgrade to 2.7
diff --git a/docs/developer/contributing/contributing.md b/docs/developer/contributing/contributing.md
index 37fcaab73..0e73b6f2b 100644
--- a/docs/developer/contributing/contributing.md
+++ b/docs/developer/contributing/contributing.md
@@ -59,7 +59,7 @@ and do not rename them opportunistically either: a template variable is a public
 is a breaking change that belongs in a major release and in `UPGRADE.md`.
 
 Finally, document the options a template expects in a `{# Variables: #}` comment at the top of the
-file, the way `admin/head.html.twig` does. It is the only place a caller can discover them.
+file, the way `layouts/head.html.twig` does. It is the only place a caller can discover them.
 
 ## Building a back-office breadcrumb
 
diff --git a/docs/extensions/additional_entries_navbar.md b/docs/extensions/additional_entries_navbar.md
index bfc4324ce..ed1b2a35f 100644
--- a/docs/extensions/additional_entries_navbar.md
+++ b/docs/extensions/additional_entries_navbar.md
@@ -21,7 +21,7 @@ Here is how to add a button. You simply need to change the template you extend (
 {% extends "@!RoadizRozier/users/navBar.html.twig" %}
 
 {# 2. Import the macro #}
-{% import "@!RoadizRozier/macros/rz_menu_bar.html.twig" as rz_menu_bar %}
+{% import "@!RoadizRozier/patterns/menu_bar.html.twig" as rz_menu_bar %}
 
 {# 3. Add your content #}
 {% block additional_entries %}
@@ -79,7 +79,7 @@ You can replace a default button with your own implementation:
 
 ```twig
 {% extends "@RoadizRozier/nodes/navBar.html.twig" %}
-{% import "@!RoadizRozier/macros/rz_menu_bar.html.twig" as rz_menu_bar %}
+{% import "@!RoadizRozier/patterns/menu_bar.html.twig" as rz_menu_bar %}
 
 {# Overrides the SEO button display #}
 {% block node_seo %}
diff --git a/docs/extensions/backoffice_extension_points.md b/docs/extensions/backoffice_extension_points.md
index 080cfde95..a26b91cfc 100644
--- a/docs/extensions/backoffice_extension_points.md
+++ b/docs/extensions/backoffice_extension_points.md
@@ -113,7 +113,7 @@ services:
 
 {%- block dashboard_panels -%}
     <div class="rz-dashboard__row">
-        {% embed '@RoadizRozier/dashboard/panel.html.twig' with {
+        {% embed '@RoadizRozier/patterns/dashboard_panel.html.twig' with {
             icon: 'rz-icon-ri--computer-line',
             title: 'My latest articles'|trans,
         } %}
diff --git a/docs/extensions/backoffice_templates.md b/docs/extensions/backoffice_templates.md
index 33b9338b3..731adab04 100644
--- a/docs/extensions/backoffice_templates.md
+++ b/docs/extensions/backoffice_templates.md
@@ -15,7 +15,7 @@ The template system is organized into several layers:
 
 ## Generic Admin Templates
 
-### `admin/base.html.twig`
+### `layouts/admin.html.twig`
 
 The base layout for listing pages. Extends `@RoadizRozier/layout.html.twig` and provides a structured content area with bulk selection support.
 
@@ -30,10 +30,10 @@ The base layout for listing pages. Extends `@RoadizRozier/layout.html.twig` and
 **Example usage:**
 
 ```twig
-{% extends "@RoadizRozier/admin/base.html.twig" %}
+{% extends "@RoadizRozier/layouts/admin.html.twig" %}
 
 {%- block header -%}
-    {% include '@RoadizRozier/admin/head.html.twig' with {
+    {% include '@RoadizRozier/layouts/head.html.twig' with {
         title: 'my_entities'|trans,
         filters: filters,
         buttons: [{
@@ -45,7 +45,7 @@ The base layout for listing pages. Extends `@RoadizRozier/layout.html.twig` and
 {%- endblock -%}
 
 {%- block content_filters -%}
-    {% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+    {% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
         filters: filters,
         display_select_all_button: true,
     } only %}
@@ -58,7 +58,7 @@ The base layout for listing pages. Extends `@RoadizRozier/layout.html.twig` and
 {%- endblock -%}
 ```
 
-### `admin/head.html.twig`
+### `layouts/head.html.twig`
 
 A generic and reusable header template for admin pages. It handles page titles, breadcrumbs, action buttons, item counts, and translation switching.
 
@@ -111,7 +111,7 @@ A generic and reusable header template for admin pages. It handles page titles,
 **Full example:**
 
 ```twig
-{% include '@RoadizRozier/admin/head.html.twig' with {
+{% include '@RoadizRozier/layouts/head.html.twig' with {
     title: 'edit.article'|trans ~ ' "' ~ item.title ~ '"',
     filters: filters,
     buttons: [
@@ -306,18 +306,18 @@ Items are rendered using the `rz_card.html.twig` macro which supports three thum
 {% endif %}
 ```
 
-## Macros System
+## Components
 
-Macros are reusable Twig components for rendering UI elements consistently.
+Components live in `components/`, one file per `rz-*` element. Leaf components are macros you import; the ones with content slots are templates you embed.
 
-### `rz_button.html.twig`
+### `components/rz_button.html.twig`
 
 Renders buttons and button-like links.
 
 **Import and usage:**
 
 ```twig
-{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+{% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
 
 {# Basic submit button #}
 {{ rz_button.root({
@@ -356,12 +356,12 @@ Renders buttons and button-like links.
 | `attributes` | object | HTML attributes (`href`, `type`, `title`, etc.) |
 | `tagName` | string | HTML tag (default: `button`, auto `a` if `href`) |
 
-### `rz_badge.html.twig`
+### `components/rz_badge.html.twig`
 
 Renders badges for status indicators, counts, or labels.
 
 ```twig
-{% import "@RoadizRozier/macros/rz_badge.html.twig" as rz_badge %}
+{% import "@RoadizRozier/components/rz_badge.html.twig" as rz_badge %}
 
 {{ rz_badge.item({
     label: 'published',
@@ -387,12 +387,12 @@ Renders badges for status indicators, counts, or labels.
 | `color` | string | `success`, `danger`, `warning`, `default` |
 | `attributes` | object | HTML attributes (use `href` for link badge) |
 
-### `rz_actions_menu.html.twig`
+### `components/rz_actions_menu.html.twig`
 
 An embeddable template for action menus (typically positioned on the side of edit pages).
 
 ```twig
-{% embed "@RoadizRozier/macros/rz_actions_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_actions_menu.html.twig" with {
     vertical: true,
     class: 'actions-menu',
 } only %}
@@ -411,12 +411,12 @@ An embeddable template for action menus (typically positioned on the side of edi
 | `deleteItem(label, href, attr)` | Delete button/link |
 | `item(label, class, href, icon, attr)` | Generic action item |
 
-### `rz_dropdown_menu.html.twig`
+### `components/rz_dropdown.html.twig`
 
 Creates dropdown menus with customizable items.
 
 ```twig
-{% embed "@RoadizRozier/macros/rz_dropdown_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_dropdown.html.twig" with {
     targetId: 'my-dropdown',
     title: 'actions'|trans,
 } %}
@@ -447,12 +447,14 @@ Creates dropdown menus with customizable items.
 | `badgeLabel` | string | Badge text |
 | `selected` | bool | Highlight as selected |
 
-### `rz_link.html.twig`
+Pass `target_options` (the options of the `rz_button` that opens it) and the menu comes with its own trigger, wrapped in an `<rz-popover>`; `placement`, `offset`, `shift` and `popover_attributes` tune the popover. Without `target_options`, render the trigger yourself and point it at `targetId`.
+
+### `components/rz_link.html.twig`
 
 Simple link component.
 
 ```twig
-{% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+{% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
 
 {{ rz_link.root({
     label: 'see.details',
@@ -461,28 +463,28 @@ Simple link component.
 }) }}
 ```
 
-### `rz_bulk.html.twig`
+### Bulk selection inputs (`components/rz_bulk_actions.html.twig`)
 
 Utilities for bulk selection in tables.
 
 ```twig
-{% import '@RoadizRozier/macros/rz_bulk.html.twig' as rz_bulk %}
+{% import '@RoadizRozier/components/rz_bulk_actions.html.twig' as rz_bulk_actions %}
 
 {# In table header #}
-{{ rz_bulk.select_all_input() }}
+{{ rz_bulk_actions.select_all_input() }}
 
 {# In table row #}
-{{ rz_bulk.select_input({ value: item.id }) }}
+{{ rz_bulk_actions.select_input({ value: item.id }) }}
 ```
 
 ## Reusable Widgets
 
-### `widgets/rz_filters_bar.html.twig`
+### `components/rz_filters_bar.html.twig`
 
 Complete filter bar with search, pagination, and bulk selection controls.
 
 ```twig
-{% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+{% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
     filters: filters,
     display_select_all_button: true,
     display_layout_fields: false,
@@ -492,7 +494,7 @@ Complete filter bar with search, pagination, and bulk selection controls.
 **With custom filters using embed:**
 
 ```twig
-{% embed "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+{% embed "@RoadizRozier/components/rz_filters_bar.html.twig" with {
     filters: filters,
     display_select_all_button: true,
 } only %}
@@ -515,13 +517,13 @@ Complete filter bar with search, pagination, and bulk selection controls.
 | `display_layout_fields` | bool | Show grid/list toggle |
 | `with_filter_form` | bool | Enable search form (default: true) |
 
-### `widgets/rz_bulk_actions.html.twig`
+### `components/rz_bulk_actions.html.twig`
 
 Floating action bar that appears when items are selected.
 
 ```twig
-{% embed "@RoadizRozier/widgets/rz_bulk_actions.html.twig" %}
-    {% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+{% embed "@RoadizRozier/components/rz_bulk_actions.html.twig" %}
+    {% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
     
     {% block other_actions %}
         {{ rz_button.root({
@@ -555,12 +557,12 @@ For standard bulk actions (publish, unpublish, delete), use the pre-built `@Road
 This requires `hasBulkActions`, `bulkPublishForm`, `bulkUnpublishForm`, and `bulkDeleteForm` variables from your controller.
 :::
 
-### `includes/rz_table.html.twig`
+### `components/rz_table.html.twig`
 
 Embeddable table component with sorting, selection, and action columns.
 
 ```twig
-{% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+{% embed '@RoadizRozier/components/rz_table.html.twig' with {
     selection_available: true,
     actions_available: true,
     items: items,
@@ -576,19 +578,19 @@ Embeddable table component with sorting, selection, and action columns.
             <tr>
                 {% if selection_available %}
                     <td>
-                        {% import '@RoadizRozier/macros/rz_bulk.html.twig' as rz_bulk %}
-                        {{ rz_bulk.select_input({ value: item.id }) }}
+                        {% import '@RoadizRozier/components/rz_bulk_actions.html.twig' as rz_bulk_actions %}
+                        {{ rz_bulk_actions.select_input({ value: item.id }) }}
                     </td>
                 {% endif %}
                 <td>{{ item.title }}</td>
                 <td>{{ item.createdAt|format_datetime('short', 'short') }}</td>
                 <td>
-                    {% import "@RoadizRozier/macros/rz_badge.html.twig" as rz_badge %}
+                    {% import "@RoadizRozier/components/rz_badge.html.twig" as rz_badge %}
                     {{ rz_badge.item({ label: item.status }) }}
                 </td>
                 {% if actions_available %}
                     <td>
-                        {% include '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                        {% include '@RoadizRozier/components/rz_table_actions.html.twig' with {
                             edit_href: path('entity_edit', { id: item.id }),
                             delete_href: path('entity_delete', { id: item.id }),
                         } %}
@@ -614,12 +616,12 @@ Embeddable table component with sorting, selection, and action columns.
 | `sortable.enabled` | bool | Enable drag-and-drop sorting |
 | `sortable.url` | string | URL for sort updates |
 
-### `includes/rz_table_actions.html.twig`
+### `components/rz_table_actions.html.twig`
 
 Row action buttons (edit, delete, custom).
 
 ```twig
-{% embed '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+{% embed '@RoadizRozier/components/rz_table_actions.html.twig' with {
     edit_href: path('entity_edit', { id: item.id }),
     delete_href: path('entity_delete', { id: item.id }),
 } %}
@@ -647,7 +649,7 @@ Understanding when to use `{% include %}` versus `{% embed %}` is essential for
 
 ```twig
 {# Simple inclusion with variables #}
-{% include '@RoadizRozier/admin/head.html.twig' with {
+{% include '@RoadizRozier/layouts/head.html.twig' with {
     title: 'My Page',
     buttons: [...]
 } only %}
@@ -661,7 +663,7 @@ Understanding when to use `{% include %}` versus `{% embed %}` is essential for
 
 ```twig
 {# Embedding with block customization #}
-{% embed "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+{% embed "@RoadizRozier/components/rz_filters_bar.html.twig" with {
     filters: filters,
 } only %}
     {% block before_submit %}
@@ -707,10 +709,10 @@ Use the `@!` prefix to extend the original template while adding customizations:
 ```twig
 {# templates/bundles/RoadizRozierBundle/dashboard/index.html.twig #}
 {% extends "@!RoadizRozier/dashboard/index.html.twig" %}
-{% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+{% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
 
 {%- block header -%}
-    {% include '@RoadizRozier/admin/head.html.twig' with {
+    {% include '@RoadizRozier/layouts/head.html.twig' with {
         title: "hello.%name%"|trans({'%name%': displayName}),
         breadcrumb: {
             label: 'breadcrumb',
@@ -730,7 +732,7 @@ Use the `@!` prefix to extend the original template while adding customizations:
     {{ parent() }}
     
     {# Add custom panel #}
-    {% embed '@RoadizRozier/dashboard/panel.html.twig' with {
+    {% embed '@RoadizRozier/patterns/dashboard_panel.html.twig' with {
         icon: 'rz-icon-ri--bar-chart-line',
         title: 'my.custom.stats'|trans,
     } %}
@@ -747,7 +749,7 @@ For complete replacement without inheritance:
 
 ```twig
 {# templates/bundles/RoadizRozierBundle/redirections/list.html.twig #}
-{% extends '@RoadizRozier/admin/base.html.twig' %}
+{% extends '@RoadizRozier/layouts/admin.html.twig' %}
 
 {# Completely custom implementation #}
 {%- block header -%}
@@ -796,10 +798,10 @@ Here's a complete example of a custom listing page:
 
 ```twig
 {# templates/admin/product/list.html.twig #}
-{% extends "@RoadizRozier/admin/base.html.twig" %}
+{% extends "@RoadizRozier/layouts/admin.html.twig" %}
 
 {%- block header -%}
-    {% include '@RoadizRozier/admin/head.html.twig' with {
+    {% include '@RoadizRozier/layouts/head.html.twig' with {
         title: 'products'|trans,
         filters: filters,
         buttons: [{
@@ -815,7 +817,7 @@ Here's a complete example of a custom listing page:
 {%- endblock -%}
 
 {%- block content_filters -%}
-    {% embed "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+    {% embed "@RoadizRozier/components/rz_filters_bar.html.twig" with {
         filters: filters,
         display_select_all_button: hasBulkActions,
     } only %}
@@ -836,7 +838,7 @@ Here's a complete example of a custom listing page:
 
 {%- block content_body -%}
     <article>
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             selection_available: hasBulkActions,
             actions_available: true,
             items: products,
@@ -852,8 +854,8 @@ Here's a complete example of a custom listing page:
                     <tr>
                         {% if selection_available %}
                             <td>
-                                {% import '@RoadizRozier/macros/rz_bulk.html.twig' as rz_bulk %}
-                                {{ rz_bulk.select_input({ value: product.id }) }}
+                                {% import '@RoadizRozier/components/rz_bulk_actions.html.twig' as rz_bulk_actions %}
+                                {{ rz_bulk_actions.select_input({ value: product.id }) }}
                             </td>
                         {% endif %}
                         <td>
@@ -863,7 +865,7 @@ Here's a complete example of a custom listing page:
                         </td>
                         <td>{{ product.price|format_currency('EUR') }}</td>
                         <td>
-                            {% import "@RoadizRozier/macros/rz_badge.html.twig" as rz_badge %}
+                            {% import "@RoadizRozier/components/rz_badge.html.twig" as rz_badge %}
                             {{ rz_badge.item({
                                 label: product.status,
                                 color: product.isPublished ? 'success' : 'warning',
@@ -871,7 +873,7 @@ Here's a complete example of a custom listing page:
                         </td>
                         {% if actions_available %}
                             <td>
-                                {% include '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                                {% include '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                     edit_href: path('product_edit', { id: product.id }),
                                     delete_href: path('product_delete', { id: product.id }),
                                 } %}
diff --git a/docs/extensions/custom_backoffice_entry.md b/docs/extensions/custom_backoffice_entry.md
index 2604b2961..ea08b908f 100644
--- a/docs/extensions/custom_backoffice_entry.md
+++ b/docs/extensions/custom_backoffice_entry.md
@@ -387,13 +387,13 @@ instead of retyping it:
 
 ```twig
 {# templates/admin/article/list.html.twig #}
-{% include '@RoadizRozier/admin/head.html.twig' with {
+{% include '@RoadizRozier/layouts/head.html.twig' with {
     title: 'articles'|trans,
     breadcrumb: { current: 'articles'|trans },
 } only %}
 
 {# templates/admin/article/add.html.twig #}
-{% include '@RoadizRozier/admin/head.html.twig' with {
+{% include '@RoadizRozier/layouts/head.html.twig' with {
     title: 'articles.add'|trans,
     breadcrumb: {
         parents: [breadcrumb_root('articles')],
diff --git a/lib/RoadizCoreBundle/templates/customForm/base_custom_form.html.twig b/lib/RoadizCoreBundle/templates/customForm/base_custom_form.html.twig
index 93161ef93..34cd23347 100644
--- a/lib/RoadizCoreBundle/templates/customForm/base_custom_form.html.twig
+++ b/lib/RoadizCoreBundle/templates/customForm/base_custom_form.html.twig
@@ -7,7 +7,7 @@
     <title>{% block title %}{{ meta.siteName }}{% endblock %}</title>
     <meta name="description" content="{% block description %}{% trans %}back_office{% endtrans %}{% endblock %}">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-    {% include '@RoadizRozier/admin/meta-icon.html.twig' %}
+    {% include '@RoadizRozier/layouts/meta_icon.html.twig' %}
     {# CSS scripts inclusions / Using webpack #}
     {{ manifest_preload_tags('shared') }}
     {{ manifest_preload_tags('simple') }}
diff --git a/lib/RoadizRozierBundle/src/Controller/AbstractAdminWithBulkController.php b/lib/RoadizRozierBundle/src/Controller/AbstractAdminWithBulkController.php
index a8b12a8c1..a4e1f10df 100644
--- a/lib/RoadizRozierBundle/src/Controller/AbstractAdminWithBulkController.php
+++ b/lib/RoadizRozierBundle/src/Controller/AbstractAdminWithBulkController.php
@@ -208,7 +208,7 @@ protected function bulkAction(
 
         $this->assignation[$bulkFormName] = $bulkForm->createView();
         $this->assignation['title'] = $templateOptions['title'] ?? $this->translator->trans('delete.bulk.'.$this->getNamespace());
-        $this->assignation['headPath'] = $templateOptions['headPath'] ?? '@RoadizRozier/admin/head.html.twig';
+        $this->assignation['headPath'] = $templateOptions['headPath'] ?? '@RoadizRozier/layouts/head.html.twig';
         $this->assignation['cancelPath'] = $templateOptions['cancelPath'] ?? $this->generateUrl($this->getDefaultRouteName(), $this->getDefaultRouteParameters());
         $this->assignation['alertMessage'] = $templateOptions['alertMessage'] ?? $this->translator->trans(
             'are_you_sure.delete.these.%namespace%',
diff --git a/lib/RoadizRozierBundle/src/Controller/Ajax/Tree/AjaxFolderTreeController.php b/lib/RoadizRozierBundle/src/Controller/Ajax/Tree/AjaxFolderTreeController.php
index 6efbb2f84..7d6d5d404 100644
--- a/lib/RoadizRozierBundle/src/Controller/Ajax/Tree/AjaxFolderTreeController.php
+++ b/lib/RoadizRozierBundle/src/Controller/Ajax/Tree/AjaxFolderTreeController.php
@@ -71,7 +71,7 @@ public function getTreeAction(Request $request): JsonResponse
             'statusCode' => '200',
             'status' => 'success',
             'tree_type' => $assignation['tree_type'],
-            'folderTree' => $this->twig->render('@RoadizRozier/widgets/rz_tree_wrapper_auto.html.twig', $assignation),
+            'folderTree' => $this->twig->render('@RoadizRozier/components/rz_tree.html.twig', $assignation),
         ]);
     }
 }
diff --git a/lib/RoadizRozierBundle/src/Controller/Ajax/Tree/AjaxNodeTreeController.php b/lib/RoadizRozierBundle/src/Controller/Ajax/Tree/AjaxNodeTreeController.php
index ff543f4db..0dc088c2f 100644
--- a/lib/RoadizRozierBundle/src/Controller/Ajax/Tree/AjaxNodeTreeController.php
+++ b/lib/RoadizRozierBundle/src/Controller/Ajax/Tree/AjaxNodeTreeController.php
@@ -124,7 +124,7 @@ public function getTreeAction(Request $request): JsonResponse
             'status' => 'success',
             'tree_type' => $assignation['tree_type'],
             'linkedTypes' => $linkedTypes,
-            'nodeTree' => trim($this->twig->render('@RoadizRozier/widgets/rz_tree_wrapper_auto.html.twig', $assignation)),
+            'nodeTree' => trim($this->twig->render('@RoadizRozier/components/rz_tree.html.twig', $assignation)),
         ]);
     }
 }
diff --git a/lib/RoadizRozierBundle/src/Controller/Ajax/Tree/AjaxTagTreeController.php b/lib/RoadizRozierBundle/src/Controller/Ajax/Tree/AjaxTagTreeController.php
index 6043bbe57..019dc4058 100644
--- a/lib/RoadizRozierBundle/src/Controller/Ajax/Tree/AjaxTagTreeController.php
+++ b/lib/RoadizRozierBundle/src/Controller/Ajax/Tree/AjaxTagTreeController.php
@@ -78,7 +78,7 @@ public function getTreeAction(Request $request): JsonResponse
             'statusCode' => '200',
             'status' => 'success',
             'tree_type' => $assignation['tree_type'],
-            'tagTree' => $this->twig->render('@RoadizRozier/widgets/rz_tree_wrapper_auto.html.twig', $assignation),
+            'tagTree' => $this->twig->render('@RoadizRozier/components/rz_tree.html.twig', $assignation),
         ]);
     }
 }
diff --git a/lib/RoadizRozierBundle/src/Controller/SettingController.php b/lib/RoadizRozierBundle/src/Controller/SettingController.php
index d8adfea87..422ce0d3a 100644
--- a/lib/RoadizRozierBundle/src/Controller/SettingController.php
+++ b/lib/RoadizRozierBundle/src/Controller/SettingController.php
@@ -339,7 +339,7 @@ public function deleteAction(Request $request, int $settingId): Response
 
         return $this->render('@RoadizRozier/admin/confirm_action.html.twig', [
             'title' => $title,
-            'headPath' => '@RoadizRozier/admin/head.html.twig',
+            'headPath' => '@RoadizRozier/layouts/head.html.twig',
             'breadcrumb_parents' => [
                 $this->breadcrumbRoots->get('settings'),
                 [
diff --git a/lib/RoadizRozierBundle/src/Controller/Tag/TagController.php b/lib/RoadizRozierBundle/src/Controller/Tag/TagController.php
index 3a7622105..0839b7613 100644
--- a/lib/RoadizRozierBundle/src/Controller/Tag/TagController.php
+++ b/lib/RoadizRozierBundle/src/Controller/Tag/TagController.php
@@ -308,7 +308,7 @@ public function bulkDeleteAction(Request $request): Response
 
         return $this->render('@RoadizRozier/admin/confirm_action.html.twig', [
             'title' => $title,
-            'headPath' => '@RoadizRozier/admin/head.html.twig',
+            'headPath' => '@RoadizRozier/layouts/head.html.twig',
             'cancelPath' => $assignation['referer'] ?? $this->generateUrl('tagsHomePage'),
             'breadcrumb_parents' => [$this->breadcrumbRoots->get('tags')],
             'alertMessage' => 'are_you_sure.delete.these.tags',
diff --git a/lib/RoadizRozierBundle/src/Controller/TranslationController.php b/lib/RoadizRozierBundle/src/Controller/TranslationController.php
index e54e7f34f..249106f76 100644
--- a/lib/RoadizRozierBundle/src/Controller/TranslationController.php
+++ b/lib/RoadizRozierBundle/src/Controller/TranslationController.php
@@ -194,7 +194,7 @@ public function deleteAction(Request $request, int $translationId): Response
 
         return $this->render('@RoadizRozier/admin/confirm_action.html.twig', [
             'title' => $title,
-            'headPath' => '@RoadizRozier/admin/head.html.twig',
+            'headPath' => '@RoadizRozier/layouts/head.html.twig',
             'cancelPath' => $this->generateUrl('translationsHomePage'),
             'breadcrumb_parents' => [
                 $this->breadcrumbRoots->get('translations'),
diff --git a/lib/RoadizRozierBundle/src/Controller/User/UserRoleController.php b/lib/RoadizRozierBundle/src/Controller/User/UserRoleController.php
index 45f6afaed..9a993c62f 100644
--- a/lib/RoadizRozierBundle/src/Controller/User/UserRoleController.php
+++ b/lib/RoadizRozierBundle/src/Controller/User/UserRoleController.php
@@ -116,7 +116,7 @@ public function removeRoleAction(Request $request, int $userId, string $role): R
                 '%name%' => $user->getUserName(),
                 '%role%' => $role,
             ]),
-            'headPath' => '@RoadizRozier/admin/head.html.twig',
+            'headPath' => '@RoadizRozier/layouts/head.html.twig',
             'breadcrumb_parents' => [
                 $this->breadcrumbRoots->get('users'),
                 [
diff --git a/lib/RoadizRozierBundle/templates/admin/blocks/adminImage.html.twig b/lib/RoadizRozierBundle/templates/admin/blocks/adminImage.html.twig
deleted file mode 100644
index 76546b8c7..000000000
--- a/lib/RoadizRozierBundle/templates/admin/blocks/adminImage.html.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-<div id="company">
-    {%  if project_logo_url is not empty %}
-        <a class="admin-image" href="{{ path('adminHomePage') }}"><img loading="lazy" src="{{ project_logo_url }}" alt=""/></a>
-    {% else %}
-        <a class="uk-icon-rz-roadiz-icon" href="{{ path('adminHomePage') }}"></a>
-    {% endif %}
-</div>
diff --git a/lib/RoadizRozierBundle/templates/admin/blocks/loginImage.html.twig b/lib/RoadizRozierBundle/templates/admin/blocks/loginImage.html.twig
deleted file mode 100644
index 4bcfafcb6..000000000
--- a/lib/RoadizRozierBundle/templates/admin/blocks/loginImage.html.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-<div id="login-logo">
-    {%  if project_logo_url is not empty %}
-        <img loading="lazy" src="{{ project_logo_url }}" alt=""/>
-    {% else %}
-        <i class="uk-icon-rz-roadiz-icon"></i>
-    {% endif %}
-</div>
diff --git a/lib/RoadizRozierBundle/templates/admin/bulk_actions.html.twig b/lib/RoadizRozierBundle/templates/admin/bulk_actions.html.twig
index fa7fb1565..402165dd3 100644
--- a/lib/RoadizRozierBundle/templates/admin/bulk_actions.html.twig
+++ b/lib/RoadizRozierBundle/templates/admin/bulk_actions.html.twig
@@ -1,6 +1,6 @@
 {% if hasBulkActions %}
-    {% embed "@RoadizRozier/widgets/rz_bulk_actions.html.twig" %}
-        {% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+    {% embed "@RoadizRozier/components/rz_bulk_actions.html.twig" %}
+        {% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
         {% block other_actions %}
             {% if bulkPublishForm %}
                 {% form_theme bulkPublishForm '@RoadizRozier/forms.html.twig' %}
diff --git a/lib/RoadizRozierBundle/templates/admin/confirm_action.html.twig b/lib/RoadizRozierBundle/templates/admin/confirm_action.html.twig
index 6c6ce0b29..dae5a69f9 100644
--- a/lib/RoadizRozierBundle/templates/admin/confirm_action.html.twig
+++ b/lib/RoadizRozierBundle/templates/admin/confirm_action.html.twig
@@ -5,7 +5,7 @@
     - title (required): page title, also the last breadcrumb entry
     - subtitle (optional): line under the title
     - form (required): the confirmation form
-    - headPath (required): head template to include, e.g. '@RoadizRozier/admin/head.html.twig'
+    - headPath (required): head template to include, e.g. '@RoadizRozier/layouts/head.html.twig'
     - cancelPath (required): URL of the cancel button
     - alertMessage (required): translation key of the warning shown above the buttons
     - messageType (optional): rz-message modifier, defaults to 'error'
@@ -13,14 +13,14 @@
     - thumbnailFormat (optional): format passed to the item cards
 
     Template options (snake_case):
-    - breadcrumb_parents (optional): breadcrumb ancestors, see macros/rz_breadcrumb.html.twig
+    - breadcrumb_parents (optional): breadcrumb ancestors, see components/rz_breadcrumb.html.twig
     - action_label / action_icon / action_color (optional): submit button, defaults to a red "delete"
 
     Note: the camelCase parameters above predate the naming rule documented in
     docs/developer/contributing/contributing.md. Renaming them is a breaking change.
 #}
 {% extends '@RoadizRozier/layout.html.twig' %}
-{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+{% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
 
 {% block title %}{{ title|truncate_title }}{% endblock %}
 
@@ -77,7 +77,7 @@
             {{ form_end(form) }}
 
             {% if items is defined and items|length > 0 %}
-                {% import '@RoadizRozier/macros/rz_card.html.twig' as card %}
+                {% import '@RoadizRozier/components/rz_card.html.twig' as card %}
 
                 <ul class="rz-delete-page__body rz-layout-grid">
                     {% for item in items %}
diff --git a/lib/RoadizRozierBundle/templates/admin/webhooks/actionsMenu.html.twig b/lib/RoadizRozierBundle/templates/admin/webhooks/actionsMenu.html.twig
index dce6a889f..be59b8523 100644
--- a/lib/RoadizRozierBundle/templates/admin/webhooks/actionsMenu.html.twig
+++ b/lib/RoadizRozierBundle/templates/admin/webhooks/actionsMenu.html.twig
@@ -1,4 +1,4 @@
-{% embed "@RoadizRozier/macros/rz_actions_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_actions_menu.html.twig" with {
     vertical: true,
     class: 'actions-menu',
     item: item
diff --git a/lib/RoadizRozierBundle/templates/admin/webhooks/add.html.twig b/lib/RoadizRozierBundle/templates/admin/webhooks/add.html.twig
index a3f8377a2..252f31626 100644
--- a/lib/RoadizRozierBundle/templates/admin/webhooks/add.html.twig
+++ b/lib/RoadizRozierBundle/templates/admin/webhooks/add.html.twig
@@ -5,7 +5,7 @@
 
 {% block content %}
 <section class="content-global add-item">
-    {% include '@RoadizRozier/admin/head.html.twig' with {
+    {% include '@RoadizRozier/layouts/head.html.twig' with {
         title: title,
         breadcrumb: {
             parents: [breadcrumb_root('webhooks')],
@@ -17,7 +17,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: { id: "add-webhook-form" }}) }}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#add-webhook-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/admin/webhooks/delete.html.twig b/lib/RoadizRozierBundle/templates/admin/webhooks/delete.html.twig
index f6a2b073f..4fcac5e09 100644
--- a/lib/RoadizRozierBundle/templates/admin/webhooks/delete.html.twig
+++ b/lib/RoadizRozierBundle/templates/admin/webhooks/delete.html.twig
@@ -1,6 +1,6 @@
 {% include '@RoadizRozier/admin/confirm_action.html.twig' with {
     'title': "delete.webhook.%name%"|trans({'%name%': item.getName()}),
-    'headPath': '@RoadizRozier/admin/head.html.twig',
+    'headPath': '@RoadizRozier/layouts/head.html.twig',
     'breadcrumb_parents': [
         breadcrumb_root('webhooks'),
         {
diff --git a/lib/RoadizRozierBundle/templates/admin/webhooks/edit.html.twig b/lib/RoadizRozierBundle/templates/admin/webhooks/edit.html.twig
index a46dc8240..d7d8aa70c 100644
--- a/lib/RoadizRozierBundle/templates/admin/webhooks/edit.html.twig
+++ b/lib/RoadizRozierBundle/templates/admin/webhooks/edit.html.twig
@@ -4,7 +4,7 @@
 
 {% block content %}
 <section class="content-global edit-item">
-    {% include '@RoadizRozier/admin/head.html.twig' with {
+    {% include '@RoadizRozier/layouts/head.html.twig' with {
         title: "edit.webhook.%name%"|trans({'%name%': item}),
         breadcrumb: {
             parents: [breadcrumb_root('webhooks')],
@@ -16,7 +16,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: { id: "edit-webhook-form" }}) }}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#edit-webhook-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/admin/webhooks/list.html.twig b/lib/RoadizRozierBundle/templates/admin/webhooks/list.html.twig
index d5b17fe8e..4a7ca6695 100644
--- a/lib/RoadizRozierBundle/templates/admin/webhooks/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/admin/webhooks/list.html.twig
@@ -4,7 +4,7 @@
 
 {% block content %}
 <rz-bulk-section>
-    {% include '@RoadizRozier/admin/head.html.twig' with {
+    {% include '@RoadizRozier/layouts/head.html.twig' with {
         title: 'webhooks'|trans,
         filters: filters,
         buttons: [{
@@ -19,7 +19,7 @@
         },
     } only %}
 
-    {% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+    {% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
         filters: filters,
         display_select_all_button: true,
     }  only %}
diff --git a/lib/RoadizRozierBundle/templates/admin/webhooks/list_table.html.twig b/lib/RoadizRozierBundle/templates/admin/webhooks/list_table.html.twig
index 40a9088e6..32aecaaae 100644
--- a/lib/RoadizRozierBundle/templates/admin/webhooks/list_table.html.twig
+++ b/lib/RoadizRozierBundle/templates/admin/webhooks/list_table.html.twig
@@ -1,4 +1,4 @@
-{% embed '@RoadizRozier/includes/rz_table.html.twig' %}
+{% embed '@RoadizRozier/components/rz_table.html.twig' %}
 	{% block thead_cells %}
 		<th>{% trans %}webhooks.description{% endtrans %}</th>
 		<th>
@@ -33,8 +33,8 @@
 			<tr>
 				{% if selection_available %}
 				<td>
-					{% import '@RoadizRozier/macros/rz_bulk.html.twig' as rz_bulk %}
-					{{ rz_bulk.select_input({ value: item.id }) }}
+					{% import '@RoadizRozier/components/rz_bulk_actions.html.twig' as rz_bulk_actions %}
+					{{ rz_bulk_actions.select_input({ value: item.id }) }}
 				</td>
 				{% endif %}
 				<td title="{{ item.description }}">{{- item.description|centralTruncate(30) -}}</td>
@@ -55,7 +55,7 @@
 				<td>{{- item.lastTriggeredAt ? item.lastTriggeredAt|format_datetime(locale=app.request.locale) : 'never'|trans -}}</td>
 				{% if actions_available %}
 					<td>
-						{% embed '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+						{% embed '@RoadizRozier/components/rz_table_actions.html.twig' with {
 							'edit_href': path('webhooksEditPage', { id: item.id }),
 							'delete_href': path('webhooksDeletePage', { id: item.id }),
 						} %}
diff --git a/lib/RoadizRozierBundle/templates/admin/webhooks/trigger.html.twig b/lib/RoadizRozierBundle/templates/admin/webhooks/trigger.html.twig
index d37652d5d..389fb8105 100644
--- a/lib/RoadizRozierBundle/templates/admin/webhooks/trigger.html.twig
+++ b/lib/RoadizRozierBundle/templates/admin/webhooks/trigger.html.twig
@@ -1,5 +1,5 @@
 {% extends '@RoadizRozier/layout.html.twig' %}
-{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+{% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
 
 {% set title = "trigger.webhook.%name%"|trans({'%name%': item}) %}
 
@@ -7,7 +7,7 @@
 
 {% block content %}
     <section class="content-global">
-        {% include '@RoadizRozier/admin/head.html.twig' with {
+        {% include '@RoadizRozier/layouts/head.html.twig' with {
             title: title,
             breadcrumb: {
                 parents: [breadcrumb_root('webhooks'), {
diff --git a/lib/RoadizRozierBundle/templates/attributes/actionsMenu.html.twig b/lib/RoadizRozierBundle/templates/attributes/actionsMenu.html.twig
index e35d7a780..77b13f5db 100644
--- a/lib/RoadizRozierBundle/templates/attributes/actionsMenu.html.twig
+++ b/lib/RoadizRozierBundle/templates/attributes/actionsMenu.html.twig
@@ -1,4 +1,4 @@
-{% embed "@RoadizRozier/macros/rz_actions_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_actions_menu.html.twig" with {
     vertical: true,
     class: 'actions-menu',
     item: item
diff --git a/lib/RoadizRozierBundle/templates/attributes/add.html.twig b/lib/RoadizRozierBundle/templates/attributes/add.html.twig
index c881edccc..7ae50f617 100644
--- a/lib/RoadizRozierBundle/templates/attributes/add.html.twig
+++ b/lib/RoadizRozierBundle/templates/attributes/add.html.twig
@@ -12,7 +12,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: { id: 'add-attribute-form'}}) }}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#add-attribute-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/attributes/edit.html.twig b/lib/RoadizRozierBundle/templates/attributes/edit.html.twig
index 2b17d85a8..af07d2022 100644
--- a/lib/RoadizRozierBundle/templates/attributes/edit.html.twig
+++ b/lib/RoadizRozierBundle/templates/attributes/edit.html.twig
@@ -12,7 +12,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, {attr:{id: 'edit-attribute-form'}}) }}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#edit-attribute-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/attributes/groups/actionsMenu.html.twig b/lib/RoadizRozierBundle/templates/attributes/groups/actionsMenu.html.twig
index c6d66e59c..ae92a3156 100644
--- a/lib/RoadizRozierBundle/templates/attributes/groups/actionsMenu.html.twig
+++ b/lib/RoadizRozierBundle/templates/attributes/groups/actionsMenu.html.twig
@@ -1,4 +1,4 @@
-{% embed "@RoadizRozier/macros/rz_actions_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_actions_menu.html.twig" with {
     vertical: true,
     class: 'actions-menu',
     item: item
diff --git a/lib/RoadizRozierBundle/templates/attributes/groups/add.html.twig b/lib/RoadizRozierBundle/templates/attributes/groups/add.html.twig
index 5fe5e13cb..867ac0de6 100644
--- a/lib/RoadizRozierBundle/templates/attributes/groups/add.html.twig
+++ b/lib/RoadizRozierBundle/templates/attributes/groups/add.html.twig
@@ -12,7 +12,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: { id: "add-attribute-group-form" }}) }}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#add-attribute-group-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/attributes/groups/delete.html.twig b/lib/RoadizRozierBundle/templates/attributes/groups/delete.html.twig
index 8c9a0cdaf..f2392b7d2 100644
--- a/lib/RoadizRozierBundle/templates/attributes/groups/delete.html.twig
+++ b/lib/RoadizRozierBundle/templates/attributes/groups/delete.html.twig
@@ -1,6 +1,6 @@
 {% include '@RoadizRozier/admin/confirm_action.html.twig' with {
     'title': "delete.attribute_group.%name%"|trans({'%name%': item.getName()}),
-    'headPath': '@RoadizRozier/admin/head.html.twig',
+    'headPath': '@RoadizRozier/layouts/head.html.twig',
     'breadcrumb_parents': [breadcrumb_root('attributeGroups')],
     'cancelPath': path('attributeGroupsHomePage'),
     'alertMessage': 'are_you_sure.delete.attribute_group'|trans,
diff --git a/lib/RoadizRozierBundle/templates/attributes/groups/edit.html.twig b/lib/RoadizRozierBundle/templates/attributes/groups/edit.html.twig
index 51d39003f..a752bc51b 100644
--- a/lib/RoadizRozierBundle/templates/attributes/groups/edit.html.twig
+++ b/lib/RoadizRozierBundle/templates/attributes/groups/edit.html.twig
@@ -15,7 +15,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: { id: "edit-attribute-form" }}) }}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#edit-attribute-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/attributes/groups/list.html.twig b/lib/RoadizRozierBundle/templates/attributes/groups/list.html.twig
index 491fcb816..7a431f688 100644
--- a/lib/RoadizRozierBundle/templates/attributes/groups/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/attributes/groups/list.html.twig
@@ -18,12 +18,12 @@
         ],
     } only %}
 
-    {% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+    {% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
         filters: filters,
     }  only %}
 
     <article>
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             selection_available: hasBulkActions,
             actions_available: true,
         } %}
@@ -46,7 +46,7 @@
                         <td>{{- item.name -}}</td>
                         {% if actions_available %}
                         <td>
-                            {% include '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                            {% include '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                 'edit_href': path('attributeGroupsEditPage', { id: item.id }),
                                 'delete_href': is_granted('ROLE_ACCESS_ATTRIBUTES_DELETE') ?  path('attributeGroupsDeletePage', { id: item.id }) : null,
                             } %}
diff --git a/lib/RoadizRozierBundle/templates/attributes/head.html.twig b/lib/RoadizRozierBundle/templates/attributes/head.html.twig
index 540250ddb..b1092beae 100644
--- a/lib/RoadizRozierBundle/templates/attributes/head.html.twig
+++ b/lib/RoadizRozierBundle/templates/attributes/head.html.twig
@@ -10,7 +10,7 @@
     } %}
 {% endif %}
 
-{% include "@RoadizRozier/admin/head.html.twig" with {
+{% include "@RoadizRozier/layouts/head.html.twig" with {
     title: title,
     buttons: buttons,
     filters: filters,
diff --git a/lib/RoadizRozierBundle/templates/attributes/import.html.twig b/lib/RoadizRozierBundle/templates/attributes/import.html.twig
index de2964be6..6e3b6a5ce 100644
--- a/lib/RoadizRozierBundle/templates/attributes/import.html.twig
+++ b/lib/RoadizRozierBundle/templates/attributes/import.html.twig
@@ -1,5 +1,5 @@
 {% extends '@RoadizRozier/layout.html.twig' %}
-{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+{% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
 
 {% block title %}{% trans %}import.attributes{% endtrans %} | {{ parent() }}{% endblock %}
 
diff --git a/lib/RoadizRozierBundle/templates/attributes/list.html.twig b/lib/RoadizRozierBundle/templates/attributes/list.html.twig
index 114015332..e47c22c1c 100644
--- a/lib/RoadizRozierBundle/templates/attributes/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/attributes/list.html.twig
@@ -40,7 +40,7 @@
             ],
         } only %}
 
-        {% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+        {% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
             filters: filters,
             display_select_all_button: true,
         }  only %}
diff --git a/lib/RoadizRozierBundle/templates/attributes/list_table.html.twig b/lib/RoadizRozierBundle/templates/attributes/list_table.html.twig
index fd2eb69bc..b841a098b 100644
--- a/lib/RoadizRozierBundle/templates/attributes/list_table.html.twig
+++ b/lib/RoadizRozierBundle/templates/attributes/list_table.html.twig
@@ -1,4 +1,4 @@
-{% embed '@RoadizRozier/includes/rz_table.html.twig' %}
+{% embed '@RoadizRozier/components/rz_table.html.twig' %}
 	{% block thead_cells %}
 		<th>
 			{% if not no_sort %}
@@ -36,7 +36,7 @@
 			>
 				{{ _self.selection_input(selection_available, item.id) }}
 				<td>
-					{% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+					{% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
 					{{ rz_link.root({
 						label: item.code,
 						attributes: { href: path('attributesEditPage', { id: item.id }) },
@@ -50,7 +50,7 @@
 				<td>{{- item.typeLabel|trans -}}</td>
 
 				<td>
-					{% import '@RoadizRozier/macros/rz_badge.html.twig' as rz_badge %}
+					{% import '@RoadizRozier/components/rz_badge.html.twig' as rz_badge %}
 					{{ rz_badge.item({
 						label: ' ' ~ (item.attributeValues|length),
 					}) }}
@@ -61,7 +61,7 @@
 				{% if actions_available %}
 					<td>
 						{% set delete_href = is_granted('ROLE_ACCESS_ATTRIBUTES_DELETE') ? path('attributesDeletePage', { id: item.id }) : null %}
-						{% include '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+						{% include '@RoadizRozier/components/rz_table_actions.html.twig' with {
 							'edit_href': path('attributesEditPage', { id: item.id }),
 							'delete_href': delete_href,
 						} %}
diff --git a/lib/RoadizRozierBundle/templates/cache/deleteAssets.html.twig b/lib/RoadizRozierBundle/templates/cache/deleteAssets.html.twig
index 47fc0c3b5..817c5c664 100644
--- a/lib/RoadizRozierBundle/templates/cache/deleteAssets.html.twig
+++ b/lib/RoadizRozierBundle/templates/cache/deleteAssets.html.twig
@@ -1,6 +1,6 @@
 {% include '@RoadizRozier/admin/confirm_action.html.twig' with {
     'title': "purge.generated_images.cache"|trans,
-    'headPath': '@RoadizRozier/admin/head.html.twig',
+    'headPath': '@RoadizRozier/layouts/head.html.twig',
     'cancelPath': path('adminHomePage'),
     'action_label': 'clear'|trans,
     'action_icon': 'rz-icon-ri--flashlight-line',
diff --git a/lib/RoadizRozierBundle/templates/cache/deleteDoctrine.html.twig b/lib/RoadizRozierBundle/templates/cache/deleteDoctrine.html.twig
index eb2d5face..87257a060 100644
--- a/lib/RoadizRozierBundle/templates/cache/deleteDoctrine.html.twig
+++ b/lib/RoadizRozierBundle/templates/cache/deleteDoctrine.html.twig
@@ -1,6 +1,6 @@
 {% include '@RoadizRozier/admin/confirm_action.html.twig' with {
     'title': "purge.cache"|trans,
-    'headPath': '@RoadizRozier/admin/head.html.twig',
+    'headPath': '@RoadizRozier/layouts/head.html.twig',
     'cancelPath': path('adminHomePage'),
     'action_label': 'clear'|trans,
     'action_icon': 'rz-icon-ri--flashlight-line',
diff --git a/lib/RoadizRozierBundle/templates/macros/rz_actions_menu.html.twig b/lib/RoadizRozierBundle/templates/components/rz_actions_menu.html.twig
similarity index 100%
rename from lib/RoadizRozierBundle/templates/macros/rz_actions_menu.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_actions_menu.html.twig
diff --git a/lib/RoadizRozierBundle/templates/macros/rz_badge.html.twig b/lib/RoadizRozierBundle/templates/components/rz_badge.html.twig
similarity index 100%
rename from lib/RoadizRozierBundle/templates/macros/rz_badge.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_badge.html.twig
diff --git a/lib/RoadizRozierBundle/templates/macros/rz_breadcrumb.html.twig b/lib/RoadizRozierBundle/templates/components/rz_breadcrumb.html.twig
similarity index 61%
rename from lib/RoadizRozierBundle/templates/macros/rz_breadcrumb.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_breadcrumb.html.twig
index 23e40eb89..2a5b55c31 100644
--- a/lib/RoadizRozierBundle/templates/macros/rz_breadcrumb.html.twig
+++ b/lib/RoadizRozierBundle/templates/components/rz_breadcrumb.html.twig
@@ -25,7 +25,6 @@
     admin/confirm_action.html.twig puts the deleted item and its ancestry above its own title.
 #}
 {% macro root(breadcrumb) %}
-    {% set item_template = '@RoadizRozier/includes/rz_breadcrumb_item.html.twig' %}
     {% set parents = breadcrumb.parents|default([]) %}
     {# Counts ancestors only, the current page excluded. #}
     {% set max_visible = 6 %}
@@ -37,17 +36,16 @@
         <ol class="rz-breadcrumb__list">
             {% if middle is empty %}
                 {% for item in parents %}
-                    {{ include(item_template, { item: item }, with_context = false) }}
+                    {{ _self.item(item) }}
                 {% endfor %}
             {% else %}
-                {{ include(item_template, { item: parents|first }, with_context = false) }}
+                {{ _self.item(parents|first) }}
 
-                {{ include('@RoadizRozier/macros/rz_overflow_list.html.twig', {
+                {% embed '@RoadizRozier/components/rz_overflow_list.html.twig' with {
                     items: middle|slice(0, folded_count),
                     visibleCount: 0,
                     wrapperTag: 'li',
                     wrapperClass: 'rz-breadcrumb__list-item',
-                    itemTemplate: item_template,
                     responsive: true,
                     responsiveInline: middle|length - folded_count,
                     popover: {
@@ -57,19 +55,46 @@
                         label: '',
                         ariaLabel: 'breadcrumb.show_more',
                     },
-                }, with_context = false) }}
+                } only %}
+                    {% block item %}
+                        {% if item is defined %}
+                            {% import '@RoadizRozier/components/rz_breadcrumb.html.twig' as rz_breadcrumb %}
+                            {{ rz_breadcrumb.item(item) }}
+                        {% endif %}
+                    {% endblock %}
+                {% endembed %}
 
                 {% for item in middle|slice(folded_count) %}
-                    {{ include(item_template, { item: item }, with_context = false) }}
+                    {{ _self.item(item) }}
                 {% endfor %}
 
-                {{ include(item_template, { item: parents|last }, with_context = false) }}
+                {{ _self.item(parents|last) }}
             {% endif %}
 
-            {{ include(item_template, {
-                item: { label: breadcrumb.current },
-                current: true,
-            }, with_context = false) }}
+            {{ _self.item({ label: breadcrumb.current }, true) }}
         </ol>
     </nav>
 {% endmacro %}
+
+{#
+    One breadcrumb entry. Shared by the trail and by its overflow popover: the markup is the
+    same in both places so the responsive collapse (utils/OverflowList.ts) can move a <li>
+    between them as is. Folded levels get their menu-entry look from CSS
+    (`.rz-overflow-list__list .rz-breadcrumb__item` in rz-breadcrumb.css).
+
+    - item (required): a hash {label, url}, or an entity supported by a
+      BreadcrumbsItemFactory (Node, NodesSources, Tag, Folder, Document, Translation).
+    - current (optional): render as the current page, as plain text instead of a link.
+#}
+{% macro item(item, current = false) %}
+    {% set item = item is iterable ? item : getBreadcrumbsItem(item) %}
+    {% if item %}
+        <li class="rz-breadcrumb__list-item">
+            {% if current %}
+                <span class="rz-breadcrumb__item" aria-current="page">{{- item.label|truncate_title -}}</span>
+            {% else %}
+                <a class="rz-breadcrumb__item" href="{{ item.url }}">{{- item.label|truncate_title -}}</a>
+            {% endif %}
+        </li>
+    {% endif %}
+{% endmacro %}
diff --git a/lib/RoadizRozierBundle/templates/macros/rz_bulk.html.twig b/lib/RoadizRozierBundle/templates/components/rz_bulk_actions.html.twig
similarity index 55%
rename from lib/RoadizRozierBundle/templates/macros/rz_bulk.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_bulk_actions.html.twig
index 1791eed67..e85790ee9 100644
--- a/lib/RoadizRozierBundle/templates/macros/rz_bulk.html.twig
+++ b/lib/RoadizRozierBundle/templates/components/rz_bulk_actions.html.twig
@@ -1,5 +1,52 @@
+{% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
+
+<rz-bulk-actions
+	class="rz-bulk-actions"
+	visibility-class="rz-bulk-actions--visible"
+>
+	<h3 class="rz-bulk-actions__title">
+		{% block title_content %}
+			{% trans %}bulk.actions{% endtrans %}
+		{% endblock %}
+	</h3>
+
+	<div class="rz-bulk-actions__buttons">
+		{{ _self.deselect_all_button() }}
+
+		{% block other_actions %}{% endblock %}
+
+		{% block delete_form %}
+			<form
+				class="rz-bulk-actions__form-button"
+				action="{{ delete_form_action }}"
+				method="{{ delete_form_method|default('POST') }}"
+			>
+				{% block delete_form_content %}
+					{% if delete_form_data %}
+						{% form_theme delete_form_data '@RoadizRozier/forms.html.twig' %}
+						{{ form_widget(delete_form_data) }}
+					{% endif %}
+				{% endblock %}
+				{{
+					rz_button.root({
+						attributes: {
+							type: 'submit',
+							title: title
+						},
+						color: 'danger',
+						emphasis: 'primary',
+						icon: 'rz-icon-ri--delete-bin-7-line',
+					})
+				}}
+			</form>
+		{% endblock %}
+	</div>
+
+	{% block panels %}{% endblock %}
+</rz-bulk-actions>
+
 {% macro select_all_button(attributes = {}) %}
-    {% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+    {% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
         {{
             rz_button.root({
                 attributes: {
@@ -16,7 +63,7 @@
 {% endmacro %}
 
 {% macro deselect_all_button(attributes = {}) %}
-    {% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+    {% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
     {{
         rz_button.root({
             attributes: {
diff --git a/lib/RoadizRozierBundle/templates/macros/rz_button.html.twig b/lib/RoadizRozierBundle/templates/components/rz_button.html.twig
similarity index 100%
rename from lib/RoadizRozierBundle/templates/macros/rz_button.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_button.html.twig
diff --git a/lib/RoadizRozierBundle/templates/macros/rz_card.html.twig b/lib/RoadizRozierBundle/templates/components/rz_card.html.twig
similarity index 100%
rename from lib/RoadizRozierBundle/templates/macros/rz_card.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_card.html.twig
diff --git a/lib/RoadizRozierBundle/templates/components/rz_color_scheme_switcher.html.twig b/lib/RoadizRozierBundle/templates/components/rz_color_scheme_switcher.html.twig
new file mode 100644
index 000000000..afc673128
--- /dev/null
+++ b/lib/RoadizRozierBundle/templates/components/rz_color_scheme_switcher.html.twig
@@ -0,0 +1,49 @@
+{% set popover_id = "color-theme-switcher" %}
+{% embed "@RoadizRozier/components/rz_dropdown.html.twig" with {
+	targetId: popover_id,
+	wrapper_tag: 'rz-color-scheme-switcher',
+	target_options: {
+		size: 'sm',
+		icon: 'rz-icon-ri--color-filter-line',
+		attributes: {
+			'aria-label': 'show.color.theme'|trans,
+		},
+	},
+	popover_attributes: {
+		class: class|default(''),
+	},
+} %}
+	{% block items %}
+		{{ _self.item({
+			selected: true,
+			label: 'color.system'|trans,
+			rightIcon: 'rz-icon-ri--computer-line',
+			attributes: {
+				type: 'button',
+				'data-value': 'system',
+				command: '--update-color-scheme',
+				commandfor: popover_id,
+			}
+		}) }}
+		{{ _self.item({
+			label: 'color.light'|trans,
+			rightIcon: 'rz-icon-ri--sun-line',
+			attributes: {
+				type: 'button',
+				'data-value': 'light',
+				command: '--update-color-scheme',
+				commandfor: popover_id,
+			}
+		}) }}
+		{{ _self.item({
+			label: 'color.dark'|trans,
+			rightIcon: 'rz-icon-ri--moon-line',
+			attributes: {
+				type: 'button',
+				'data-value': 'dark',
+				command: '--update-color-scheme',
+				commandfor: popover_id,
+			}
+		}) }}
+	{% endblock %}
+{% endembed %}
diff --git a/lib/RoadizRozierBundle/templates/macros/rz_dialog.html.twig b/lib/RoadizRozierBundle/templates/components/rz_dialog.html.twig
similarity index 96%
rename from lib/RoadizRozierBundle/templates/macros/rz_dialog.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_dialog.html.twig
index 125f4804f..b978fa7e3 100644
--- a/lib/RoadizRozierBundle/templates/macros/rz_dialog.html.twig
+++ b/lib/RoadizRozierBundle/templates/components/rz_dialog.html.twig
@@ -1,7 +1,7 @@
 {# rz-dialog: options = Args (storybook/renderer/rzDialog.ts), story Components/Overlay/Dialog #}
 {% macro root(options = {}) %}
     {% import '@RoadizRozier/macros/element_attributes.html.twig' as el_attrs %}
-    {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+    {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
 
     {% set element_class = 'rz-dialog' %}
     {% set dialog_id = options.dialogId|default('rz-dialog') %}
@@ -75,7 +75,7 @@
 {% endmacro %}
 
 {% macro close(closeIconClass) %}
-    {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+    {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
 
     {{ rz_button.root({
         iconClass: closeIconClass,
diff --git a/lib/RoadizRozierBundle/templates/widgets/drawer.html.twig b/lib/RoadizRozierBundle/templates/components/rz_drawer.html.twig
similarity index 97%
rename from lib/RoadizRozierBundle/templates/widgets/drawer.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_drawer.html.twig
index 7b4c2f54e..f0fbff623 100644
--- a/lib/RoadizRozierBundle/templates/widgets/drawer.html.twig
+++ b/lib/RoadizRozierBundle/templates/components/rz_drawer.html.twig
@@ -1,4 +1,4 @@
-{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+{% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
 
 {% set entity_ids = [] %}
 {% set is_sortable = isSortable|default('true') %}
@@ -82,7 +82,7 @@
 {% endif %}
 
 
-{% import "@RoadizRozier/macros/rz_form_field.html.twig" as rz_form_field %}
+{% import "@RoadizRozier/components/rz_form_field.html.twig" as rz_form_field %}
 
 <rz-form-field {{ field_attributes|join(' ')|raw }}>
     {% if label is empty -%}
diff --git a/lib/RoadizRozierBundle/templates/macros/rz_dropdown_menu.html.twig b/lib/RoadizRozierBundle/templates/components/rz_dropdown.html.twig
similarity index 83%
rename from lib/RoadizRozierBundle/templates/macros/rz_dropdown_menu.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_dropdown.html.twig
index 5e67220f1..b81e708ba 100644
--- a/lib/RoadizRozierBundle/templates/macros/rz_dropdown_menu.html.twig
+++ b/lib/RoadizRozierBundle/templates/components/rz_dropdown.html.twig
@@ -8,7 +8,7 @@
                 {% for item in items %}
                     <li class="rz-dropdown__info-item">
                         {% if item.badge is defined and item.badge %}
-                            {% import "@RoadizRozier/macros/rz_badge.html.twig" as badge %}
+                            {% import "@RoadizRozier/components/rz_badge.html.twig" as badge %}
                             {{ badge.item({
                                 label: item.badge.label,
                                 icon: item.badge.icon,
@@ -125,6 +125,31 @@
     </li>
 {% endmacro %}
 
+{#
+    With `target_options`, the menu comes with its own trigger: an <rz-popover> holding the
+    rz-button that opens it (`placement`, `offset`, `shift` and `popover_attributes` tune the
+    popover). Without it, the caller renders the trigger and points it at `targetId`.
+#}
+{% set has_trigger = target_options is defined %}
+{% if has_trigger %}
+    {% import '@RoadizRozier/macros/element_attributes.html.twig' as el_attrs %}
+    {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
+
+    {% set targetId = targetId|default('rz-dropdown-' ~ random()) %}
+    {% set shift = shift|default(null) %}
+    {% set target_options_attributes = target_options.attributes|default({})|merge({
+        popovertarget: targetId,
+        type: 'button',
+    }) %}
+
+    <rz-popover
+        {% if shift is not null %}popover-shift="{{ shift }}"{% endif %}
+        popover-placement="{{ placement|default('bottom-end') }}"
+        popover-offset="{{ offset|default('12') }}"
+        {{ el_attrs.print(popover_attributes|default({})) }}
+    >
+        {{ rz_button.root(target_options|merge({ attributes: target_options_attributes })) }}
+{% endif %}
 {% block wrapper %}
     {% import '@RoadizRozier/macros/element_attributes.html.twig' as el_attrs %}
     {% set classes = html_classes('rz-dropdown', class|default(''), { 'rz-dropdown--reverse': reverse }) %}
@@ -152,3 +177,6 @@
         {% endblock %}
     </{{ wrapper_tag }}>
 {% endblock %}
+{% if has_trigger %}
+    </rz-popover>
+{% endif %}
diff --git a/lib/RoadizRozierBundle/templates/macros/rz_filters_bar.html.twig b/lib/RoadizRozierBundle/templates/components/rz_filters_bar.html.twig
similarity index 61%
rename from lib/RoadizRozierBundle/templates/macros/rz_filters_bar.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_filters_bar.html.twig
index 1d3ae8002..353ee4529 100644
--- a/lib/RoadizRozierBundle/templates/macros/rz_filters_bar.html.twig
+++ b/lib/RoadizRozierBundle/templates/components/rz_filters_bar.html.twig
@@ -1,4 +1,61 @@
-{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+{% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
+
+<rz-filters-bar>
+    {% if filters.description %}
+        <p class="rz-filters-bar__description">{{ filters.description }}</p>
+    {% endif %}
+
+    {% if with_filter_form is not same as(false) %}
+        <form method="get" class="rz-filters-bar__group">
+            {% if display_layout_fields %}
+                {% set value = filters.layout ?? app.request.query.get('layout') %}
+                {{ _self.layout_fields(value) }}
+            {% endif %}
+
+            <input
+                class="rz-input"
+                id="uk-form-filter-input-search"
+                type="search"
+                name="search"
+                placeholder="{% trans %}search{% endtrans %}"
+                value="{{ filters.search|default(app.request.get('search') ?? '') }}"
+            />
+            {% block before_submit %}{% endblock %}
+            {{
+                rz_button.root({
+                    attributes: {
+                        type: 'submit',
+                    },
+                    emphasis: 'secondary',
+                    label: 'filter'|trans,
+                    icon: 'rz-icon-ri--search-line'
+                })
+            }}
+            {% if display_select_all_button %}
+                {% import '@RoadizRozier/components/rz_bulk_actions.html.twig' as rz_bulk_actions %}
+                {{ rz_bulk_actions.select_all_button() }}
+            {% endif %}
+        </form>
+    {% endif %}
+
+
+    {% set hasItemPerPageParams = app.request.get('item_per_page') and (app.request.get('item_per_page') != 20) %}
+    {% set hasMorePage = filters.itemCount > filters.itemPerPage %}
+
+    {% if hasItemPerPageParams or hasMorePage %}
+        <div class="rz-filters-bar__group rz-filters-bar__group--right">
+            {% if hasMorePage %}
+                {{ _self.pagination(filters) }}
+            {% endif %}
+
+
+            {% if filters.pageCount > 1 or filters.itemCount > 10 %}
+                {# Keep select if there are multiple pages or enough items #}
+                {{ _self.item_per_page(filters.itemPerPage) }}
+            {% endif %}
+        </div>
+    {% endif %}
+</rz-filters-bar>
 
 {% macro layout_fields(value) %}
 	<div class="rz-filters-bar__group rz-filters-bar__group--divider">
diff --git a/lib/RoadizRozierBundle/templates/macros/rz_form_field.html.twig b/lib/RoadizRozierBundle/templates/components/rz_form_field.html.twig
similarity index 96%
rename from lib/RoadizRozierBundle/templates/macros/rz_form_field.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_form_field.html.twig
index 976c40644..2d3e13f04 100644
--- a/lib/RoadizRozierBundle/templates/macros/rz_form_field.html.twig
+++ b/lib/RoadizRozierBundle/templates/components/rz_form_field.html.twig
@@ -19,7 +19,7 @@
     {{- label|trans -}}
     </label>
     {% if attr['data-universal'] %}
-        {% import "@RoadizRozier/macros/rz_badge.html.twig" as rz_badge %}
+        {% import "@RoadizRozier/components/rz_badge.html.twig" as rz_badge %}
         {{ rz_badge.item({
             size: 'xs',
             color: 'default',
diff --git a/lib/RoadizRozierBundle/templates/widgets/rz_geotag_field.html.twig b/lib/RoadizRozierBundle/templates/components/rz_geotag.html.twig
similarity index 97%
rename from lib/RoadizRozierBundle/templates/widgets/rz_geotag_field.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_geotag.html.twig
index 5c7986000..1950b849b 100644
--- a/lib/RoadizRozierBundle/templates/widgets/rz_geotag_field.html.twig
+++ b/lib/RoadizRozierBundle/templates/components/rz_geotag.html.twig
@@ -1,5 +1,5 @@
-{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
-{% import "@RoadizRozier/macros/rz_form_field.html.twig" as rz_form_field %}
+{% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
+{% import "@RoadizRozier/components/rz_form_field.html.twig" as rz_form_field %}
 
 
 {% set field_attributes_whitelist = [
diff --git a/lib/RoadizRozierBundle/templates/macros/rz_header.html.twig b/lib/RoadizRozierBundle/templates/components/rz_header_nav_item.html.twig
similarity index 100%
rename from lib/RoadizRozierBundle/templates/macros/rz_header.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_header_nav_item.html.twig
diff --git a/lib/RoadizRozierBundle/templates/widgets/rz_language_switcher.html.twig b/lib/RoadizRozierBundle/templates/components/rz_language_switcher.html.twig
similarity index 94%
rename from lib/RoadizRozierBundle/templates/widgets/rz_language_switcher.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_language_switcher.html.twig
index bb3a8807d..fc8db3188 100644
--- a/lib/RoadizRozierBundle/templates/widgets/rz_language_switcher.html.twig
+++ b/lib/RoadizRozierBundle/templates/components/rz_language_switcher.html.twig
@@ -38,7 +38,7 @@
 
 		{% endif %}
 
-		{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+		{% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
 		{{ rz_button.root(button_data|merge({
 				attributes: button_attr|merge(btn_attr)
 			}))
diff --git a/lib/RoadizRozierBundle/templates/macros/rz_link.html.twig b/lib/RoadizRozierBundle/templates/components/rz_link.html.twig
similarity index 100%
rename from lib/RoadizRozierBundle/templates/macros/rz_link.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_link.html.twig
diff --git a/lib/RoadizRozierBundle/templates/macros/rz_node_badge.html.twig b/lib/RoadizRozierBundle/templates/components/rz_node_badge.html.twig
similarity index 98%
rename from lib/RoadizRozierBundle/templates/macros/rz_node_badge.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_node_badge.html.twig
index 5369b03e0..72ff3629f 100644
--- a/lib/RoadizRozierBundle/templates/macros/rz_node_badge.html.twig
+++ b/lib/RoadizRozierBundle/templates/components/rz_node_badge.html.twig
@@ -98,7 +98,7 @@
             }) %}
     {% endif %}
 
-    {% import "@RoadizRozier/macros/rz_badge.html.twig" as rz_badge %}
+    {% import "@RoadizRozier/components/rz_badge.html.twig" as rz_badge %}
     {{ rz_badge.item(default_options|merge(type_options)) }}
 {% endmacro %}
 
diff --git a/lib/RoadizRozierBundle/templates/macros/rz_overflow_list.html.twig b/lib/RoadizRozierBundle/templates/components/rz_overflow_list.html.twig
similarity index 84%
rename from lib/RoadizRozierBundle/templates/macros/rz_overflow_list.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_overflow_list.html.twig
index ad4ac0d40..d22917791 100644
--- a/lib/RoadizRozierBundle/templates/macros/rz_overflow_list.html.twig
+++ b/lib/RoadizRozierBundle/templates/components/rz_overflow_list.html.twig
@@ -1,5 +1,5 @@
 {% import '@RoadizRozier/macros/element_attributes.html.twig' as el_attrs %}
-{% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+{% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
 
 {% set items = items|default([]) %}
 {% set visible_count = visibleCount|default(0) %}
@@ -47,8 +47,6 @@
 
 {% set visible_items = items|slice(0, visible_count) %}
 {% set overflow_items = items|slice(visible_count) %}
-{% set item_template = itemTemplate|default(null) %}
-{% set item_template_context = itemTemplateContext|default({}) %}
 {% set wrapperTag = wrapperTag|default('div') %}
 {# responsive: items fold into the popover when the wrapper's parent row is too narrow, and
    unfold again when it widens (utils/OverflowList.ts). The popover is then always rendered,
@@ -69,13 +67,9 @@
     {% if responsive_empty and visible_count == 0 %}hidden{% endif %}
 >
     {% for loop_item in visible_items %}
-        {% if item_template %}
-            {{ include(item_template, item_template_context|merge({ item: loop_item })) }}
-        {% else %}
-            {% with { item: loop_item } %}
-                {{ block('item') }}
-            {% endwith %}
-        {% endif %}
+        {% with { item: loop_item } %}
+            {{ block('item') }}
+        {% endwith %}
     {% endfor %}
 
     {% if overflow_items|length > 0 or responsive %}
@@ -109,13 +103,9 @@
                 {# .rz-dropdown__list paints the surface the wrapping .rz-dropdown expects. #}
                 <{{ popover_tag_list }} class="rz-dropdown__list rz-overflow-list__list">
                     {% for loop_item in overflow_items %}
-                        {% if item_template %}
-                            {{ include(item_template, item_template_context|merge({ item: loop_item })) }}
-                        {% else %}
-                            {% with { item: loop_item } %}
-                                {{ block('item') }}
-                            {% endwith %}
-                        {% endif %}
+                        {% with { item: loop_item } %}
+                            {{ block('item') }}
+                        {% endwith %}
                     {% endfor %}
                 </{{ popover_tag_list }}>
             </div>
diff --git a/lib/RoadizRozierBundle/templates/macros/rz_page_header.html.twig b/lib/RoadizRozierBundle/templates/components/rz_page_header.html.twig
similarity index 94%
rename from lib/RoadizRozierBundle/templates/macros/rz_page_header.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_page_header.html.twig
index f3735b046..b4de209b3 100644
--- a/lib/RoadizRozierBundle/templates/macros/rz_page_header.html.twig
+++ b/lib/RoadizRozierBundle/templates/components/rz_page_header.html.twig
@@ -1,7 +1,7 @@
 {% set breadcrumb_html %}
     {% block breadcrumb %}
         {% if breadcrumb is defined and breadcrumb %}
-            {% import '@RoadizRozier/macros/rz_breadcrumb.html.twig' as rz_breadcrumb %}
+            {% import '@RoadizRozier/components/rz_breadcrumb.html.twig' as rz_breadcrumb %}
             {{ rz_breadcrumb.root(breadcrumb) }}
         {% endif %}
     {% endblock %}
@@ -46,7 +46,7 @@
 </div>
 
 {% macro translations_bar(available_translations, path, pathParams, current, pathAddTranslations, pathAddTranslationsTitle) %}
-    {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+    {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
     {% if available_translations %}
         <div class="rz-page-header__translations rz-button-group rz-button-group--sm rz-button-group--collapsed">
             {%- for translation in available_translations -%}
@@ -95,7 +95,7 @@
 
 {% macro button_group(buttons) %}
     {%- if buttons and buttons|length > 0 -%}
-        {% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+        {% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
         <div class="rz-page-header__item--right{% if buttons|length > 1 %} rz-button-group rz-button-group--gap-md{% endif %}">
             {%- for btn in buttons -%}
                 {{ rz_button.root(btn|merge({emphasis : 'primary'})) }}
diff --git a/lib/RoadizRozierBundle/templates/macros/rz_progress.html.twig b/lib/RoadizRozierBundle/templates/components/rz_progress.html.twig
similarity index 100%
rename from lib/RoadizRozierBundle/templates/macros/rz_progress.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_progress.html.twig
diff --git a/lib/RoadizRozierBundle/templates/components/rz_repeatable.html.twig b/lib/RoadizRozierBundle/templates/components/rz_repeatable.html.twig
new file mode 100644
index 000000000..cfd1e3cb6
--- /dev/null
+++ b/lib/RoadizRozierBundle/templates/components/rz_repeatable.html.twig
@@ -0,0 +1,125 @@
+{% import "@RoadizRozier/components/rz_form_field.html.twig" as rz_form_field %}
+{% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
+
+{% set repeatable_id = id ~ '_repeatable'|default(random() ~ '_repeatable') %}
+<rz-repeatable
+	input-index-placeholder="{{ prototype.vars.name }}"
+	input-base-name="{{ full_name }}"
+	id-base-name="{{ id }}"
+	id="{{ repeatable_id }}"
+>
+	{% if label is not same as(false) -%}
+		{% if label is empty -%}
+			{% set label = name|humanize %}
+		{%- endif -%}
+		<div class="rz-form-field__head">
+			{{ rz_form_field.inner_head(label, label_attr, form, icon|default('rz-icon-ri--repeat-2-line'), attr, entityIds|length) }}
+
+			{{ rz_button.root({
+				label: 'repeatable.add'|trans,
+				icon: 'rz-icon-ri--add-line',
+				size: 'sm',
+				class: 'rz-form-field__head__end',
+				attributes: {
+					type: 'button',
+					'command': '--add',
+					'commandfor': repeatable_id,
+					'data-insert-index': '0',
+				},
+			}) }}
+		</div>
+
+		<template data-item="">
+			{{ _self.item({
+				repeatable_id: repeatable_id,
+				icon: icon|default(null),
+				label: label,
+				content: data_prototype,
+			}) }}
+		</template>
+
+		<div class="rz-form-field__body rz-repeatable__body">
+			<ol data-list="" class="rz-repeatable__list">
+				{% if stored_items_form is not null %}
+                    {% for item in stored_items_form %}
+                        {{ _self.item({
+                            repeatable_id: repeatable_id,
+                            icon: icon|default(null),
+                            label: label,
+                            content: form_widget(item),
+                        }) }}
+                    {% endfor %}
+				{% endif %}
+			</ol>
+			<div class="rz-repeatable__insert-zone">
+				{{ rz_button.root({
+					icon: 'rz-icon-ri--add-line',
+					attributes: {
+						type: 'button',
+						'command': '--add',
+						'commandfor': repeatable_id,
+						'tooltip-text': 'insert.zone'|trans,
+						'aria-label': 'collection.insert_item'|trans,
+					},
+				}) }}
+			</div>
+		</div>
+	{% endif %}
+</rz-repeatable>
+
+{#
+    One entry of the list, also used as the <template data-item> the element clones.
+    options: repeatable_id, icon, label, content (the entry's form, already rendered).
+#}
+{% macro item(options = {}) %}
+    {% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
+    <li class="rz-repeatable__item">
+        <div class="rz-repeatable__item__header">
+            {% set _icon = options.icon|default('rz-icon-ri--list-unordered') %}
+            <span class="{{ _icon }}"></span>
+            {% if options.label is not empty %}
+                <span class="rz-repeatable__item__title">{{ options.label|trans }}</span>
+            {% endif %}
+            <div class="rz-button-group rz-button-group--collapsed rz-repeatable__item--align-end">
+                {{ rz_button.root({
+                    icon: 'rz-icon-ri--arrow-up-line',
+                    size: 'sm',
+                    attributes: {
+                        type: 'button',
+                        'command': '--move-up',
+                        'commandfor': options.repeatable_id,
+                        'tooltip-text': 'move.up'|trans,
+                        'aria-label': 'collection.move_up_item'|trans,
+                    },
+                }) }}
+                {{ rz_button.root({
+                    icon: 'rz-icon-ri--arrow-down-line',
+                    size: 'sm',
+                    attributes: {
+                        type: 'button',
+                        'command': '--move-down',
+                        'commandfor': options.repeatable_id,
+                        'tooltip-text': 'move.down'|trans,
+                        'aria-label': 'collection.move_down_item'|trans,
+                    },
+                }) }}
+            </div>
+            {{ rz_button.root({
+                icon: 'rz-icon-ri--delete-bin-7-line',
+                size: 'sm',
+                color: 'danger',
+                emphasis: 'primary',
+                attributes: {
+                    type: 'button',
+                    'command': '--remove',
+                    'commandfor': options.repeatable_id,
+                    'tooltip-text': 'remove.item'|trans,
+                    'aria-label': 'collection.delete_item'|trans,
+                },
+            }) }}
+        </div>
+        <div data-form class="rz-repeatable__item__body">
+            {{ options.content|raw }}
+        </div>
+    </li>
+{% endmacro %}
diff --git a/lib/RoadizRozierBundle/templates/includes/rz_table.html.twig b/lib/RoadizRozierBundle/templates/components/rz_table.html.twig
similarity index 91%
rename from lib/RoadizRozierBundle/templates/includes/rz_table.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_table.html.twig
index 1597c5e0a..9e867ac98 100644
--- a/lib/RoadizRozierBundle/templates/includes/rz_table.html.twig
+++ b/lib/RoadizRozierBundle/templates/components/rz_table.html.twig
@@ -1,6 +1,6 @@
 
 {% import '@RoadizRozier/macros/element_attributes.html.twig' as el_attr %}
-{% import '@RoadizRozier/macros/rz_bulk.html.twig' as rz_bulk %}
+{% import '@RoadizRozier/components/rz_bulk_actions.html.twig' as rz_bulk_actions %}
 
 {% set classes = ["rz-table"]|merge(attr.class is defined ? [attr.class] : []) %}
 {% set layout_class = bordered is defined and bordered ? 'rz-table--bordered' : 'rz-table--default' %}
@@ -41,7 +41,7 @@
 					<tr>
 						{% if selection_available %}
 							<th>
-							{{ rz_bulk.select_all_input() }}
+							{{ rz_bulk_actions.select_all_input() }}
 							</th>
 						{% endif %}
 						{{ _thead_cells|raw }}
@@ -69,8 +69,8 @@
 	{% endif %}
 
 	{% if selection_available %}
-		{% import '@RoadizRozier/macros/rz_bulk.html.twig' as rz_bulk %}
-		<td>{{ rz_bulk.select_input({ value: value }|merge(attrs)) }}</td>
+		{% import '@RoadizRozier/components/rz_bulk_actions.html.twig' as rz_bulk_actions %}
+		<td>{{ rz_bulk_actions.select_input({ value: value }|merge(attrs)) }}</td>
 	{% endif %}
 
 {% endmacro %}
diff --git a/lib/RoadizRozierBundle/templates/includes/rz_table_actions.html.twig b/lib/RoadizRozierBundle/templates/components/rz_table_actions.html.twig
similarity index 92%
rename from lib/RoadizRozierBundle/templates/includes/rz_table_actions.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_table_actions.html.twig
index f5314c62e..103599527 100644
--- a/lib/RoadizRozierBundle/templates/includes/rz_table_actions.html.twig
+++ b/lib/RoadizRozierBundle/templates/components/rz_table_actions.html.twig
@@ -33,7 +33,7 @@
 </div>
 
 {% macro button(options = {}) %}
-	{% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+	{% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
 
 	{% set default_options = {
 		size: 'xs',
diff --git a/lib/RoadizRozierBundle/templates/widgets/rz_tree_wrapper_auto.html.twig b/lib/RoadizRozierBundle/templates/components/rz_tree.html.twig
similarity index 96%
rename from lib/RoadizRozierBundle/templates/widgets/rz_tree_wrapper_auto.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_tree.html.twig
index b6c6e7b39..b6e9e44e7 100644
--- a/lib/RoadizRozierBundle/templates/widgets/rz_tree_wrapper_auto.html.twig
+++ b/lib/RoadizRozierBundle/templates/components/rz_tree.html.twig
@@ -1,4 +1,4 @@
-{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+{% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
 
 {% set type_prefix = tree_type|default('node') %}
 {% set root_classes = ['rz-tree-wrapper', 'tree-widget', type_prefix ~ '-tree-widget'] %}
@@ -70,7 +70,7 @@
         </div>
 
 		{% if mainTree %}
-			{% include '@RoadizRozier/widgets/rz_language_switcher.html.twig' with {
+			{% include '@RoadizRozier/components/rz_language_switcher.html.twig' with {
 				tree: tree,
 				type_prefix: type_prefix,
 				classes: ['rz-aside__langs', type_prefix ~ '-tree-langs'],
diff --git a/lib/RoadizRozierBundle/templates/widgets/rz_tree_item_inner.html.twig b/lib/RoadizRozierBundle/templates/components/rz_tree_item.html.twig
similarity index 83%
rename from lib/RoadizRozierBundle/templates/widgets/rz_tree_item_inner.html.twig
rename to lib/RoadizRozierBundle/templates/components/rz_tree_item.html.twig
index ddf444db6..4d3e250d0 100644
--- a/lib/RoadizRozierBundle/templates/widgets/rz_tree_item_inner.html.twig
+++ b/lib/RoadizRozierBundle/templates/components/rz_tree_item.html.twig
@@ -24,7 +24,7 @@
     {% block before_actions %}{% endblock %}
 
     {% if has_children %}
-        {% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+        {% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
         {{
             rz_button.root({
                 emphasis: 'tertiary',
@@ -44,8 +44,8 @@
 
     {% if has_selection %}
         <div class="nodetree-bulk-selection">
-            {% import '@RoadizRozier/macros/rz_bulk.html.twig' as rz_bulk %}
-            {{ rz_bulk.select_input({ value: item.id }) }}
+            {% import '@RoadizRozier/components/rz_bulk_actions.html.twig' as rz_bulk_actions %}
+            {{ rz_bulk_actions.select_input({ value: item.id }) }}
         </div>
     {% endif %}
 </div>
diff --git a/lib/RoadizRozierBundle/templates/custom-form-answers/list.html.twig b/lib/RoadizRozierBundle/templates/custom-form-answers/list.html.twig
index 6fdce069b..c8089185f 100644
--- a/lib/RoadizRozierBundle/templates/custom-form-answers/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/custom-form-answers/list.html.twig
@@ -17,12 +17,12 @@
             icon: 'rz-icon-ri--download-line'
         }],
     } only %}
-    {% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+    {% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
         filters: filters,
     }  only %}
 
     <section class="rz-page__body">
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             actions_available: true,
         }%}
             {% block thead_cells %}
@@ -54,7 +54,7 @@
                         <td class="mobile-hidden">{{ type.email }}</td>
                         <td>{{ type.submittedAt|format_date('short', locale=app.request.locale) }}</td>
                         <td class="table-actions-row table-actions-row-2">
-                            {% embed '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                            {% embed '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                 'delete_href': path('customFormAnswersDeletePage', { customFormAnswerId: type.getId }),
                             } %}
                                 {% block other_actions %}
diff --git a/lib/RoadizRozierBundle/templates/custom-form-fields/actionsMenu.html.twig b/lib/RoadizRozierBundle/templates/custom-form-fields/actionsMenu.html.twig
index 7ed38c8e0..db81acefd 100644
--- a/lib/RoadizRozierBundle/templates/custom-form-fields/actionsMenu.html.twig
+++ b/lib/RoadizRozierBundle/templates/custom-form-fields/actionsMenu.html.twig
@@ -1,4 +1,4 @@
-{% embed "@RoadizRozier/macros/rz_actions_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_actions_menu.html.twig" with {
     vertical: true,
     class: 'actions-menu',
     field: field
diff --git a/lib/RoadizRozierBundle/templates/custom-form-fields/add.html.twig b/lib/RoadizRozierBundle/templates/custom-form-fields/add.html.twig
index 8b04eb3f8..37910e7f1 100644
--- a/lib/RoadizRozierBundle/templates/custom-form-fields/add.html.twig
+++ b/lib/RoadizRozierBundle/templates/custom-form-fields/add.html.twig
@@ -17,7 +17,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{- form_start(form, { 'attr': { 'id': "add-custom-form-field-form" }}) -}}
         {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#add-custom-form-field-form') }}
         {{- form_end(form) -}}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/custom-form-fields/ajaxEditBase.html.twig b/lib/RoadizRozierBundle/templates/custom-form-fields/ajaxEditBase.html.twig
deleted file mode 100644
index d28bf8697..000000000
--- a/lib/RoadizRozierBundle/templates/custom-form-fields/ajaxEditBase.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-{% block subcontent %}{% endblock %}
diff --git a/lib/RoadizRozierBundle/templates/custom-form-fields/edit.html.twig b/lib/RoadizRozierBundle/templates/custom-form-fields/edit.html.twig
index a9cb74609..c9f470723 100644
--- a/lib/RoadizRozierBundle/templates/custom-form-fields/edit.html.twig
+++ b/lib/RoadizRozierBundle/templates/custom-form-fields/edit.html.twig
@@ -4,7 +4,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{- form_start(form, { 'attr': {'id': "edit-custom-form-field-form"}}) -}}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#edit-custom-form-field-form') }}
         {{- form_end(form) -}}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/custom-form-fields/list.html.twig b/lib/RoadizRozierBundle/templates/custom-form-fields/list.html.twig
index 9d1cc00a0..dd04485db 100644
--- a/lib/RoadizRozierBundle/templates/custom-form-fields/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/custom-form-fields/list.html.twig
@@ -19,7 +19,7 @@
     } only %}
 
     <section class="rz-page__body">
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             sortable: {
                 enabled: true,
                 url: path('customFormFieldPositionAjax'),
@@ -40,7 +40,7 @@
                         data-id="{{ field.getId }}"
                     >
                         <td class="rz-table__handle">
-                            {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+                            {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
                             {{ rz_link.root({
                                 label: field.label,
                                 attributes: {
@@ -53,7 +53,7 @@
                         <td class="mobile-hidden">{{ field.groupName|trans }}</td>
                         <td class="mobile-hidden">
                             {% if field.required %}
-                                {% import '@RoadizRozier/macros/rz_badge.html.twig' as rz_badge %}
+                                {% import '@RoadizRozier/components/rz_badge.html.twig' as rz_badge %}
                                 {{ rz_badge.item({
                                     icon: 'rz-icon-ri--asterisk',
                                     attributes: {
@@ -63,7 +63,7 @@
                             {% endif %}
                         </td>
                         <td>
-                            {% include '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                            {% include '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                 'edit_href': path('customFormFieldsEditPage', { customFormFieldId: field.getId }),
                                 'delete_href': path('customFormFieldsDeletePage', { customFormFieldId: field.getId }),
                             } %}
diff --git a/lib/RoadizRozierBundle/templates/custom-forms/actionsMenu.html.twig b/lib/RoadizRozierBundle/templates/custom-forms/actionsMenu.html.twig
index dc4ff659b..b3f11e829 100644
--- a/lib/RoadizRozierBundle/templates/custom-forms/actionsMenu.html.twig
+++ b/lib/RoadizRozierBundle/templates/custom-forms/actionsMenu.html.twig
@@ -1,4 +1,4 @@
-{% embed "@RoadizRozier/macros/rz_actions_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_actions_menu.html.twig" with {
     vertical: true,
     class: 'actions-menu',
     item: item
diff --git a/lib/RoadizRozierBundle/templates/custom-forms/add.html.twig b/lib/RoadizRozierBundle/templates/custom-forms/add.html.twig
index 484cfb3d7..369d00b9e 100644
--- a/lib/RoadizRozierBundle/templates/custom-forms/add.html.twig
+++ b/lib/RoadizRozierBundle/templates/custom-forms/add.html.twig
@@ -11,7 +11,7 @@
         <article>
             {% form_theme form '@RoadizRozier/forms.html.twig' %}
             {{ form_start(form) }}
-                {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+                {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
                 {{ actions_menu.saveItem('#' ~ field_id(form)) }}
             {{ form_end(form) }}
         </article>
diff --git a/lib/RoadizRozierBundle/templates/custom-forms/edit.html.twig b/lib/RoadizRozierBundle/templates/custom-forms/edit.html.twig
index 7ded78cef..e6b062877 100644
--- a/lib/RoadizRozierBundle/templates/custom-forms/edit.html.twig
+++ b/lib/RoadizRozierBundle/templates/custom-forms/edit.html.twig
@@ -14,11 +14,11 @@
         <article>
             {% form_theme form '@RoadizRozier/forms.html.twig' %}
             {{ form_start(form) }}
-                {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+                {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
                 {{ actions_menu.saveItem('#' ~ field_id(form)) }}
             {{ form_end(form) }}
 
-            {% include '@RoadizRozier/includes/rz_meta_item_table.html.twig' with {
+            {% include '@RoadizRozier/includes/meta_item_table.html.twig' with {
                 item: item,
             } only %}
         </article>
diff --git a/lib/RoadizRozierBundle/templates/custom-forms/head.html.twig b/lib/RoadizRozierBundle/templates/custom-forms/head.html.twig
index 7576765d6..5e73dc915 100644
--- a/lib/RoadizRozierBundle/templates/custom-forms/head.html.twig
+++ b/lib/RoadizRozierBundle/templates/custom-forms/head.html.twig
@@ -9,7 +9,7 @@
     } %}
 {% endif %}
 
-{% include "@RoadizRozier/admin/head.html.twig" with {
+{% include "@RoadizRozier/layouts/head.html.twig" with {
     nav_bar_template: '@RoadizRozier/custom-forms/navBar.html.twig',
     nav_bar_context: {current: current, type: type}
 } %}
diff --git a/lib/RoadizRozierBundle/templates/custom-forms/list.html.twig b/lib/RoadizRozierBundle/templates/custom-forms/list.html.twig
index f02fa541f..f27c97c5e 100644
--- a/lib/RoadizRozierBundle/templates/custom-forms/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/custom-forms/list.html.twig
@@ -16,7 +16,7 @@
         }],
     } only %}
 
-    {% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+    {% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
         filters: filters,
         display_select_all_button: true,
     }  only %}
diff --git a/lib/RoadizRozierBundle/templates/custom-forms/list_table.html.twig b/lib/RoadizRozierBundle/templates/custom-forms/list_table.html.twig
index 2bce57a91..858702ede 100644
--- a/lib/RoadizRozierBundle/templates/custom-forms/list_table.html.twig
+++ b/lib/RoadizRozierBundle/templates/custom-forms/list_table.html.twig
@@ -1,4 +1,4 @@
-{% embed '@RoadizRozier/includes/rz_table.html.twig' %}
+{% embed '@RoadizRozier/components/rz_table.html.twig' %}
 	{% block thead_cells %}
 		<th>
 			{% include '@RoadizRozier/includes/column_ordering.html.twig' with {
@@ -28,15 +28,15 @@
 	{% endblock %}
 
 	{% block tbody_content %}
-        {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+        {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
 		{% for item in items %}
 			<tr
 				{{ _self.colored_row_attrs({'color': item.color }) }}
 			>
 				{% if selection_available %}
 					<td>
-						{% import '@RoadizRozier/macros/rz_bulk.html.twig' as rz_bulk %}
-						{{ rz_bulk.select_input({ value: item.id }) }}
+						{% import '@RoadizRozier/components/rz_bulk_actions.html.twig' as rz_bulk_actions %}
+						{{ rz_bulk_actions.select_input({ value: item.id }) }}
 					</td>
 				{% endif %}
 				<td>
@@ -54,7 +54,7 @@
 				</td>
 				{% if actions_available %}
 					<td>
-						{% embed '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+						{% embed '@RoadizRozier/components/rz_table_actions.html.twig' with {
 							'edit_href': path('customFormsEditPage', { id: item.getId }),
 							'delete_href': path('customFormsDeletePage', { id: item.getId }),
 						} %}
diff --git a/lib/RoadizRozierBundle/templates/custom-forms/navBar.html.twig b/lib/RoadizRozierBundle/templates/custom-forms/navBar.html.twig
index 2fa730df4..979ecc683 100644
--- a/lib/RoadizRozierBundle/templates/custom-forms/navBar.html.twig
+++ b/lib/RoadizRozierBundle/templates/custom-forms/navBar.html.twig
@@ -43,7 +43,7 @@ set listItems = [
     {% block additional_entries %}{% endblock %}
 {% endset %}
 
-{% embed "@RoadizRozier/macros/rz_menu_bar.html.twig" with {listItems : listItems, current: current} %}
+{% embed "@RoadizRozier/patterns/menu_bar.html.twig" with {listItems : listItems, current: current} %}
     {% block additional_entries %}
         {{ custom_entries_content|raw }}
     {% endblock %}
diff --git a/lib/RoadizRozierBundle/templates/custom-forms/usage.html.twig b/lib/RoadizRozierBundle/templates/custom-forms/usage.html.twig
index 6c944c84b..d0e1f30ab 100644
--- a/lib/RoadizRozierBundle/templates/custom-forms/usage.html.twig
+++ b/lib/RoadizRozierBundle/templates/custom-forms/usage.html.twig
@@ -11,7 +11,7 @@
     } only %}
 
     <section class="rz-page__body">
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             actions_available: true,
         } %}
             {% block thead_cells %}
@@ -31,7 +31,7 @@
                         <td>{{ usage.fieldName }}</td>
                         {% if actions_available %}
                             <td>
-                                {% include '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                                {% include '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                     'edit_href': nodeHref,
                                     'edit_icon': 'rz-icon-ri--eye-line',
                                     'edit_title': 'view.node'|trans,
diff --git a/lib/RoadizRozierBundle/templates/custom-forms/webhook.html.twig b/lib/RoadizRozierBundle/templates/custom-forms/webhook.html.twig
index 97df27b56..1abafa1d2 100644
--- a/lib/RoadizRozierBundle/templates/custom-forms/webhook.html.twig
+++ b/lib/RoadizRozierBundle/templates/custom-forms/webhook.html.twig
@@ -13,11 +13,11 @@
 
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#' ~ field_id(form)) }}
         {{ form_end(form) }}
 
-        {% include '@RoadizRozier/includes/rz_meta_item_table.html.twig' with {
+        {% include '@RoadizRozier/includes/meta_item_table.html.twig' with {
             item: item,
         } only %}
 
diff --git a/lib/RoadizRozierBundle/templates/dashboard/index.html.twig b/lib/RoadizRozierBundle/templates/dashboard/index.html.twig
index 28ea345c0..9bd1afffb 100644
--- a/lib/RoadizRozierBundle/templates/dashboard/index.html.twig
+++ b/lib/RoadizRozierBundle/templates/dashboard/index.html.twig
@@ -1,4 +1,4 @@
-{% extends "@RoadizRozier/admin/base.html.twig" %}
+{% extends "@RoadizRozier/layouts/admin.html.twig" %}
 
 {% if app.user %}
     {% set displayName = app.user.firstName|default(app.user.nickname|default(app.user.givenName|default(app.user.name|default(app.user.userIdentifier)))) %}
@@ -9,13 +9,13 @@
 {% block title %}{% trans %}dashboard{% endtrans %} | {{ parent() }}{% endblock %}
 
 {%- block header -%}
-    {% include '@RoadizRozier/admin/head.html.twig' with {
+    {% include '@RoadizRozier/layouts/head.html.twig' with {
         title: "hello.%name%"|trans({'%name%': displayName}),
         breadcrumb: {
             current: 'dashboard'|trans,
         },
         with_nav_bar: true,
-        nav_bar_template: '@RoadizRozier/dashboard/navBar.html.twig',
+        nav_bar_template: '@RoadizRozier/patterns/dashboard_nav.html.twig',
         nav_bar_context: {'current':'dashboard'}
     } only %}
 {%- endblock -%}
@@ -35,13 +35,13 @@
 
         <div class="rz-dashboard__row">
             {% if latestLogs %}
-                {% embed '@RoadizRozier/dashboard/panel.html.twig' with {
+                {% embed '@RoadizRozier/patterns/dashboard_panel.html.twig' with {
                     icon: 'rz-icon-ri--command-line',
                     title: 'latest.node-sources.updates'|trans,
                     latestLogs: latestLogs
                 } only %}
                     {% block content %}
-                        {% embed '@RoadizRozier/includes/rz_table.html.twig' %}
+                        {% embed '@RoadizRozier/components/rz_table.html.twig' %}
                             {% block tbody_content %}
                                 {% for log in latestLogs %}
                                     {% set entityPath = log_entity_edit_path(log) %}
@@ -63,7 +63,7 @@
                                             </figure>
                                         </td>
                                         <td>
-                                            {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+                                            {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
                                             {{ rz_link.root({
                                                 label: log.additionalData.entity_title,
                                                 attributes: { href: entityPath },
@@ -84,7 +84,7 @@
             {% endif %}
 
             {% if bookmarks|length %}
-                {% embed '@RoadizRozier/dashboard/panel.html.twig' with {
+                {% embed '@RoadizRozier/patterns/dashboard_panel.html.twig' with {
                     id: 'dashboard-bookmarks',
                     icon: 'rz-icon-ri--computer-line',
                     title: 'bookmarks.links'|trans,
@@ -93,7 +93,7 @@
                         <ul class="rz-dashboard__body-bg">
                             {% for bookmark in bookmarks %}
                                 <li>
-                                    {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+                                    {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
                                     {{ rz_link.root({
                                         label: bookmark.label,
                                         class: 'rz-dashboard__text',
@@ -109,13 +109,13 @@
                 {% endembed %}
             {% endif %}
             {% if translateAssistantEnabled and translateAssistantUsage() %}
-                {% embed '@RoadizRozier/dashboard/panel.html.twig' with {
+                {% embed '@RoadizRozier/patterns/dashboard_panel.html.twig' with {
                     id: 'dashboard-translate-assistant-usage',
                     icon: 'rz-icon-ri--translate',
                     title: 'translate_assistant.usage'|trans,
                 } %}
                     {% block content %}
-                        {% include '@RoadizRozier/includes/translateAssistantUsage.html.twig' %}
+                        {% include '@RoadizRozier/includes/translate_assistant_usage.html.twig' %}
                     {% endblock %}
                 {% endembed %}
             {% endif %}
diff --git a/lib/RoadizRozierBundle/templates/document-translations/edit.html.twig b/lib/RoadizRozierBundle/templates/document-translations/edit.html.twig
index e50e24d90..21193bf29 100644
--- a/lib/RoadizRozierBundle/templates/document-translations/edit.html.twig
+++ b/lib/RoadizRozierBundle/templates/document-translations/edit.html.twig
@@ -43,7 +43,7 @@
         {{ form_start(form, { attr: { id: "edit-document-form"}}) }}
             {{ form_widget(form) }}
             {% if not readOnly %}
-                {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+                {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
                 {{ actions_menu.saveItem('#edit-document-form') }}
             {% endif %}
         {{ form_end(form) }}
diff --git a/lib/RoadizRozierBundle/templates/documents/actionsMenu.html.twig b/lib/RoadizRozierBundle/templates/documents/actionsMenu.html.twig
index 3e153aafd..0eb602626 100644
--- a/lib/RoadizRozierBundle/templates/documents/actionsMenu.html.twig
+++ b/lib/RoadizRozierBundle/templates/documents/actionsMenu.html.twig
@@ -1,4 +1,4 @@
-{% embed "@RoadizRozier/macros/rz_actions_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_actions_menu.html.twig" with {
     vertical: true,
     class: 'actions-menu',
     document: document,
@@ -29,7 +29,7 @@
                     <span class="rz-button__icon rz-icon-ri--git-fork-line"></span>
                 </button>
 
-                {% embed "@RoadizRozier/macros/rz_dropdown_menu.html.twig" with {
+                {% embed "@RoadizRozier/components/rz_dropdown.html.twig" with {
                     title: 'versions',
                     reverse: true,
                     targetId: 'version-menu',
diff --git a/lib/RoadizRozierBundle/templates/documents/backLink.html.twig b/lib/RoadizRozierBundle/templates/documents/backLink.html.twig
deleted file mode 100644
index 85bdef04c..000000000
--- a/lib/RoadizRozierBundle/templates/documents/backLink.html.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends '@RoadizRozier/widgets/backlink.html.twig' %}
-
-{%- block link -%}
-    {% set link = path('documentsHomePage') %}
-    {% set title = 'back_to.documents'|trans %}
-    {{- parent() -}}
-{%- endblock -%}
diff --git a/lib/RoadizRozierBundle/templates/documents/bulkActions.html.twig b/lib/RoadizRozierBundle/templates/documents/bulkActions.html.twig
index 15aa3a188..d736ed4ce 100644
--- a/lib/RoadizRozierBundle/templates/documents/bulkActions.html.twig
+++ b/lib/RoadizRozierBundle/templates/documents/bulkActions.html.twig
@@ -1,5 +1,5 @@
-{% embed "@RoadizRozier/widgets/rz_bulk_actions.html.twig" %}
-	{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+{% embed "@RoadizRozier/components/rz_bulk_actions.html.twig" %}
+	{% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
 	{% set folder_id = "documents-bulk-folder-cont" %}
 
 	{% block other_actions %}
diff --git a/lib/RoadizRozierBundle/templates/documents/edit.html.twig b/lib/RoadizRozierBundle/templates/documents/edit.html.twig
index 2c77baaf6..689f66a33 100644
--- a/lib/RoadizRozierBundle/templates/documents/edit.html.twig
+++ b/lib/RoadizRozierBundle/templates/documents/edit.html.twig
@@ -67,7 +67,7 @@
                         {{ form_row(form.filename) }}
                         {{ form_row(form.mimeType) }}
                         {{ form_row(form.newDocument) }}
-                        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+                        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
                             bordered: true,
                             attributes: {
                                 class: 'rz-table--td-ellipsis',
@@ -75,7 +75,7 @@
                             }
                         } %}
                             {% block tbody_content %}
-                                {% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+                                {% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
                                 {% if not document.private and document.filename %}
                                     <tr><th>{% trans %}document.relative_url{% endtrans %}</th><td>{{ document|url}}</td></tr>
                                     <tr><th>{% trans %}document.absolute_url{% endtrans %}</th><td>{{ document|url({absolute:true}) }}</td></tr>
@@ -165,7 +165,7 @@
             <div class="rz-form__field-list">
                 {{ form_rest(form) }}
             </div>
-        {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+        {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
         {{ actions_menu.saveItem('#edit-document-form') }}
         {{ form_end(form, { render_rest: false }) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/documents/embed.html.twig b/lib/RoadizRozierBundle/templates/documents/embed.html.twig
index c69360780..a0c6bfcae 100644
--- a/lib/RoadizRozierBundle/templates/documents/embed.html.twig
+++ b/lib/RoadizRozierBundle/templates/documents/embed.html.twig
@@ -12,7 +12,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: { id: "embed-dropzone-document" }}) }}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#embed-dropzone-document') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/documents/filtersBar.html.twig b/lib/RoadizRozierBundle/templates/documents/filtersBar.html.twig
index f97d05924..9f403eeb1 100644
--- a/lib/RoadizRozierBundle/templates/documents/filtersBar.html.twig
+++ b/lib/RoadizRozierBundle/templates/documents/filtersBar.html.twig
@@ -1,4 +1,4 @@
-{% embed "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+{% embed "@RoadizRozier/components/rz_filters_bar.html.twig" with {
     filters: filters,
     display_select_all_button: true,
     display_layout_fields: true,
diff --git a/lib/RoadizRozierBundle/templates/documents/head.html.twig b/lib/RoadizRozierBundle/templates/documents/head.html.twig
index 13760b2ce..0a71efb91 100644
--- a/lib/RoadizRozierBundle/templates/documents/head.html.twig
+++ b/lib/RoadizRozierBundle/templates/documents/head.html.twig
@@ -11,7 +11,7 @@
     } %}
 {% endif %}
 
-{% embed "@RoadizRozier/macros/rz_page_header.html.twig" with {
+{% embed "@RoadizRozier/components/rz_page_header.html.twig" with {
     breadcrumb: breadcrumb,
 } %}
     {% block translation %}
@@ -55,7 +55,7 @@
 
     {% block badges %}
         {% if filters and filters.itemCount %}
-            {% import "@RoadizRozier/macros/rz_badge.html.twig" as rz_badge %}
+            {% import "@RoadizRozier/components/rz_badge.html.twig" as rz_badge %}
             <div class="rz-page-header__item">
                 {{ rz_badge.item({
                     label: '%count%.items'|transchoice(filters.itemCount)|raw,
diff --git a/lib/RoadizRozierBundle/templates/documents/itemPerPage.html.twig b/lib/RoadizRozierBundle/templates/documents/itemPerPage.html.twig
deleted file mode 100644
index a44feb217..000000000
--- a/lib/RoadizRozierBundle/templates/documents/itemPerPage.html.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "@RoadizRozier/widgets/itemPerPage.html.twig" %}
-
-{% block additional_inputs %}
-{% if app.request.query.get('list') == '1' %}<input type="hidden" name="list" value="1" />{% endif %}
-{% endblock %}
diff --git a/lib/RoadizRozierBundle/templates/documents/limitations.html.twig b/lib/RoadizRozierBundle/templates/documents/limitations.html.twig
index 07cbd433d..49b881d8f 100644
--- a/lib/RoadizRozierBundle/templates/documents/limitations.html.twig
+++ b/lib/RoadizRozierBundle/templates/documents/limitations.html.twig
@@ -15,7 +15,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: {id: "edit-document-form"}}) }}
         {{ form_widget(form) }}
-        {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+        {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
         {{ actions_menu.saveItem('#edit-document-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/documents/list-table.html.twig b/lib/RoadizRozierBundle/templates/documents/list-table.html.twig
index 28dd1b10c..313b8ca18 100644
--- a/lib/RoadizRozierBundle/templates/documents/list-table.html.twig
+++ b/lib/RoadizRozierBundle/templates/documents/list-table.html.twig
@@ -4,7 +4,7 @@
     <article>
         {% block pre_content_body %}{% endblock %}
 
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             selection_available: true,
             actions_available: true,
         } %}
@@ -63,15 +63,15 @@
             {% endblock %}
 
             {% block tbody_content %}
-                {% import '@RoadizRozier/macros/rz_badge.html.twig' as rz_badge %}
+                {% import '@RoadizRozier/components/rz_badge.html.twig' as rz_badge %}
                 {% for document in documents %}
                     <tr
                      {{ _self.colored_row_attrs({'color': document.imageAverageColor }) }}
                     >
                         {% if selection_available %}
                         <td>
-					        {% import '@RoadizRozier/macros/rz_bulk.html.twig' as rz_bulk %}
-                            {{ rz_bulk.select_input({ value: document.id }) }}
+					        {% import '@RoadizRozier/components/rz_bulk_actions.html.twig' as rz_bulk_actions %}
+                            {{ rz_bulk_actions.select_input({ value: document.id }) }}
                         </td>
                         {% endif %}
                         <td class="mobile-hidden rz-table__cell rz-table__cell--flex-center">
@@ -93,7 +93,7 @@
                             {% endif %}
                         </td>
                         <td>
-                            {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+                            {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
                             {{ rz_link.root({
                                 label: document|centralTruncate(30, -4),
                                 attributes: { href: path('documentsEditPage', { documentId: document.id }) },
@@ -121,7 +121,7 @@
                                 {% if document.embedPlatform == 'unsplash' or document.embedPlatform == 'splashbase' %}
                                     {% set iconName = 'documents' %}
                                 {% endif %}
-                                {% import "@RoadizRozier/macros/rz_badge.html.twig" as rz_badge %}
+                                {% import "@RoadizRozier/components/rz_badge.html.twig" as rz_badge %}
                                 {{ rz_badge.item({
                                     label: iconName,
                                     icon: 'rz-icon-logo--' ~ iconName,
@@ -132,7 +132,7 @@
                             {% endif %}
                         </td>
                         <td>
-                            {% include '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                            {% include '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                 'edit_href': path('documentsEditPage', { documentId: document.id }),
                                 'delete_href': path('documentsDeletePage', { documentId: document.id }),
                             } %}
diff --git a/lib/RoadizRozierBundle/templates/documents/navBar.html.twig b/lib/RoadizRozierBundle/templates/documents/navBar.html.twig
index 0da9e07f2..4b4bb78c3 100644
--- a/lib/RoadizRozierBundle/templates/documents/navBar.html.twig
+++ b/lib/RoadizRozierBundle/templates/documents/navBar.html.twig
@@ -48,7 +48,7 @@ set listItems = [
     {% block additional_entries %}{% endblock %}
 {% endset %}
 
-{% embed "@RoadizRozier/macros/rz_menu_bar.html.twig" with {listItems : listItems, current: current} %}
+{% embed "@RoadizRozier/patterns/menu_bar.html.twig" with {listItems : listItems, current: current} %}
     {% block additional_entries %}
         {{ custom_entries_content|raw }}
     {% endblock %}
diff --git a/lib/RoadizRozierBundle/templates/documents/preview.html.twig b/lib/RoadizRozierBundle/templates/documents/preview.html.twig
index 1cf86fd5e..18c3edebc 100644
--- a/lib/RoadizRozierBundle/templates/documents/preview.html.twig
+++ b/lib/RoadizRozierBundle/templates/documents/preview.html.twig
@@ -3,7 +3,7 @@
 {% block title %}{{ "edit.document.%name%"|trans({'%name%': document})|truncate_title }} | {{ parent() }}{% endblock %}
 
 {% block content %}
-    {% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+    {% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
 
     <section class="content-global manage-document">
         {% include '@RoadizRozier/documents/head.html.twig' with {
@@ -56,7 +56,7 @@
             </div>
         </article>
         <article class="content content-document-infos">
-            {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+            {% embed '@RoadizRozier/components/rz_table.html.twig' with {
                 bordered: true
             } %}
                 {% block tbody_content %}
@@ -79,7 +79,7 @@
             {% if otherVideos|length %}
                 <hr>
                 <h4>{% trans %}document.video_sources{% endtrans %}</h4>
-                {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+                {% embed '@RoadizRozier/components/rz_table.html.twig' with {
                     bordered: true
                 } %}
                     {% block tbody_content %}
@@ -105,7 +105,7 @@
             {% if otherAudios|length %}
                 <hr>
                 <h4>{% trans %}document.audio_sources{% endtrans %}</h4>
-                {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+                {% embed '@RoadizRozier/components/rz_table.html.twig' with {
                     bordered: true
                 } %}
                     {% block tbody_content %}
@@ -131,7 +131,7 @@
             {% if otherPictures|length %}
                 <hr>
                 <h4>{% trans %}document.picture_sources{% endtrans %}</h4>
-                {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+                {% embed '@RoadizRozier/components/rz_table.html.twig' with {
                     bordered: true
                 } %}
                     {% block tbody_content %}
diff --git a/lib/RoadizRozierBundle/templates/documents/singleDocumentThumbnail.html.twig b/lib/RoadizRozierBundle/templates/documents/singleDocumentThumbnail.html.twig
index 0afb0e660..2022e2697 100644
--- a/lib/RoadizRozierBundle/templates/documents/singleDocumentThumbnail.html.twig
+++ b/lib/RoadizRozierBundle/templates/documents/singleDocumentThumbnail.html.twig
@@ -1,6 +1,6 @@
-{% import '@RoadizRozier/macros/rz_bulk.html.twig' as rz_bulk %}
-{% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
-{% import '@RoadizRozier/macros/rz_badge.html.twig' as rz_badge %}
+{% import '@RoadizRozier/components/rz_bulk_actions.html.twig' as rz_bulk_actions %}
+{% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
+{% import '@RoadizRozier/components/rz_badge.html.twig' as rz_badge %}
 
 <div class="rz-document-card">
     <div class="rz-document-card__asset">
@@ -74,7 +74,7 @@
     <div class="rz-document-card__name">
         {% if controls %}
             {% set input_id = 'bulk-selection-' ~ document.id %}
-            {{ rz_bulk.select_input({
+            {{ rz_bulk_actions.select_input({
                 value: document.id,
                 id: input_id,
             }) }}
diff --git a/lib/RoadizRozierBundle/templates/documents/usage.html.twig b/lib/RoadizRozierBundle/templates/documents/usage.html.twig
index 1d267f4f5..e426d5327 100644
--- a/lib/RoadizRozierBundle/templates/documents/usage.html.twig
+++ b/lib/RoadizRozierBundle/templates/documents/usage.html.twig
@@ -11,7 +11,7 @@
     } only %}
 
     <section>
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             usages: usages,
             actions_available: true,
         } only %}
@@ -25,7 +25,7 @@
                     {% set edit_source_link = path('nodesEditSourcePage', { nodeId: source.node.id, translationId: source.translation.id }) %}
                     <tr>
                         <td>
-                            {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+                            {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
                             {{ rz_link.root({
                                 label: source.title|default(source.node.nodeName),
                                 attributes: { href: edit_source_link },
@@ -34,7 +34,7 @@
                         <td>{{ usage.fieldName }}</td>
                         {% if actions_available %}
                             <td>
-                                {% include '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                                {% include '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                     'edit_href': edit_source_link,
                                     'edit_icon': 'rz-icon-ri--eye-line',
                                 } %}
@@ -55,7 +55,7 @@
         {% if attributes|length %}
             <hr>
             <h3 class="text-h1-sm">{% trans %}attributes{% endtrans %}</h3>
-            {% embed '@RoadizRozier/includes/rz_table.html.twig' %}
+            {% embed '@RoadizRozier/components/rz_table.html.twig' %}
                 {% block thead_cells %}
                     <th>{% trans %}attributes.code{% endtrans %}</th>
                     <th>{% trans %}attributes.group{% endtrans %}</th>
@@ -85,7 +85,7 @@
 
         {% if tags|length %}
             <h3>{% trans %}tags{% endtrans %}</h3>
-            {% embed '@RoadizRozier/includes/rz_table.html.twig' %}
+            {% embed '@RoadizRozier/components/rz_table.html.twig' %}
                 {% block thead_cells %}
                     <th>{% trans %}tagName{% endtrans %}</th>
                 {% endblock %}
diff --git a/lib/RoadizRozierBundle/templates/folders/actionsMenu.html.twig b/lib/RoadizRozierBundle/templates/folders/actionsMenu.html.twig
index f0b1cf5a2..9e1ce5d3c 100644
--- a/lib/RoadizRozierBundle/templates/folders/actionsMenu.html.twig
+++ b/lib/RoadizRozierBundle/templates/folders/actionsMenu.html.twig
@@ -1,4 +1,4 @@
-{% embed "@RoadizRozier/macros/rz_actions_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_actions_menu.html.twig" with {
     vertical: true,
     class: 'actions-menu',
     folder: folder
diff --git a/lib/RoadizRozierBundle/templates/folders/add.html.twig b/lib/RoadizRozierBundle/templates/folders/add.html.twig
index 05738fcbf..16ecdf824 100644
--- a/lib/RoadizRozierBundle/templates/folders/add.html.twig
+++ b/lib/RoadizRozierBundle/templates/folders/add.html.twig
@@ -12,7 +12,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: {id: "add-folder-form"}}) }}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#add-folder-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/folders/edit.html.twig b/lib/RoadizRozierBundle/templates/folders/edit.html.twig
index a352fcbca..264907196 100644
--- a/lib/RoadizRozierBundle/templates/folders/edit.html.twig
+++ b/lib/RoadizRozierBundle/templates/folders/edit.html.twig
@@ -25,12 +25,12 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: { id: "edit-folder-form" }}) }}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#edit-folder-form') }}
         {{ form_end(form) }}
 
         <div class="content-table-cont metadata-list">
-            {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+            {% embed '@RoadizRozier/components/rz_table.html.twig' with {
                 bordered: true
             } %}
                 {% block tbody_content %}
diff --git a/lib/RoadizRozierBundle/templates/folders/head.html.twig b/lib/RoadizRozierBundle/templates/folders/head.html.twig
index e9fcb2dbc..643e4325d 100644
--- a/lib/RoadizRozierBundle/templates/folders/head.html.twig
+++ b/lib/RoadizRozierBundle/templates/folders/head.html.twig
@@ -10,7 +10,7 @@
     } %}
 {% endif %}
 
-{% include "@RoadizRozier/admin/head.html.twig" with {
+{% include "@RoadizRozier/layouts/head.html.twig" with {
     translation_route: 'foldersEditTranslationPage',
     translation_params: {
         folderId: folder.id,
diff --git a/lib/RoadizRozierBundle/templates/folders/list.html.twig b/lib/RoadizRozierBundle/templates/folders/list.html.twig
index cf0613732..dc26a99cb 100644
--- a/lib/RoadizRozierBundle/templates/folders/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/folders/list.html.twig
@@ -16,12 +16,12 @@
         }],
     } only %}
 
-    {% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+    {% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
         filters: filters,
         display_select_all_button: false,
     }  only %}
     <article>
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             selection_available: false,
             actions_available: true,
             folders: folders,
@@ -44,8 +44,8 @@
                     >
                         {% if selection_available %}
                             <td>
-                                {% import '@RoadizRozier/macros/rz_bulk.html.twig' as rz_bulk %}
-                                {{ rz_bulk.select_input({ value: folder.id }) }}
+                                {% import '@RoadizRozier/components/rz_bulk_actions.html.twig' as rz_bulk_actions %}
+                                {{ rz_bulk_actions.select_input({ value: folder.id }) }}
                             </td>
                         {% endif %}
                         <td>
@@ -53,7 +53,7 @@
                         </td>
                         {% if actions_available %}
                             <td>
-                                {% embed '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                                {% embed '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                     'edit_href': path('foldersEditPage', { folderId: folder.id }),
                                     'delete_href': path('foldersDeletePage', { folderId: folder.id }),
                                 } %}
diff --git a/lib/RoadizRozierBundle/templates/folders/navBar.html.twig b/lib/RoadizRozierBundle/templates/folders/navBar.html.twig
index faa117306..c8e1ac0ed 100644
--- a/lib/RoadizRozierBundle/templates/folders/navBar.html.twig
+++ b/lib/RoadizRozierBundle/templates/folders/navBar.html.twig
@@ -28,7 +28,7 @@ set listItems = [
     {% block additional_entries %}{% endblock %}
 {% endset %}
 
-{% embed "@RoadizRozier/macros/rz_menu_bar.html.twig" with {listItems : listItems, current: current} %}
+{% embed "@RoadizRozier/patterns/menu_bar.html.twig" with {listItems : listItems, current: current} %}
     {% block additional_entries %}
         {{ custom_entries_content|raw }}
     {% endblock %}
diff --git a/lib/RoadizRozierBundle/templates/widgets/documentAlignment.html.twig b/lib/RoadizRozierBundle/templates/form/document_alignment.html.twig
similarity index 96%
rename from lib/RoadizRozierBundle/templates/widgets/documentAlignment.html.twig
rename to lib/RoadizRozierBundle/templates/form/document_alignment.html.twig
index 7ebaa09a4..f9d6cfed6 100644
--- a/lib/RoadizRozierBundle/templates/widgets/documentAlignment.html.twig
+++ b/lib/RoadizRozierBundle/templates/form/document_alignment.html.twig
@@ -37,7 +37,7 @@
         <span>{{ 'document.imageAlignment.override'|trans }}</span>
     </label>
 
-    {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+    {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
     {{ rz_button.root({
         class: 'document-alignment-widget__reset',
         icon: 'rz-icon-ri--refresh-line',
diff --git a/lib/RoadizRozierBundle/templates/horizontalForms.html.twig b/lib/RoadizRozierBundle/templates/form/horizontal_forms.html.twig
similarity index 100%
rename from lib/RoadizRozierBundle/templates/horizontalForms.html.twig
rename to lib/RoadizRozierBundle/templates/form/horizontal_forms.html.twig
diff --git a/lib/RoadizRozierBundle/templates/forms.html.twig b/lib/RoadizRozierBundle/templates/forms.html.twig
index d2fe5fd81..29c5fea7a 100644
--- a/lib/RoadizRozierBundle/templates/forms.html.twig
+++ b/lib/RoadizRozierBundle/templates/forms.html.twig
@@ -214,7 +214,7 @@
 
 {%- block textarea_widget -%}
     {% if attr.class is defined and 'rz-geotag-field' in attr.class %}
-        {% include '@RoadizRozier/widgets/rz_geotag_field.html.twig' with {
+        {% include '@RoadizRozier/components/rz_geotag.html.twig' with {
             form: form,
             vars: form.vars,
             widget_attributes: block('widget_attributes'),
@@ -251,7 +251,7 @@
 {% endblock dynamic_widget %}
 
 {%- block collection_widget -%}
-    {% include '@RoadizRozier/widgets/rz_repeatable.html.twig' with {
+    {% include '@RoadizRozier/components/rz_repeatable.html.twig' with {
         widget_attributes: block('widget_attributes'),
         data_prototype: form_row(prototype, { attr: { 'no-field-group': true } }),
         stored_items_form: form.vars.value is not empty ? form.children : null,
@@ -259,7 +259,7 @@
 {%- endblock collection_widget -%}
 
 {% block tags_widget %}
-    {% include '@RoadizRozier/widgets/drawer.html.twig' with {
+    {% include '@RoadizRozier/components/rz_drawer.html.twig' with {
         widget_attributes: block('widget_attributes'),
         enableDropzone: false,
         entity: 'tag',
@@ -269,7 +269,7 @@
 {% endblock tags_widget %}
 
 {% block sortable_tags_widget %}
-    {% include '@RoadizRozier/widgets/drawer.html.twig' with {
+    {% include '@RoadizRozier/components/rz_drawer.html.twig' with {
         widget_attributes: block('widget_attributes'),
         enableDropzone: false,
         entity: 'tag',
@@ -278,7 +278,7 @@
 {% endblock sortable_tags_widget %}
 
 {% block documents_widget %}
-    {% include '@RoadizRozier/widgets/drawer.html.twig' with {
+    {% include '@RoadizRozier/components/rz_drawer.html.twig' with {
         widget_attributes: block('widget_attributes'),
         enableDropzone: true,
         entity: 'document',
@@ -287,7 +287,7 @@
 {% endblock documents_widget %}
 
 {% block node_source_documents_widget %}
-    {% include '@RoadizRozier/widgets/drawer.html.twig' with {
+    {% include '@RoadizRozier/components/rz_drawer.html.twig' with {
         widget_attributes: block('widget_attributes'),
         enableDropzone: true,
         entity: 'document',
@@ -296,7 +296,7 @@
 {% endblock node_source_documents_widget %}
 
 {% block folders_widget %}
-    {% include '@RoadizRozier/widgets/drawer.html.twig' with {
+    {% include '@RoadizRozier/components/rz_drawer.html.twig' with {
         widget_attributes: block('widget_attributes'),
         enableDropzone: false,
         entity: 'explorer-provider',
@@ -305,7 +305,7 @@
 {% endblock folders_widget %}
 
 {% block nodes_widget %}
-    {% include '@RoadizRozier/widgets/drawer.html.twig' with {
+    {% include '@RoadizRozier/components/rz_drawer.html.twig' with {
         widget_attributes: block('widget_attributes'),
         enableDropzone: false,
         entity: 'node',
@@ -314,7 +314,7 @@
 {% endblock nodes_widget %}
 
 {% block join_widget %}
-    {% include '@RoadizRozier/widgets/drawer.html.twig' with {
+    {% include '@RoadizRozier/components/rz_drawer.html.twig' with {
         widget_attributes: block('widget_attributes'),
         enableDropzone: false,
         entity: 'join',
@@ -323,7 +323,7 @@
 {% endblock join_widget %}
 
 {% block provider_widget %}
-    {% include '@RoadizRozier/widgets/drawer.html.twig' with {
+    {% include '@RoadizRozier/components/rz_drawer.html.twig' with {
         widget_attributes: block('widget_attributes'),
         enableDropzone: false,
         entity: 'explorer-provider',
@@ -332,7 +332,7 @@
 {% endblock provider_widget %}
 
 {% block explorer_provider_widget %}
-    {% include '@RoadizRozier/widgets/drawer.html.twig' with {
+    {% include '@RoadizRozier/components/rz_drawer.html.twig' with {
         widget_attributes: block('widget_attributes'),
         enableDropzone: false,
         entity: 'explorer-provider',
@@ -341,7 +341,7 @@
 {% endblock explorer_provider_widget %}
 
 {% block custom_forms_widget %}
-    {% include '@RoadizRozier/widgets/drawer.html.twig' with {
+    {% include '@RoadizRozier/components/rz_drawer.html.twig' with {
         widget_attributes: block('widget_attributes'),
         enableDropzone: false,
         entity: 'custom-form',
@@ -363,7 +363,7 @@
 {%- endblock radio_widget -%}
 
 {%- block document_alignment_widget -%}
-    {% include '@RoadizRozier/widgets/documentAlignment.html.twig' with {
+    {% include '@RoadizRozier/form/document_alignment.html.twig' with {
         widget_attributes: block('widget_attributes'),
         widget_class: 'rz-form-field__body',
         id: 'document-edit',
@@ -477,7 +477,7 @@
 
 {# Children node tree field #}
 {% block childrennodes_widget %}
-    {% import "@RoadizRozier/macros/rz_form_field.html.twig" as rz_form_field %}
+    {% import "@RoadizRozier/components/rz_form_field.html.twig" as rz_form_field %}
     <rz-form-field
         class="rz-form-field"
         data-translation-id="{{ nodeTree.translation.id }}"
@@ -493,8 +493,9 @@
             {% if linkedTypes|length %}
                 <div class="rz-button-group rz-button-group--md rz-form-field__head__end">
                     {% set popover_id = "ChildrenNodesQuickCreation_" ~ nodeTree.rootNode.id %}
-                    {% embed "@RoadizRozier/includes/rz_dropdown.html.twig" with {
-                            id: popover_id,
+                    {% embed "@RoadizRozier/components/rz_dropdown.html.twig" with {
+                            targetId: popover_id,
+                            class: 'children-nodes-quick-creation',
                             placement: 'bottom-end',
                             offset: '12',
                             target_options: {
@@ -505,28 +506,21 @@
                                 icon: 'rz-icon-ri--add-line',
                             }
                     } %}
-                        {% block popover %}
-                            {% embed "@RoadizRozier/macros/rz_dropdown_menu.html.twig" with {
-                                    targetId: popover_id,
-                                    class: 'children-nodes-quick-creation',
-                                } %}
-                                {% block items %}
-                                    {% for linkedType in linkedTypes %}
-                                        {{ _self.item({
-                                            label: linkedType.displayName,
-                                            rightIcon: 'rz-icon-ri--add-line',
-                                            attributes: {
-                                                type: 'button',
-                                                command: '--quick-add-child-node',
-                                                commandfor: 'form-children-' ~ (nodeTree.id ?? form.vars.unique_block_prefix),
-                                                'data-children-node-type': linkedType.name,
-                                                'data-children-parent-node': nodeTree.rootNode.id,
-                                                'data-translation-id': nodeTree.translation.id,
-                                            }
-                                        }) }}
-                                    {% endfor %}
-                                {% endblock %}
-                            {% endembed %}
+                        {% block items %}
+                            {% for linkedType in linkedTypes %}
+                                {{ _self.item({
+                                    label: linkedType.displayName,
+                                    rightIcon: 'rz-icon-ri--add-line',
+                                    attributes: {
+                                        type: 'button',
+                                        command: '--quick-add-child-node',
+                                        commandfor: 'form-children-' ~ (nodeTree.id ?? form.vars.unique_block_prefix),
+                                        'data-children-node-type': linkedType.name,
+                                        'data-children-parent-node': nodeTree.rootNode.id,
+                                        'data-translation-id': nodeTree.translation.id,
+                                    }
+                                }) }}
+                            {% endfor %}
                         {% endblock %}
                     {% endembed %}
                 </div>
@@ -593,7 +587,7 @@
 {%- endblock form_start %}
 
 {% block form_label -%}
-    {% import "@RoadizRozier/macros/rz_form_field.html.twig" as rz_form_field %}
+    {% import "@RoadizRozier/components/rz_form_field.html.twig" as rz_form_field %}
     {% if not compound -%}
         {% set label_attr = label_attr|merge({'for': id}) %}
     {%- endif %}
diff --git a/lib/RoadizRozierBundle/templates/groups/actionsMenu.html.twig b/lib/RoadizRozierBundle/templates/groups/actionsMenu.html.twig
index d98337854..3bfb30dde 100644
--- a/lib/RoadizRozierBundle/templates/groups/actionsMenu.html.twig
+++ b/lib/RoadizRozierBundle/templates/groups/actionsMenu.html.twig
@@ -1,4 +1,4 @@
-{% embed "@RoadizRozier/macros/rz_actions_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_actions_menu.html.twig" with {
     vertical: true,
     class: 'actions-menu',
     item: item
diff --git a/lib/RoadizRozierBundle/templates/groups/add.html.twig b/lib/RoadizRozierBundle/templates/groups/add.html.twig
index 47fd456ac..297bf98dc 100644
--- a/lib/RoadizRozierBundle/templates/groups/add.html.twig
+++ b/lib/RoadizRozierBundle/templates/groups/add.html.twig
@@ -13,7 +13,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: { id: "add-group-form" }}) }}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#add-group-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/groups/delete.html.twig b/lib/RoadizRozierBundle/templates/groups/delete.html.twig
index 7aa4ef98d..872a401c8 100644
--- a/lib/RoadizRozierBundle/templates/groups/delete.html.twig
+++ b/lib/RoadizRozierBundle/templates/groups/delete.html.twig
@@ -1,6 +1,6 @@
 {% include '@RoadizRozier/admin/confirm_action.html.twig' with {
     'title': "delete.group.%name%"|trans({'%name%': item.getName()}),
-    'headPath': '@RoadizRozier/admin/head.html.twig',
+    'headPath': '@RoadizRozier/layouts/head.html.twig',
     'breadcrumb_parents': [
         breadcrumb_root('groups'),
         {
diff --git a/lib/RoadizRozierBundle/templates/groups/edit.html.twig b/lib/RoadizRozierBundle/templates/groups/edit.html.twig
index 162a6639d..d6c072777 100644
--- a/lib/RoadizRozierBundle/templates/groups/edit.html.twig
+++ b/lib/RoadizRozierBundle/templates/groups/edit.html.twig
@@ -15,7 +15,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: { id: "edit-group-form" }}) }}
         {{ form_widget(form) }}
-        {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+        {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
         {{ actions_menu.saveItem('#edit-group-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/groups/head.html.twig b/lib/RoadizRozierBundle/templates/groups/head.html.twig
index f034e0bcc..07e3eec1e 100644
--- a/lib/RoadizRozierBundle/templates/groups/head.html.twig
+++ b/lib/RoadizRozierBundle/templates/groups/head.html.twig
@@ -9,7 +9,7 @@
     } %}
 {% endif %}
 
-{% include "@RoadizRozier/admin/head.html.twig" with {
+{% include "@RoadizRozier/layouts/head.html.twig" with {
     nav_bar_template: '@RoadizRozier/groups/navBar.html.twig',
     nav_bar_context: {'item': item, current: current}
 } %}
diff --git a/lib/RoadizRozierBundle/templates/groups/list.html.twig b/lib/RoadizRozierBundle/templates/groups/list.html.twig
index 7a5b337cd..713f28d7e 100644
--- a/lib/RoadizRozierBundle/templates/groups/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/groups/list.html.twig
@@ -31,14 +31,14 @@
         ],
     } only %}
 
-    {% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+    {% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
         filters: filters,
         display_select_all_button: false,
         items: items
     }  only %}
 
     <section>
-         {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+         {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             selection_available: false,
             actions_available: true,
             items: items,
@@ -62,7 +62,7 @@
                         <tr>
                             <td>
                                 {% if not item.required %}
-                                    {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+                                    {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
                                     {{ rz_link.root({
                                         label: item.name,
                                         attributes: { href: path('groupsEditPage', { id: item.id })  },
@@ -80,7 +80,7 @@
                             {% if actions_available %}
                                 <td>
                                     {% if not item.required %}
-                                        {% embed '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                                        {% embed '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                             'edit_href': is_granted(item) ? path('groupsEditPage', { id: item.id }) : null,
                                             'delete_href': is_granted(item) ? path('groupsDeletePage', { id: item.id }) : null,
                                         } %}
diff --git a/lib/RoadizRozierBundle/templates/groups/navBar.html.twig b/lib/RoadizRozierBundle/templates/groups/navBar.html.twig
index 25834866e..2a4550022 100644
--- a/lib/RoadizRozierBundle/templates/groups/navBar.html.twig
+++ b/lib/RoadizRozierBundle/templates/groups/navBar.html.twig
@@ -23,7 +23,7 @@
     {% block additional_entries %}{% endblock %}
 {% endset %}
 
-{% embed "@RoadizRozier/macros/rz_menu_bar.html.twig" with {listItems : listItems, current: current} %}
+{% embed "@RoadizRozier/patterns/menu_bar.html.twig" with {listItems : listItems, current: current} %}
     {% block additional_entries %}
         {{ custom_entries_content|raw }}
     {% endblock %}
diff --git a/lib/RoadizRozierBundle/templates/groups/removeRole.html.twig b/lib/RoadizRozierBundle/templates/groups/removeRole.html.twig
index caa9d7939..588f54764 100644
--- a/lib/RoadizRozierBundle/templates/groups/removeRole.html.twig
+++ b/lib/RoadizRozierBundle/templates/groups/removeRole.html.twig
@@ -1,6 +1,6 @@
 {% include '@RoadizRozier/admin/confirm_action.html.twig' with {
     'title': "unlink.role.%name%"|trans({'%name%': role}),
-    'headPath': '@RoadizRozier/admin/head.html.twig',
+    'headPath': '@RoadizRozier/layouts/head.html.twig',
     'breadcrumb_parents': [
         breadcrumb_root('groups'),
         {
diff --git a/lib/RoadizRozierBundle/templates/groups/removeUser.html.twig b/lib/RoadizRozierBundle/templates/groups/removeUser.html.twig
index ff50a84ff..b8297b8eb 100644
--- a/lib/RoadizRozierBundle/templates/groups/removeUser.html.twig
+++ b/lib/RoadizRozierBundle/templates/groups/removeUser.html.twig
@@ -1,6 +1,6 @@
 {% include '@RoadizRozier/admin/confirm_action.html.twig' with {
     'title': "unlink.user.%name%"|trans({'%name%': user.userName}),
-    'headPath': '@RoadizRozier/admin/head.html.twig',
+    'headPath': '@RoadizRozier/layouts/head.html.twig',
     'breadcrumb_parents': [
         breadcrumb_root('groups'),
         {
diff --git a/lib/RoadizRozierBundle/templates/groups/roles.html.twig b/lib/RoadizRozierBundle/templates/groups/roles.html.twig
index bdbe15270..52115e010 100644
--- a/lib/RoadizRozierBundle/templates/groups/roles.html.twig
+++ b/lib/RoadizRozierBundle/templates/groups/roles.html.twig
@@ -1,5 +1,5 @@
 {% extends '@RoadizRozier/layout.html.twig' %}
-{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+{% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
 
 {% block title %}{{- "edit.group.%name%.roles"|trans({'%name%': item.getName})|truncate_title }} | {{ parent() }}{% endblock %}
 
@@ -13,7 +13,7 @@
     } only %}
 
     <article>
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             selection_available: false,
             actions_available: true,
         } %}
@@ -27,7 +27,7 @@
                         <td>{{ role }}</td>
                         {% if actions_available %}
                             <td>
-                                {% embed '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                                {% embed '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                     'delete_href': is_granted(role) ? path('groupsRemoveRolesPage', { id: item.id, role: role }) : null,
                                     'delete_title': 'unlink.role'|trans,
                                 } %}
diff --git a/lib/RoadizRozierBundle/templates/groups/users.html.twig b/lib/RoadizRozierBundle/templates/groups/users.html.twig
index 6c8586412..7349807c5 100644
--- a/lib/RoadizRozierBundle/templates/groups/users.html.twig
+++ b/lib/RoadizRozierBundle/templates/groups/users.html.twig
@@ -12,7 +12,7 @@
     } only %}
 
     <article>
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             selection_available: false,
             actions_available: true,
         } %}
@@ -26,7 +26,7 @@
                     <td>{{ user.userName }}</td>
                     {% if actions_available %}
                         <td>
-                            {% embed '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                            {% embed '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                 'delete_href': path('groupsRemoveUsersPage', { id: item.getId, userId: user.getId }),
                                 'delete_title': 'unlink.user'|trans,
                             } %}
@@ -44,7 +44,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form) }}
         {{ form_widget(form) }}
-        {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+        {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
         {{ actions_menu.saveItem('#' ~ field_id(form)) }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/history/list.html.twig b/lib/RoadizRozierBundle/templates/history/list.html.twig
index 1f4d5e71d..4dcd76eb6 100644
--- a/lib/RoadizRozierBundle/templates/history/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/history/list.html.twig
@@ -17,18 +17,18 @@
     {% else %}
         {% set pageTitle = 'history'|trans %}
     {% endif %}
-    {% include '@RoadizRozier/admin/head.html.twig' with {
+    {% include '@RoadizRozier/layouts/head.html.twig' with {
         title: pageTitle,
         filters: filters,
         with_nav_bar: true,
-        nav_bar_template: user ? '@RoadizRozier/users/navBar.html.twig' : '@RoadizRozier/dashboard/navBar.html.twig',
+        nav_bar_template: user ? '@RoadizRozier/users/navBar.html.twig' : '@RoadizRozier/patterns/dashboard_nav.html.twig',
         nav_bar_context: user ? {'user':user, 'current':'history'} : {'current':'history'},
         breadcrumb: {
             current: pageTitle,
         },
     } only %}
 
-    {% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+    {% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
         filters: filters,
         display_select_all_button: false,
     }  only %}
diff --git a/lib/RoadizRozierBundle/templates/history/list_table.html.twig b/lib/RoadizRozierBundle/templates/history/list_table.html.twig
index 338ae6c52..dc5375187 100644
--- a/lib/RoadizRozierBundle/templates/history/list_table.html.twig
+++ b/lib/RoadizRozierBundle/templates/history/list_table.html.twig
@@ -1,4 +1,4 @@
-{% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+{% embed '@RoadizRozier/components/rz_table.html.twig' with {
 	actions_available: true,
 } %}
 	{% block thead_cells %}
@@ -82,13 +82,13 @@
 				</td>
 				<td>
 					{% if log.channel and log.channel != 'roadiz' and log.channel != 'app' %}
-                        {% import "@RoadizRozier/macros/rz_badge.html.twig" as rz_badge %}
+                        {% import "@RoadizRozier/components/rz_badge.html.twig" as rz_badge %}
 						{{ rz_badge.item({
 							label: log.channel|trans,
 						}) }}
 					{% endif %}
 					{% if log.level and log.level >= 300 %}
-                        {% import "@RoadizRozier/macros/rz_badge.html.twig" as rz_badge %}
+                        {% import "@RoadizRozier/components/rz_badge.html.twig" as rz_badge %}
 						{{ rz_badge.item({
 							label: levels[log.level]|trans,
 							color: log.level >= 400 ? 'danger' : log.level >= 300 ? 'warning' : null,
@@ -97,9 +97,9 @@
 					<span>{{ log.message|u.truncate(90, '[…]') -}}</span>
 				</td>
 				<td>
-					{% embed '@RoadizRozier/includes/rz_table_actions.html.twig' %}
+					{% embed '@RoadizRozier/components/rz_table_actions.html.twig' %}
 						{% block other_actions %}
-						{% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+						{% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
 						{% set dialog_id = 'history-dialog-details-' ~ loop.index ~ '-' ~ log.id %}
 						<dialog
 							is="rz-dialog"
diff --git a/lib/RoadizRozierBundle/templates/includes/column_ordering.html.twig b/lib/RoadizRozierBundle/templates/includes/column_ordering.html.twig
index 0745c8785..2c44cad9d 100644
--- a/lib/RoadizRozierBundle/templates/includes/column_ordering.html.twig
+++ b/lib/RoadizRozierBundle/templates/includes/column_ordering.html.twig
@@ -1,4 +1,4 @@
-{% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+{% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
 
 {% if orderingParams is not defined %}
     {% if filters is not defined %}
diff --git a/lib/RoadizRozierBundle/templates/includes/rz_meta_item_table.html.twig b/lib/RoadizRozierBundle/templates/includes/meta_item_table.html.twig
similarity index 94%
rename from lib/RoadizRozierBundle/templates/includes/rz_meta_item_table.html.twig
rename to lib/RoadizRozierBundle/templates/includes/meta_item_table.html.twig
index b2d6a39cd..338b81770 100644
--- a/lib/RoadizRozierBundle/templates/includes/rz_meta_item_table.html.twig
+++ b/lib/RoadizRozierBundle/templates/includes/meta_item_table.html.twig
@@ -1,4 +1,4 @@
-{% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+{% embed '@RoadizRozier/components/rz_table.html.twig' with {
 	bordered: true,
 	margin_top: 'xs',
 	caption: table_caption|default('node_source.meta_table.caption'|trans),
diff --git a/lib/RoadizRozierBundle/templates/includes/rz_breadcrumb_item.html.twig b/lib/RoadizRozierBundle/templates/includes/rz_breadcrumb_item.html.twig
deleted file mode 100644
index b9d219577..000000000
--- a/lib/RoadizRozierBundle/templates/includes/rz_breadcrumb_item.html.twig
+++ /dev/null
@@ -1,21 +0,0 @@
-{#
-    One breadcrumb entry. Shared by the trail and by its overflow popover: the markup is the
-    same in both places so the responsive collapse (utils/OverflowList.ts) can move a <li>
-    between them as is. Folded levels get their menu-entry look from CSS
-    (`.rz-overflow-list__list .rz-breadcrumb__item` in rz-breadcrumb.css).
-
-    Variables:
-    - item (required): a hash {label, url}, or an entity supported by a
-      BreadcrumbsItemFactory (Node, NodesSources, Tag, Folder, Document, Translation).
-    - current (optional): render as the current page, as plain text instead of a link.
-#}
-{% set item = item is iterable ? item : getBreadcrumbsItem(item) %}
-{% if item %}
-    <li class="rz-breadcrumb__list-item">
-        {% if current|default(false) %}
-            <span class="rz-breadcrumb__item" aria-current="page">{{- item.label|truncate_title -}}</span>
-        {% else %}
-            <a class="rz-breadcrumb__item" href="{{ item.url }}">{{- item.label|truncate_title -}}</a>
-        {% endif %}
-    </li>
-{% endif %}
diff --git a/lib/RoadizRozierBundle/templates/includes/rz_color_scheme_switcher.html.twig b/lib/RoadizRozierBundle/templates/includes/rz_color_scheme_switcher.html.twig
deleted file mode 100644
index 6bcca76d8..000000000
--- a/lib/RoadizRozierBundle/templates/includes/rz_color_scheme_switcher.html.twig
+++ /dev/null
@@ -1,55 +0,0 @@
-{% set popover_id = "color-theme-switcher" %}
-{% embed "@RoadizRozier/includes/rz_dropdown.html.twig" with {
-	id: popover_id,
-	target_options: {
-		size: 'sm',
-		icon: 'rz-icon-ri--color-filter-line',
-		attributes: {
-			'aria-label': 'show.color.theme'|trans,
-		},
-	},
-	attributes: {
-		class: class|default(''),
-	}
-} %}
-	{% block popover %}
-		{% embed "@RoadizRozier/macros/rz_dropdown_menu.html.twig" with {
-			targetId: popover_id,
-			wrapper_tag: 'rz-color-scheme-switcher'
-		} %}
-			{% block items %}
-				{{ _self.item({
-					selected: true,
-					label: 'color.system'|trans,
-					rightIcon: 'rz-icon-ri--computer-line',
-					attributes: {
-						type: 'button',
-						'data-value': 'system',
-						command: '--update-color-scheme',
-						commandfor: popover_id,
-					}
-				}) }}
-				{{ _self.item({
-					label: 'color.light'|trans,
-					rightIcon: 'rz-icon-ri--sun-line',
-					attributes: {
-						type: 'button',
-						'data-value': 'light',
-						command: '--update-color-scheme',
-						commandfor: popover_id,
-					}
-				}) }}
-				{{ _self.item({
-					label: 'color.dark'|trans,
-					rightIcon: 'rz-icon-ri--moon-line',
-					attributes: {
-						type: 'button',
-						'data-value': 'dark',
-						command: '--update-color-scheme',
-						commandfor: popover_id,
-					}
-				}) }}
-			{% endblock %}
-		{% endembed %}
-	{% endblock %}
-{% endembed %}
diff --git a/lib/RoadizRozierBundle/templates/includes/rz_dropdown.html.twig b/lib/RoadizRozierBundle/templates/includes/rz_dropdown.html.twig
deleted file mode 100644
index afe48e707..000000000
--- a/lib/RoadizRozierBundle/templates/includes/rz_dropdown.html.twig
+++ /dev/null
@@ -1,24 +0,0 @@
-{% import '@RoadizRozier/macros/element_attributes.html.twig' as el_attrs %}
-{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
-
-{% set popover_id = id|default('rz-dropdown-' ~ random()) %}
-{% set placement = placement|default('bottom-end') %}
-{% set offset = offset|default('12') %}
-{% set shift = shift|default(null) %}
-
-{% set _target_options = target_options|default({}) %}
-{% set target_options_attributes = _target_options.attributes|default({})|merge({
-		'popovertarget': popover_id,
-		type: 'button',
-	}) %}
-{% set button_options = _target_options|merge({ attributes: target_options_attributes })%}
-
-<rz-popover
-	{% if shift is not null %}popover-shift="{{ shift }}"{% endif %}
-	popover-placement="{{ placement }}"
-	popover-offset="{{ offset }}"
-	{{ el_attrs.print(attributes|default({})) }}
->
-	{{ rz_button.root(button_options) }}
-	{% block popover %}{% endblock %}
-</rz-popover>
diff --git a/lib/RoadizRozierBundle/templates/includes/translateAssistantUsage.html.twig b/lib/RoadizRozierBundle/templates/includes/translate_assistant_usage.html.twig
similarity index 96%
rename from lib/RoadizRozierBundle/templates/includes/translateAssistantUsage.html.twig
rename to lib/RoadizRozierBundle/templates/includes/translate_assistant_usage.html.twig
index 7f86ee19f..d9d6cd562 100644
--- a/lib/RoadizRozierBundle/templates/includes/translateAssistantUsage.html.twig
+++ b/lib/RoadizRozierBundle/templates/includes/translate_assistant_usage.html.twig
@@ -10,7 +10,7 @@
 {% if translateAssistantEnabled %}
     {% set assistantUsage = translateAssistantUsage() %}
     {% if assistantUsage %}
-        {% import '@RoadizRozier/macros/rz_progress.html.twig' as rz_progress %}
+        {% import '@RoadizRozier/components/rz_progress.html.twig' as rz_progress %}
 
         {# An empty estimate consumes nothing: it has no projection to draw. #}
         {% set assistantEstimate = estimate|default(null) %}
diff --git a/lib/RoadizRozierBundle/templates/layout.html.twig b/lib/RoadizRozierBundle/templates/layout.html.twig
index c69d02611..f8510fd5a 100644
--- a/lib/RoadizRozierBundle/templates/layout.html.twig
+++ b/lib/RoadizRozierBundle/templates/layout.html.twig
@@ -1 +1 @@
-{% extends '@RoadizRozier/base.html.twig' %}
+{% extends '@RoadizRozier/layouts/base.html.twig' %}
diff --git a/lib/RoadizRozierBundle/templates/admin/base.html.twig b/lib/RoadizRozierBundle/templates/layouts/admin.html.twig
similarity index 100%
rename from lib/RoadizRozierBundle/templates/admin/base.html.twig
rename to lib/RoadizRozierBundle/templates/layouts/admin.html.twig
diff --git a/lib/RoadizRozierBundle/templates/base.html.twig b/lib/RoadizRozierBundle/templates/layouts/base.html.twig
similarity index 97%
rename from lib/RoadizRozierBundle/templates/base.html.twig
rename to lib/RoadizRozierBundle/templates/layouts/base.html.twig
index 0f1376d3a..675ead3b5 100644
--- a/lib/RoadizRozierBundle/templates/base.html.twig
+++ b/lib/RoadizRozierBundle/templates/layouts/base.html.twig
@@ -19,7 +19,7 @@
                 }
             })()
         </script>
-        {% include '@RoadizRozier/admin/meta-icon.html.twig' %}
+        {% include '@RoadizRozier/layouts/meta_icon.html.twig' %}
         {# CSS scripts inclusions / Using webpack #}
         {{ manifest_preload_tags('shared') }}
         {{ manifest_preload_tags('main') }}
@@ -47,13 +47,13 @@
     <body>
         <div class="rz-app" id="app">
             <header is="rz-header" class="rz-header">
-                {% include '@RoadizRozier/admin/rz_header.html.twig' with {
+                {% include '@RoadizRozier/patterns/header.html.twig' with {
                     'backofficeEntries':backofficeEntries,
                 } only %}
             </header>
 
             {% if is_granted('ROLE_ACCESS_NODES') or is_granted('ROLE_ACCESS_DOCUMENTS') or is_granted('ROLE_ACCESS_TAGS') %}
-                {% include '@RoadizRozier/widgets/rz_aside.html.twig' %}
+                {% include '@RoadizRozier/patterns/aside.html.twig' %}
             {% endif %}
             <!-- Add your site or application content here -->
             <main is="rz-page" id="rz-page" class="rz-page" data-uk-observe>
@@ -66,7 +66,7 @@
                 </div>
                 <div id="canvasloader-container"></div>
 
-                {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+                {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
                 {{ rz_button.root({
                     class: 'rz-back-to-top-button',
                     icon: 'rz-icon-ri--arrow-up-line',
@@ -88,7 +88,7 @@
         </div>
         <div id="codemirror-preview-containers"></div>
         {# Blocking dialogs opened by LoginCheckService. The login link skips ajax navigation: the login page is a full page. #}
-        {% import '@RoadizRozier/macros/rz_dialog.html.twig' as rz_dialog %}
+        {% import '@RoadizRozier/components/rz_dialog.html.twig' as rz_dialog %}
         {{ rz_dialog.root({
             dialogId: 'rz-session-expired-dialog',
             variant: 'warning',
diff --git a/lib/RoadizRozierBundle/templates/admin/head.html.twig b/lib/RoadizRozierBundle/templates/layouts/head.html.twig
similarity index 94%
rename from lib/RoadizRozierBundle/templates/admin/head.html.twig
rename to lib/RoadizRozierBundle/templates/layouts/head.html.twig
index d3a75853c..a1b849e71 100644
--- a/lib/RoadizRozierBundle/templates/admin/head.html.twig
+++ b/lib/RoadizRozierBundle/templates/layouts/head.html.twig
@@ -15,7 +15,7 @@
     - translation_add_route (optional): Route name for adding translations
     - translation_add_title (optional): Title for adding translations link
 #}
-{% embed "@RoadizRozier/macros/rz_page_header.html.twig" %}
+{% embed "@RoadizRozier/components/rz_page_header.html.twig" %}
     {% block translation %}
         {% if available_translations is defined and available_translations and translation is defined and translation.id and translation_route is defined %}
             <div class="rz-page-header__item--right">
@@ -40,7 +40,7 @@
 
     {% block badges %}
         {% if filters is defined and filters.itemCount %}
-            {% import "@RoadizRozier/macros/rz_badge.html.twig" as rz_badge %}
+            {% import "@RoadizRozier/components/rz_badge.html.twig" as rz_badge %}
             <div class="rz-page-header__item">
                 {{ rz_badge.item({
                     label: '%count%.items'|transchoice(filters.itemCount)|raw,
diff --git a/lib/RoadizRozierBundle/templates/login/base.html.twig b/lib/RoadizRozierBundle/templates/layouts/login.html.twig
similarity index 96%
rename from lib/RoadizRozierBundle/templates/login/base.html.twig
rename to lib/RoadizRozierBundle/templates/layouts/login.html.twig
index d0755e107..54df78fcd 100644
--- a/lib/RoadizRozierBundle/templates/login/base.html.twig
+++ b/lib/RoadizRozierBundle/templates/layouts/login.html.twig
@@ -1,4 +1,4 @@
-{% extends '@RoadizRozier/simple.html.twig' %}
+{% extends '@RoadizRozier/layouts/simple.html.twig' %}
 
 {% block content %}
     <div class="rz-login">
diff --git a/lib/RoadizRozierBundle/templates/admin/meta-icon.html.twig b/lib/RoadizRozierBundle/templates/layouts/meta_icon.html.twig
similarity index 100%
rename from lib/RoadizRozierBundle/templates/admin/meta-icon.html.twig
rename to lib/RoadizRozierBundle/templates/layouts/meta_icon.html.twig
diff --git a/lib/RoadizRozierBundle/templates/simple.html.twig b/lib/RoadizRozierBundle/templates/layouts/simple.html.twig
similarity index 97%
rename from lib/RoadizRozierBundle/templates/simple.html.twig
rename to lib/RoadizRozierBundle/templates/layouts/simple.html.twig
index 364502267..8b873088d 100644
--- a/lib/RoadizRozierBundle/templates/simple.html.twig
+++ b/lib/RoadizRozierBundle/templates/layouts/simple.html.twig
@@ -7,7 +7,7 @@
     <title>{% block title %}{% trans %}back_office{% endtrans %}: {{ meta.backofficeName }}{% endblock %}</title>
     <meta name="description" content="{% block description %}{% trans %}back_office{% endtrans %}{% endblock %}">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-    {% include '@RoadizRozier/admin/meta-icon.html.twig' %}
+    {% include '@RoadizRozier/layouts/meta_icon.html.twig' %}
     {# CSS scripts inclusions / Using webpack #}
     {{ manifest_preload_tags('shared') }}
     {{ manifest_preload_tags('simple') }}
diff --git a/lib/RoadizRozierBundle/templates/login/check.html.twig b/lib/RoadizRozierBundle/templates/login/check.html.twig
deleted file mode 100644
index 1ad6837af..000000000
--- a/lib/RoadizRozierBundle/templates/login/check.html.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends '@RoadizRozier/login/base.html.twig' %}
-
-{% block login_content %}
-    <p class="text-body-md rz-login__group">{% trans %}wait_for.authentification{% endtrans %}</p>
-{% endblock %}
diff --git a/lib/RoadizRozierBundle/templates/login/request.html.twig b/lib/RoadizRozierBundle/templates/login/request.html.twig
index efb2bc79d..a68da4bdb 100644
--- a/lib/RoadizRozierBundle/templates/login/request.html.twig
+++ b/lib/RoadizRozierBundle/templates/login/request.html.twig
@@ -1,4 +1,4 @@
-{% extends '@RoadizRozier/login/base.html.twig' %}
+{% extends '@RoadizRozier/layouts/login.html.twig' %}
 
 {% block login_content %}
     {% if not error and form.vars.valid %}
diff --git a/lib/RoadizRozierBundle/templates/login/requestConfirm.html.twig b/lib/RoadizRozierBundle/templates/login/requestConfirm.html.twig
index 1fb990e3c..7f263c7cc 100644
--- a/lib/RoadizRozierBundle/templates/login/requestConfirm.html.twig
+++ b/lib/RoadizRozierBundle/templates/login/requestConfirm.html.twig
@@ -1,4 +1,4 @@
-{% extends '@RoadizRozier/login/base.html.twig' %}
+{% extends '@RoadizRozier/layouts/login.html.twig' %}
 
 {% block login_content %}
     <p class="text-body-md rz-login__group">{% trans %}a.personal.password.reset.link.has.been.sent.to.your.account.email{% endtrans %}</p>
diff --git a/lib/RoadizRozierBundle/templates/login/reset.html.twig b/lib/RoadizRozierBundle/templates/login/reset.html.twig
index cc24da501..961490a1f 100644
--- a/lib/RoadizRozierBundle/templates/login/reset.html.twig
+++ b/lib/RoadizRozierBundle/templates/login/reset.html.twig
@@ -1,4 +1,4 @@
-{% extends '@RoadizRozier/login/base.html.twig' %}
+{% extends '@RoadizRozier/layouts/login.html.twig' %}
 
 {% block login_content %}
     {% if error %}
diff --git a/lib/RoadizRozierBundle/templates/login/resetConfirm.html.twig b/lib/RoadizRozierBundle/templates/login/resetConfirm.html.twig
index c90799ecd..1400383c2 100644
--- a/lib/RoadizRozierBundle/templates/login/resetConfirm.html.twig
+++ b/lib/RoadizRozierBundle/templates/login/resetConfirm.html.twig
@@ -1,4 +1,4 @@
-{% extends '@RoadizRozier/login/base.html.twig' %}
+{% extends '@RoadizRozier/layouts/login.html.twig' %}
 
 {% block login_content %}
     <p class="text-body-md rz-login__group">{% trans %}your.new.password.has.been.saved{% endtrans %}</p>
diff --git a/lib/RoadizRozierBundle/templates/macros/rz_repeatable.html.twig b/lib/RoadizRozierBundle/templates/macros/rz_repeatable.html.twig
deleted file mode 100644
index 733ddbdc9..000000000
--- a/lib/RoadizRozierBundle/templates/macros/rz_repeatable.html.twig
+++ /dev/null
@@ -1,51 +0,0 @@
-{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
-<li class="rz-repeatable__item">
-    <div class="rz-repeatable__item__header">
-        {% set _icon = icon|default('rz-icon-ri--list-unordered') %}
-        <span class="{{ _icon }}"></span>
-        {% if label is defined and label is not empty %}
-            <span class="rz-repeatable__item__title">{{ label|trans }}</span>
-        {% endif %}
-        <div class="rz-button-group rz-button-group--collapsed rz-repeatable__item--align-end">
-            {{ rz_button.root({
-                icon: 'rz-icon-ri--arrow-up-line',
-                size: 'sm',
-                attributes: {
-                    type: 'button',
-                    'command': '--move-up',
-                    'commandfor': repeatable_id,
-                    'tooltip-text': 'move.up'|trans,
-                    'aria-label': 'collection.move_up_item'|trans,
-                },
-            }) }}
-            {{ rz_button.root({
-                icon: 'rz-icon-ri--arrow-down-line',
-                size: 'sm',
-                attributes: {
-                    type: 'button',
-                    'command': '--move-down',
-                    'commandfor': repeatable_id,
-                    'tooltip-text': 'move.down'|trans,
-                    'aria-label': 'collection.move_down_item'|trans,
-                },
-            }) }}
-        </div>
-        {{ rz_button.root({
-            icon: 'rz-icon-ri--delete-bin-7-line',
-            size: 'sm',
-            color: 'danger',
-            emphasis: 'primary',
-            attributes: {
-                type: 'button',
-                'command': '--remove',
-                'commandfor': repeatable_id,
-                'tooltip-text': 'remove.item'|trans,
-                'aria-label': 'collection.delete_item'|trans,
-            },
-        }) }}
-    </div>
-    <div data-form class="rz-repeatable__item__body">
-        {% block inner_body %}
-        {% endblock %}
-    </div>
-</li>
diff --git a/lib/RoadizRozierBundle/templates/node-type-fields/list.html.twig b/lib/RoadizRozierBundle/templates/node-type-fields/list.html.twig
index 3bde8b6d6..a97324aed 100644
--- a/lib/RoadizRozierBundle/templates/node-type-fields/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/node-type-fields/list.html.twig
@@ -10,7 +10,7 @@
         } only %}
 
         <article>
-            {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+            {% embed '@RoadizRozier/components/rz_table.html.twig' with {
                 selection_available: false,
                 actions_available: true,
                 fields: fields,
@@ -32,7 +32,7 @@
                             <td class="mobile-hidden">{{ field.typeName|trans }}</td>
                             <td class="mobile-hidden">{{ field.groupName|trans }}</td>
                             <td class="mobile-hidden">
-                                {% import '@RoadizRozier/macros/rz_node_badge.html.twig' as rz_node_badge %}
+                                {% import '@RoadizRozier/components/rz_node_badge.html.twig' as rz_node_badge %}
                                 {% if not field.visible %}
                                     {{ rz_node_badge.item('hidden', false) }}
                                 {% endif %}
@@ -48,7 +48,7 @@
                             </td>
                             {% if actions_available %}
                                 <td>
-                                    {% embed '@RoadizRozier/includes/rz_table_actions.html.twig' %}
+                                    {% embed '@RoadizRozier/components/rz_table_actions.html.twig' %}
                                         {% block other_actions %}
                                             {{ _self.button({
                                                 icon: 'rz-icon-ri--edit-line',
diff --git a/lib/RoadizRozierBundle/templates/node-types-decorators/actionsMenu.html.twig b/lib/RoadizRozierBundle/templates/node-types-decorators/actionsMenu.html.twig
index 600a88289..6ceef3ed1 100644
--- a/lib/RoadizRozierBundle/templates/node-types-decorators/actionsMenu.html.twig
+++ b/lib/RoadizRozierBundle/templates/node-types-decorators/actionsMenu.html.twig
@@ -1,4 +1,4 @@
-{% embed "@RoadizRozier/macros/rz_actions_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_actions_menu.html.twig" with {
     vertical: true,
     class: 'actions-menu',
     item: item
diff --git a/lib/RoadizRozierBundle/templates/node-types-decorators/add.html.twig b/lib/RoadizRozierBundle/templates/node-types-decorators/add.html.twig
index fcb009aca..0a3f2e472 100644
--- a/lib/RoadizRozierBundle/templates/node-types-decorators/add.html.twig
+++ b/lib/RoadizRozierBundle/templates/node-types-decorators/add.html.twig
@@ -29,7 +29,7 @@
                 }})
             }}
                 {{ form_widget(form) }}
-                {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+                {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
                 {{ actions_menu.saveItem('#edit-nodetypedecorator-form') }}
             {{ form_end(form) }}
         </article>
diff --git a/lib/RoadizRozierBundle/templates/node-types-decorators/delete.html.twig b/lib/RoadizRozierBundle/templates/node-types-decorators/delete.html.twig
index 84d278e1e..03622bbdc 100644
--- a/lib/RoadizRozierBundle/templates/node-types-decorators/delete.html.twig
+++ b/lib/RoadizRozierBundle/templates/node-types-decorators/delete.html.twig
@@ -1,6 +1,6 @@
 {% include '@RoadizRozier/admin/confirm_action.html.twig' with {
     'title': "delete.nodeTypeDecorator.%name%"|trans({'%name%': item.displayName}),
-    'headPath': '@RoadizRozier/admin/head.html.twig',
+    'headPath': '@RoadizRozier/layouts/head.html.twig',
     'breadcrumb_parents': [
         breadcrumb_root('nodeTypes'),
         {
diff --git a/lib/RoadizRozierBundle/templates/node-types-decorators/list.html.twig b/lib/RoadizRozierBundle/templates/node-types-decorators/list.html.twig
index 10ee14f7a..299f1da57 100644
--- a/lib/RoadizRozierBundle/templates/node-types-decorators/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/node-types-decorators/list.html.twig
@@ -15,14 +15,14 @@
             item: {displayName: 'nodeTypeDecorator'|trans},
         } only %}
 
-        {% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+        {% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
             filters: filters,
             display_select_all_button: false,
         }  only %}
         {% include '@RoadizRozier/admin/bulk_actions.html.twig' %}
 
         <article>
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
                 selection_available: hasBulkActions,
                 actions_available: true,
             } %}
@@ -55,8 +55,8 @@
                 {% endblock %}
 
                 {% block tbody_content %}
-                {% import '@RoadizRozier/macros/rz_bulk.html.twig' as rz_bulk %}
-                {% import "@RoadizRozier/macros/rz_badge.html.twig" as rz_badge %}
+                {% import '@RoadizRozier/components/rz_bulk_actions.html.twig' as rz_bulk_actions %}
+                {% import "@RoadizRozier/components/rz_badge.html.twig" as rz_badge %}
 
                 {%- for item in items -%}
                     {% set path = item.path|split('.') %}
@@ -70,11 +70,11 @@
                     <tr {{ _self.colored_row_attrs({'color': color }) }}>
                         {% if selection_available %}
                             <td>
-                                {{ rz_bulk.select_input({ value: item.id }) }}
+                                {{ rz_bulk_actions.select_input({ value: item.id }) }}
                             </td>
                         {% endif %}
                         <td>
-                            {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+                            {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
                             {{ rz_link.root({
                                 label: entity,
                                 attributes: { href: path('nodeTypeDecoratorsEditPage', { id: item.getId }) },
@@ -108,7 +108,7 @@
                         </td>
                         {% if actions_available %}
                             <td>
-                                {% include '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                                {% include '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                     'edit_href': path('nodeTypeDecoratorsEditPage', { id: item.getId }),
                                     'delete_href': path('nodeTypeDecoratorsDeletePage', { id: item.getId }),
                                 } %}
diff --git a/lib/RoadizRozierBundle/templates/node-types/head.html.twig b/lib/RoadizRozierBundle/templates/node-types/head.html.twig
index 3935f82b3..e032f1974 100644
--- a/lib/RoadizRozierBundle/templates/node-types/head.html.twig
+++ b/lib/RoadizRozierBundle/templates/node-types/head.html.twig
@@ -9,7 +9,7 @@
     } %}
 {% endif %}
 
-{% embed "@RoadizRozier/macros/rz_page_header.html.twig" %}
+{% embed "@RoadizRozier/components/rz_page_header.html.twig" %}
     {% block buttons %}
         {% if buttons is defined and buttons %}
             {{ _self.button_group(buttons) }}
@@ -26,7 +26,7 @@
                     <span class="rz-button__icon {{ popover.icon }}"></span>
                 </button>
 
-                {% embed "@RoadizRozier/macros/rz_dropdown_menu.html.twig" with {
+                {% embed "@RoadizRozier/components/rz_dropdown.html.twig" with {
                     targetId: 'nodeType-menu',
                     tagList: 'ul',
                     items: popover.items,
@@ -50,7 +50,7 @@
 
     {% block badges %}
         {% if filters is defined and filters.itemCount %}
-            {% import "@RoadizRozier/macros/rz_badge.html.twig" as rz_badge %}
+            {% import "@RoadizRozier/components/rz_badge.html.twig" as rz_badge %}
             <div class="rz-page-header__item">
                 {{ rz_badge.item({
                     label: '%count%.items'|transchoice(filters.itemCount)|raw,
diff --git a/lib/RoadizRozierBundle/templates/node-types/list.html.twig b/lib/RoadizRozierBundle/templates/node-types/list.html.twig
index d1c499b49..ebd04d8fa 100644
--- a/lib/RoadizRozierBundle/templates/node-types/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/node-types/list.html.twig
@@ -35,7 +35,7 @@
         } only %}
 
         <article>
-             {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+             {% embed '@RoadizRozier/components/rz_table.html.twig' with {
                 selection_available: false,
                 actions_available: true,
             } %}
@@ -69,7 +69,7 @@
                              {{ _self.colored_row_attrs({'color': type.color }) }}
                         >
                             <td>
-                                {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+                                {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
                                 {{ rz_link.root({
                                     label: type.getName,
                                     attributes: { href: path('nodeTypeFieldsListPage', { nodeTypeName: type.getName }) },
@@ -81,7 +81,7 @@
                                 {% transchoice type.getFields|length %}{0} no.nodeTypeField|{1} 1.nodeTypeField|]1,Inf] %count%.nodeTypeFields{% endtranschoice %}
                             </td>
                             <td class="mobile-hidden uk-hidden-small uk-visible-large">
-                                {% import '@RoadizRozier/macros/rz_node_badge.html.twig' as rz_node_badge %}
+                                {% import '@RoadizRozier/components/rz_node_badge.html.twig' as rz_node_badge %}
                                 {% if not type.visible %}
                                     {{ rz_node_badge.item('hidden', false) }}
                                 {% endif %}
@@ -94,7 +94,7 @@
                             </td>
                             {% if actions_available %}
                                 <td>
-                                    {% embed '@RoadizRozier/includes/rz_table_actions.html.twig' %}
+                                    {% embed '@RoadizRozier/components/rz_table_actions.html.twig' %}
                                         {% block other_actions %}
                                             {{ _self.button({
                                                 icon: 'uk-icon-rz-node-type-field',
diff --git a/lib/RoadizRozierBundle/templates/nodes/actionsMenu.html.twig b/lib/RoadizRozierBundle/templates/nodes/actionsMenu.html.twig
index 51c0dec99..4f1cfe6b6 100644
--- a/lib/RoadizRozierBundle/templates/nodes/actionsMenu.html.twig
+++ b/lib/RoadizRozierBundle/templates/nodes/actionsMenu.html.twig
@@ -1,4 +1,4 @@
-{% embed "@RoadizRozier/macros/rz_actions_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_actions_menu.html.twig" with {
     vertical: true,
     class: 'actions-menu',
     node: node,
@@ -67,7 +67,7 @@
             {% endif %}
         {% endif %}
 
-        {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+        {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
         {% set canPublish = workflow_can(node, 'publish') %}
         {% if not node.isDeleted %}
             <rz-popover
@@ -84,7 +84,7 @@
                             'popover-placement': 'left',
                         }
                     }) }}
-                {% embed "@RoadizRozier/macros/rz_dropdown_menu.html.twig" with {
+                {% embed "@RoadizRozier/components/rz_dropdown.html.twig" with {
                     title: 'actions',
                     reverse: true,
                     targetId: 'action-menu'
@@ -241,7 +241,7 @@
                         'popover-placement': 'left',
                     }
                 }) }}
-                {% embed "@RoadizRozier/macros/rz_dropdown_menu.html.twig" with {
+                {% embed "@RoadizRozier/components/rz_dropdown.html.twig" with {
                     title: 'versions',
                     reverse: true,
                     targetId: 'version-menu'
diff --git a/lib/RoadizRozierBundle/templates/nodes/add.html.twig b/lib/RoadizRozierBundle/templates/nodes/add.html.twig
index 93448a6bb..fffa03b57 100644
--- a/lib/RoadizRozierBundle/templates/nodes/add.html.twig
+++ b/lib/RoadizRozierBundle/templates/nodes/add.html.twig
@@ -25,7 +25,7 @@
             }
         }) }}
         {{ form_widget(form) }}
-        {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+        {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
         {{ actions_menu.saveItem('#add-node-form') }}
         {{ form_end(form) }}
     </section>
diff --git a/lib/RoadizRozierBundle/templates/nodes/attributes/edit.html.twig b/lib/RoadizRozierBundle/templates/nodes/attributes/edit.html.twig
index f1bd2c5ae..83b4c693d 100644
--- a/lib/RoadizRozierBundle/templates/nodes/attributes/edit.html.twig
+++ b/lib/RoadizRozierBundle/templates/nodes/attributes/edit.html.twig
@@ -20,14 +20,14 @@
     } only %}
 
     <section class="rz-page__body">
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             sortable: {
                 enabled: not order_by_weight,
                 url: path('attributeValuePositionAjax'),
             },
             actions_available: true,
         } %}
-            {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+            {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
 
             {% block thead_cells %}
                 <th>{{'name'|trans}}</th>
@@ -77,7 +77,7 @@
                         </td>
                         <td>
                             {% set display_delete_button = translation and (translation.defaultTranslation or attributeValue.attributeValueTranslations.count == 1) %}
-                            {% embed '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                            {% embed '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                 delete_title: 'attributes.delete_value'|trans,
                                 delete_href: display_delete_button ? path('nodesDeleteAttributesPage', { nodeId : node.id, translationId : translation.id, attributeValueId : attributeValue.id }) : null,
                                 save_href: '#',
@@ -149,7 +149,7 @@
     </section>
 
     <hr />
-    {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+    {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
     {{ rz_button.root({
         icon: 'rz-icon-ri--add-large-line',
         label: 'add.a.attribute'|trans,
diff --git a/lib/RoadizRozierBundle/templates/nodes/bulkActions.html.twig b/lib/RoadizRozierBundle/templates/nodes/bulkActions.html.twig
index 1eeea95b8..45ede29a9 100644
--- a/lib/RoadizRozierBundle/templates/nodes/bulkActions.html.twig
+++ b/lib/RoadizRozierBundle/templates/nodes/bulkActions.html.twig
@@ -1,5 +1,5 @@
-{% embed "@RoadizRozier/widgets/rz_bulk_actions.html.twig" %}
-    {% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+{% embed "@RoadizRozier/components/rz_bulk_actions.html.twig" %}
+    {% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
 
     {% set tags_panel_id = "nodes-bulk-folder-form-cont" %}
     {% set status_panel_id = "nodes-bulk-status-form-cont" %}
diff --git a/lib/RoadizRozierBundle/templates/nodes/edit.html.twig b/lib/RoadizRozierBundle/templates/nodes/edit.html.twig
index 5d7e34cd7..4d09442a3 100644
--- a/lib/RoadizRozierBundle/templates/nodes/edit.html.twig
+++ b/lib/RoadizRozierBundle/templates/nodes/edit.html.twig
@@ -46,7 +46,7 @@
             {% endif %}
             {{ form_rest(form) }}
         </div>
-        {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+        {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
         {{ actions_menu.saveItem('#edit-node-form') }}
         {{ form_end(form) }}
     </section>
@@ -55,7 +55,7 @@
         <hr />
         <section class="rz-page__body">
             <h2 class="text-h1-sm">{% trans %}stack.types{% endtrans %}</h2>
-            {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+            {% embed '@RoadizRozier/components/rz_table.html.twig' with {
                 selection_available: false,
                 actions_available: true,
                 node: node,
@@ -72,7 +72,7 @@
                                 <td>{{ nodeType.displayName }}</td>
                                 {% if actions_available %}
                                     <td>
-                                        {% embed '@RoadizRozier/includes/rz_table_actions.html.twig' %}
+                                        {% embed '@RoadizRozier/components/rz_table_actions.html.twig' %}
                                             {% block other_actions %}
                                                 <form
                                                     action="{{ path('nodesRemoveStackTypePage', {nodeId:node.id, typeName:nodeType.name}) }}"
@@ -112,7 +112,7 @@
                             {{ form_end(stackTypesForm) }}
                         </td>
                         <td class="rz-table__cell--align-right">
-                            {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+                            {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
                             {{ rz_button.root({
                                 icon: 'rz-icon-ri--add-line',
                                 emphasis: 'primary',
@@ -136,7 +136,7 @@
             {% form_theme translationForm '@RoadizRozier/forms.html.twig' %}
             {{ form_start(translationForm) }}
                 {{ form_widget(translationForm) }}
-                {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+                {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
                 {{ rz_button.root({
                     icon: 'rz-icon-ri--flag-line',
                     emphasis: 'primary',
@@ -149,7 +149,7 @@
         </section>
     {% endif %}
 
-    {% include '@RoadizRozier/includes/rz_meta_item_table.html.twig' with {
+    {% include '@RoadizRozier/includes/meta_item_table.html.twig' with {
         item: node,
         additional_rows: [[{ tag: 'th', content: 'position'|trans }, { tag: 'td', content: node.position }]],
     } only %}
diff --git a/lib/RoadizRozierBundle/templates/nodes/editAliases.html.twig b/lib/RoadizRozierBundle/templates/nodes/editAliases.html.twig
index b96e81cd3..26e42f176 100644
--- a/lib/RoadizRozierBundle/templates/nodes/editAliases.html.twig
+++ b/lib/RoadizRozierBundle/templates/nodes/editAliases.html.twig
@@ -27,7 +27,7 @@
             {% form_theme seoForm '@RoadizRozier/forms.html.twig' %}
             {{ form_start(seoForm, { action: '#' }) }}
                 {{ form_widget(seoForm, {'attr': { 'class': 'rz-form__field-list' }}) }}
-                {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+                {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
                 {{ actions_menu.saveItem('#' ~ field_id(seoForm)) }}
             {{ form_end(seoForm) }}
             <hr />
@@ -36,7 +36,7 @@
         <h2 id="manage-aliases" class="text-h1-sm">{% trans %}urlAlias{% endtrans %}</h2>
         <p class="text-body-md">{% trans %}nodeSource.urlAlias.help{% endtrans %}</p>
 
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             selection_available: false,
             actions_available: true,
         } %}
@@ -74,7 +74,7 @@
                                 {{ form_row(form._token, { attr: { form: field_id(form) }}) }}
                             </td>
                             <td class="rz-table__cell--align-right">
-                                {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+                                {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
                                 {{ rz_button.root({
                                     icon: 'rz-icon-ri--add-large-line',
                                     emphasis: 'primary',
@@ -95,7 +95,7 @@
         <h2 id="manage-redirections" class="text-h1-sm">{% trans %}manage.redirections{% endtrans %}</h2>
         <p class="text-body-md">{% trans %}nodeSource.redirections.help{% endtrans %}</p>
 
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             actions_available: true,
             filters: filters,
             redirections: redirections,
@@ -132,7 +132,7 @@
                          <td></td>
                          <td></td>
                         <td class="rz-table__cell--align-right">
-                            {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+                            {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
                             {{ rz_button.root({
                                 icon: 'rz-icon-ri--add-large-line',
                                 emphasis: 'primary',
diff --git a/lib/RoadizRozierBundle/templates/nodes/editSource.html.twig b/lib/RoadizRozierBundle/templates/nodes/editSource.html.twig
index ca970c0de..bc111a684 100644
--- a/lib/RoadizRozierBundle/templates/nodes/editSource.html.twig
+++ b/lib/RoadizRozierBundle/templates/nodes/editSource.html.twig
@@ -1,8 +1,8 @@
 {% set currentTitle = source.title|default(node.nodeName) %}
 
 {% extends '@RoadizRozier/layout.html.twig' %}
-{% import "@RoadizRozier/macros/rz_badge.html.twig" as rz_badge %}
-{% import "@RoadizRozier/macros/rz_page_header.html.twig" as page_header %}
+{% import "@RoadizRozier/components/rz_badge.html.twig" as rz_badge %}
+{% import "@RoadizRozier/components/rz_page_header.html.twig" as page_header %}
 
 {% block content %}
     {# default(), not ??: the globals are '' (not null) when the env vars are empty #}
@@ -105,7 +105,7 @@
                 {% endif %}
             {% endfor %}
         {% if not readOnly %}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#edit-node-source-form') }}
         {% endif %}
         {{ form_end(form) }}
diff --git a/lib/RoadizRozierBundle/templates/nodes/editTags.html.twig b/lib/RoadizRozierBundle/templates/nodes/editTags.html.twig
index b760c4b58..b38163cc5 100644
--- a/lib/RoadizRozierBundle/templates/nodes/editTags.html.twig
+++ b/lib/RoadizRozierBundle/templates/nodes/editTags.html.twig
@@ -21,7 +21,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: {id: 'edit-node-tags-form'}}) }}
         {{ form_widget(form) }}
-        {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+        {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
         {{ actions_menu.saveItem('#edit-node-tags-form') }}
         {{ form_end(form) }}
     </section>
diff --git a/lib/RoadizRozierBundle/templates/nodes/filtersBar.html.twig b/lib/RoadizRozierBundle/templates/nodes/filtersBar.html.twig
index aaf0fca02..fa743eb03 100644
--- a/lib/RoadizRozierBundle/templates/nodes/filtersBar.html.twig
+++ b/lib/RoadizRozierBundle/templates/nodes/filtersBar.html.twig
@@ -1,5 +1,5 @@
 
-{% embed "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+{% embed "@RoadizRozier/components/rz_filters_bar.html.twig" with {
     display_select_all_button: true,
     filters: filters,
     tags: tags,
diff --git a/lib/RoadizRozierBundle/templates/nodes/head.html.twig b/lib/RoadizRozierBundle/templates/nodes/head.html.twig
index 8cdc09cb5..7fe3a2406 100644
--- a/lib/RoadizRozierBundle/templates/nodes/head.html.twig
+++ b/lib/RoadizRozierBundle/templates/nodes/head.html.twig
@@ -25,10 +25,10 @@
     {% endif %}
 {% endif %}
 
-{% embed "@RoadizRozier/macros/rz_page_header.html.twig" with {
+{% embed "@RoadizRozier/components/rz_page_header.html.twig" with {
     breadcrumb: breadcrumb
 } %}
-    {% import "@RoadizRozier/macros/rz_badge.html.twig" as rz_badge %}
+    {% import "@RoadizRozier/components/rz_badge.html.twig" as rz_badge %}
     {% block translation %}
         {% if available_translations is defined and available_translations and translation is defined and translation.id %}
             {% if not route %}
@@ -86,7 +86,7 @@
                             <span class="rz-button__icon rz-icon-ri--download-cloud-2-line"></span>
                         </button>
 
-                        {% embed "@RoadizRozier/macros/rz_dropdown_menu.html.twig" with {
+                        {% embed "@RoadizRozier/components/rz_dropdown.html.twig" with {
                             targetId: 'nodeExport-menu',
                             tagList: 'ul',
                             items: availableTranslations,
@@ -133,7 +133,7 @@
             </div>
         {% endif %}
         {% if with_status_badge is defined and with_status_badge %}
-            {% import "@RoadizRozier/macros/rz_node_badge.html.twig" as rz_node_badge %}
+            {% import "@RoadizRozier/components/rz_node_badge.html.twig" as rz_node_badge %}
             <div class="rz-page-header__item">
                 {{ rz_node_badge.status(node) }}
                 {{ rz_node_badge.parameters(node, { display_label:  false }) }}
diff --git a/lib/RoadizRozierBundle/templates/nodes/history.html.twig b/lib/RoadizRozierBundle/templates/nodes/history.html.twig
index 8c706af72..bd1a5afb7 100644
--- a/lib/RoadizRozierBundle/templates/nodes/history.html.twig
+++ b/lib/RoadizRozierBundle/templates/nodes/history.html.twig
@@ -13,7 +13,7 @@
         with_nav_bar: true,
     } only %}
 
-    {% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+    {% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
         filters: filters,
         display_select_all_button: false,
     }  only %}
diff --git a/lib/RoadizRozierBundle/templates/nodes/list_table.html.twig b/lib/RoadizRozierBundle/templates/nodes/list_table.html.twig
index 4e6bcd109..07b941326 100644
--- a/lib/RoadizRozierBundle/templates/nodes/list_table.html.twig
+++ b/lib/RoadizRozierBundle/templates/nodes/list_table.html.twig
@@ -1,4 +1,4 @@
-{% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+{% embed '@RoadizRozier/components/rz_table.html.twig' with {
     nodes: nodes,
     selection_available: selection_available,
     actions_available: actions_available,
@@ -31,7 +31,7 @@
     {% endblock %}
 
     {% block tbody_content %}
-        {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+        {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
 
         {% for node in nodes %}
             <tr
@@ -57,14 +57,14 @@
                 <td class="mobile-hidden">{{ getNodeType(node).displayName }}</td>
                 <td class="rz-table__cell">
                     <div class="rz-button-group rz-button-group--nowrap">
-                        {% import "@RoadizRozier/macros/rz_node_badge.html.twig" as rz_node_badge %}
+                        {% import "@RoadizRozier/components/rz_node_badge.html.twig" as rz_node_badge %}
                         {{ rz_node_badge.all(node, { display_label: false }) }}
                     </div>
                 </td>
                 <td class="mobile-hidden uk-visible-xlarge">{{ node.updatedAt|format_date('short', locale=app.request.locale) }}</td>
                 {% if actions_available %}
                     <td>
-                        {% embed '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                        {% embed '@RoadizRozier/components/rz_table_actions.html.twig' with {
                             'edit_href': path('nodesEditPage', { nodeId: node.id }),
                             'delete_href': workflow_can(node, 'delete') ? path('nodesDeletePage', { nodeId: node.id }) : null,
                         } %}
diff --git a/lib/RoadizRozierBundle/templates/nodes/navBar.html.twig b/lib/RoadizRozierBundle/templates/nodes/navBar.html.twig
index 013837ac7..6227cf1e6 100644
--- a/lib/RoadizRozierBundle/templates/nodes/navBar.html.twig
+++ b/lib/RoadizRozierBundle/templates/nodes/navBar.html.twig
@@ -1,4 +1,4 @@
-{% import "@RoadizRozier/macros/rz_menu_bar.html.twig" as rz_menu_bar %}
+{% import "@RoadizRozier/patterns/menu_bar.html.twig" as rz_menu_bar %}
 {% if source %}
     {% set translation = source.translation %}
 {% elseif available_translations[0] %}
diff --git a/lib/RoadizRozierBundle/templates/nodes/realms_table.html.twig b/lib/RoadizRozierBundle/templates/nodes/realms_table.html.twig
index 5831af9d6..076db55c4 100644
--- a/lib/RoadizRozierBundle/templates/nodes/realms_table.html.twig
+++ b/lib/RoadizRozierBundle/templates/nodes/realms_table.html.twig
@@ -1,4 +1,4 @@
-{% embed '@RoadizRozier/includes/rz_table.html.twig' %}
+{% embed '@RoadizRozier/components/rz_table.html.twig' %}
 	{% block thead_cells %}
         <th>{% trans %}name{% endtrans %}</th>
         <th>{% trans %}realm.type{% endtrans %}</th>
@@ -12,7 +12,7 @@
                 <td>
                     {% if nodeRealm.realm %}
                         {% if accessRealms %}
-                            {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+                            {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
                             {{ rz_link.root({
                                 label: nodeRealm.realm.name,
                                 attributes: { href: path('realmsEditPage', { id: nodeRealm.realm.id }) },
@@ -29,7 +29,7 @@
                 <td>{{ ('realm_node.' ~ nodeRealm.inheritanceType)|trans }}</td>
                  {% if actions_available %}
                     <td>
-                        {% include '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                        {% include '@RoadizRozier/components/rz_table_actions.html.twig' with {
                             edit_href: path('realmsEditPage', {  id: nodeRealm.realm.id }),
                             edit_title: 'edit.realm'|trans,
                             delete_href: path('nodesRealmsDeletePage', { id: node.id, realmNodeId: nodeRealm.id }),
diff --git a/lib/RoadizRozierBundle/templates/nodes/redirection_table.html.twig b/lib/RoadizRozierBundle/templates/nodes/redirection_table.html.twig
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/RoadizRozierBundle/templates/nodes/translate.html.twig b/lib/RoadizRozierBundle/templates/nodes/translate.html.twig
index 1f8b0ca67..9394c74c5 100644
--- a/lib/RoadizRozierBundle/templates/nodes/translate.html.twig
+++ b/lib/RoadizRozierBundle/templates/nodes/translate.html.twig
@@ -20,10 +20,10 @@
             {% form_theme form '@RoadizRozier/forms.html.twig' %}
             {{ form_start(form) }}
                 {{ form_widget(form) }}
-                {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+                {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
                 {% if form.use_translate_assistant is defined %}
                     <div class="rz-form-field">
-                        {% include '@RoadizRozier/includes/translateAssistantUsage.html.twig' with {
+                        {% include '@RoadizRozier/includes/translate_assistant_usage.html.twig' with {
                             label: 'translate_assistant.usage',
                             estimate: estimate|default(null),
                         } %}
diff --git a/lib/RoadizRozierBundle/templates/nodes/translateWaiting.html.twig b/lib/RoadizRozierBundle/templates/nodes/translateWaiting.html.twig
index dfbd6e1ea..f8f6ec685 100644
--- a/lib/RoadizRozierBundle/templates/nodes/translateWaiting.html.twig
+++ b/lib/RoadizRozierBundle/templates/nodes/translateWaiting.html.twig
@@ -28,7 +28,7 @@
                 <p class="rz-message__text">{% trans %}translation_in_progress{% endtrans %}</p>
             </div>
         {% else %}
-            {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+            {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
             <div class="rz-message rz-message--warning">
                 <span class="rz-icon-ri--error-warning-line"></span>
                 <p class="rz-message__text">{% trans %}translation_in_progress.taking_longer{% endtrans %}</p>
diff --git a/lib/RoadizRozierBundle/templates/nodes/widgets/node-header.html.twig b/lib/RoadizRozierBundle/templates/nodes/widgets/node-header.html.twig
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/RoadizRozierBundle/templates/widgets/rz_aside.html.twig b/lib/RoadizRozierBundle/templates/patterns/aside.html.twig
similarity index 76%
rename from lib/RoadizRozierBundle/templates/widgets/rz_aside.html.twig
rename to lib/RoadizRozierBundle/templates/patterns/aside.html.twig
index 8b6b8a03e..b9ad55a74 100644
--- a/lib/RoadizRozierBundle/templates/widgets/rz_aside.html.twig
+++ b/lib/RoadizRozierBundle/templates/patterns/aside.html.twig
@@ -5,6 +5,6 @@
     data-default-translation-id="{{ default_translation.id }}"
 >
     <div class="rz-aside__body">
-        {% include '@RoadizRozier/widgets/rz_tree_wrapper_auto.html.twig' only %}
+        {% include '@RoadizRozier/components/rz_tree.html.twig' only %}
     </div>
 </rz-aside>
diff --git a/lib/RoadizRozierBundle/templates/dashboard/navBar.html.twig b/lib/RoadizRozierBundle/templates/patterns/dashboard_nav.html.twig
similarity index 84%
rename from lib/RoadizRozierBundle/templates/dashboard/navBar.html.twig
rename to lib/RoadizRozierBundle/templates/patterns/dashboard_nav.html.twig
index 932c728bc..4d519d555 100644
--- a/lib/RoadizRozierBundle/templates/dashboard/navBar.html.twig
+++ b/lib/RoadizRozierBundle/templates/patterns/dashboard_nav.html.twig
@@ -18,7 +18,7 @@
     {% block additional_entries %}{% endblock %}
 {% endset %}
 
-{% embed "@RoadizRozier/macros/rz_menu_bar.html.twig" with {listItems : listItems, current: current} %}
+{% embed "@RoadizRozier/patterns/menu_bar.html.twig" with {listItems : listItems, current: current} %}
     {% block additional_entries %}
         {{ custom_entries_content|raw }}
     {% endblock %}
diff --git a/lib/RoadizRozierBundle/templates/dashboard/panel.html.twig b/lib/RoadizRozierBundle/templates/patterns/dashboard_panel.html.twig
similarity index 89%
rename from lib/RoadizRozierBundle/templates/dashboard/panel.html.twig
rename to lib/RoadizRozierBundle/templates/patterns/dashboard_panel.html.twig
index 3f9e906d9..62a04a2e7 100644
--- a/lib/RoadizRozierBundle/templates/dashboard/panel.html.twig
+++ b/lib/RoadizRozierBundle/templates/patterns/dashboard_panel.html.twig
@@ -9,7 +9,7 @@
 		{% endif %}
 
 		{% if button %}
-		    {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+		    {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
 			{{ rz_button.root(button|merge({ class: 'rz-dashboard__header__button'})) }}
 		{% endif %}
 	</div>
diff --git a/lib/RoadizRozierBundle/templates/admin/rz_header.html.twig b/lib/RoadizRozierBundle/templates/patterns/header.html.twig
similarity index 96%
rename from lib/RoadizRozierBundle/templates/admin/rz_header.html.twig
rename to lib/RoadizRozierBundle/templates/patterns/header.html.twig
index 297db68a0..c3875c310 100644
--- a/lib/RoadizRozierBundle/templates/admin/rz_header.html.twig
+++ b/lib/RoadizRozierBundle/templates/patterns/header.html.twig
@@ -1,4 +1,4 @@
-{% import "@RoadizRozier/macros/rz_header.html.twig" as header %}
+{% import "@RoadizRozier/components/rz_header_nav_item.html.twig" as header %}
 
 <div class="rz-header__head">
     <rz-popover
@@ -13,7 +13,7 @@
             <span class="rz-icon-rz--logo-rz"></span>
         </button>
         {%- if bookmarks|length -%}
-            {% embed "@RoadizRozier/macros/rz_dropdown_menu.html.twig" with {
+            {% embed "@RoadizRozier/components/rz_dropdown.html.twig" with {
                 targetId: 'QuickAccessNav',
                 tagList: 'ul',
             } %}
@@ -35,7 +35,7 @@
         <span class="rz-icon-ri--menu-line"></span>
         <input name="burger-menu" id="burger-menu" type="checkbox"/>
     </div>
-    {% include '@RoadizRozier/includes/rz_color_scheme_switcher.html.twig' with { class: 'rz-header__color-switcher rz-header__head__item--end'} %}
+    {% include '@RoadizRozier/components/rz_color_scheme_switcher.html.twig' with { class: 'rz-header__color-switcher rz-header__head__item--end'} %}
     <div class="rz-header__head__item rz-badge rz-badge--sm">
         <span class="rz-badge__label">{{ cms_prefix }} {{ cms_version }}</span>
     </div>
@@ -53,7 +53,7 @@
     >
         {% set search_dialog_id = "search_dialog_id" %}
         <div class="rz-header__li">
-            {% import "@RoadizRozier/macros/rz_badge.html.twig" as rz_badge %}
+            {% import "@RoadizRozier/components/rz_badge.html.twig" as rz_badge %}
             {{
                 header.button({
                     label: "search"|trans,
diff --git a/lib/RoadizRozierBundle/templates/macros/rz_menu_bar.html.twig b/lib/RoadizRozierBundle/templates/patterns/menu_bar.html.twig
similarity index 100%
rename from lib/RoadizRozierBundle/templates/macros/rz_menu_bar.html.twig
rename to lib/RoadizRozierBundle/templates/patterns/menu_bar.html.twig
diff --git a/lib/RoadizRozierBundle/templates/realms/actionsMenu.html.twig b/lib/RoadizRozierBundle/templates/realms/actionsMenu.html.twig
index 55e6a3b17..9d0e62558 100644
--- a/lib/RoadizRozierBundle/templates/realms/actionsMenu.html.twig
+++ b/lib/RoadizRozierBundle/templates/realms/actionsMenu.html.twig
@@ -1,4 +1,4 @@
-{% embed "@RoadizRozier/macros/rz_actions_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_actions_menu.html.twig" with {
     vertical: true,
     class: 'actions-menu',
     item: item
diff --git a/lib/RoadizRozierBundle/templates/realms/add.html.twig b/lib/RoadizRozierBundle/templates/realms/add.html.twig
index 3fdfeefcc..8f1d96ce4 100644
--- a/lib/RoadizRozierBundle/templates/realms/add.html.twig
+++ b/lib/RoadizRozierBundle/templates/realms/add.html.twig
@@ -11,7 +11,7 @@
     <article class="content">
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#' ~ field_id(form)) }}
         {{ form_end(form) }}
         {% block content_body_after %}{% endblock %}
diff --git a/lib/RoadizRozierBundle/templates/realms/delete.html.twig b/lib/RoadizRozierBundle/templates/realms/delete.html.twig
index de4722c76..c7f502825 100644
--- a/lib/RoadizRozierBundle/templates/realms/delete.html.twig
+++ b/lib/RoadizRozierBundle/templates/realms/delete.html.twig
@@ -1,6 +1,6 @@
 {% include '@RoadizRozier/admin/confirm_action.html.twig' with {
     'title': "delete.realm.%name%"|trans({'%name%': item.getName()}),
-    'headPath': '@RoadizRozier/admin/head.html.twig',
+    'headPath': '@RoadizRozier/layouts/head.html.twig',
     'breadcrumb_parents': [
         breadcrumb_root('realms'),
         {
diff --git a/lib/RoadizRozierBundle/templates/realms/edit.html.twig b/lib/RoadizRozierBundle/templates/realms/edit.html.twig
index 50b859ee8..278ec4e1f 100644
--- a/lib/RoadizRozierBundle/templates/realms/edit.html.twig
+++ b/lib/RoadizRozierBundle/templates/realms/edit.html.twig
@@ -11,7 +11,7 @@
     <article>
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#' ~ field_id(form)) }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/realms/head.html.twig b/lib/RoadizRozierBundle/templates/realms/head.html.twig
index cff1817ef..02dce8522 100644
--- a/lib/RoadizRozierBundle/templates/realms/head.html.twig
+++ b/lib/RoadizRozierBundle/templates/realms/head.html.twig
@@ -11,4 +11,4 @@
     } %}
 {% endif %}
 
-{% include "@RoadizRozier/admin/head.html.twig" %}
+{% include "@RoadizRozier/layouts/head.html.twig" %}
diff --git a/lib/RoadizRozierBundle/templates/realms/list.html.twig b/lib/RoadizRozierBundle/templates/realms/list.html.twig
index 156bb2a68..68848ed27 100644
--- a/lib/RoadizRozierBundle/templates/realms/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/realms/list.html.twig
@@ -16,7 +16,7 @@
         }],
     } only %}
 
-    {% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+    {% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
         filters: filters,
         display_select_all_button: false,
     }  only %}
diff --git a/lib/RoadizRozierBundle/templates/realms/list_table.html.twig b/lib/RoadizRozierBundle/templates/realms/list_table.html.twig
index ae1a1c788..1052d5d1d 100644
--- a/lib/RoadizRozierBundle/templates/realms/list_table.html.twig
+++ b/lib/RoadizRozierBundle/templates/realms/list_table.html.twig
@@ -1,4 +1,4 @@
-{% embed '@RoadizRozier/includes/rz_table.html.twig' %}
+{% embed '@RoadizRozier/components/rz_table.html.twig' %}
     {% block thead_cells %}
         <th>
             {% include '@RoadizRozier/includes/column_ordering.html.twig' with {
@@ -30,7 +30,7 @@
     {% endblock %}
 
     {% block tbody_content %}
-        {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+        {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
         {% for item in items %}
             <tr>
                 <td>
@@ -44,7 +44,7 @@
                 <td>{{ item.serializationGroup }}</td>
                 {% if actions_available %}
                     <td>
-                        {% embed '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                        {% embed '@RoadizRozier/components/rz_table_actions.html.twig' with {
                             'edit_href': path('realmsEditPage', { id: item.id }),
                             'delete_href': path('realmsDeletePage', { id: item.id }),
                         } %}
diff --git a/lib/RoadizRozierBundle/templates/redirections/actionsMenu.html.twig b/lib/RoadizRozierBundle/templates/redirections/actionsMenu.html.twig
index db3505a1f..a5502372a 100644
--- a/lib/RoadizRozierBundle/templates/redirections/actionsMenu.html.twig
+++ b/lib/RoadizRozierBundle/templates/redirections/actionsMenu.html.twig
@@ -1,4 +1,4 @@
-{% embed "@RoadizRozier/macros/rz_actions_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_actions_menu.html.twig" with {
     vertical: true,
     class: 'actions-menu',
     item: item
diff --git a/lib/RoadizRozierBundle/templates/redirections/add.html.twig b/lib/RoadizRozierBundle/templates/redirections/add.html.twig
index 8f7e9bd74..42e8d17bc 100644
--- a/lib/RoadizRozierBundle/templates/redirections/add.html.twig
+++ b/lib/RoadizRozierBundle/templates/redirections/add.html.twig
@@ -16,7 +16,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: { id: 'add-redirection-form'}}) }}
         {{ form_widget(form) }}
-        {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+        {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
         {{ actions_menu.saveItem('#add-redirection-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/redirections/delete.html.twig b/lib/RoadizRozierBundle/templates/redirections/delete.html.twig
index 3feae605b..777056e61 100644
--- a/lib/RoadizRozierBundle/templates/redirections/delete.html.twig
+++ b/lib/RoadizRozierBundle/templates/redirections/delete.html.twig
@@ -11,7 +11,7 @@
 
 {% include '@RoadizRozier/admin/confirm_action.html.twig' with {
     'title': "delete.redirection"|trans,
-    'headPath': '@RoadizRozier/admin/head.html.twig',
+    'headPath': '@RoadizRozier/layouts/head.html.twig',
     'breadcrumb_parents': breadcrumb_parents,
     'cancelPath': path('redirectionsHomePage'),
     'alertMessage': 'are_you_sure.delete.redirection'|trans,
diff --git a/lib/RoadizRozierBundle/templates/redirections/edit.html.twig b/lib/RoadizRozierBundle/templates/redirections/edit.html.twig
index fe9bdde63..84ede35d8 100644
--- a/lib/RoadizRozierBundle/templates/redirections/edit.html.twig
+++ b/lib/RoadizRozierBundle/templates/redirections/edit.html.twig
@@ -16,13 +16,13 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, {attr:{id: 'edit-redirection-form'}}) }}
         {{ form_widget(form) }}
-        {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+        {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
         {{ actions_menu.saveItem('#edit-redirection-form') }}
         {{ form_end(form) }}
     </article>
 
     <article>
-        {% include '@RoadizRozier/includes/rz_meta_item_table.html.twig' with {
+        {% include '@RoadizRozier/includes/meta_item_table.html.twig' with {
             item: item
         } only %}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/redirections/editRow.html.twig b/lib/RoadizRozierBundle/templates/redirections/editRow.html.twig
index 14160cc03..1bd06ef4d 100644
--- a/lib/RoadizRozierBundle/templates/redirections/editRow.html.twig
+++ b/lib/RoadizRozierBundle/templates/redirections/editRow.html.twig
@@ -12,7 +12,7 @@
 
     <td>
         {# Delete URL Alias #}
-        {% embed '@RoadizRozier/includes/rz_table_actions.html.twig' %}
+        {% embed '@RoadizRozier/components/rz_table_actions.html.twig' %}
             {% block other_actions %}
 
                 {{ _self.button({
diff --git a/lib/RoadizRozierBundle/templates/redirections/head.html.twig b/lib/RoadizRozierBundle/templates/redirections/head.html.twig
index a7c5e4836..67af51995 100644
--- a/lib/RoadizRozierBundle/templates/redirections/head.html.twig
+++ b/lib/RoadizRozierBundle/templates/redirections/head.html.twig
@@ -9,4 +9,4 @@
     } %}
 {% endif %}
 
-{% include "@RoadizRozier/admin/head.html.twig" %}
+{% include "@RoadizRozier/layouts/head.html.twig" %}
diff --git a/lib/RoadizRozierBundle/templates/redirections/list.html.twig b/lib/RoadizRozierBundle/templates/redirections/list.html.twig
index 346c33105..c2491f877 100644
--- a/lib/RoadizRozierBundle/templates/redirections/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/redirections/list.html.twig
@@ -20,7 +20,7 @@
             }],
         } only %}
 
-        {% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+        {% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
             filters: filters,
             display_select_all_button: true,
         }  only %}
diff --git a/lib/RoadizRozierBundle/templates/redirections/list_table.html.twig b/lib/RoadizRozierBundle/templates/redirections/list_table.html.twig
index 9e3e276b9..60fd3bd73 100644
--- a/lib/RoadizRozierBundle/templates/redirections/list_table.html.twig
+++ b/lib/RoadizRozierBundle/templates/redirections/list_table.html.twig
@@ -1,4 +1,4 @@
-{% embed '@RoadizRozier/includes/rz_table.html.twig' %}
+{% embed '@RoadizRozier/components/rz_table.html.twig' %}
     {% block thead_cells %}
         <th>
             {% set label = 'redirection.query'|trans %}
@@ -43,7 +43,7 @@
     {% endblock %}
 
     {% block tbody_content %}
-        {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+        {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
         {% for item in items %}
             <tr>
                 {% set url = path('redirectionsEditPage', { id: item.id }) %}
@@ -55,8 +55,8 @@
                 {% endif %}
                 {% if selection_available %}
                     <td>
-                        {% import '@RoadizRozier/macros/rz_bulk.html.twig' as rz_bulk %}
-                        {{ rz_bulk.select_input({ value: item.id }) }}
+                        {% import '@RoadizRozier/components/rz_bulk_actions.html.twig' as rz_bulk_actions %}
+                        {{ rz_bulk_actions.select_input({ value: item.id }) }}
                     </td>
                 {% endif %}
                 <td>
@@ -77,7 +77,7 @@
                 <td class="mobile-hidden">{{ item.useCount }}</td>
                 {% if actions_available %}
                     <td>
-                        {% include '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                        {% include '@RoadizRozier/components/rz_table_actions.html.twig' with {
                             'edit_href': url,
                             'delete_href':path('redirectionsDeletePage', { id: item.id }),
                         } %}
diff --git a/lib/RoadizRozierBundle/templates/search/list.html.twig b/lib/RoadizRozierBundle/templates/search/list.html.twig
index a5512a40f..19282d7b4 100644
--- a/lib/RoadizRozierBundle/templates/search/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/search/list.html.twig
@@ -8,7 +8,7 @@
 
 {% block content %}
     <rz-bulk-section>
-        {% include '@RoadizRozier/admin/head.html.twig' with {
+        {% include '@RoadizRozier/layouts/head.html.twig' with {
             title: title_label,
             filters: filters,
             breadcrumb: {
diff --git a/lib/RoadizRozierBundle/templates/security/login.html.twig b/lib/RoadizRozierBundle/templates/security/login.html.twig
index d41b0599d..4684b0382 100644
--- a/lib/RoadizRozierBundle/templates/security/login.html.twig
+++ b/lib/RoadizRozierBundle/templates/security/login.html.twig
@@ -1,4 +1,4 @@
-{% extends '@RoadizRozier/login/base.html.twig' %}
+{% extends '@RoadizRozier/layouts/login.html.twig' %}
 
 {% block title %}{% trans %}login{% endtrans %} | {{ parent() }}{% endblock %}
 
diff --git a/lib/RoadizRozierBundle/templates/security/login_link_confirm.html.twig b/lib/RoadizRozierBundle/templates/security/login_link_confirm.html.twig
index d5e3547a6..220ab9011 100644
--- a/lib/RoadizRozierBundle/templates/security/login_link_confirm.html.twig
+++ b/lib/RoadizRozierBundle/templates/security/login_link_confirm.html.twig
@@ -1,4 +1,4 @@
-{% extends '@RoadizRozier/login/base.html.twig' %}
+{% extends '@RoadizRozier/layouts/login.html.twig' %}
 
 {% block title %}{% trans %}login_link.confirm{% endtrans %} | {{ parent() }}{% endblock %}
 
diff --git a/lib/RoadizRozierBundle/templates/security/login_link_sent.html.twig b/lib/RoadizRozierBundle/templates/security/login_link_sent.html.twig
index bf9d0378f..d2e0e9dae 100644
--- a/lib/RoadizRozierBundle/templates/security/login_link_sent.html.twig
+++ b/lib/RoadizRozierBundle/templates/security/login_link_sent.html.twig
@@ -1,4 +1,4 @@
-{% extends '@RoadizRozier/login/base.html.twig' %}
+{% extends '@RoadizRozier/layouts/login.html.twig' %}
 
 {% block title %}{% trans %}login_link_sent{% endtrans %} | {{ parent() }}{% endblock %}
 
diff --git a/lib/RoadizRozierBundle/templates/security/request_login_link.html.twig b/lib/RoadizRozierBundle/templates/security/request_login_link.html.twig
index 4a920e1d0..4c7b89235 100644
--- a/lib/RoadizRozierBundle/templates/security/request_login_link.html.twig
+++ b/lib/RoadizRozierBundle/templates/security/request_login_link.html.twig
@@ -1,4 +1,4 @@
-{% extends '@RoadizRozier/login/base.html.twig' %}
+{% extends '@RoadizRozier/layouts/login.html.twig' %}
 
 {% block title %}{% trans %}login_link{% endtrans %} | {{ parent() }}{% endblock %}
 
diff --git a/lib/RoadizRozierBundle/templates/settingGroups/actionsMenu.html.twig b/lib/RoadizRozierBundle/templates/settingGroups/actionsMenu.html.twig
index 47cab3f7d..95398ba6a 100644
--- a/lib/RoadizRozierBundle/templates/settingGroups/actionsMenu.html.twig
+++ b/lib/RoadizRozierBundle/templates/settingGroups/actionsMenu.html.twig
@@ -1,4 +1,4 @@
-{% embed "@RoadizRozier/macros/rz_actions_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_actions_menu.html.twig" with {
     vertical: true,
     class: 'actions-menu',
     item: item
diff --git a/lib/RoadizRozierBundle/templates/settingGroups/add.html.twig b/lib/RoadizRozierBundle/templates/settingGroups/add.html.twig
index fa71c0e17..1cd497369 100644
--- a/lib/RoadizRozierBundle/templates/settingGroups/add.html.twig
+++ b/lib/RoadizRozierBundle/templates/settingGroups/add.html.twig
@@ -17,7 +17,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: { id: 'add-settingGroup-form'}}) }}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#add-settingGroup-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/settingGroups/delete.html.twig b/lib/RoadizRozierBundle/templates/settingGroups/delete.html.twig
index d5fbd54d8..9087aed90 100644
--- a/lib/RoadizRozierBundle/templates/settingGroups/delete.html.twig
+++ b/lib/RoadizRozierBundle/templates/settingGroups/delete.html.twig
@@ -1,6 +1,6 @@
 {% include '@RoadizRozier/admin/confirm_action.html.twig' with {
     'title': "delete.settingGroup.%name%"|trans({'%name%': item.getName}),
-    'headPath': '@RoadizRozier/admin/head.html.twig',
+    'headPath': '@RoadizRozier/layouts/head.html.twig',
     'breadcrumb_parents': [
         breadcrumb_root('settingGroups'),
         {
diff --git a/lib/RoadizRozierBundle/templates/settingGroups/edit.html.twig b/lib/RoadizRozierBundle/templates/settingGroups/edit.html.twig
index 38409ea05..a20792093 100644
--- a/lib/RoadizRozierBundle/templates/settingGroups/edit.html.twig
+++ b/lib/RoadizRozierBundle/templates/settingGroups/edit.html.twig
@@ -17,7 +17,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: { id: 'edit-settingGroup-form'}}) }}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#edit-settingGroup-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/settingGroups/head.html.twig b/lib/RoadizRozierBundle/templates/settingGroups/head.html.twig
index 690788fb1..d4f2503c4 100644
--- a/lib/RoadizRozierBundle/templates/settingGroups/head.html.twig
+++ b/lib/RoadizRozierBundle/templates/settingGroups/head.html.twig
@@ -9,4 +9,4 @@
     } %}
 {% endif %}
 
-{% include "@RoadizRozier/admin/head.html.twig" %}
+{% include "@RoadizRozier/layouts/head.html.twig" %}
diff --git a/lib/RoadizRozierBundle/templates/settingGroups/list.html.twig b/lib/RoadizRozierBundle/templates/settingGroups/list.html.twig
index fe9967589..4af798bfb 100644
--- a/lib/RoadizRozierBundle/templates/settingGroups/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/settingGroups/list.html.twig
@@ -20,12 +20,12 @@
             }],
         } only %}
 
-        {% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+        {% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
             filters: filters,
         }  only %}
 
         <article>
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             actions_available: true,
             selection_available: false,
         } %}
@@ -47,7 +47,7 @@
                         <td><a href="{{ edit_href }}">{{ item.getName }}</a></td>
                         <td class="mobile-hidden">
                             {% if item.isInMenu %}
-                                {% import '@RoadizRozier/macros/rz_badge.html.twig' as rz_badge %}
+                                {% import '@RoadizRozier/components/rz_badge.html.twig' as rz_badge %}
                                 {{ rz_badge.item({
                                     icon: 'rz-icon-ri--check-line',
                                     attributes: {
@@ -58,7 +58,7 @@
                         </td>
                         {% if actions_available %}
                             <td>
-                                {% embed '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                                {% embed '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                     'edit_href': edit_href,
                                     'delete_href': path('settingGroupsDeletePage', { id: item.id }),
                                 } %}
diff --git a/lib/RoadizRozierBundle/templates/settings/actionsMenu.html.twig b/lib/RoadizRozierBundle/templates/settings/actionsMenu.html.twig
index 221db8c1f..9eeb50b5b 100644
--- a/lib/RoadizRozierBundle/templates/settings/actionsMenu.html.twig
+++ b/lib/RoadizRozierBundle/templates/settings/actionsMenu.html.twig
@@ -1,4 +1,4 @@
-{% embed "@RoadizRozier/macros/rz_actions_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_actions_menu.html.twig" with {
     vertical: true,
     class: 'actions-menu',
     setting: setting,
diff --git a/lib/RoadizRozierBundle/templates/settings/add.html.twig b/lib/RoadizRozierBundle/templates/settings/add.html.twig
index ca0866a81..f8696fbea 100644
--- a/lib/RoadizRozierBundle/templates/settings/add.html.twig
+++ b/lib/RoadizRozierBundle/templates/settings/add.html.twig
@@ -16,7 +16,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: { id: 'add-setting-form'}}) }}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#add-setting-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/settings/edit.html.twig b/lib/RoadizRozierBundle/templates/settings/edit.html.twig
index 75cb94592..a1e2c180d 100644
--- a/lib/RoadizRozierBundle/templates/settings/edit.html.twig
+++ b/lib/RoadizRozierBundle/templates/settings/edit.html.twig
@@ -16,7 +16,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: { id: 'edit-setting-form'}}) }}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#edit-setting-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/settings/head.html.twig b/lib/RoadizRozierBundle/templates/settings/head.html.twig
index c1f4589c2..7d65e8456 100644
--- a/lib/RoadizRozierBundle/templates/settings/head.html.twig
+++ b/lib/RoadizRozierBundle/templates/settings/head.html.twig
@@ -9,4 +9,4 @@
     } %}
 {% endif %}
 
-{% include "@RoadizRozier/admin/head.html.twig" %}
+{% include "@RoadizRozier/layouts/head.html.twig" %}
diff --git a/lib/RoadizRozierBundle/templates/settings/import.html.twig b/lib/RoadizRozierBundle/templates/settings/import.html.twig
index d8016dac3..1ced038b1 100644
--- a/lib/RoadizRozierBundle/templates/settings/import.html.twig
+++ b/lib/RoadizRozierBundle/templates/settings/import.html.twig
@@ -1,5 +1,5 @@
 {% extends '@RoadizRozier/layout.html.twig' %}
-{% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+{% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
 
 {%- block title -%}
     {% trans %}import.setting{% endtrans %}
diff --git a/lib/RoadizRozierBundle/templates/settings/list.html.twig b/lib/RoadizRozierBundle/templates/settings/list.html.twig
index 6a4c1ddea..72ac30678 100644
--- a/lib/RoadizRozierBundle/templates/settings/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/settings/list.html.twig
@@ -43,12 +43,12 @@
                 }
             ],
         } only %}
-        {% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+        {% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
             filters: filters,
         }  only %}
 
         <article>
-            {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+            {% embed '@RoadizRozier/components/rz_table.html.twig' with {
                 actions_available: true,
                 selection_available: false,
             } %}
@@ -82,10 +82,10 @@
                                 {% if setting.document %}
                                     <figure>{{- setting.document|display({height:30}) -}}</figure>
                                 {% endif %}
-                                {% form_theme setting.form '@RoadizRozier/horizontalForms.html.twig' %}
+                                {% form_theme setting.form '@RoadizRozier/form/horizontal_forms.html.twig' %}
                                 {{ form_start(setting.form, { attr: { class: 'rz-form-field--head-hidden'}}) }}
                                     {{ form_widget(setting.form) }}
-                                    {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+                                    {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
                                     {{ rz_button.root({
                                         icon: 'rz-icon-ri--save-line',
                                         attributes: {
@@ -98,7 +98,7 @@
                             </td>
                             {% if actions_available %}
                                 <td>
-                                    {% include '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                                    {% include '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                         'edit_href': edit_href,
                                         'delete_href': path('settingsDeletePage', { settingId: setting.setting.getId }),
                                         'save_href': '#',
diff --git a/lib/RoadizRozierBundle/templates/tags/actionsMenu.html.twig b/lib/RoadizRozierBundle/templates/tags/actionsMenu.html.twig
index 5544a8500..95f222343 100644
--- a/lib/RoadizRozierBundle/templates/tags/actionsMenu.html.twig
+++ b/lib/RoadizRozierBundle/templates/tags/actionsMenu.html.twig
@@ -1,4 +1,4 @@
-{% embed "@RoadizRozier/macros/rz_actions_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_actions_menu.html.twig" with {
     vertical: true,
     class: 'actions-menu',
     versions: versions,
@@ -19,7 +19,7 @@
                 popover-placement="left-start"
                 popover-offset="18px"
             >
-                {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+                {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
                 {{ rz_button.root({
                     icon: 'rz-icon-ri--git-fork-line',
                     emphasis: 'tertiary',
@@ -29,7 +29,7 @@
                         'popovertarget': version_popover_id,
                     }
                 }) }}
-                {% embed "@RoadizRozier/macros/rz_dropdown_menu.html.twig" with {
+                {% embed "@RoadizRozier/components/rz_dropdown.html.twig" with {
                     title: 'versions',
                     reverse: true,
                     targetId: version_popover_id,
diff --git a/lib/RoadizRozierBundle/templates/tags/add-multiple.html.twig b/lib/RoadizRozierBundle/templates/tags/add-multiple.html.twig
index d256f57ca..eccc3ad5b 100644
--- a/lib/RoadizRozierBundle/templates/tags/add-multiple.html.twig
+++ b/lib/RoadizRozierBundle/templates/tags/add-multiple.html.twig
@@ -1,5 +1,5 @@
 {% extends '@RoadizRozier/layout.html.twig' %}
-{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+{% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
 
 {%- block title -%}
     {% trans %}add.multiple.tags{% endtrans %}
diff --git a/lib/RoadizRozierBundle/templates/tags/add.html.twig b/lib/RoadizRozierBundle/templates/tags/add.html.twig
index ba57d6744..de5e7a403 100644
--- a/lib/RoadizRozierBundle/templates/tags/add.html.twig
+++ b/lib/RoadizRozierBundle/templates/tags/add.html.twig
@@ -16,7 +16,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: {id: 'add-tag-form'}}) }}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#add-tag-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/tags/edit.html.twig b/lib/RoadizRozierBundle/templates/tags/edit.html.twig
index 7c344940f..924f3fbc5 100644
--- a/lib/RoadizRozierBundle/templates/tags/edit.html.twig
+++ b/lib/RoadizRozierBundle/templates/tags/edit.html.twig
@@ -48,7 +48,7 @@
         {{ form_start(form, { attr: {id: 'edit-tag-form'}}) }}
         {{ form_widget(form) }}
         {% if not readOnly %}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#edit-tag-form') }}
         {% endif %}
         {{ form_end(form) }}
diff --git a/lib/RoadizRozierBundle/templates/tags/filtersBar.html.twig b/lib/RoadizRozierBundle/templates/tags/filtersBar.html.twig
index b28072170..2fdb10f94 100644
--- a/lib/RoadizRozierBundle/templates/tags/filtersBar.html.twig
+++ b/lib/RoadizRozierBundle/templates/tags/filtersBar.html.twig
@@ -1,4 +1,4 @@
-{% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+{% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
     filters: filters,
     display_select_all_button: true,
 }  only %}
diff --git a/lib/RoadizRozierBundle/templates/tags/head.html.twig b/lib/RoadizRozierBundle/templates/tags/head.html.twig
index 21504fef8..96f7fc40f 100644
--- a/lib/RoadizRozierBundle/templates/tags/head.html.twig
+++ b/lib/RoadizRozierBundle/templates/tags/head.html.twig
@@ -10,7 +10,7 @@
     } %}
 {% endif %}
 
-{% include "@RoadizRozier/admin/head.html.twig" with {
+{% include "@RoadizRozier/layouts/head.html.twig" with {
     item: tag,
     translation_route: 'tagsEditTranslatedPage',
     translation_params: {tagId: tag.id},
diff --git a/lib/RoadizRozierBundle/templates/tags/list.html.twig b/lib/RoadizRozierBundle/templates/tags/list.html.twig
index 70bdfc812..ce382bb9e 100644
--- a/lib/RoadizRozierBundle/templates/tags/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/tags/list.html.twig
@@ -24,14 +24,14 @@
         filters: filters,
     } only %}
 
-    {% include "@RoadizRozier/widgets/rz_bulk_actions.html.twig" with {
+    {% include "@RoadizRozier/components/rz_bulk_actions.html.twig" with {
         delete_form_data: deleteTagsForm,
         delete_form_action: path('tagsBulkDeletePage'),
         delete_form_method: 'GET',
     } only %}
 
     <section class="rz-page__body">
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             sortable: false,
             selection_available: true,
             actions_available: true,
@@ -49,8 +49,8 @@
             {% endblock %}
 
             {% block tbody_content %}
-                {% import '@RoadizRozier/macros/rz_badge.html.twig' as rz_badge %}
-                {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+                {% import '@RoadizRozier/components/rz_badge.html.twig' as rz_badge %}
+                {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
 
                 {% for tag in tags %}
                     {% set translated_tag = tag.getTranslatedTags.first %}
@@ -81,7 +81,7 @@
                         <td>{{ tag.id }}</td>
                         {% if actions_available %}
                             <td>
-                                {% include '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                                {% include '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                     'edit_href': edit_link,
                                     'delete_href': can_delete ? path('tagsDeletePage', { tagId: tag.id }) : null,
                                 } only %}
diff --git a/lib/RoadizRozierBundle/templates/tags/navBack.html.twig b/lib/RoadizRozierBundle/templates/tags/navBack.html.twig
deleted file mode 100644
index 8d37d4e57..000000000
--- a/lib/RoadizRozierBundle/templates/tags/navBack.html.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends '@RoadizRozier/widgets/backlink.html.twig' %}
-
-{%- block link -%}
-    {% set link = path('tagsHomePage') %}
-    {% set title = 'back_to.tags'|trans %}
-    {{- parent() -}}
-{%- endblock -%}
diff --git a/lib/RoadizRozierBundle/templates/tags/navBar.html.twig b/lib/RoadizRozierBundle/templates/tags/navBar.html.twig
index e858cd97f..34ce88913 100644
--- a/lib/RoadizRozierBundle/templates/tags/navBar.html.twig
+++ b/lib/RoadizRozierBundle/templates/tags/navBar.html.twig
@@ -38,7 +38,7 @@ set listItems = [
     {% block additional_entries %}{% endblock %}
 {% endset %}
 
-{% embed "@RoadizRozier/macros/rz_menu_bar.html.twig" with {listItems : listItems, current: current} %}
+{% embed "@RoadizRozier/patterns/menu_bar.html.twig" with {listItems : listItems, current: current} %}
     {% block additional_entries %}
         {{ custom_entries_content|raw }}
     {% endblock %}
diff --git a/lib/RoadizRozierBundle/templates/tags/nodes.html.twig b/lib/RoadizRozierBundle/templates/tags/nodes.html.twig
index 44e825511..9ec3dd7ce 100644
--- a/lib/RoadizRozierBundle/templates/tags/nodes.html.twig
+++ b/lib/RoadizRozierBundle/templates/tags/nodes.html.twig
@@ -18,7 +18,7 @@
         translation: translation,
     } only %}
 
-    {% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+    {% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
         filters: filters,
         display_select_all_button: false,
     }  only %}
diff --git a/lib/RoadizRozierBundle/templates/tags/settings.html.twig b/lib/RoadizRozierBundle/templates/tags/settings.html.twig
index b537163b2..163b24ac2 100644
--- a/lib/RoadizRozierBundle/templates/tags/settings.html.twig
+++ b/lib/RoadizRozierBundle/templates/tags/settings.html.twig
@@ -19,12 +19,12 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: {id: 'edit-tag-form'}}) }}
         {{ form_widget(form) }}
-        {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+        {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
         {{ actions_menu.saveItem('#edit-tag-form') }}
         {{ form_end(form) }}
     </article>
 
-    {% include '@RoadizRozier/includes/rz_meta_item_table.html.twig' with {
+    {% include '@RoadizRozier/includes/meta_item_table.html.twig' with {
         item: tag
     } only %}
 
diff --git a/lib/RoadizRozierBundle/templates/translations/actionsMenu.html.twig b/lib/RoadizRozierBundle/templates/translations/actionsMenu.html.twig
index eae5080d5..9e0e14d78 100644
--- a/lib/RoadizRozierBundle/templates/translations/actionsMenu.html.twig
+++ b/lib/RoadizRozierBundle/templates/translations/actionsMenu.html.twig
@@ -1,4 +1,4 @@
-{% embed "@RoadizRozier/macros/rz_actions_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_actions_menu.html.twig" with {
     vertical: true,
     class: 'actions-menu',
     translation: translation
diff --git a/lib/RoadizRozierBundle/templates/translations/add.html.twig b/lib/RoadizRozierBundle/templates/translations/add.html.twig
index de36554ee..648c36a19 100644
--- a/lib/RoadizRozierBundle/templates/translations/add.html.twig
+++ b/lib/RoadizRozierBundle/templates/translations/add.html.twig
@@ -17,7 +17,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: { id: 'add-translation-form'}}) }}
         {{ form_widget(form) }}
-        {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+        {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
         {{ actions_menu.saveItem('#add-translation-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/translations/edit.html.twig b/lib/RoadizRozierBundle/templates/translations/edit.html.twig
index 2e2ccf70e..1185f94ee 100644
--- a/lib/RoadizRozierBundle/templates/translations/edit.html.twig
+++ b/lib/RoadizRozierBundle/templates/translations/edit.html.twig
@@ -17,7 +17,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: { id: 'edit-translation-form'}}) }}
         {{ form_widget(form) }}
-        {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+        {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
         {{ actions_menu.saveItem('#edit-translation-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/translations/head.html.twig b/lib/RoadizRozierBundle/templates/translations/head.html.twig
index 29c77910c..ff33f8c9b 100644
--- a/lib/RoadizRozierBundle/templates/translations/head.html.twig
+++ b/lib/RoadizRozierBundle/templates/translations/head.html.twig
@@ -9,4 +9,4 @@
     } %}
 {% endif %}
 
-{% include "@RoadizRozier/admin/head.html.twig" %}
+{% include "@RoadizRozier/layouts/head.html.twig" %}
diff --git a/lib/RoadizRozierBundle/templates/translations/list.html.twig b/lib/RoadizRozierBundle/templates/translations/list.html.twig
index daf7e9af1..e467597a5 100644
--- a/lib/RoadizRozierBundle/templates/translations/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/translations/list.html.twig
@@ -19,13 +19,13 @@
         }],
     } only %}
 
-    {% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+    {% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
         filters: filters,
         display_select_all_button: false,
     }  only %}
 
     <section class="rz-page__body">
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             selection_available: hasBulkActions,
             actions_available: true,
         } %}
@@ -59,8 +59,8 @@
             {% endblock %}
 
             {% block tbody_content %}
-                {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
-                {% import '@RoadizRozier/macros/rz_badge.html.twig' as rz_badge %}
+                {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
+                {% import '@RoadizRozier/components/rz_badge.html.twig' as rz_badge %}
 
                 {% for t in translations %}
                     <tr>
@@ -88,7 +88,7 @@
                         {% if actions_available %}
                             {% set is_not_default = t.translation.isDefaultTranslation == false %}
                             <td>
-                                {% embed '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                                {% embed '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                     'edit_href': path('translationsEditPage', { translationId: t.translation.getId }),
                                     'delete_href': is_not_default ? path('translationsDeletePage', { translationId: t.translation.getId }) : null,
                                 } %}
diff --git a/lib/RoadizRozierBundle/templates/url-aliases/editRow.html.twig b/lib/RoadizRozierBundle/templates/url-aliases/editRow.html.twig
index 1973c4940..67d1d0ee9 100644
--- a/lib/RoadizRozierBundle/templates/url-aliases/editRow.html.twig
+++ b/lib/RoadizRozierBundle/templates/url-aliases/editRow.html.twig
@@ -1,4 +1,4 @@
-{% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+{% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
 
 <tr>
     <td>
@@ -13,7 +13,7 @@
     </td>
     {% if actions_available %}
         <td>
-            {% embed '@RoadizRozier/includes/rz_table_actions.html.twig' %}
+            {% embed '@RoadizRozier/components/rz_table_actions.html.twig' %}
                 {% block other_actions %}
                     {# Submit editForm #}
                     {{ _self.button({
diff --git a/lib/RoadizRozierBundle/templates/users/actionsMenu.html.twig b/lib/RoadizRozierBundle/templates/users/actionsMenu.html.twig
index a97e6bafe..5fce05edf 100644
--- a/lib/RoadizRozierBundle/templates/users/actionsMenu.html.twig
+++ b/lib/RoadizRozierBundle/templates/users/actionsMenu.html.twig
@@ -1,4 +1,4 @@
-{% embed "@RoadizRozier/macros/rz_actions_menu.html.twig" with {
+{% embed "@RoadizRozier/components/rz_actions_menu.html.twig" with {
     vertical: true,
     class: 'actions-menu',
     user: user
diff --git a/lib/RoadizRozierBundle/templates/users/add.html.twig b/lib/RoadizRozierBundle/templates/users/add.html.twig
index 319153d33..566fcf235 100644
--- a/lib/RoadizRozierBundle/templates/users/add.html.twig
+++ b/lib/RoadizRozierBundle/templates/users/add.html.twig
@@ -16,7 +16,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: {id: 'add-user-form'}}) }}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#add-user-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/users/bulkActions.html.twig b/lib/RoadizRozierBundle/templates/users/bulkActions.html.twig
index a0018dfe2..b18a0d997 100644
--- a/lib/RoadizRozierBundle/templates/users/bulkActions.html.twig
+++ b/lib/RoadizRozierBundle/templates/users/bulkActions.html.twig
@@ -1,5 +1,5 @@
-{% embed "@RoadizRozier/widgets/rz_bulk_actions.html.twig" %}
-	{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+{% embed "@RoadizRozier/components/rz_bulk_actions.html.twig" %}
+	{% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
 
 	{% block other_actions %}
         {% if bulkEnableForm %}
diff --git a/lib/RoadizRozierBundle/templates/users/delete.html.twig b/lib/RoadizRozierBundle/templates/users/delete.html.twig
index 867bbea3d..8ad152ea1 100644
--- a/lib/RoadizRozierBundle/templates/users/delete.html.twig
+++ b/lib/RoadizRozierBundle/templates/users/delete.html.twig
@@ -1,6 +1,6 @@
 {% include '@RoadizRozier/admin/confirm_action.html.twig' with {
     'title': "delete.user.%name%"|trans({'%name%': item.username }),
-    'headPath': '@RoadizRozier/admin/head.html.twig',
+    'headPath': '@RoadizRozier/layouts/head.html.twig',
     'breadcrumb_parents': [
         breadcrumb_root('users'),
         {
diff --git a/lib/RoadizRozierBundle/templates/users/edit.html.twig b/lib/RoadizRozierBundle/templates/users/edit.html.twig
index 5724a35d2..69cc1abcd 100644
--- a/lib/RoadizRozierBundle/templates/users/edit.html.twig
+++ b/lib/RoadizRozierBundle/templates/users/edit.html.twig
@@ -19,12 +19,12 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: {id: 'edit-user-form'}}) }}
         {{ form_widget(form) }}
-        {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+        {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
         {{ actions_menu.saveItem('#edit-user-form') }}
         {{ form_end(form) }}
 
 
-        {% include '@RoadizRozier/includes/rz_meta_item_table.html.twig' with {
+        {% include '@RoadizRozier/includes/meta_item_table.html.twig' with {
             item: item,
         } only %}
 
diff --git a/lib/RoadizRozierBundle/templates/users/editDetails.html.twig b/lib/RoadizRozierBundle/templates/users/editDetails.html.twig
index b0c139dab..25bfa968a 100644
--- a/lib/RoadizRozierBundle/templates/users/editDetails.html.twig
+++ b/lib/RoadizRozierBundle/templates/users/editDetails.html.twig
@@ -19,7 +19,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: {id: 'edit-user-form'}}) }}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+            {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
             {{ actions_menu.saveItem('#edit-user-form') }}
         {{ form_end(form) }}
     </article>
diff --git a/lib/RoadizRozierBundle/templates/users/groups.html.twig b/lib/RoadizRozierBundle/templates/users/groups.html.twig
index e212ec122..718a98582 100644
--- a/lib/RoadizRozierBundle/templates/users/groups.html.twig
+++ b/lib/RoadizRozierBundle/templates/users/groups.html.twig
@@ -15,7 +15,7 @@
     } only %}
 
     <section class="rz-page__body">
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             selection_available: false,
             actions_available: true,
         }%}
@@ -28,12 +28,12 @@
                     <tr>
                         {% if selection_available %}
                             <td>
-                                {% import '@RoadizRozier/macros/rz_bulk.html.twig' as rz_bulk %}
-                                {{ rz_bulk.select_input({ value: group.getId }) }}
+                                {% import '@RoadizRozier/components/rz_bulk_actions.html.twig' as rz_bulk_actions %}
+                                {{ rz_bulk_actions.select_input({ value: group.getId }) }}
                             </td>
                         {% endif %}
                         <td>
-                            {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+                            {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
                             {{ rz_link.root({
                                 label: group.getName,
                                 attributes: { href: path('groupsEditPage', { id: group.getId })  },
@@ -42,7 +42,7 @@
                         {% if actions_available %}
                             <td>
                                 {% if is_granted(group) %}
-                                    {% include '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                                    {% include '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                         'edit_href': path('groupsEditRolesPage', { id: group.getId }),
                                         'edit_title': 'roles'|trans,
                                         'delete_href': path('usersRemoveGroupsPage', { userId: user.getId, groupId: group.getId }),
@@ -70,7 +70,7 @@
         {{ form_start(form) }}
             {{ form_widget(form) }}
             <div class="rz-form-field rz-form-field--align-start">
-                {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+                {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
                 {{ rz_button.root({
                     size: 'md',
                     label: 'add.group'|trans,
diff --git a/lib/RoadizRozierBundle/templates/users/head.html.twig b/lib/RoadizRozierBundle/templates/users/head.html.twig
index a9f893846..0744b300f 100644
--- a/lib/RoadizRozierBundle/templates/users/head.html.twig
+++ b/lib/RoadizRozierBundle/templates/users/head.html.twig
@@ -9,7 +9,7 @@
     } %}
 {% endif %}
 
-{% include "@RoadizRozier/admin/head.html.twig" with {
+{% include "@RoadizRozier/layouts/head.html.twig" with {
     nav_bar_template: '@RoadizRozier/users/navBar.html.twig',
     nav_bar_context: {'user': user, current: current}
 } %}
diff --git a/lib/RoadizRozierBundle/templates/users/list.html.twig b/lib/RoadizRozierBundle/templates/users/list.html.twig
index 3eac95e4c..5d20ed3ed 100644
--- a/lib/RoadizRozierBundle/templates/users/list.html.twig
+++ b/lib/RoadizRozierBundle/templates/users/list.html.twig
@@ -16,7 +16,7 @@
             }],
         } only %}
 
-        {% include "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+        {% include "@RoadizRozier/components/rz_filters_bar.html.twig" with {
             filters: filters,
             display_select_all_button: false,
         }  only %}
diff --git a/lib/RoadizRozierBundle/templates/users/list_table.html.twig b/lib/RoadizRozierBundle/templates/users/list_table.html.twig
index 1d457c3ae..0e3323344 100644
--- a/lib/RoadizRozierBundle/templates/users/list_table.html.twig
+++ b/lib/RoadizRozierBundle/templates/users/list_table.html.twig
@@ -1,4 +1,4 @@
-{% embed '@RoadizRozier/includes/rz_table.html.twig' %}
+{% embed '@RoadizRozier/components/rz_table.html.twig' %}
 	{% block thead_cells %}
 		<th class="mobile-hidden uk-visible-xlarge">
 			{% set label = 'user.username'|trans %}
@@ -48,15 +48,15 @@
 	{% endblock %}
 
 	{% block tbody_content %}
-		{% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
-		{% import '@RoadizRozier/macros/rz_bulk.html.twig' as rz_bulk %}
-		{% import '@RoadizRozier/macros/rz_badge.html.twig' as rz_badge %}
+		{% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
+		{% import '@RoadizRozier/components/rz_bulk_actions.html.twig' as rz_bulk_actions %}
+		{% import '@RoadizRozier/components/rz_badge.html.twig' as rz_badge %}
 
 		{% for item in items %}
 			<tr>
 				{% if selection_available %}
                     <td>
-                        {{ rz_bulk.select_input({ value: item.id }) }}
+                        {{ rz_bulk_actions.select_input({ value: item.id }) }}
                     </td>
                 {% endif %}
 				<td class="rz-table__cell--flex" >
@@ -126,7 +126,7 @@
 				{% if actions_available %}
                     <td>
 						{% if is_granted('ROLE_SUPERADMIN') or not item.SuperAdmin %}
-							{% embed '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+							{% embed '@RoadizRozier/components/rz_table_actions.html.twig' with {
 								'edit_href': path('usersEditPage', { id: item.id }),
 								'delete_href': is_granted('ROLE_ACCESS_USERS_DELETE') ? path('usersDeletePage', { id: item.id }) : null,
 							} %}
diff --git a/lib/RoadizRozierBundle/templates/users/navBar.html.twig b/lib/RoadizRozierBundle/templates/users/navBar.html.twig
index dd35f619c..138b77650 100644
--- a/lib/RoadizRozierBundle/templates/users/navBar.html.twig
+++ b/lib/RoadizRozierBundle/templates/users/navBar.html.twig
@@ -42,7 +42,7 @@ set listItems = [
     {% block additional_entries %}{% endblock %}
 {% endset %}
 
-{% embed "@RoadizRozier/macros/rz_menu_bar.html.twig" with {listItems : listItems, current: current} %}
+{% embed "@RoadizRozier/patterns/menu_bar.html.twig" with {listItems : listItems, current: current} %}
     {% block additional_entries %}
         {{ custom_entries_content|raw }}
     {% endblock %}
diff --git a/lib/RoadizRozierBundle/templates/users/removeGroup.html.twig b/lib/RoadizRozierBundle/templates/users/removeGroup.html.twig
index d0851994e..34aa65ddd 100644
--- a/lib/RoadizRozierBundle/templates/users/removeGroup.html.twig
+++ b/lib/RoadizRozierBundle/templates/users/removeGroup.html.twig
@@ -9,7 +9,7 @@
 {% block content %}
 <section class="content-global delete-user">
     {% set page_title = "remove.user.%name%.from.group.%group%"|trans({'%name%': user.username, '%group%': group.getName})|truncate_title %}
-    {% include '@RoadizRozier/admin/head.html.twig' with {
+    {% include '@RoadizRozier/layouts/head.html.twig' with {
         title: page_title,
         breadcrumb: {
             parents: [breadcrumb_root('users'), {
diff --git a/lib/RoadizRozierBundle/templates/users/roles.html.twig b/lib/RoadizRozierBundle/templates/users/roles.html.twig
index 372b34158..0d4de711d 100644
--- a/lib/RoadizRozierBundle/templates/users/roles.html.twig
+++ b/lib/RoadizRozierBundle/templates/users/roles.html.twig
@@ -15,7 +15,7 @@
     } only %}
 
     <section class="rz-page__body">
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             roles: user.roles,
             caption: 'inherited.roles.caption'|trans,
         } only %}
@@ -41,7 +41,7 @@
 
         <hr />
 
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             userRoles: user.userRoles,
             selection_available: false,
             actions_available: true,
@@ -58,7 +58,7 @@
                         <td>{{ role }}</td>
                         {% if actions_available %}
                             <td>
-                                {% include '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                                {% include '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                     'edit_href': null,
                                     'delete_href': is_granted(role) ? path('usersRemoveRolesPage', { userId: userId, role: role }) : null,
                                     'delete_title': 'remove'|trans,
@@ -84,7 +84,7 @@
         {{ form_start(form) }}
             {{ form_widget(form) }}
             <div class="rz-form-field rz-form-field--align-start">
-                {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+                {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
                 {{ rz_button.root({
                     size: 'md',
                     label: 'add.role'|trans,
diff --git a/lib/RoadizRozierBundle/templates/users/security.html.twig b/lib/RoadizRozierBundle/templates/users/security.html.twig
index d1604b2c6..d5fe17855 100644
--- a/lib/RoadizRozierBundle/templates/users/security.html.twig
+++ b/lib/RoadizRozierBundle/templates/users/security.html.twig
@@ -19,11 +19,11 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form, { attr: {id: 'edit-user-form'}}) }}
         {{ form_widget(form) }}
-        {% import "@RoadizRozier/macros/rz_actions_menu.html.twig" as actions_menu %}
+        {% import "@RoadizRozier/components/rz_actions_menu.html.twig" as actions_menu %}
         {{ actions_menu.saveItem('#edit-user-form') }}
         {{ form_end(form) }}
 
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             bordered: true,
             margin_top: 'xs',
             caption: 'user.security.meta_table.caption'|trans,
diff --git a/lib/RoadizRozierBundle/templates/widgets/backlink.html.twig b/lib/RoadizRozierBundle/templates/widgets/backlink.html.twig
deleted file mode 100644
index c10b95f81..000000000
--- a/lib/RoadizRozierBundle/templates/widgets/backlink.html.twig
+++ /dev/null
@@ -1,17 +0,0 @@
-{%- block link -%}
-    {%- if app.request and app.request.get('referer') -%}
-        {% set link = app.request.get('referer') %}
-        {% set title = 'back'|trans %}
-    {%- endif -%}
-    {# Prevent display non local referer links #}
-    {%- if link and link|u.startsWith('/') -%}
-        {%- if title is not defined -%}
-            {% set title = 'back'|trans %}
-        {%- endif -%}
-        <a class="content-header-nav-back uk-navbar-content"
-           href="{{- link -}}"
-           title="{{- title|escape('html_attr') -}}"
-           data-uk-tooltip="{animation:true}"><i class="uk-icon-rz-back-parent"></i></a>
-    {%- endif -%}
-{%- endblock -%}
-
diff --git a/lib/RoadizRozierBundle/templates/widgets/countFiltersBar.html.twig b/lib/RoadizRozierBundle/templates/widgets/countFiltersBar.html.twig
deleted file mode 100644
index d896df726..000000000
--- a/lib/RoadizRozierBundle/templates/widgets/countFiltersBar.html.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-{% if filters and filters.itemCount %}
-    <nav class="count-filters-bar uk-navbar">
-        <div class="uk-navbar-content" id="uk-navbar-filter-count">
-            {{ '{0} no.item|{1} 1.item|]1,Inf] %count%.items'|transchoice(filters.itemCount)|raw }}
-        </div>
-    </nav>
-{% endif %}
diff --git a/lib/RoadizRozierBundle/templates/widgets/folderTree/singleFolder.html.twig b/lib/RoadizRozierBundle/templates/widgets/folderTree/singleFolder.html.twig
index 75afd518f..7bdb75c8f 100644
--- a/lib/RoadizRozierBundle/templates/widgets/folderTree/singleFolder.html.twig
+++ b/lib/RoadizRozierBundle/templates/widgets/folderTree/singleFolder.html.twig
@@ -24,7 +24,7 @@
         class="{{ innerClasses|join(' ') }}"
         role="treeitem"
     >
-        {% embed '@RoadizRozier/widgets/rz_tree_item_inner.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_tree_item.html.twig' with {
             item: folder,
             has_children: subFolders|length > 0,
             icon_class: 'rz-icon-ri--folder-fill',
@@ -40,7 +40,7 @@
             {% block contextual_menu %}
                 <rz-popover popover-placement="bottom-start" popover-offset="8">
                     {% set popover_id = "folder-contextual-menu-" ~ item.id %}
-                    {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+                    {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
                     {{ rz_button.root({
                         icon: 'rz-icon-ri--more-line',
                         size: 'sm',
@@ -52,7 +52,7 @@
                             popovertarget: popover_id,
                         }
                     })}}
-                        {% embed "@RoadizRozier/macros/rz_dropdown_menu.html.twig" with {
+                        {% embed "@RoadizRozier/components/rz_dropdown.html.twig" with {
                             targetId: popover_id,
                             tagList: 'ul',
                         } %}
diff --git a/lib/RoadizRozierBundle/templates/widgets/itemPerPage.html.twig b/lib/RoadizRozierBundle/templates/widgets/itemPerPage.html.twig
deleted file mode 100644
index 84e51d658..000000000
--- a/lib/RoadizRozierBundle/templates/widgets/itemPerPage.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{% if filters.itemPerPage and filters.itemCount > 10 %}
-{% set enabledCounts = [10,20,50,100,200] %}
-<form class="uk-form uk-margin-remove uk-display-inline-block" method="get">
-    {% if filters.search %}<input type="hidden" name="search" value="{{ filters.search }}" />{% endif %}
-    {# Current page should be reset to avoid displaying empty results pages because items per page is higher than items count #}
-    <input type="hidden" name="page" value="1" />
-    {% block additional_inputs %}{% endblock %}
-    <span class="item-per-page-label">{% trans %}item-per-page.display.count{% endtrans %}</span>
-    <div class="rz-select">
-        <select class="item-per-page" name="item_per_page">
-            {% if filters.itemPerPage not in enabledCounts %}
-            <option selected value="{{ filters.itemPerPage }}">{{ '%count%.items'|trans({'%count%':filters.itemPerPage})|raw }}</option>
-            {% endif %}
-            {% for index in enabledCounts %}
-            <option {% if filters.itemPerPage == index %}selected{% endif %} value="{{ index }}">{{ '%count%.items'|trans({'%count%':index})|raw }}</option>
-            {% endfor %}
-        </select>
-    </div>
-</form>
-{% endif %}
diff --git a/lib/RoadizRozierBundle/templates/widgets/nodeTree/contextualMenu.html.twig b/lib/RoadizRozierBundle/templates/widgets/nodeTree/contextualMenu.html.twig
index 821f3c9e1..05833b938 100644
--- a/lib/RoadizRozierBundle/templates/widgets/nodeTree/contextualMenu.html.twig
+++ b/lib/RoadizRozierBundle/templates/widgets/nodeTree/contextualMenu.html.twig
@@ -1,9 +1,9 @@
- {% import "@RoadizRozier/macros/rz_dropdown_menu.html.twig" as rz_dropdown_menu %}
+ {% import "@RoadizRozier/components/rz_dropdown.html.twig" as rz_dropdown %}
 <div class="rz-dropdown">
     <div class="rz-dropdown__head">
         <div class="rz-dropdown__title">{% trans %}actions{% endtrans %} | {{ node.nodeName|truncate_title(18) }}</div>
         <div class="rz-dropdown__info-list">
-            {% import '@RoadizRozier/macros/rz_node_badge.html.twig' as rz_node_badge %}
+            {% import '@RoadizRozier/components/rz_node_badge.html.twig' as rz_node_badge %}
             {{ rz_node_badge.parameters(node, { display_label: false }) }}
             {{ rz_node_badge.status(node, { display_label: false }) }}
         </div>
@@ -12,21 +12,21 @@
     {% if is_granted('CREATE', node) or is_granted('EDIT_SETTING', node) %}
         <menu class="rz-dropdown__list">
             {% if is_granted('CREATE', node) %}
-                {{ rz_dropdown_menu.item({
+                {{ rz_dropdown.item({
                     label: 'add.a.child.node'|trans,
                     leftIcon: 'rz-icon-ri--add-line',
                     href: path('nodesAddChildPage', { nodeId: node.id }),
                 }) }}
             {%- endif -%}
             {% if is_granted('EDIT_SETTING', node) %}
-                {{ rz_dropdown_menu.item({
+                {{ rz_dropdown.item({
                         label: 'edit.node'|trans,
                         leftIcon: 'rz-icon-ri--edit-line',
                         href: path('nodesEditPage', { nodeId:node.id }),
                     }) }}
 
                 {%- if not node.Locked -%}
-                    {{ rz_dropdown_menu.item({
+                    {{ rz_dropdown.item({
                         label: 'move.node.to.first.position'|trans,
                         class: 'move-node-first-position',
                         leftIcon: 'rz-icon-ri--arrow-up-line',
@@ -36,7 +36,7 @@
                             'commandfor': 'DYNAMICALLY_SET_BY_JS',
                         }
                     }) }}
-                    {{ rz_dropdown_menu.item({
+                    {{ rz_dropdown.item({
                         label: 'move.node.to.last.position'|trans,
                         leftIcon: 'rz-icon-ri--arrow-down-line',
                         attributes: {
@@ -52,7 +52,7 @@
 
      {% if is_granted('DUPLICATE', node) %}
         <menu class="rz-dropdown__list">
-            {{ rz_dropdown_menu.item({
+            {{ rz_dropdown.item({
                 label: 'node.copy'|trans,
                 leftIcon: 'rz-icon-ri--file-copy-line',
                 attributes: {
@@ -61,7 +61,7 @@
                     'commandfor': 'DYNAMICALLY_SET_BY_JS',
                 }
             }) }}
-            {{ rz_dropdown_menu.item({
+            {{ rz_dropdown.item({
                 label: 'node.paste_inside'|trans,
                 leftIcon: 'rz-icon-ri--file-copy-line',
                 attributes: {
@@ -71,7 +71,7 @@
                     disabled: 'true',
                 }
             }) }}
-            {{ rz_dropdown_menu.item({
+            {{ rz_dropdown.item({
                 label: 'node.paste_after'|trans,
                 leftIcon: 'rz-icon-ri--file-copy-line',
                 attributes: {
@@ -81,7 +81,7 @@
                     disabled: 'true',
                 }
             }) }}
-            {{ rz_dropdown_menu.item({
+            {{ rz_dropdown.item({
                 label: 'node.duplicate'|trans,
                 leftIcon: 'rz-icon-ri--file-copy-line',
                 attributes: {
@@ -96,7 +96,7 @@
      {% if not node.locked and is_granted('EDIT_STATUS', node)%}
         <menu class="rz-dropdown__list">
             {% if node.visible %}
-                {{ rz_dropdown_menu.item({
+                {{ rz_dropdown.item({
                     label: 'node.hide'|trans,
                     leftIcon: 'rz-icon-ri--eye-off-line',
                     class: "hide-node",
@@ -109,7 +109,7 @@
                     }
                 }) }}
             {% else %}
-                {{ rz_dropdown_menu.item({
+                {{ rz_dropdown.item({
                     label: 'node.show'|trans,
                     leftIcon: 'rz-icon-ri--eye-line',
                     class: "show-node",
@@ -123,7 +123,7 @@
                 }) }}
             {% endif %}
             {% if not node.published and workflow_can(node, 'publish') %}
-                {{ rz_dropdown_menu.item({
+                {{ rz_dropdown.item({
                     label: 'node.publish'|trans,
                     leftIcon: 'rz-icon-rz--status-published-line',
                     attributes: {
@@ -135,7 +135,7 @@
                     }
                 }) }}
             {% elseif node.published and workflow_can(node, 'reject') %}
-                {{ rz_dropdown_menu.item({
+                {{ rz_dropdown.item({
                     label: 'node.unpublish'|trans,
                     leftIcon: 'rz-icon-rz--status-draft-line',
                     attributes: {
@@ -152,7 +152,7 @@
         {% if workflow_can(node, 'delete') %}
             <menu class="rz-dropdown__list">
                 {% set refererUrl = node.parent ? getBreadcrumbsItem(node.parent).url : null %}
-                {{ rz_dropdown_menu.item({
+                {{ rz_dropdown.item({
                     label: 'delete.node'|trans,
                     leftIcon: 'rz-icon-ri--delete-bin-7-line',
                     href: path('nodesDeletePage', { nodeId: node.id, referer: refererUrl }),
diff --git a/lib/RoadizRozierBundle/templates/widgets/nodeTree/singleNode.html.twig b/lib/RoadizRozierBundle/templates/widgets/nodeTree/singleNode.html.twig
index d2d672a2c..f30a70347 100644
--- a/lib/RoadizRozierBundle/templates/widgets/nodeTree/singleNode.html.twig
+++ b/lib/RoadizRozierBundle/templates/widgets/nodeTree/singleNode.html.twig
@@ -54,7 +54,7 @@
         {% endif %}
         {% set contextual_menu_id = 'node-contextual-menu-' ~ (isMainTree ? 'main-' : '') ~ node.id %}
 
-        {% embed '@RoadizRozier/widgets/rz_tree_item_inner.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_tree_item.html.twig' with {
             item: node,
             has_children: children is defined and children|length > 0,
             icon_class: icon_class,
@@ -85,7 +85,7 @@
 
                 {% set node_href = getNodeSourceHref(item, nodeTree.translation, parent) %}
                 {% if node_href is not null %}
-                    {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+                    {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
 					{{ rz_link.root({
 						label: node_label,
 						attributes: {
@@ -101,7 +101,7 @@
             {% block before_actions %}
                 {% set tags = nodeTree.getTags(item) %}
                 {% if tags|length and nodeTree.isStackTree %}
-                    {% embed "@RoadizRozier/macros/rz_overflow_list.html.twig" with {
+                    {% embed "@RoadizRozier/components/rz_overflow_list.html.twig" with {
                         items: tags,
                         visibleCount: 6,
                         responsive: true,
@@ -121,7 +121,7 @@
                         {% block item %}
                             {% set label = item.name|default(item.tagName) %}
                             {% if item and label %}
-                                {% import "@RoadizRozier/macros/rz_badge.html.twig" as rz_badge %}
+                                {% import "@RoadizRozier/components/rz_badge.html.twig" as rz_badge %}
                                 {{ rz_badge.item({
                                     label: label,
                                     size: 'sm',
@@ -150,7 +150,7 @@
                     popover-placement="bottom-end"
                     id="{{ contextual_menu_id }}"
                 >
-                    {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+                    {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
                     {{ rz_button.root({
                         icon: 'rz-icon-ri--more-line',
                         size: 'sm',
diff --git a/lib/RoadizRozierBundle/templates/widgets/rz_bulk_actions.html.twig b/lib/RoadizRozierBundle/templates/widgets/rz_bulk_actions.html.twig
deleted file mode 100644
index a947de01c..000000000
--- a/lib/RoadizRozierBundle/templates/widgets/rz_bulk_actions.html.twig
+++ /dev/null
@@ -1,56 +0,0 @@
-{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
-
-<rz-bulk-actions
-	class="rz-bulk-actions"
-	visibility-class="rz-bulk-actions--visible"
->
-	<h3 class="rz-bulk-actions__title">
-		{% block title_content %}
-			{% trans %}bulk.actions{% endtrans %}
-		{% endblock %}
-	</h3>
-
-	<div class="rz-bulk-actions__buttons">
-		{{
-			rz_button.root({
-				attributes: {
-					type: 'button',
-					title: "deselect.all"|trans,
-					'data-bulk-deselect-all-button': '',
-				},
-				emphasis: 'primary',
-				icon: 'rz-icon-ri--checkbox-blank-line',
-			})
-		}}
-
-		{% block other_actions %}{% endblock %}
-
-		{% block delete_form %}
-			<form
-				class="rz-bulk-actions__form-button"
-				action="{{ delete_form_action }}"
-				method="{{ delete_form_method|default('POST') }}"
-			>
-				{% block delete_form_content %}
-					{% if delete_form_data %}
-						{% form_theme delete_form_data '@RoadizRozier/forms.html.twig' %}
-						{{ form_widget(delete_form_data) }}
-					{% endif %}
-				{% endblock %}
-				{{
-					rz_button.root({
-						attributes: {
-							type: 'submit',
-							title: title
-						},
-						color: 'danger',
-						emphasis: 'primary',
-						icon: 'rz-icon-ri--delete-bin-7-line',
-					})
-				}}
-			</form>
-		{% endblock %}
-	</div>
-
-	{% block panels %}{% endblock %}
-</rz-bulk-actions>
diff --git a/lib/RoadizRozierBundle/templates/widgets/rz_filters_bar.html.twig b/lib/RoadizRozierBundle/templates/widgets/rz_filters_bar.html.twig
deleted file mode 100644
index bce431e6b..000000000
--- a/lib/RoadizRozierBundle/templates/widgets/rz_filters_bar.html.twig
+++ /dev/null
@@ -1,70 +0,0 @@
-{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
-{% import "@RoadizRozier/macros/rz_filters_bar.html.twig" as rz_filters_bar %}
-
-<rz-filters-bar>
-    {% if filters.description %}
-        <p class="rz-filters-bar__description">{{ filters.description }}</p>
-    {% endif %}
-
-    {% if with_filter_form is not same as(false) %}
-        <form method="get" class="rz-filters-bar__group">
-            {% if display_layout_fields %}
-                {% set value = filters.layout ?? app.request.query.get('layout') %}
-                {{ rz_filters_bar.layout_fields(value) }}
-            {% endif %}
-
-            <input
-                class="rz-input"
-                id="uk-form-filter-input-search"
-                type="search"
-                name="search"
-                placeholder="{% trans %}search{% endtrans %}"
-                value="{{ filters.search|default(app.request.get('search') ?? '') }}"
-            />
-            {% block before_submit %}{% endblock %}
-            {{
-                rz_button.root({
-                    attributes: {
-                        type: 'submit',
-                    },
-                    emphasis: 'secondary',
-                    label: 'filter'|trans,
-                    icon: 'rz-icon-ri--search-line'
-                })
-            }}
-            {% if display_select_all_button %}
-            {{
-                rz_button.root({
-                    attributes: {
-                        type: 'button',
-                        'aria-selected': 'false',
-                        'data-bulk-select-all-button': '',
-                        'selected-class': 'rz-button--selected',
-                    },
-                    emphasis: 'secondary',
-                    label: 'select.all',
-                    icon: 'rz-icon-ri--checkbox-line'
-                })
-            }}
-            {% endif %}
-        </form>
-    {% endif %}
-
-
-    {% set hasItemPerPageParams = app.request.get('item_per_page') and (app.request.get('item_per_page') != 20) %}
-    {% set hasMorePage = filters.itemCount > filters.itemPerPage %}
-
-    {% if hasItemPerPageParams or hasMorePage %}
-        <div class="rz-filters-bar__group rz-filters-bar__group--right">
-            {% if hasMorePage %}
-                {{ rz_filters_bar.pagination(filters) }}
-            {% endif %}
-
-
-            {% if filters.pageCount > 1 or filters.itemCount > 10 %}
-                {# Keep select if there are multiple pages or enough items #}
-                {{ rz_filters_bar.item_per_page(filters.itemPerPage) }}
-            {% endif %}
-        </div>
-    {% endif %}
-</rz-filters-bar>
diff --git a/lib/RoadizRozierBundle/templates/widgets/rz_repeatable.html.twig b/lib/RoadizRozierBundle/templates/widgets/rz_repeatable.html.twig
deleted file mode 100644
index edd1ef838..000000000
--- a/lib/RoadizRozierBundle/templates/widgets/rz_repeatable.html.twig
+++ /dev/null
@@ -1,66 +0,0 @@
-{% import "@RoadizRozier/macros/rz_form_field.html.twig" as rz_form_field %}
-{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
-
-{% set repeatable_id = id ~ '_repeatable'|default(random() ~ '_repeatable') %}
-<rz-repeatable
-	input-index-placeholder="{{ prototype.vars.name }}"
-	input-base-name="{{ full_name }}"
-	id-base-name="{{ id }}"
-	id="{{ repeatable_id }}"
->
-	{% if label is not same as(false) -%}
-		{% if label is empty -%}
-			{% set label = name|humanize %}
-		{%- endif -%}
-		<div class="rz-form-field__head">
-			{{ rz_form_field.inner_head(label, label_attr, form, icon|default('rz-icon-ri--repeat-2-line'), attr, entityIds|length) }}
-
-			{{ rz_button.root({
-				label: 'repeatable.add'|trans,
-				icon: 'rz-icon-ri--add-line',
-				size: 'sm',
-				class: 'rz-form-field__head__end',
-				attributes: {
-					type: 'button',
-					'command': '--add',
-					'commandfor': repeatable_id,
-					'data-insert-index': '0',
-				},
-			}) }}
-		</div>
-
-		<template data-item="">
-			{% embed "@RoadizRozier/macros/rz_repeatable.html.twig" %}
-				{% block inner_body %}
-					{{ data_prototype|raw }}
-				{% endblock %}
-			{% endembed %}
-		</template>
-
-		<div class="rz-form-field__body rz-repeatable__body">
-			<ol data-list="" class="rz-repeatable__list">
-				{% if stored_items_form is not null %}
-                    {% for item in stored_items_form %}
-                        {% embed "@RoadizRozier/macros/rz_repeatable.html.twig" %}
-                            {% block inner_body %}
-                                {{ form_widget(item) }}
-                            {% endblock %}
-                        {% endembed %}
-                    {% endfor %}
-				{% endif %}
-			</ol>
-			<div class="rz-repeatable__insert-zone">
-				{{ rz_button.root({
-					icon: 'rz-icon-ri--add-line',
-					attributes: {
-						type: 'button',
-						'command': '--add',
-						'commandfor': repeatable_id,
-						'tooltip-text': 'insert.zone'|trans,
-						'aria-label': 'collection.insert_item'|trans,
-					},
-				}) }}
-			</div>
-		</div>
-	{% endif %}
-</rz-repeatable>
diff --git a/lib/RoadizRozierBundle/templates/widgets/tagTree/singleTag.html.twig b/lib/RoadizRozierBundle/templates/widgets/tagTree/singleTag.html.twig
index 0530786a2..880fa9107 100644
--- a/lib/RoadizRozierBundle/templates/widgets/tagTree/singleTag.html.twig
+++ b/lib/RoadizRozierBundle/templates/widgets/tagTree/singleTag.html.twig
@@ -31,7 +31,7 @@
         class="{{ innerClasses|join(' ') }}"
         role="treeitem"
     >
-        {% embed '@RoadizRozier/widgets/rz_tree_item_inner.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_tree_item.html.twig' with {
             item: tag,
             has_children: children|length > 0,
             icon_class: 'rz-icon-ri--price-tag-3-fill',
@@ -48,7 +48,7 @@
             {% block contextual_menu %}
                 <rz-popover popover-placement="bottom-start" popover-offset="8">
                     {% set popover_id = 'tag-contextual-menu-' ~ (isMainTree ? 'main-' : '') ~ item.id %}
-                    {% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+                    {% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
                     {{ rz_button.root({
                         icon: 'rz-icon-ri--more-line',
                         size: 'sm',
@@ -60,7 +60,7 @@
                             popovertarget: popover_id,
                         }
                     })}}
-                        {% embed "@RoadizRozier/macros/rz_dropdown_menu.html.twig" with {
+                        {% embed "@RoadizRozier/components/rz_dropdown.html.twig" with {
                             targetId: popover_id,
                             tagList: 'ul',
                         } %}
diff --git a/lib/RoadizRozierBundle/templates/widgets/versionItem.html.twig b/lib/RoadizRozierBundle/templates/widgets/versionItem.html.twig
deleted file mode 100644
index 32b8dbcc0..000000000
--- a/lib/RoadizRozierBundle/templates/widgets/versionItem.html.twig
+++ /dev/null
@@ -1,4 +0,0 @@
-<a class="uk-button{% if currentVersion.id == version.id %} uk-active{% endif %}" href="{{ url }}">
-    <time>{{- version.loggedAt|format_datetime('short', 'short', locale=app.request.locale) -}}</time><br />
-    <span class="uk-text-small">{{- version.username -}}</span>
-</a>
diff --git a/lib/RoadizTwoFactorBundle/templates/Authentication/form.html.twig b/lib/RoadizTwoFactorBundle/templates/Authentication/form.html.twig
index 52e2fb8c9..c176e83a8 100644
--- a/lib/RoadizTwoFactorBundle/templates/Authentication/form.html.twig
+++ b/lib/RoadizTwoFactorBundle/templates/Authentication/form.html.twig
@@ -1,4 +1,4 @@
-{% extends '@RoadizRozier/login/base.html.twig' %}
+{% extends '@RoadizRozier/layouts/login.html.twig' %}
 
 {% block login_content %}
     {# Authentication errors #}
diff --git a/lib/RoadizTwoFactorBundle/templates/admin/backup_codes.html.twig b/lib/RoadizTwoFactorBundle/templates/admin/backup_codes.html.twig
index 732a66ccb..ea7a5c24d 100644
--- a/lib/RoadizTwoFactorBundle/templates/admin/backup_codes.html.twig
+++ b/lib/RoadizTwoFactorBundle/templates/admin/backup_codes.html.twig
@@ -1,11 +1,11 @@
 {% extends '@RoadizRozier/layout.html.twig' %}
-{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+{% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
 
 {% block title %}{% trans %}two_factor_backup_codes{% endtrans %} | {{ parent() }}{% endblock %}
 
 {% block content %}
     <section class="rz-page__body">
-        {% include '@RoadizRozier/admin/head.html.twig' with {
+        {% include '@RoadizRozier/layouts/head.html.twig' with {
             title: 'two_factor_backup_codes'|trans,
             breadcrumb: {
                 label: 'two-factor-breadcrumb',
diff --git a/lib/RoadizTwoFactorBundle/templates/admin/disable_two_factor.html.twig b/lib/RoadizTwoFactorBundle/templates/admin/disable_two_factor.html.twig
index fee9c30f2..05f8c4f7d 100644
--- a/lib/RoadizTwoFactorBundle/templates/admin/disable_two_factor.html.twig
+++ b/lib/RoadizTwoFactorBundle/templates/admin/disable_two_factor.html.twig
@@ -1,5 +1,5 @@
 {% extends '@RoadizRozier/layout.html.twig' %}
-{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+{% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
 
 {% set title = 'disable_two_factor_authentication'|trans %}
 
@@ -7,7 +7,7 @@
 
 {% block content %}
     <section class="content-global delete-document">
-        {% include '@RoadizRozier/admin/head.html.twig' with {
+        {% include '@RoadizRozier/layouts/head.html.twig' with {
             title: title,
             breadcrumb: {
                 label: 'two-factor-breadcrumb',
diff --git a/lib/RoadizTwoFactorBundle/templates/admin/two_factor.html.twig b/lib/RoadizTwoFactorBundle/templates/admin/two_factor.html.twig
index a684bf4b1..12e6f6250 100644
--- a/lib/RoadizTwoFactorBundle/templates/admin/two_factor.html.twig
+++ b/lib/RoadizTwoFactorBundle/templates/admin/two_factor.html.twig
@@ -1,11 +1,11 @@
 {% extends '@RoadizRozier/layout.html.twig' %}
-{% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+{% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
 
 {% block title %}{% trans %}two_factor_authentication{% endtrans %} | {{ parent() }}{% endblock %}
 
 {% block content %}
     <section class="rz-page__body">
-        {% include '@RoadizRozier/admin/head.html.twig' with {
+        {% include '@RoadizRozier/layouts/head.html.twig' with {
             title: 'two_factor_authentication'|trans,
             subtitle: 'start_two_factor_activation'|trans,
             breadcrumb: {
diff --git a/lib/Rozier/app/services/LoginCheckService.js b/lib/Rozier/app/services/LoginCheckService.js
index ad6efa282..603f26844 100644
--- a/lib/Rozier/app/services/LoginCheckService.js
+++ b/lib/Rozier/app/services/LoginCheckService.js
@@ -6,7 +6,7 @@ const DIALOG_IDS = [SESSION_EXPIRED_DIALOG_ID, HEALTH_CHECK_DIALOG_ID]
  * Login Check Event Service.
  *
  * Pings the back-end and opens the matching blocking dialog
- * (see base.html.twig) when the session expired
+ * (see layouts/base.html.twig) when the session expired
  * or when the back-end stopped answering.
  */
 export default class LoginCheckService {
diff --git a/lib/Rozier/app/utils/OverflowList.ts b/lib/Rozier/app/utils/OverflowList.ts
index fdb696a4b..55aa07594 100644
--- a/lib/Rozier/app/utils/OverflowList.ts
+++ b/lib/Rozier/app/utils/OverflowList.ts
@@ -3,7 +3,7 @@
  * narrow for them, and unfolds them again as it widens, never beyond what the server left
  * inline. The server state is the maximum, so the page is right without JS on a wide screen.
  *
- * Two DOM shapes, told apart by `overflow-inline-side` (macros/rz_overflow_list.html.twig):
+ * Two DOM shapes, told apart by `overflow-inline-side` (components/rz_overflow_list.html.twig):
  *
  * - `after` (breadcrumb): the N inline items are siblings *after* the wrapper, the popover holds
  *   the *first* levels. Folding takes the first inline item; the whole wrapper hides once nothing
diff --git a/lib/Rozier/app/utils/storybook/renderer/rzActionsMenu.ts b/lib/Rozier/app/utils/storybook/renderer/rzActionsMenu.ts
index 9ea4b17a3..b429fb104 100644
--- a/lib/Rozier/app/utils/storybook/renderer/rzActionsMenu.ts
+++ b/lib/Rozier/app/utils/storybook/renderer/rzActionsMenu.ts
@@ -17,7 +17,7 @@ export type RzActionsMenuOptions = {
 
 const COMPONENT_CLASS_NAME = 'rz-actions-menu'
 
-/** Mirrors macros/rz_actions_menu.html.twig. */
+/** Mirrors components/rz_actions_menu.html.twig. */
 export function rzActionsMenuRenderer(args: RzActionsMenuOptions) {
     const element = document.createElement('rz-actions-menu')
     element.classList.add(COMPONENT_CLASS_NAME)
diff --git a/lib/Rozier/app/utils/storybook/renderer/rzAside.ts b/lib/Rozier/app/utils/storybook/renderer/rzAside.ts
index 8d8ac446e..8d75721fe 100644
--- a/lib/Rozier/app/utils/storybook/renderer/rzAside.ts
+++ b/lib/Rozier/app/utils/storybook/renderer/rzAside.ts
@@ -24,7 +24,7 @@ const TREE_LABELS = {
     folder: { title: 'Folder tree', add: 'Add a folder' },
 }
 
-/** Mirrors widgets/rz_tree_wrapper_auto.html.twig for a root tree, without the language switcher. */
+/** Mirrors components/rz_tree.html.twig for a root tree, without the language switcher. */
 export function rzAsideTreeWrapperRenderer(args: RzAsideTreeWrapperOptions) {
     const wrapper = document.createElement('div')
     wrapper.classList.add(
@@ -77,7 +77,7 @@ export function rzAsideTreeWrapperRenderer(args: RzAsideTreeWrapperOptions) {
     return wrapper
 }
 
-/** Mirrors widgets/rz_aside.html.twig: the element then fetches its tree. */
+/** Mirrors patterns/aside.html.twig: the element then fetches its tree. */
 export function rzAsideRenderer(args: RzAsideOptions) {
     const element = document.createElement('rz-aside')
     element.classList.add(COMPONENT_CLASS_NAME)
diff --git a/lib/Rozier/app/utils/storybook/renderer/rzBreadcrumb.ts b/lib/Rozier/app/utils/storybook/renderer/rzBreadcrumb.ts
index a1b0dc287..83503d367 100644
--- a/lib/Rozier/app/utils/storybook/renderer/rzBreadcrumb.ts
+++ b/lib/Rozier/app/utils/storybook/renderer/rzBreadcrumb.ts
@@ -6,7 +6,7 @@ const COMPONENT_CLASS_NAME = 'rz-breadcrumb'
 
 /**
  * At most this many ancestors stay in the trail, the levels after the root fold into a popover
- * past that. Mirrors `max_visible` in templates/macros/rz_breadcrumb.html.twig — keep both in step.
+ * past that. Mirrors `max_visible` in templates/components/rz_breadcrumb.html.twig — keep both in step.
  */
 export const MAX_VISIBLE = 6
 
diff --git a/lib/Rozier/app/utils/storybook/renderer/rzBulkActions.ts b/lib/Rozier/app/utils/storybook/renderer/rzBulkActions.ts
index 9b98c546a..379c2e27f 100644
--- a/lib/Rozier/app/utils/storybook/renderer/rzBulkActions.ts
+++ b/lib/Rozier/app/utils/storybook/renderer/rzBulkActions.ts
@@ -48,7 +48,7 @@ export const DEFAULT_BULK_ACTIONS: RzBulkActionsOptions = {
 
 let instanceCounter = 0
 
-/** Mirrors widgets/rz_bulk_actions.html.twig. */
+/** Mirrors components/rz_bulk_actions.html.twig. */
 export function rzBulkActionsRenderer(args: RzBulkActionsOptions) {
     const prefix = `${COMPONENT_CLASS_NAME}-${++instanceCounter}`
     const element = document.createElement('rz-bulk-actions')
diff --git a/lib/Rozier/app/utils/storybook/renderer/rzBulkSection.ts b/lib/Rozier/app/utils/storybook/renderer/rzBulkSection.ts
index ca96a12d1..621114840 100644
--- a/lib/Rozier/app/utils/storybook/renderer/rzBulkSection.ts
+++ b/lib/Rozier/app/utils/storybook/renderer/rzBulkSection.ts
@@ -12,11 +12,11 @@ export type RzBulkSectionItemOptions = {
 export type RzBulkSectionOptions = {
     items: RzBulkSectionItemOptions[]
     bulkActions: RzBulkActionsOptions
-    /** Select-all button of widgets/rz_filters_bar.html.twig (`display_select_all_button`). */
+    /** Select-all button of components/rz_filters_bar.html.twig (`display_select_all_button`). */
     selectAllButton?: boolean
 }
 
-/** Mirrors rz_bulk.select_all_input and rz_bulk.select_input (macros/rz_bulk.html.twig). */
+/** Mirrors rz_bulk_actions.select_all_input and rz_bulk_actions.select_input (components/rz_bulk_actions.html.twig). */
 function selectInputRenderer(name: string, label: string, value?: string) {
     const input = document.createElement('input', { is: 'rz-input' })
     input.setAttribute('is', 'rz-input')
diff --git a/lib/Rozier/app/utils/storybook/renderer/rzColorSchemeSwitcher.ts b/lib/Rozier/app/utils/storybook/renderer/rzColorSchemeSwitcher.ts
index 68742f752..074ffaf42 100644
--- a/lib/Rozier/app/utils/storybook/renderer/rzColorSchemeSwitcher.ts
+++ b/lib/Rozier/app/utils/storybook/renderer/rzColorSchemeSwitcher.ts
@@ -19,7 +19,7 @@ export type RzColorSchemeSwitcherOptions = {
     attributes?: Record<string, string>
 }
 
-// Mirrors includes/rz_color_scheme_switcher.html.twig
+// Mirrors components/rz_color_scheme_switcher.html.twig
 export function rzColorSchemeSwitcherRenderer(
     args: RzColorSchemeSwitcherOptions = {},
 ) {
diff --git a/lib/Rozier/app/utils/storybook/renderer/rzGeotag.ts b/lib/Rozier/app/utils/storybook/renderer/rzGeotag.ts
index ef06d235e..2aadfb282 100644
--- a/lib/Rozier/app/utils/storybook/renderer/rzGeotag.ts
+++ b/lib/Rozier/app/utils/storybook/renderer/rzGeotag.ts
@@ -12,7 +12,7 @@ export type RzGeotagOptions = {
 
 const COMPONENT_CLASS_NAME = 'rz-geotag'
 
-/** Mirrors the item_detail macro of widgets/rz_geotag_field.html.twig. */
+/** Mirrors the item_detail macro of components/rz_geotag.html.twig. */
 function itemDetailRenderer(
     componentId: string,
     itemId = '',
@@ -71,7 +71,7 @@ function parseValue(value?: string) {
     }
 }
 
-/** Mirrors widgets/rz_geotag_field.html.twig. */
+/** Mirrors components/rz_geotag.html.twig. */
 export function rzGeotagRenderer(args: RzGeotagOptions) {
     const fieldId = args.id
     const wrapperId = `${fieldId}-wrapper`
@@ -140,7 +140,7 @@ export function rzGeotagRenderer(args: RzGeotagOptions) {
     )
 
     if (args.help) {
-        // rz_form_field.help (macros/rz_form_field.html.twig)
+        // rz_form_field.help (components/rz_form_field.html.twig)
         const help = document.createElement('p')
         help.id = `${fieldId}_help`
         help.classList.add('rz-form-field__description')
diff --git a/lib/Rozier/app/utils/storybook/renderer/rzPage.ts b/lib/Rozier/app/utils/storybook/renderer/rzPage.ts
index 91309f5f3..873ef1ee4 100644
--- a/lib/Rozier/app/utils/storybook/renderer/rzPage.ts
+++ b/lib/Rozier/app/utils/storybook/renderer/rzPage.ts
@@ -7,7 +7,7 @@ export type RzPageOptions = {
 
 const COMPONENT_CLASS_NAME = 'rz-page'
 
-/** Mirrors the <main is="rz-page"> of base.html.twig, without its legacy overlay, loader and UIkit hooks. */
+/** Mirrors the <main is="rz-page"> of layouts/base.html.twig, without its legacy overlay, loader and UIkit hooks. */
 export function rzPageRenderer(args: RzPageOptions) {
     const id = args.id || COMPONENT_CLASS_NAME
     const page = document.createElement('main', { is: COMPONENT_CLASS_NAME })
@@ -24,7 +24,7 @@ export function rzPageRenderer(args: RzPageOptions) {
     }
     page.appendChild(scrollable)
 
-    // Hidden by main.css, kept to match base.html.twig
+    // Hidden by main.css, kept to match layouts/base.html.twig
     page.appendChild(
         rzButtonRenderer({
             iconClass: 'rz-icon-ri--arrow-up-line',
diff --git a/lib/Rozier/app/utils/storybook/renderer/rzSaveButton.ts b/lib/Rozier/app/utils/storybook/renderer/rzSaveButton.ts
index 2621423f7..b3d6b1d19 100644
--- a/lib/Rozier/app/utils/storybook/renderer/rzSaveButton.ts
+++ b/lib/Rozier/app/utils/storybook/renderer/rzSaveButton.ts
@@ -6,7 +6,7 @@ export type RzSaveButtonOptions = {
     label?: string
 }
 
-/** Mirrors rz_actions_menu.saveItem (macros/rz_actions_menu.html.twig). */
+/** Mirrors rz_actions_menu.saveItem (components/rz_actions_menu.html.twig). */
 export function rzSaveButtonRenderer(args: RzSaveButtonOptions) {
     return rzButtonRenderer({
         is: 'rz-save-button',
diff --git a/lib/Rozier/docs/templates.md b/lib/Rozier/docs/templates.md
index 3e04bde8a..ae13fa23d 100644
--- a/lib/Rozier/docs/templates.md
+++ b/lib/Rozier/docs/templates.md
@@ -15,10 +15,11 @@ templates/
   patterns/           layout regions and screen parts: header, aside, menu_bar,
                       dashboard_nav, dashboard_panel
   components/         one file per rz-* root: rz_button.html.twig, rz_table.html.twig…
-  form/               form theme variants: horizontal_forms
+  form/               form theme variants and partials: horizontal_forms,
+                      document_alignment
   macros/             helpers without an rz-* root: element_attributes
   includes/           shared partials without an rz-* root: column_ordering,
-                      messages, translate_assistant_usage
+                      meta_item_table, messages, translate_assistant_usage
   <feature>/          pages and their local partials (nodes/, documents/, users/…)
   widgets/            legacy trees only, until the Navigation zone replaces them
 ```
diff --git a/lib/Rozier/docs/ui-redesign-todo.md b/lib/Rozier/docs/ui-redesign-todo.md
index 2efae9ab5..8bfe0cbd6 100644
--- a/lib/Rozier/docs/ui-redesign-todo.md
+++ b/lib/Rozier/docs/ui-redesign-todo.md
@@ -89,7 +89,7 @@ The dismissible alert is the one exception: it has no native equivalent and need
 - [ ] Replace the Vuex store (6 modules) and migrate the coupled block: `ExplorerContainer.vue`, `FilterExplorerContainer.vue`, `DocumentPreviewContainer.vue` and their dynamic children
 - [ ] Migrate the 7 remaining isolated Vue files (`Overlay.vue`, `BlanchetteEditorContainer.vue`/`BlanchetteToolbar.vue`...) following the event-driven pattern already proven on `rz-drawer`
 - [ ] Handle the last genuinely live UIkit behaviours: dismissible alert (`data-uk-alert` × 8, no native equivalent yet — needs a minimal design), `switcher` and `sortable` (moved here from Phase 0, [#535](https://github.com/roadiz/core-bundle-dev-app/issues/535)), and finish wiring `RzTooltip.ts` everywhere
-- [ ] Clean up the 4 files with a UIkit/native double dependency (`RzEntityThumbnail.ts`, `RzMarkdownEditor.ts`, `RzAside.ts`, `base.html.twig`)
+- [ ] Clean up the 4 files with a UIkit/native double dependency (`RzEntityThumbnail.ts`, `RzMarkdownEditor.ts`, `RzAside.ts`, `layouts/base.html.twig`)
 - [ ] Remove jQuery + UIkit from the bundle (`main.js`, `vendor.less`) — only possible once the two previous points are done, since jQuery and UIkit 2.x are coupled at runtime
 - [ ] Write a manual QA checklist per removed behaviour (no automated test exists in `lib/Rozier` to safety-net these removals)
 - [ ] Mark [ADR 0001](adr/0001-custom-elements-over-vue-uikit-jquery.md) as fully applied once this scope is handled
diff --git a/lib/Rozier/stories/RzAside.stories.ts b/lib/Rozier/stories/RzAside.stories.ts
index 31e2dd3f1..60c3793ba 100644
--- a/lib/Rozier/stories/RzAside.stories.ts
+++ b/lib/Rozier/stories/RzAside.stories.ts
@@ -95,7 +95,7 @@ type Story = StoryObj<Args>
 
 export const Default: Story = {}
 
-/** The gateway never answers: the loading state rendered by rz_aside.html.twig stays. */
+/** The gateway never answers: the loading state rendered by patterns/aside.html.twig stays. */
 export const Loading: Story = {
     parameters: {
         controls: { include: [] },
diff --git a/lib/Rozier/stories/RzDialog.stories.ts b/lib/Rozier/stories/RzDialog.stories.ts
index 490967d80..a0170ff02 100644
--- a/lib/Rozier/stories/RzDialog.stories.ts
+++ b/lib/Rozier/stories/RzDialog.stories.ts
@@ -134,7 +134,7 @@ export const NonModal: Story = {
     },
 }
 
-// Mirrors the session expired dialog of base.html.twig, opened by LoginCheckService.
+// Mirrors the session expired dialog of layouts/base.html.twig, opened by LoginCheckService.
 export const SessionExpired: Story = {
     args: {
         dialogId: 'session-expired-dialog',
@@ -162,7 +162,7 @@ export const SessionExpired: Story = {
     },
 }
 
-// Mirrors the health check dialog of base.html.twig: no close button, no action.
+// Mirrors the health check dialog of layouts/base.html.twig: no close button, no action.
 export const HealthCheckFailed: Story = {
     args: {
         dialogId: 'health-check-dialog',
diff --git a/lib/Rozier/stories/RzLivePreview.stories.ts b/lib/Rozier/stories/RzLivePreview.stories.ts
index 9cd0eb10e..49ba9f287 100644
--- a/lib/Rozier/stories/RzLivePreview.stories.ts
+++ b/lib/Rozier/stories/RzLivePreview.stories.ts
@@ -62,7 +62,7 @@ function rzLivePreviewRenderer(args: Args) {
         // private mode
     }
 
-    // Same nesting as base.html.twig + nodes/editSource.html.twig: .rz-page > .rz-page__body > form + preview
+    // Same nesting as layouts/base.html.twig + nodes/editSource.html.twig: .rz-page > .rz-page__body > form + preview
     const page = el('main', 'rz-page')
     const body = el('section', 'rz-page__body')
     const form = el(
diff --git a/lib/Rozier/stories/RzPage.stories.ts b/lib/Rozier/stories/RzPage.stories.ts
index 729959109..3393c786e 100644
--- a/lib/Rozier/stories/RzPage.stories.ts
+++ b/lib/Rozier/stories/RzPage.stories.ts
@@ -18,7 +18,7 @@ const meta: Meta<Args> = {
     tags: ['autodocs'],
     render: (args) => {
         const page = rzPageRenderer(args)
-        // The back-to-top button of base.html.twig is hidden: any button can send --scroll-top
+        // The back-to-top button of layouts/base.html.twig is hidden: any button can send --scroll-top
         page.querySelector('#main-content-scrollable')?.appendChild(
             rzButtonRenderer({
                 label: 'Scroll to top',
diff --git a/templates/admin/article/add.html.twig b/templates/admin/article/add.html.twig
index 314f0ccc2..2896f2ab2 100644
--- a/templates/admin/article/add.html.twig
+++ b/templates/admin/article/add.html.twig
@@ -1,7 +1,7 @@
-{% extends "@RoadizRozier/admin/base.html.twig" %}
+{% extends "@RoadizRozier/layouts/admin.html.twig" %}
 
 {%- block header -%}
-    {% include '@RoadizRozier/admin/head.html.twig' with {
+    {% include '@RoadizRozier/layouts/head.html.twig' with {
         title: 'articles.add'|trans,
         breadcrumb: {
             parents: [breadcrumb_root('articles')],
@@ -17,7 +17,7 @@
         {% form_theme form '@RoadizRozier/forms.html.twig' %}
         {{ form_start(form) }}
             {{ form_widget(form) }}
-            {% import "@RoadizRozier/macros/rz_button.html.twig" as rz_button %}
+            {% import "@RoadizRozier/components/rz_button.html.twig" as rz_button %}
             {{ rz_button.root({
                 label: 'articles.form.add'|trans,
                 emphasis: 'primary',
diff --git a/templates/admin/article/list.html.twig b/templates/admin/article/list.html.twig
index 638b51708..0d263e5f0 100644
--- a/templates/admin/article/list.html.twig
+++ b/templates/admin/article/list.html.twig
@@ -1,8 +1,8 @@
-{% extends "@RoadizRozier/admin/base.html.twig" %}
+{% extends "@RoadizRozier/layouts/admin.html.twig" %}
 
 {%- block header -%}
     {# This page is the section root, so the trail is just its own name. #}
-    {% include '@RoadizRozier/admin/head.html.twig' with {
+    {% include '@RoadizRozier/layouts/head.html.twig' with {
         title: 'articles'|trans,
         breadcrumb: { current: 'articles'|trans },
         filters: filters,
@@ -19,7 +19,7 @@
 {%- endblock -%}
 
 {%- block content_filters -%}
-    {% embed "@RoadizRozier/widgets/rz_filters_bar.html.twig" with {
+    {% embed "@RoadizRozier/components/rz_filters_bar.html.twig" with {
         filters: filters,
         display_select_all_button: true,
         tags: tags,
@@ -45,7 +45,7 @@
 
 {%- block content_body -%}
     <article>
-        {% embed '@RoadizRozier/includes/rz_table.html.twig' with {
+        {% embed '@RoadizRozier/components/rz_table.html.twig' with {
             selection_available: true,
             actions_available: true,
             items: items
@@ -89,7 +89,7 @@
                                 entity-class="App\GeneratedEntity\NSArticle"
                                 entity-id="{{ item.id }}"
                             ></rz-entity-thumbnail>
-                            {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+                            {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
                             {{ rz_link.root({
                                 label: item.title,
                                 class: "rz-table__cell--ellipsis",
@@ -99,11 +99,11 @@
                         <td>{{- item.publishedAt ? item.publishedAt|format_datetime('short', 'short', locale=app.request.locale) : '-' -}}</td>
                         <td>{{- item.node.createdAt|format_datetime('short', 'short', locale=app.request.locale) -}}</td>
                         <td>
-                            {% import "@RoadizRozier/macros/rz_node_badge.html.twig" as rz_node_badge %}
+                            {% import "@RoadizRozier/components/rz_node_badge.html.twig" as rz_node_badge %}
                             {{ rz_node_badge.all(item.node, { display_label: false }) }}
                         </td>
                         <td>
-                            {% import "@RoadizRozier/macros/rz_badge.html.twig" as rz_badge %}
+                            {% import "@RoadizRozier/components/rz_badge.html.twig" as rz_badge %}
                             {%- for tag in item.node.tags -%}
                                 {{ rz_badge.item({
                                     label: tag.name,
@@ -112,7 +112,7 @@
                         </td>
                         {% if actions_available %}
                             <td>
-                                {% embed '@RoadizRozier/includes/rz_table_actions.html.twig' with {
+                                {% embed '@RoadizRozier/components/rz_table_actions.html.twig' with {
                                     'edit_href': itemEditUrl,
                                     'delete_href': workflow_can(item.node, 'delete') ? path('nodesDeletePage', { nodeId: item.node.id }) : null,
                                 } %}
diff --git a/templates/bundles/RoadizRozierBundle/dashboard/index.html.twig b/templates/bundles/RoadizRozierBundle/dashboard/index.html.twig
index 1379f7789..7fd8b56b6 100644
--- a/templates/bundles/RoadizRozierBundle/dashboard/index.html.twig
+++ b/templates/bundles/RoadizRozierBundle/dashboard/index.html.twig
@@ -1,11 +1,11 @@
 {% extends "@!RoadizRozier/dashboard/index.html.twig" %}
-{% import '@RoadizRozier/macros/rz_button.html.twig' as rz_button %}
+{% import '@RoadizRozier/components/rz_button.html.twig' as rz_button %}
 
 {%- block header -%}
-    {% include '@RoadizRozier/admin/head.html.twig' with {
+    {% include '@RoadizRozier/layouts/head.html.twig' with {
         title: "hello.%name%"|trans({'%name%': displayName}),
         with_nav_bar: true,
-        nav_bar_template: '@RoadizRozier/dashboard/navBar.html.twig',
+        nav_bar_template: '@RoadizRozier/patterns/dashboard_nav.html.twig',
         nav_bar_context: {'current':'dashboard'},
         breadcrumb: {
             label: 'breadcrumb',
@@ -25,7 +25,7 @@
 
 {%- block dashboard_panels -%}
     <div class="rz-dashboard__row">
-        {% embed '@RoadizRozier/dashboard/panel.html.twig' with {
+        {% embed '@RoadizRozier/patterns/dashboard_panel.html.twig' with {
             icon: 'rz-icon-ri--computer-line',
             title: 'roadiz.dashboard.my_last_articles'|trans,
             button: {
@@ -38,7 +38,7 @@
             }
         } %}
             {% block content %}
-                {% embed '@RoadizRozier/includes/rz_table.html.twig' %}
+                {% embed '@RoadizRozier/components/rz_table.html.twig' %}
                     {% block tbody_content %}
                         {% for article in articles %}
                             <tr>
@@ -51,7 +51,7 @@
                                     ></rz-entity-thumbnail>
                                 </td>
                                 <td>
-                                    {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
+                                    {% import '@RoadizRozier/components/rz_link.html.twig' as rz_link %}
                                     {{ rz_link.root({
                                         label: article.title,
                                         attributes: {
@@ -76,7 +76,7 @@
         {% endembed %}
 
         {% if clientsTag is not null %}
-            {% embed '@RoadizRozier/dashboard/panel.html.twig' with {
+            {% embed '@RoadizRozier/patterns/dashboard_panel.html.twig' with {
                 icon: 'rz-icon-ri--price-tag-3-line',
                 title: 'roadiz.dashboard.clients'|trans,
                 button: {