diff --git a/website_project_task/__manifest__.py b/website_project_task/__manifest__.py
index efb95eed..064283ec 100644
--- a/website_project_task/__manifest__.py
+++ b/website_project_task/__manifest__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Website Project Tasks',
-    'version': '11.0.1.0.0',
+    'version': '12.0.1.0.0',
     'author': 'Hibou Corp. <hello@hibou.io>',
     'website': 'https://hibou.io/',
     'license': 'AGPL-3',
diff --git a/website_project_task/project_task_templates.xml b/website_project_task/project_task_templates.xml
index fc9495cc..3ace2e2c 100644
--- a/website_project_task/project_task_templates.xml
+++ b/website_project_task/project_task_templates.xml
@@ -2,21 +2,21 @@
 <odoo>
 
     <template id="my_tasks" inherit_id='project.portal_my_tasks' name="Stage Colors etc.">
-        <xpath expr="//td/span[@class='label label-info']" position="attributes">
-            <attribute name="t-attf-class">label label-info stage stage-{{ task.stage_id.name }}</attribute>
+        <xpath expr="//td/span[hasclass('badge-info')]" position="attributes">
+            <attribute name="t-attf-class">badge badge-pill badge-info stage stage-{{ task.stage_id.name }}</attribute>
         </xpath>
     </template>
 
 
     <template id="task_tag_grid" inherit_id='project.portal_my_tasks' customize_show="True" name="Task Tags on table">
-        <xpath expr="//table/thead/tr/th[1]" position="attributes">
+        <xpath expr="//thead/tr/th[1]" position="attributes">
             <attribute name="class">col-md-8</attribute>
         </xpath>
-        <xpath expr="//table/thead/tr/th[2]" position="after">
+        <xpath expr="//thead/tr/th[2]" position="after">
             <th>Tags</th>
         </xpath>
         <!-- Strange number of columns -->
-        <xpath expr="//table/tbody/t/tr/td[1]" position="after">
+        <xpath expr="//tbody/t/tr/td[1]" position="after">
             <td>
                 <t t-foreach="task.tag_ids" t-as="tag">
                     <span t-attf-class="label tag tag-color-{{ tag.color }} tag-{{ tag.name }}"><t t-esc="tag.name"/></span>
@@ -26,8 +26,8 @@
     </template>
 
     <template id="my_task" inherit_id='project.portal_my_task' name="Stage Colors etc.">
-        <xpath expr="//span[@class='pull-right label label-info']" position="attributes">
-            <attribute name="t-attf-class">pull-right label label-info stage stage-{{ task.stage_id.name }}</attribute>
+        <xpath expr="//span[hasclass('badge-info')]" position="attributes">
+            <attribute name="t-attf-class">badge badge-pill badge-info stage stage-{{ task.stage_id.name }}</attribute>
         </xpath>
         <xpath expr="//h4" position="after">
             <p t-if="task.tag_ids">
@@ -37,7 +37,7 @@
     </template>
 
     <template id="my_task_todo" inherit_id='project.portal_my_task' name="Todo List (requires project_task_line)" customize_show="True" active="False">
-        <xpath expr="//t[@t-if='task.description']" position="before">
+        <xpath expr="//div[@t-if='task.description']" position="before">
             <t t-if="task.sudo().line_ids">
                 <div class="col-md-12">
                     <strong>Todo List</strong>