diff --git a/volunteer/README.rst b/volunteer/README.rst
index 76a64437e..df967dfc2 100644
--- a/volunteer/README.rst
+++ b/volunteer/README.rst
@@ -1,7 +1,3 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 =========
 Volunteer
 =========
@@ -17,7 +13,7 @@ Volunteer
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-beescoop%2FObeesdoo-lightgray.png?logo=github
diff --git a/volunteer/__manifest__.py b/volunteer/__manifest__.py
index edbc1638e..4b9a57cbd 100644
--- a/volunteer/__manifest__.py
+++ b/volunteer/__manifest__.py
@@ -24,6 +24,7 @@
         "views/volunteer_shift_generator_views.xml",
         "views/volunteer_shift_kanban_views.xml",
         "views/volunteer_shift_participation_views.xml",
+        "views/volunteer_shift_generator_kanban_views.xml",
         "views/volunteer_shift_subscription_views.xml",
         "views/volunteer_shift_category_views.xml",
         "views/volunteer_shift_type_views.xml",
diff --git a/volunteer/demo/volunteer_shift_demo.xml b/volunteer/demo/volunteer_shift_demo.xml
index 249cbaa59..b0518c9b9 100644
--- a/volunteer/demo/volunteer_shift_demo.xml
+++ b/volunteer/demo/volunteer_shift_demo.xml
@@ -5,117 +5,90 @@ SPDX-FileCopyrightText: 2025 Coop IT Easy SC
 SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <odoo>
-    <record id="volunteer_shift_demo_today" model="volunteer.shift">
-        <field name="name">Shift Today</field>
+    <record id="volunteer_shift_demo_cheese" model="volunteer.shift">
+        <field name="name">Cheese cutting</field>
         <field name="max_volunteer_nb">2</field>
-        <field name="start_time" eval="datetime.now().strftime('%Y-%m-%d %H:%M:%S')" />
-        <field
-            name="end_time"
-            eval="(datetime.now() + timedelta(hours=2)).strftime('%Y-%m-%d %H:%M:%S')"
-        />
-        <field name="coordinator_id" ref="volunteer_partner_demo_b" />
+        <field name="start_time" eval="datetime.now()" />
+        <field name="end_time" eval="datetime.now() + timedelta(hours=2)" />
+        <field name="coordinator_id" ref="volunteer_partner_demo_john" />
         <field name="stage_id" ref="volunteer_shift_stage_confirmed" />
-        <field name="type_id" ref="volunteer_shift_type_demo_closing" />
+        <field name="type_id" ref="volunteer_shift_type_demo_cheese_cut" />
     </record>
 
-    <record id="volunteer_shift_demo_tomorrow" model="volunteer.shift">
-        <field name="name">Shift Tomorrow</field>
+    <record id="volunteer_shift_demo_delicatessen" model="volunteer.shift">
+        <field name="name">Delicatessen cutting</field>
         <field name="max_volunteer_nb">3</field>
+        <field name="start_time" eval="datetime.now() + timedelta(days=1)" />
+        <field name="end_time" eval="datetime.now() + timedelta(days=1, hours=2)" />
+        <field name="stage_id" ref="volunteer_shift_stage_canceled" />
+        <field name="type_id" ref="volunteer_shift_type_demo_delicatessen_cut" />
         <field
-            name="start_time"
-            eval="(datetime.now() + timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')"
-        />
-        <field
-            name="end_time"
-            eval="(datetime.now() + timedelta(days=1, hours=2)).strftime('%Y-%m-%d %H:%M:%S')"
+            name="tag_ids"
+            eval="[(6, 0, [ref('volunteer_shift_tag_demo_fresh')])]"
         />
-        <field name="stage_id" ref="volunteer_shift_stage_canceled" />
-        <field name="type_id" ref="volunteer_shift_type_demo_opening" />
-        <field name="tag_ids" eval="[(6, 0, [ref('volunteer_shift_demo_tag_a')])]" />
         <field name="category_id" ref="volunteer_shift_category_demo_week_b" />
     </record>
 
-    <record id="volunteer_shift_demo_next_7_days" model="volunteer.shift">
-        <field name="name">Shift Next 7 days</field>
+    <record id="volunteer_shift_demo_closing" model="volunteer.shift">
+        <field name="name">Thursday closing</field>
         <field name="max_volunteer_nb">3</field>
-        <field
-            name="start_time"
-            eval="(datetime.now() + timedelta(days=+6)).strftime('%Y-%m-%d %H:%M:%S')"
-        />
-        <field
-            name="end_time"
-            eval="(datetime.now() + timedelta(days=+6, hours=2)).strftime('%Y-%m-%d %H:%M:%S')"
-        />
+        <field name="start_time" eval="datetime.now() + timedelta(days=+6)" />
+        <field name="end_time" eval="datetime.now() + timedelta(days=+6, hours=2)" />
         <field name="stage_id" ref="volunteer_shift_stage_confirmed" />
         <field
             name="tag_ids"
-            eval="[(6, 0, [ref('volunteer_shift_demo_tag_a'), ref('volunteer_shift_demo_tag_b'), ref('volunteer_shift_demo_tag_c')])]"
+            eval="[(6, 0, [ref('volunteer_shift_tag_demo_physical'), ref('volunteer_shift_tag_demo_lifting')])]"
         />
-        <field name="type_id" ref="volunteer_shift_type_demo_cheese_cut" />
+        <field name="type_id" ref="volunteer_shift_type_demo_closing" />
         <field name="category_id" ref="volunteer_shift_category_demo_week_a" />
     </record>
 
-    <record id="volunteer_shift_demo_next_30_days" model="volunteer.shift">
-        <field name="name">Shift Next 30 days</field>
+    <record id="volunteer_shift_demo_future_closing" model="volunteer.shift">
+        <field name="name">Friday closing</field>
         <field name="max_volunteer_nb">9</field>
         <field
             name="start_time"
-            eval="(datetime.now() + timedelta(days=+29)).strftime('%Y-%m-%d %H:%M:%S')"
+            eval="(datetime.now() + timedelta(days=29)).replace(hour=20, minute=0, second=0)"
         />
         <field
             name="end_time"
-            eval="(datetime.now() + timedelta(days=+29, hours=2)).strftime('%Y-%m-%d %H:%M:%S')"
+            eval="(datetime.now() + timedelta(days=30)).replace(hour=2, minute=0, second=0)"
         />
-        <field name="coordinator_id" ref="volunteer_partner_demo_a" />
+        <field name="coordinator_id" ref="volunteer_partner_demo_jean" />
         <field name="stage_id" ref="volunteer_shift_stage_confirmed" />
         <field name="type_id" ref="volunteer_shift_type_demo_closing" />
-        <field name="tag_ids" eval="[(6, 0, [ref('volunteer_shift_demo_tag_a')])]" />
+        <field
+            name="tag_ids"
+            eval="[(6, 0, [ref('volunteer_shift_tag_demo_physical')])]"
+        />
     </record>
 
-    <record id="volunteer_shift_demo_yesterday" model="volunteer.shift">
-        <field name="name">Shift Yesterday</field>
+    <record id="volunteer_shift_demo_past_opening" model="volunteer.shift">
+        <field name="name">Store opening</field>
         <field name="max_volunteer_nb">3</field>
-        <field
-            name="start_time"
-            eval="(datetime.now() + timedelta(days=-1)).strftime('%Y-%m-%d %H:%M:%S')"
-        />
-        <field
-            name="end_time"
-            eval="(datetime.now() + timedelta(days=-1, hours=2)).strftime('%Y-%m-%d %H:%M:%S')"
-        />
-        <field name="coordinator_id" ref="volunteer_partner_demo_b" />
+        <field name="start_time" eval="datetime.now() + timedelta(days=-1)" />
+        <field name="end_time" eval="datetime.now() + timedelta(days=-1, hours=2)" />
+        <field name="coordinator_id" ref="volunteer_partner_demo_emma" />
         <field name="stage_id" ref="volunteer_shift_stage_confirmed" />
-        <field name="type_id" ref="volunteer_shift_type_demo_cheese_cut" />
+        <field name="type_id" ref="volunteer_shift_type_demo_opening" />
     </record>
 
-    <record id="volunteer_shift_demo_last_7_days" model="volunteer.shift">
-        <field name="name">Shift Last 7 days</field>
+    <record id="volunteer_shift_demo_past_cheese" model="volunteer.shift">
+        <field name="name">Cheese cutting</field>
         <field name="max_volunteer_nb">3</field>
-        <field
-            name="start_time"
-            eval="(datetime.now() + timedelta(days=-6)).strftime('%Y-%m-%d %H:%M:%S')"
-        />
-        <field
-            name="end_time"
-            eval="(datetime.now() + timedelta(days=-6, hours=2)).strftime('%Y-%m-%d %H:%M:%S')"
-        />
-        <field name="coordinator_id" ref="volunteer_partner_demo_b" />
+        <field name="start_time" eval="datetime.now() + timedelta(days=-6)" />
+        <field name="end_time" eval="datetime.now() + timedelta(days=-6, hours=2)" />
+        <field name="coordinator_id" ref="volunteer_partner_demo_emma" />
         <field name="stage_id" ref="volunteer_shift_stage_confirmed" />
         <field name="type_id" ref="volunteer_shift_type_demo_cheese_cut" />
     </record>
 
-    <record id="volunteer_shift_demo_last_year" model="volunteer.shift">
-        <field name="name">Shift Last year</field>
+    <record id="volunteer_shift_demo_past_delicatessen" model="volunteer.shift">
+        <field name="name">Delicatessen cutting</field>
         <field name="max_volunteer_nb">3</field>
-        <field
-            name="start_time"
-            eval="(datetime.now() + timedelta(days=-367)).strftime('%Y-%m-%d %H:%M:%S')"
-        />
-        <field
-            name="end_time"
-            eval="(datetime.now() + timedelta(days=-367, hours=2)).strftime('%Y-%m-%d %H:%M:%S')"
-        />
-        <field name="coordinator_id" ref="volunteer_partner_demo_b" />
-        <field name="type_id" ref="volunteer_shift_type_demo_cheese_cut" />
+        <field name="start_time" eval="datetime.now() + timedelta(days=-367)" />
+        <field name="end_time" eval="datetime.now() + timedelta(days=-367, hours=2)" />
+        <field name="coordinator_id" ref="volunteer_partner_demo_emma" />
+        <field name="type_id" ref="volunteer_shift_type_demo_delicatessen_cut" />
     </record>
 </odoo>
diff --git a/volunteer/demo/volunteer_shift_participation_demo.xml b/volunteer/demo/volunteer_shift_participation_demo.xml
index c855adde8..d002374c4 100644
--- a/volunteer/demo/volunteer_shift_participation_demo.xml
+++ b/volunteer/demo/volunteer_shift_participation_demo.xml
@@ -9,45 +9,48 @@ SPDX-License-Identifier: AGPL-3.0-or-later
         id="volunteer_shift_participation_demo_a"
         model="volunteer.shift.participation"
     >
-        <field name="volunteer_id" ref="volunteer_demo_a" />
-        <field name="shift_id" ref="volunteer_shift_demo_next_7_days" />
+        <field name="volunteer_id" ref="volunteer_demo_jean" />
+        <field name="shift_id" ref="volunteer_shift_demo_closing" />
     </record>
 
     <record
         id="volunteer_shift_participation_demo_b"
         model="volunteer.shift.participation"
     >
-        <field name="volunteer_id" ref="volunteer_demo_b" />
-        <field name="shift_id" ref="volunteer_shift_demo_next_7_days" />
+        <field name="volunteer_id" ref="volunteer_demo_john" />
+        <field name="shift_id" ref="volunteer_shift_demo_closing" />
     </record>
 
     <record
         id="volunteer_shift_participation_demo_c"
         model="volunteer.shift.participation"
     >
-        <field name="volunteer_id" ref="volunteer_demo_a" />
-        <field name="shift_id" ref="volunteer_shift_demo_next_30_days" />
+        <field name="volunteer_id" ref="volunteer_demo_jean" />
+        <field name="shift_id" ref="volunteer_shift_demo_future_closing" />
     </record>
 
     <record
         id="volunteer_shift_participation_demo_d"
         model="volunteer.shift.participation"
     >
-        <field name="volunteer_id" ref="volunteer_demo_a" />
-        <field name="shift_id" ref="volunteer_shift_demo_today" />
+        <field name="volunteer_id" ref="volunteer_demo_jean" />
+        <field name="shift_id" ref="volunteer_shift_demo_cheese" />
     </record>
 
-    <record id="shift_participation_demo_e" model="volunteer.shift.participation">
-        <field name="volunteer_id" ref="volunteer_demo_b" />
-        <field name="shift_id" ref="volunteer_shift_demo_today" />
+    <record
+        id="volunteer_shift_participation_demo_e"
+        model="volunteer.shift.participation"
+    >
+        <field name="volunteer_id" ref="volunteer_demo_emma" />
+        <field name="shift_id" ref="volunteer_shift_demo_cheese" />
     </record>
 
     <record
         id="volunteer_shift_participation_demo_f"
         model="volunteer.shift.participation"
     >
-        <field name="volunteer_id" ref="volunteer_demo_c" />
-        <field name="shift_id" ref="volunteer_shift_demo_today" />
+        <field name="volunteer_id" ref="volunteer_demo_john" />
+        <field name="shift_id" ref="volunteer_shift_demo_cheese" />
         <field name="registration_state">canceled</field>
     </record>
 
@@ -55,23 +58,23 @@ SPDX-License-Identifier: AGPL-3.0-or-later
         id="volunteer_shift_participation_demo_g"
         model="volunteer.shift.participation"
     >
-        <field name="volunteer_id" ref="volunteer_demo_c" />
-        <field name="shift_id" ref="volunteer_shift_demo_last_7_days" />
+        <field name="volunteer_id" ref="volunteer_demo_john" />
+        <field name="shift_id" ref="volunteer_shift_demo_past_cheese" />
     </record>
 
     <record
         id="volunteer_shift_participation_demo_h"
         model="volunteer.shift.participation"
     >
-        <field name="volunteer_id" ref="volunteer_demo_c" />
-        <field name="shift_id" ref="volunteer_shift_demo_yesterday" />
+        <field name="volunteer_id" ref="volunteer_demo_john" />
+        <field name="shift_id" ref="volunteer_shift_demo_past_opening" />
     </record>
 
     <record
         id="volunteer_shift_participation_demo_i"
         model="volunteer.shift.participation"
     >
-        <field name="volunteer_id" ref="volunteer_demo_c" />
-        <field name="shift_id" ref="volunteer_shift_demo_last_year" />
+        <field name="volunteer_id" ref="volunteer_demo_john" />
+        <field name="shift_id" ref="volunteer_shift_demo_past_delicatessen" />
     </record>
 </odoo>
diff --git a/volunteer/demo/volunteer_shift_recurrent_generator_demo.xml b/volunteer/demo/volunteer_shift_recurrent_generator_demo.xml
index 832f4f740..7839b82a9 100644
--- a/volunteer/demo/volunteer_shift_recurrent_generator_demo.xml
+++ b/volunteer/demo/volunteer_shift_recurrent_generator_demo.xml
@@ -5,24 +5,104 @@ SPDX-FileCopyrightText: 2025 Coop IT Easy SC
 SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <odoo>
-        <record
-        id="volunteer_generator_demo_opening"
+    <record
+        id="volunteer_generator_demo_friday_opening"
         model="volunteer.shift.recurrent.generator"
     >
-        <field name="name">Store Opening</field>
-        <field name="max_volunteer_nb">5</field>
+        <field name="name">Friday opening</field>
+        <field name="max_volunteer_nb">3</field>
         <field
             name="start_time"
-            eval="(datetime.now() - timedelta(days=30)).replace(hour=6, minute=0, second=0).strftime('%Y-%m-%d %H:%M:%S')"
+            eval="(datetime.now() - timedelta(days=30)).replace(hour=6, minute=0, second=0)"
         />
         <field
             name="end_time"
-            eval="(datetime.now() - timedelta(days=30)).replace(hour=9, minute=0, second=0).strftime('%Y-%m-%d %H:%M:%S')"
+            eval="(datetime.now() - timedelta(days=30)).replace(hour=9, minute=0, second=0)"
         />
         <field name="interval_type">days</field>
         <field name="interval">1</field>
-        <field name="state">draft</field>
+        <field name="state">confirmed</field>
         <field name="type_id" ref="volunteer_shift_type_demo_opening" />
+        <field name="category_id" ref="volunteer_shift_category_demo_week_b" />
+        <field
+            name="tag_ids"
+            eval="[(6, 0, [ref('volunteer_shift_tag_demo_fresh'), ref('volunteer_shift_tag_demo_lifting')])]"
+        />
+        <field name="tz">Europe/Brussels</field>
+    </record>
+
+    <record
+        id="volunteer_generator_demo_thursday_closing"
+        model="volunteer.shift.recurrent.generator"
+    >
+        <field name="name">Thursday closing</field>
+        <field name="max_volunteer_nb">3</field>
+        <field
+            name="start_time"
+            eval="datetime.now().replace(hour=20, minute=0, second=0)"
+        />
+        <field
+            name="end_time"
+            eval="(datetime.now() + timedelta(days=1)).replace(hour=2, minute=0, second=0)"
+        />
+        <field name="interval_type">weeks</field>
+        <field name="interval">1</field>
+        <field name="state">draft</field>
+        <field name="type_id" ref="volunteer_shift_type_demo_closing" />
+        <field name="category_id" ref="volunteer_shift_category_demo_week_b" />
+        <field
+            name="tag_ids"
+            eval="[(6, 0, [ref('volunteer_shift_tag_demo_fresh'), ref('volunteer_shift_tag_demo_lifting')])]"
+        />
+        <field name="tz">Europe/Brussels</field>
+    </record>
+
+    <record
+        id="volunteer_generator_demo_saturday_opening"
+        model="volunteer.shift.recurrent.generator"
+    >
+        <field name="name">Saturday opening</field>
+        <field name="max_volunteer_nb">3</field>
+        <field
+            name="start_time"
+            eval="(datetime.now() + timedelta(days=3)).replace(hour=6, minute=0, second=0)"
+        />
+        <field
+            name="end_time"
+            eval="(datetime.now() + timedelta(days=3)).replace(hour=9, minute=0, second=0)"
+        />
+        <field name="interval_type">weeks</field>
+        <field name="interval">2</field>
+        <field name="state">canceled</field>
+        <field name="type_id" ref="volunteer_shift_type_demo_closing" />
+        <field name="category_id" ref="volunteer_shift_category_demo_week_a" />
+        <field
+            name="tag_ids"
+            eval="[(6, 0, [ref('volunteer_shift_tag_demo_lifting')])]"
+        />
+        <field name="tz">Europe/Brussels</field>
+    </record>
+
+    <record
+        id="volunteer_generator_demo_cheese"
+        model="volunteer.shift.recurrent.generator"
+    >
+        <field name="name">Cheese cutting</field>
+        <field name="max_volunteer_nb">2</field>
+        <field
+            name="start_time"
+            eval="datetime.now().replace(hour=8, minute=0, second=0)"
+        />
+        <field
+            name="end_time"
+            eval="datetime.now().replace(hour=12, minute=0, second=0)"
+        />
+        <field name="interval_type">months</field>
+        <field name="interval">1</field>
+        <field name="until_date" eval="datetime.now() + timedelta(days=62)" />
+        <field name="state">confirmed</field>
+        <field name="type_id" ref="volunteer_shift_type_demo_cheese_cut" />
+        <field name="coordinator_id" ref="volunteer_partner_demo_emma" />
         <field name="tz">Europe/Brussels</field>
     </record>
 </odoo>
diff --git a/volunteer/demo/volunteer_shift_recurrent_subscription_demo.xml b/volunteer/demo/volunteer_shift_recurrent_subscription_demo.xml
index 4c598e0c0..0dba8f6a2 100644
--- a/volunteer/demo/volunteer_shift_recurrent_subscription_demo.xml
+++ b/volunteer/demo/volunteer_shift_recurrent_subscription_demo.xml
@@ -11,12 +11,9 @@ SPDX-License-Identifier: AGPL-3.0-or-later
         model="volunteer.shift.recurrent.subscription"
     >
         <field name="volunteer_id" ref="volunteer_demo_emma" />
-        <field name="generator_id" ref="volunteer_generator_demo_opening" />
-        <field
-            name="start_date"
-            eval="(datetime.now() - timedelta(days=7)).strftime('%Y-%m-%d')"
-        />
-        <field name="end_date" eval="datetime.now().strftime('%Y-%m-%d')" />
+        <field name="generator_id" ref="volunteer_generator_demo_friday_opening" />
+        <field name="start_date" eval="datetime.now() - timedelta(days=7)" />
+        <field name="end_date" eval="datetime.now()" />
         <field name="active" eval="False" />
     </record>
     <!-- Ongoing subscription -->
@@ -25,15 +22,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
         model="volunteer.shift.recurrent.subscription"
     >
         <field name="volunteer_id" ref="volunteer_demo_emma" />
-        <field name="generator_id" ref="volunteer_generator_demo_opening" />
-        <field
-            name="start_date"
-            eval="(datetime.now() - timedelta(days=7)).strftime('%Y-%m-%d')"
-        />
-        <field
-            name="end_date"
-            eval="(datetime.now() + timedelta(days=7)).strftime('%Y-%m-%d')"
-        />
+        <field name="generator_id" ref="volunteer_generator_demo_friday_opening" />
+        <field name="start_date" eval="datetime.now() - timedelta(days=7)" />
     </record>
     <!-- Upcoming subscription -->
     <record
@@ -41,15 +31,9 @@ SPDX-License-Identifier: AGPL-3.0-or-later
         model="volunteer.shift.recurrent.subscription"
     >
         <field name="volunteer_id" ref="volunteer_demo_jean" />
-        <field name="generator_id" ref="volunteer_generator_demo_opening" />
-        <field
-            name="start_date"
-            eval="(datetime.now() + timedelta(days=7)).strftime('%Y-%m-%d')"
-        />
-        <field
-            name="end_date"
-            eval="(datetime.now() + timedelta(days=14)).strftime('%Y-%m-%d')"
-        />
+        <field name="generator_id" ref="volunteer_generator_demo_friday_opening" />
+        <field name="start_date" eval="datetime.now() + timedelta(days=7)" />
+        <field name="end_date" eval="datetime.now() + timedelta(days=14)" />
     </record>
     <!-- Finished subscription -->
     <record
@@ -57,14 +41,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
         model="volunteer.shift.recurrent.subscription"
     >
         <field name="volunteer_id" ref="volunteer_demo_john" />
-        <field name="generator_id" ref="volunteer_generator_demo_opening" />
-        <field
-            name="start_date"
-            eval="(datetime.now() - timedelta(days=14)).strftime('%Y-%m-%d')"
-        />
-        <field
-            name="end_date"
-            eval="(datetime.now() - timedelta(days=7)).strftime('%Y-%m-%d')"
-        />
+        <field name="generator_id" ref="volunteer_generator_demo_friday_opening" />
+        <field name="start_date" eval="datetime.now() - timedelta(days=14)" />
+        <field name="end_date" eval="datetime.now() - timedelta(days=7)" />
     </record>
 </odoo>
diff --git a/volunteer/demo/volunteer_shift_tag_demo.xml b/volunteer/demo/volunteer_shift_tag_demo.xml
index 093ee6155..1874a5f83 100644
--- a/volunteer/demo/volunteer_shift_tag_demo.xml
+++ b/volunteer/demo/volunteer_shift_tag_demo.xml
@@ -5,23 +5,18 @@ SPDX-FileCopyrightText: 2025 Coop IT Easy SC
 SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <odoo>
-    <record id="volunteer_shift_demo_tag_a" model="volunteer.shift.tag">
-        <field name="name">Tag A</field>
-        <field name="description">Shift Tag A</field>
+    <record id="volunteer_shift_tag_demo_fresh" model="volunteer.shift.tag">
+        <field name="name">Fresh</field>
+        <field name="description">Fresh product reception</field>
     </record>
 
-    <record id="volunteer_shift_demo_tag_b" model="volunteer.shift.tag">
-        <field name="name">Tag B</field>
-        <field name="description">Shift Tag B</field>
+    <record id="volunteer_shift_tag_demo_physical" model="volunteer.shift.tag">
+        <field name="name">Physical</field>
+        <field name="description">Physical work</field>
     </record>
 
-    <record id="volunteer_shift_demo_tag_c" model="volunteer.shift.tag">
-        <field name="name">Tag C</field>
-        <field name="description">Shift Tag C</field>
-    </record>
-
-    <record id="volunteer_shift_demo_tag_d" model="volunteer.shift.tag">
-        <field name="name">Tag D</field>
-        <field name="description">Shift Tag D</field>
+    <record id="volunteer_shift_tag_demo_lifting" model="volunteer.shift.tag">
+        <field name="name">Lifting</field>
+        <field name="description">Heavy lifting</field>
     </record>
 </odoo>
diff --git a/volunteer/demo/volunteer_volunteer_demo.xml b/volunteer/demo/volunteer_volunteer_demo.xml
index 14f7e105b..cdb292621 100644
--- a/volunteer/demo/volunteer_volunteer_demo.xml
+++ b/volunteer/demo/volunteer_volunteer_demo.xml
@@ -5,54 +5,6 @@ SPDX-FileCopyrightText: 2025 Coop IT Easy SC
 SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <odoo>
-    <record id="volunteer_partner_demo_a" model="res.partner">
-        <field name="name">Volunteer A</field>
-        <field name="street">123 exemple street</field>
-        <field name="zip">1190</field>
-        <field name="city">Forest</field>
-        <field name="country_id" ref="base.be" />
-        <field name="phone">123456789</field>
-        <field name="email">vol_a@exemple.com</field>
-    </record>
-    <record id="volunteer_demo_a" model="volunteer.volunteer">
-        <field name="partner_id" ref="volunteer_partner_demo_a" />
-        <field
-            name="skill_ids"
-            eval="[(6, 0, [ref('volunteer_skill_demo_french'), ref('volunteer_skill_demo_B_license')])]"
-        />
-    </record>
-
-    <record id="volunteer_partner_demo_b" model="res.partner">
-        <field name="name">Volunteer B</field>
-        <field name="street">456 exemple street</field>
-        <field name="zip">1050</field>
-        <field name="city">Ixelles</field>
-        <field name="country_id" ref="base.be" />
-        <field name="phone">987654321</field>
-        <field name="email">vol_b@exemple.com</field>
-    </record>
-    <record id="volunteer_demo_b" model="volunteer.volunteer">
-        <field name="partner_id" ref="volunteer_partner_demo_b" />
-        <field
-            name="skill_ids"
-            eval="[(6, 0, [ref('volunteer_skill_demo_english')])]"
-        />
-    </record>
-
-    <record id="volunteer_partner_demo_c" model="res.partner">
-        <field name="name">Volunteer C</field>
-        <field name="street">789 exemple street</field>
-        <field name="zip">1000</field>
-        <field name="city">Bruxelles</field>
-        <field name="country_id" ref="base.be" />
-        <field name="phone">234567891</field>
-        <field name="email">vol_c@exemple.com</field>
-    </record>
-    <record id="volunteer_demo_c" model="volunteer.volunteer">
-        <field name="partner_id" ref="volunteer_partner_demo_c" />
-        <field name="is_regular" eval="True" />
-    </record>
-
     <record id="volunteer_partner_demo_john" model="res.partner">
         <field name="name">John Leclair</field>
         <field name="street">78 chaussée de Wavre</field>
@@ -77,6 +29,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
     </record>
     <record id="volunteer_demo_emma" model="volunteer.volunteer">
         <field name="partner_id" ref="volunteer_partner_demo_emma" />
+        <field name="is_regular" eval="True" />
     </record>
 
     <record id="volunteer_partner_demo_jean" model="res.partner">
diff --git a/volunteer/models/volunteer_shift_recurrent_generator.py b/volunteer/models/volunteer_shift_recurrent_generator.py
index 005851b24..5e493de8a 100644
--- a/volunteer/models/volunteer_shift_recurrent_generator.py
+++ b/volunteer/models/volunteer_shift_recurrent_generator.py
@@ -115,7 +115,9 @@ def create(self, vals_list):
         generators = super().create(vals_list)
         for generator in generators:
             # Prevent creating generators directly in canceled state
-            if generator.state == "canceled":
+            if generator.state == "canceled" and not self.env.context.get(
+                "install_mode"
+            ):
                 raise UserError(_("A generator cannot be created in canceled state."))
             if generator.state == "confirmed":
                 generator._generate_shifts()
diff --git a/volunteer/static/description/index.html b/volunteer/static/description/index.html
index 1c62417c2..19816561c 100644
--- a/volunteer/static/description/index.html
+++ b/volunteer/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Volunteer</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:2c4ff1c3658233c0e9aa90186f78d0bdfbe78f6d01f34f33fb87ef016d5705dd
+!! source digest: sha256:34c9b39997cef7826b4714c8d01254e77800ff020fa817e391e9e1b8a6118bc2
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/beescoop/Obeesdoo/tree/16.0/volunteer"><img alt="beescoop/Obeesdoo" src="https://img.shields.io/badge/github-beescoop%2FObeesdoo-lightgray.png?logo=github" /></a></p>
 <p>Generate and manage shifts for volunteers.</p>
diff --git a/volunteer/static/src/scss/volunteer_shift.scss b/volunteer/static/src/scss/volunteer_shift.scss
index c4a534f64..1d6fa1b3d 100644
--- a/volunteer/static/src/scss/volunteer_shift.scss
+++ b/volunteer/static/src/scss/volunteer_shift.scss
@@ -1,4 +1,23 @@
 .o_kanban_view {
+    .o_volunteer_recurrence_header {
+        font-weight: bold;
+        font-size: 1.25rem;
+    }
+    .o_volunteer_state_canceled,
+    .o_volunteer_state_confirmed,
+    .o_volunteer_state_draft {
+        color: white;
+    }
+    .o_volunteer_state_canceled {
+        background-color: red;
+        opacity: 0.4;
+    }
+    .o_volunteer_state_confirmed {
+        background-color: #dc3545;
+    }
+    .o_volunteer_state_draft {
+        background-color: grey;
+    }
     .o_kanban_content {
         .o_volunteer_bold {
             font-weight: bold;
@@ -9,6 +28,12 @@
         .o_volunteer_fontsize_11 {
             font-size: 1.1rem;
         }
+        .o_volunteer_fontsize_12 {
+            font-size: 1.25rem;
+        }
+        .o_volunteer_fontsize_14 {
+            font-size: 1.4rem;
+        }
         .o_volunteer_fontsize_17 {
             font-size: 1.75rem;
         }
diff --git a/volunteer/views/volunteer_shift_generator_kanban_views.xml b/volunteer/views/volunteer_shift_generator_kanban_views.xml
new file mode 100644
index 000000000..48a9ea9e5
--- /dev/null
+++ b/volunteer/views/volunteer_shift_generator_kanban_views.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+SPDX-FileCopyrightText: 2025 Coop IT Easy SC
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+<odoo>
+    <record id="volunteer_shift_generator_view_kanban" model="ir.ui.view">
+        <field name="name">Generator Kanban</field>
+        <field name="model">volunteer.shift.recurrent.generator</field>
+        <field name="arch" type="xml">
+            <kanban>
+                <field name="name" />
+                <field name="start_time" />
+                <field name="end_time" />
+                <field name="tag_ids" />
+                <field name="type_id" />
+                <field name="category_id" />
+                <field name="max_volunteer_nb" />
+                <field name="coordinator_id" />
+                <field name="is_one_day" />
+                <field name="until_date" />
+                <field name="interval" />
+                <field name="interval_type" />
+                <field name="state" />
+                <templates>
+                    <t t-name="kanban-box">
+                        <div
+                            class="d-flex flex-column p-0 oe_kanban_card oe_kanban_global_click"
+                        >
+                            <t
+                                t-if="record.state.raw_value == 'draft'"
+                                t-set="state_class"
+                                t-value="'o_volunteer_state_draft'"
+                            />
+                            <t
+                                t-elif="record.state.raw_value == 'canceled'"
+                                t-set="state_class"
+                                t-value="'o_volunteer_state_canceled'"
+                            />
+                            <t
+                                t-else=""
+                                t-set="state_class"
+                                t-value="'o_volunteer_state_confirmed'"
+                            />
+                            <div
+                                t-attf-class="py-1 o_volunteer_recurrence_header #{state_class} text-center"
+                                t-att-title="record.interval_type.value"
+                            >
+                                Each
+                                <t t-if="record.interval.raw_value &gt; 1">
+                                    <t t-out="record.interval.raw_value" />
+                                    <t t-out="' ' + record.interval_type.raw_value" />
+                                </t>
+                                <t t-else="">
+                                    <t
+                                        t-out="' ' + record.interval_type.raw_value.slice(0, -1)"
+                                    />
+                                </t>
+                            </div>
+                            <div
+                                class="o_kanban_content p-0 m-0 position-relative row d-flex flex-fill"
+                            >
+                                <div
+                                    t-attf-class="col-3 pb-3 px-2 text-center d-flex flex-column #{state_class}"
+                                >
+                                    <t t-if="!record.is_one_day.raw_value">
+                                        <div class="ms-3">
+                                            <t
+                                                t-out="luxon.DateTime.fromISO(record.start_time.raw_value).toFormat('d MMM')"
+                                            />
+                                        </div>
+                                    </t>
+                                    <div class="d-flex flex-column flex-grow-1">
+                                        <div
+                                            class="o_volunteer_bold o_volunteer_fontsize_14"
+                                        >
+                                            <t
+                                                t-out="luxon.DateTime.fromISO(record.start_time.raw_value).toFormat('HH:mm')"
+                                            />
+                                        </div>
+                                        <div>
+                                            <i
+                                                class="fa fa-arrow-right me-2"
+                                                title="End date"
+                                            />
+                                            <t t-if="record.is_one_day.raw_value">
+                                                <span
+                                                    class="o_volunteer_bold o_volunteer_fontsize_14"
+                                                >
+                                                    <t
+                                                        t-out="luxon.DateTime.fromISO(record.end_time.raw_value).toFormat('HH:mm')"
+                                                    />
+                                                </span>
+                                                <div>
+                                                    <t
+                                                        t-out="luxon.DateTime.fromISO(record.start_time.raw_value).toFormat('d MMM')"
+                                                    />
+                                                </div>
+                                            </t>
+                                            <t t-else="">
+                                                <t
+                                                    t-out="luxon.DateTime.fromISO(record.end_time.raw_value).toFormat('d MMM')"
+                                                />
+                                                <div
+                                                    class="o_volunteer_bold o_volunteer_fontsize_14"
+                                                >
+                                                    <t
+                                                        t-out="luxon.DateTime.fromISO(record.end_time.raw_value).toFormat('HH:mm')"
+                                                    />
+                                                </div>
+                                            </t>
+                                        </div>
+                                    </div>
+                                    <t t-if="record.until_date.raw_value">
+                                        <div
+                                            class="border-top pt-2 mt-2 mb-n2 w-100 d-flex justify-content-center"
+                                        >
+                                            <span
+                                                class="o_volunteer_bold o_volunteer_fontsize_12 text-nowrap"
+                                            >
+                                                <t
+                                                    t-out="luxon.DateTime.fromISO(record.until_date.raw_value).toFormat('d MMM yy')"
+                                                />
+                                            </span>
+                                        </div>
+                                    </t>
+                                </div>
+
+                                <div class="col-9 pb-2 px-3 d-flex flex-column">
+                                    <div
+                                        class="o_kanban_record_title o_text_overflow o_volunteer_fontsize_17"
+                                        t-att-title="record.name.value"
+                                    >
+                                        <field name="name" />
+                                    </div>
+
+                                    <t
+                                        t-if="record.tag_ids.raw_value and record.tag_ids.raw_value.length"
+                                    >
+                                        <div class="o_optional mt-n2">
+                                            <field
+                                                name="tag_ids"
+                                                widget="many2many_tags"
+                                                options="{'color_field': 'color'}"
+                                            />
+                                        </div>
+                                    </t>
+
+                                    <div class="mb-2 o_volunteer_fontsize_11">
+                                        <field name="type_id" />
+                                        <div>
+                                            <field name="category_id" />
+                                        </div>
+                                    </div>
+
+                                    <div
+                                        t-if="record.coordinator_id.raw_value"
+                                        class="o_kanban_record_bottom mt-auto text-end"
+                                    >
+                                        <div class="oe_kanban_bottom_left" />
+                                        <div
+                                            class="oe_kanban_bottom_right o_volunteer_fontsize_11 o_text_overflow"
+                                        >
+                                            <field
+                                                name="coordinator_id"
+                                                widget="many2one_avatar"
+                                            />
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+
+        </field>
+    </record>
+</odoo>
diff --git a/volunteer/views/volunteer_shift_generator_views.xml b/volunteer/views/volunteer_shift_generator_views.xml
index dc7ab4407..a97b520c5 100644
--- a/volunteer/views/volunteer_shift_generator_views.xml
+++ b/volunteer/views/volunteer_shift_generator_views.xml
@@ -189,9 +189,107 @@ SPDX-License-Identifier: AGPL-3.0-or-later
         </field>
     </record>
 
+    <record id="volunteer_shift_generator_view_search" model="ir.ui.view">
+        <field name="model">volunteer.shift.recurrent.generator</field>
+        <field name="arch" type="xml">
+            <search string="Shift Generators">
+                <field
+                    name="tag_ids"
+                    string="Tags"
+                    filter_domain="[('tag_ids', 'ilike', self)]"
+                />
+                <field
+                    name="volunteer_subscription_ids"
+                    filter_domain="[('volunteer_subscription_ids.volunteer_id', 'ilike', self)]"
+                    string="Volunteer"
+                />
+                <field
+                    name="category_id"
+                    filter_domain="[('category_id.name', 'ilike', self)]"
+                    string="Category"
+                />
+                <field
+                    name="type_id"
+                    filter_domain="[('type_id.name', 'ilike', self)]"
+                    string="Type"
+                />
+
+                <filter
+                    name="filter_today"
+                    string="Today"
+                    domain="[('start_time', '>=', context_today().strftime('%Y-%m-%d 00:00:00')),('start_time','&lt;=', context_today().strftime('%Y-%m-%d 23:59:59'))]"
+                />
+                <filter
+                    name="filter_future"
+                    string="Future"
+                    domain="[('start_time', '>=', context_today().strftime('%Y-%m-%d 00:00:00'))]"
+                />
+                <filter
+                    name="filter_past"
+                    string="Past"
+                    domain="[('start_time','&lt;', context_today().strftime('%Y-%m-%d 23:59:59'))]"
+                />
+                <separator />
+                <filter
+                    name="filter_next_7_days"
+                    string="Next 7 days"
+                    domain="[('start_time', '&lt;=', (context_today()+datetime.timedelta(days=7)).strftime('%Y-%m-%d 23:59:59')),('start_time','>=', (context_today()).strftime('%Y-%m-%d 00:00:00'))]"
+                />
+                <filter
+                    name="filter_last_7_days"
+                    string="Last 7 days"
+                    domain="[('start_time', '&lt;=', context_today().strftime('%Y-%m-%d 23:59:59')),('start_time','>=', (context_today()- datetime.timedelta(days=7)).strftime('%Y-%m-%d 00:00:00'))]"
+                />
+                <filter
+                    name="filter_next_30_days"
+                    string="Next 30 days"
+                    domain="[('start_time', '&lt;=', (context_today()+datetime.timedelta(days=30)).strftime('%Y-%m-%d 23:59:59')),('start_time','>=', (context_today()).strftime('%Y-%m-%d 00:00:00'))]"
+                />
+                <separator />
+                <filter name="filter_date" string="Period" date="start_time" />
+                <filter
+                    name="filter_confirmed"
+                    string="Confirmed"
+                    domain="[('state', '=', 'confirmed')]"
+                    invisible="1"
+                />
+                <searchpanel>
+                    <field name="state" string="State" select="multi" />
+                    <field name="category_id" string="Category" select="multi" />
+                    <field name="type_id" string="Type" select="multi" />
+                </searchpanel>
+
+                <group expand="1" string="Group By">
+                    <filter
+                        name="start_time"
+                        string="Date"
+                        context="{'group_by':'start_time'}"
+                    />
+                    <filter
+                        name="state"
+                        string="State"
+                        context="{'group_by':'state'}"
+                    />
+                    <filter
+                        name="category"
+                        string="Category"
+                        context="{'group_by':'category_id'}"
+                    />
+                    <filter
+                        name="type"
+                        string="Type"
+                        context="{'group_by':'type_id'}"
+                    />
+                    <filter name="tag" string="Tag" context="{'group_by':'tag_ids'}" />
+                </group>
+            </search>
+        </field>
+    </record>
+
     <record id="volunteer_shift_generator_action" model="ir.actions.act_window">
         <field name="name">Shift Generator</field>
         <field name="res_model">volunteer.shift.recurrent.generator</field>
-        <field name="view_mode">tree,form</field>
+        <field name="context">{"search_default_filter_confirmed": 1}</field>
+        <field name="view_mode">kanban,tree,form</field>
     </record>
 </odoo>
diff --git a/volunteer/views/volunteer_shift_kanban_views.xml b/volunteer/views/volunteer_shift_kanban_views.xml
index 4d11932e2..6d760e190 100644
--- a/volunteer/views/volunteer_shift_kanban_views.xml
+++ b/volunteer/views/volunteer_shift_kanban_views.xml
@@ -46,14 +46,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
                                             t-out="luxon.DateTime.fromISO(record.start_time.raw_value).toFormat('HH:mm')"
                                         />
                                     </div>
-                                    <t
-                                        t-set="start_date_only"
-                                        t-value="record.start_time.raw_value.split('T')[0]"
-                                    />
-                                    <t
-                                        t-set="end_date_only"
-                                        t-value="record.end_time.raw_value.split('T')[0]"
-                                    />
                                     <div>
                                         <i
                                             class="fa fa-arrow-right me-2"
@@ -112,19 +104,19 @@ SPDX-License-Identifier: AGPL-3.0-or-later
                                         <div class="oe_kanban_bottom_left">
                                             <div
                                                 t-if="record.remaining_slots.raw_value &lt;= 0"
-                                                class="badge bg-danger o_volunteer_fontsize_11"
+                                                class="badge bg-success o_volunteer_fontsize_11"
                                             >
                                                 Full
                                             </div>
                                             <div
                                                 t-elif="record.remaining_slots.raw_value == record.max_volunteer_nb.raw_value"
-                                                class="badge bg-success o_volunteer_fontsize_11"
+                                                class="badge bg-danger o_volunteer_fontsize_11"
                                             >
                                                 Empty
                                             </div>
                                             <div
                                                 t-elif="record.remaining_slots.raw_value == 1"
-                                                class="badge bg-warning"
+                                                class="badge bg-info"
                                             >
                                                 <field
                                                     class="o_volunteer_fontsize_11"
@@ -134,7 +126,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
                                                     left
                                                 </span>
                                             </div>
-                                            <div t-else="" class="badge bg-info">
+                                            <div t-else="" class="badge bg-warning">
                                                 <field
                                                     class="o_volunteer_fontsize_11"
                                                     name="remaining_slots"
diff --git a/volunteer/views/volunteer_volunteer_kanban_views.xml b/volunteer/views/volunteer_volunteer_kanban_views.xml
index 760b27a2a..6a2bffa73 100644
--- a/volunteer/views/volunteer_volunteer_kanban_views.xml
+++ b/volunteer/views/volunteer_volunteer_kanban_views.xml
@@ -52,16 +52,14 @@ SPDX-License-Identifier: AGPL-3.0-or-later
                                             options="{'color_field': 'color'}"
                                         />
                                     </div>
-                                    <div
-                                        class="o_kanban_record_bottom mt-auto pt-2 text-end"
-                                    >
-                                        <div class="oe_kanban_bottom_left" />
-                                        <div class="oe_kanban_bottom_right">
-                                            <div
-                                                t-if="record.is_regular.raw_value"
-                                                class="badge bg-light"
-                                            >Regular
-                                            </div>
+                                </div>
+                                <div
+                                    t-if="record.is_regular.raw_value"
+                                    class="o_kanban_record_bottom mt-auto pt-2 text-end"
+                                >
+                                    <div class="oe_kanban_bottom_left" />
+                                    <div class="oe_kanban_bottom_right">
+                                        <div class="badge bg-light">Regular
                                         </div>
                                     </div>
                                 </div>