diff --git a/document_page/README.rst b/document_page/README.rst
index cc5d3981..c22221d3 100644
--- a/document_page/README.rst
+++ b/document_page/README.rst
@@ -14,13 +14,13 @@ Document Page
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fknowledge-lightgray.png?logo=github
-    :target: https://github.com/OCA/knowledge/tree/14.0/document_page
+    :target: https://github.com/OCA/knowledge/tree/15.0/document_page
     :alt: OCA/knowledge
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/knowledge-14-0/knowledge-14-0-document_page
+    :target: https://translation.odoo-community.org/projects/knowledge-15-0/knowledge-15-0-document_page
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/118/14.0
+    :target: https://runbot.odoo-community.org/runbot/118/15.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -57,7 +57,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/knowledge/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/knowledge/issues/new?body=module:%20document_page%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/knowledge/issues/new?body=module:%20document_page%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -109,6 +109,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/knowledge <https://github.com/OCA/knowledge/tree/14.0/document_page>`_ project on GitHub.
+This module is part of the `OCA/knowledge <https://github.com/OCA/knowledge/tree/15.0/document_page>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/document_page/__manifest__.py b/document_page/__manifest__.py
index 61ef5660..079ccf86 100644
--- a/document_page/__manifest__.py
+++ b/document_page/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     "name": "Document Page",
-    "version": "14.0.1.0.0",
+    "version": "15.0.1.0.0",
     "category": "Knowledge Management",
     "author": "OpenERP SA, Odoo Community Association (OCA)",
     "images": [
@@ -26,8 +26,12 @@
         "views/document_page.xml",
         "views/document_page_category.xml",
         "views/document_page_history.xml",
-        "views/document_page_assets.xml",
         "views/report_document_page.xml",
     ],
     "demo": ["demo/document_page.xml"],
+    "assets": {
+        "web.assets_backend": [
+            "document_page/static/src/scss/document_page.scss",
+        ],
+    },
 }
diff --git a/document_page/demo/document_page.xml b/document_page/demo/document_page.xml
index 764e61f5..386e99d3 100644
--- a/document_page/demo/document_page.xml
+++ b/document_page/demo/document_page.xml
@@ -21,7 +21,7 @@ Additional ressources
     </record>
 
     <record id="demo_page1" model="document.page">
-        <field name="name">Odoo 14.0 Functional Demo</field>
+        <field name="name">Odoo 15.0 Functional Demo</field>
         <field name="draft_name">1.0</field>
         <field name="draft_summary">Init</field>
         <field name="parent_id" ref="demo_category1" />
@@ -29,22 +29,26 @@ Additional ressources
 <![CDATA[
 <br>
 <br>
-The news is out, Odoo's latest version 14.0 is here.  It's more<br>
+The news is out, Odoo's latest version 15.0 is here.  It's more<br>
 user-friendly, even more business oriented and efficient to manage your company<br>
 <br>
-How to discover the latest version 14.0?<br>
+How to discover the latest version 15.0?<br>
 <br>
 Demo : <a target="https://demo.odoo.com" href="https://demo.odoo.com" style="background: url(&quot;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFZJREFUeF59z4EJADEIQ1F36k7u5E7ZKXeUQPACJ3wK7UNokVxVk9kHnQH7bY9hbDyDhNXgjpRLqFlo4M2GgfyJHhjq8V4agfrgPQX3JtJQGbofmCHgA/nAKks+JAjFAAAAAElFTkSuQmCC&quot;) no-repeat scroll right center transparent;padding-right: 13px;"></a><br>
 Online: <a target="https://www.odoo.com/trial" href="https://www.odoo.com/trial" style="background: url(&quot;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFZJREFUeF59z4EJADEIQ1F36k7u5E7ZKXeUQPACJ3wK7UNokVxVk9kHnQH7bY9hbDyDhNXgjpRLqFlo4M2GgfyJHhjq8V4agfrgPQX3JtJQGbofmCHgA/nAKks+JAjFAAAAAElFTkSuQmCC&quot;) no-repeat scroll right center transparent;padding-right: 13px;"></a><br>
 Download: <a target="https://www.odoo.com/page/download" href="https://www.odoo.com/page/download" style="background: url(&quot;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFZJREFUeF59z4EJADEIQ1F36k7u5E7ZKXeUQPACJ3wK7UNokVxVk9kHnQH7bY9hbDyDhNXgjpRLqFlo4M2GgfyJHhjq8V4agfrgPQX3JtJQGbofmCHgA/nAKks+JAjFAAAAAElFTkSuQmCC&quot;) no-repeat scroll right center transparent;padding-right: 13px;"></a><br>
 <br>
-We have also put together a functional demo that presents 14.0. Watch this video<br>
-to learn directly from us what Odoo 14.0 can do for you. Share it in your<br>
+We have also put together a functional demo that presents 15.0. Watch this video<br>
+to learn directly from us what Odoo 15.0 can do for you. Share it in your<br>
 company, with your clients and implement it now for your business.<br>
 <br>
 <h3>Watch on Youtube!</h3><br>
 <br>
-<iframe width="480" height="390" src="https://www.youtube.com/embed/zLSgpQM_tms" frameborder="0" allowfullscreen=""></iframe><br>
+<div class="media_iframe_video" data-oe-expression="//www.youtube.com/embed/zLSgpQM_tms">
+    <div class="css_editable_mode_display" />
+    <div class="media_iframe_video_size" />
+    <iframe src="//www.youtube.com/embed/zLSgpQM_tms" allowfullscreen="allowfullscreen" frameborder="0" />
+</div>
 <br>
 <br>
 ]]>
@@ -101,7 +105,7 @@ you change your mind there is a reset button to return to the default view.<br>
         <field name="content">
 <![CDATA[
 <br>
-The Odoo touchscreen point of sale available with 14.0 allows you<br>
+The Odoo touchscreen point of sale available with 15.0 allows you<br>
 to manage your shop sales very easily.  It's fully web based so that you don't<br>
 have to install or deploy any software and all the sales shops can be easily<br>
 consolidated.  It works in connected and disconnected modes so that you can<br>
diff --git a/document_page/models/document_page.py b/document_page/models/document_page.py
index 345a745e..1c209913 100644
--- a/document_page/models/document_page.py
+++ b/document_page/models/document_page.py
@@ -18,7 +18,6 @@ class DocumentPage(models.Model):
     name = fields.Char("Title", required=True)
     type = fields.Selection(
         [("content", "Content"), ("category", "Category")],
-        "Type",
         help="Page type",
         default="content",
     )
@@ -27,11 +26,11 @@ class DocumentPage(models.Model):
         "document.page", "Category", domain=[("type", "=", "category")]
     )
     child_ids = fields.One2many("document.page", "parent_id", "Children")
-    content = fields.Text(
-        "Content",
+    content = fields.Html(
         compute="_compute_content",
         inverse="_inverse_content",
         search="_search_content",
+        sanitize=False,
     )
 
     draft_name = fields.Char(
@@ -49,7 +48,6 @@ class DocumentPage(models.Model):
     )
 
     template = fields.Html(
-        "Template",
         help="Template that will be used as a content template "
         "for all new page of this category.",
     )
diff --git a/document_page/models/document_page_history.py b/document_page/models/document_page_history.py
index d580186a..e767713b 100644
--- a/document_page/models/document_page_history.py
+++ b/document_page/models/document_page_history.py
@@ -16,8 +16,8 @@ class DocumentPageHistory(models.Model):
     page_id = fields.Many2one("document.page", "Page", ondelete="cascade")
     name = fields.Char(index=True)
     summary = fields.Char(index=True)
-    content = fields.Text()
-    diff = fields.Text(compute="_compute_diff")
+    content = fields.Html(sanitize=False)
+    diff = fields.Html(compute="_compute_diff")
 
     company_id = fields.Many2one(
         "res.company",
diff --git a/document_page/static/description/index.html b/document_page/static/description/index.html
index 2d823965..9bb7c886 100644
--- a/document_page/static/description/index.html
+++ b/document_page/static/description/index.html
@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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" href="https://github.com/OCA/knowledge/tree/14.0/document_page"><img alt="OCA/knowledge" src="https://img.shields.io/badge/github-OCA%2Fknowledge-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/knowledge-14-0/knowledge-14-0-document_page"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/118/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" 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" 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" href="https://github.com/OCA/knowledge/tree/15.0/document_page"><img alt="OCA/knowledge" src="https://img.shields.io/badge/github-OCA%2Fknowledge-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/knowledge-15-0/knowledge-15-0-document_page"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/118/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module allows you to write web pages for internal documentation.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -407,7 +407,7 @@ ul.auto-toc {
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/knowledge/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/knowledge/issues/new?body=module:%20document_page%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/knowledge/issues/new?body=module:%20document_page%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -454,7 +454,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/knowledge/tree/14.0/document_page">OCA/knowledge</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/knowledge/tree/15.0/document_page">OCA/knowledge</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
diff --git a/document_page/tests/test_document_page.py b/document_page/tests/test_document_page.py
index bfac0668..41223daf 100644
--- a/document_page/tests/test_document_page.py
+++ b/document_page/tests/test_document_page.py
@@ -15,12 +15,12 @@ class TestDocumentPage(common.TransactionCase):
             {
                 "name": "Test Page 1",
                 "parent_id": self.category1.id,
-                "content": "Test content",
+                "content": "<p>Test content</p>",
             }
         )
-        self.assertEqual(page.content, "Test content")
+        self.assertEqual(page.content, "<p>Test content</p>")
         self.assertEqual(len(page.history_ids), 1)
-        page.content = "New content for Demo Page"
+        page.content = "<p>New content for Demo Page</p>"
         self.assertEqual(len(page.history_ids), 2)
 
     def test_category_template(self):
diff --git a/document_page/tests/test_document_page_create_menu.py b/document_page/tests/test_document_page_create_menu.py
index 95b1b0dd..8c689547 100644
--- a/document_page/tests/test_document_page_create_menu.py
+++ b/document_page/tests/test_document_page_create_menu.py
@@ -26,4 +26,4 @@ class TestDocumentPageCreateMenu(common.TransactionCase):
             active_id=[self.ref("document_page.demo_page1")]
         ).default_get(fields_list)
 
-        self.assertEqual(res["menu_name"], "Odoo 14.0 Functional Demo")
+        self.assertEqual(res["menu_name"], "Odoo 15.0 Functional Demo")
diff --git a/document_page/views/document_page.xml b/document_page/views/document_page.xml
index 24d67359..5f86abc3 100644
--- a/document_page/views/document_page.xml
+++ b/document_page/views/document_page.xml
@@ -7,7 +7,7 @@
         <field name="field_parent">child_ids</field>
         <field name="priority">100</field>
         <field name="arch" type="xml">
-            <tree string="Document Page">
+            <tree>
                 <field name="name" />
                 <field name="content_uid" />
                 <field name="content_date" />
@@ -19,7 +19,7 @@
         <field name="name">document.page.list</field>
         <field name="model">document.page</field>
         <field name="arch" type="xml">
-            <tree string="Document Page">
+            <tree>
                 <field name="name" />
                 <field name="parent_id" />
                 <field name="company_id" groups="base.group_multi_company" />
@@ -55,7 +55,7 @@
                                 widget="html"
                                 placeholder="e.g. Once upon a time..."
                                 required="1"
-                                options="{'safe': True}"
+                                options="{'safe': True, 'codeview': True}"
                             />
                         </div>
                     </group>
diff --git a/document_page/views/document_page_assets.xml b/document_page/views/document_page_assets.xml
deleted file mode 100644
index 4e9aec4b..00000000
--- a/document_page/views/document_page_assets.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <template
-        id="assets_backend"
-        name="document_page assets"
-        inherit_id="web.assets_backend"
-    >
-        <xpath expr="." position="inside">
-            <link
-                rel="stylesheet"
-                type="text/scss"
-                href="/document_page/static/src/scss/document_page.scss"
-            />
-        </xpath>
-    </template>
-</odoo>
diff --git a/document_page/views/document_page_category.xml b/document_page/views/document_page_category.xml
index 796f83f5..949ec175 100644
--- a/document_page/views/document_page_category.xml
+++ b/document_page/views/document_page_category.xml
@@ -41,7 +41,7 @@
                                 name="content"
                                 widget="html"
                                 class="oe_view_only"
-                                options='{"safe": True}'
+                                options='{"safe": True, "codeview": True}'
                                 required="0"
                             />
                         </page>
@@ -58,7 +58,7 @@
         <field name="name">document.page.category.tree</field>
         <field name="model">document.page</field>
         <field name="arch" type="xml">
-            <tree string="Categories">
+            <tree>
                 <field name="name" />
                 <field name="parent_id" />
                 <field name="create_uid" invisible="1" />
diff --git a/document_page/views/document_page_history.xml b/document_page/views/document_page_history.xml
index 234398f2..00107d75 100644
--- a/document_page/views/document_page_history.xml
+++ b/document_page/views/document_page_history.xml
@@ -6,7 +6,7 @@
         <field name="name">document.page.history.tree</field>
         <field name="model">document.page.history</field>
         <field name="arch" type="xml">
-            <tree string="Document History">
+            <tree>
                 <field name="id" />
                 <field name="page_id" />
                 <field name="name" />
@@ -63,7 +63,7 @@
                                 name="content"
                                 widget="html"
                                 placeholder="e.g. Once upon a time..."
-                                options="{'safe': True}"
+                                options="{'safe': True, 'codeview': True}"
                             />
                         </page>
                         <page name="diff" string="Changes">
diff --git a/document_page/wizard/document_page_create_menu.py b/document_page/wizard/document_page_create_menu.py
index a54f5ecd..cf7bfb17 100644
--- a/document_page/wizard/document_page_create_menu.py
+++ b/document_page/wizard/document_page_create_menu.py
@@ -10,7 +10,7 @@ class DocumentPageCreateMenu(models.TransientModel):
     _name = "document.page.create.menu"
     _description = "Wizard Create Menu"
 
-    menu_name = fields.Char("Menu Name", required=True)
+    menu_name = fields.Char(required=True)
     menu_parent_id = fields.Many2one("ir.ui.menu", "Parent Menu", required=True)
 
     @api.model
@@ -33,9 +33,7 @@ class DocumentPageCreateMenu(models.TransientModel):
         page = obj_page.browse(page_id)
 
         data = self[0]
-        view_id = obj_model_data.sudo().get_object_reference(
-            "document_page", "view_wiki_menu_form"
-        )[1]
+        view_id = obj_model_data._xmlid_to_res_id("document_page.view_wiki_menu_form")
         value = {
             "name": "Document Page",
             "view_mode": "form,tree",
diff --git a/document_page/wizard/document_page_show_diff.py b/document_page/wizard/document_page_show_diff.py
index 72cb7191..1557ff7b 100644
--- a/document_page/wizard/document_page_show_diff.py
+++ b/document_page/wizard/document_page_show_diff.py
@@ -27,4 +27,4 @@ class DocumentPageShowDiff(models.TransientModel):
             raise UserError(_("Select one or maximum two history revisions!"))
         return diff
 
-    diff = fields.Text(readonly=True, default=_get_diff)
+    diff = fields.Html(readonly=True, default=_get_diff)