diff --git a/document_knowledge/__init__.py b/document_knowledge/__init__.py
index 769d6e28..9fabbc86 100644
--- a/document_knowledge/__init__.py
+++ b/document_knowledge/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
diff --git a/document_knowledge/__manifest__.py b/document_knowledge/__manifest__.py
index b2fbc36f..1adbb8f7 100644
--- a/document_knowledge/__manifest__.py
+++ b/document_knowledge/__manifest__.py
@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Knowledge Management System",
-    "version": "10.0.1.0.0",
+    "version": "11.0.1.0.0",
     "author": "OpenERP SA, MONK Software, Odoo Community Association (OCA)",
     "category": "Knowledge",
     "license": "AGPL-3",
diff --git a/document_knowledge/data/ir_module_category.xml b/document_knowledge/data/ir_module_category.xml
index f17ca72f..5868e55b 100644
--- a/document_knowledge/data/ir_module_category.xml
+++ b/document_knowledge/data/ir_module_category.xml
@@ -3,7 +3,9 @@
 
   <record model="ir.module.category" id="module_category_knowledge">
     <field name="name">Knowledge</field>
-    <field name="description">Manage documents and knowledge-related applications</field>
+    <field name="description">Manage documents and knowledge-related
+      applications
+    </field>
     <field name="sequence">30</field>
   </record>
 
diff --git a/document_knowledge/migrations/10.0.1.0.0/openupgrade_analysis.txt b/document_knowledge/migrations/10.0.1.0.0/openupgrade_analysis.txt
deleted file mode 100644
index 865d550e..00000000
--- a/document_knowledge/migrations/10.0.1.0.0/openupgrade_analysis.txt
+++ /dev/null
@@ -1,13 +0,0 @@
----Fields in module 'knowledge'---
----XML records in module 'knowledge'---
-NEW ir.actions.act_window: knowledge.knowledge_action_documents
-DEL ir.model.access: knowledge.access_ir_attachment_partner_manager
-DEL ir.model.access: knowledge.access_ir_attachment_sale_manager
-NEW ir.module.category: knowledge.module_category_knowledge
-DEL ir.module.category: knowledge.module_category_knowledge_management
-NEW ir.ui.menu: knowledge.menu_document_root
-NEW ir.ui.menu: knowledge.menu_document_section
-DEL ir.ui.menu: knowledge.menu_document2
-NEW ir.ui.view: knowledge.ir_attachment_view_user_documents
-NEW res.groups: knowledge.group_document_user
-DEL res.groups: base.group_document_user
diff --git a/document_knowledge/migrations/10.0.1.0.0/openupgrade_analysis_work.txt b/document_knowledge/migrations/10.0.1.0.0/openupgrade_analysis_work.txt
deleted file mode 100644
index 66654c01..00000000
--- a/document_knowledge/migrations/10.0.1.0.0/openupgrade_analysis_work.txt
+++ /dev/null
@@ -1,16 +0,0 @@
----Fields in module 'knowledge'---
----XML records in module 'knowledge'---
-NEW ir.actions.act_window: knowledge.knowledge_action_documents
-DEL ir.model.access: knowledge.access_ir_attachment_partner_manager
-DEL ir.model.access: knowledge.access_ir_attachment_sale_manager
-NEW ir.module.category: knowledge.module_category_knowledge
-DEL ir.module.category: knowledge.module_category_knowledge_management
-NEW ir.ui.menu: knowledge.menu_document_root
-NEW ir.ui.menu: knowledge.menu_document_section
-DEL ir.ui.menu: knowledge.menu_document2
-NEW ir.ui.view: knowledge.ir_attachment_view_user_documents
-# Nothing to do
-NEW res.groups: knowledge.group_document_user
-# Done: Rename XML-IDs
-DEL res.groups: base.group_document_user
-# Nothing to do: noupdate=0 records
diff --git a/document_knowledge/migrations/10.0.1.0.0/pre-migration.py b/document_knowledge/migrations/10.0.1.0.0/pre-migration.py
deleted file mode 100644
index ea3f8871..00000000
--- a/document_knowledge/migrations/10.0.1.0.0/pre-migration.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017 Eficent <http://www.eficent.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
-_xmlid_renames = [
-    ('base.group_document_user', 'knowledge.group_document_user'),
-]
-
-
-def migrate(cr, version):
-    for (old, new) in _xmlid_renames:
-        query = ("UPDATE ir_model_data SET module = %s, name = %s "
-                 "WHERE module = %s and name = %s")
-        cr.execute(query, tuple(new.split('.') + old.split('.')))
diff --git a/document_knowledge/models/__init__.py b/document_knowledge/models/__init__.py
index 244a5770..7238c6a5 100644
--- a/document_knowledge/models/__init__.py
+++ b/document_knowledge/models/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
diff --git a/document_knowledge/models/ir_attachment.py b/document_knowledge/models/ir_attachment.py
index 481938c6..dffb4ae0 100644
--- a/document_knowledge/models/ir_attachment.py
+++ b/document_knowledge/models/ir_attachment.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
diff --git a/document_knowledge/models/res_config.py b/document_knowledge/models/res_config.py
index 44cf0de8..831170df 100644
--- a/document_knowledge/models/res_config.py
+++ b/document_knowledge/models/res_config.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
@@ -7,7 +6,6 @@ from odoo import fields, models
 
 class KnowledgeConfigSettings(models.TransientModel):
 
-    _name = 'knowledge.config.settings'
     _inherit = 'res.config.settings'
 
     module_document = fields.Boolean(
@@ -40,3 +38,34 @@ class KnowledgeConfigSettings(models.TransientModel):
         help='Connect Odoo with a CMIS compatible server to store files.\n'
              '- This installs the module cmis_write.'
     )
+
+    def get_values(self):
+        res = super(KnowledgeConfigSettings, self).get_values()
+        get_param = self.env['ir.config_parameter'].sudo().get_param
+        res.update(
+            module_document=get_param(
+                'knowledge.module_document'),
+            module_document_page=get_param(
+                'knowledge.module_document_page'),
+            module_document_page_approval=get_param(
+                'knowledge.module_document_page_approval'),
+            module_cmis_read=get_param(
+                'knowledge.module_cmis_read'),
+            module_cmis_write=get_param(
+                'knowledge.module_cmis_write'),
+        )
+        return res
+
+    def set_values(self):
+        super(KnowledgeConfigSettings, self).set_values()
+        set_param = self.env['ir.config_parameter'].sudo().set_param
+        set_param('knowledge.module_document',
+                  self.module_document)
+        set_param('knowledge.module_document_page',
+                  self.module_document_page)
+        set_param('knowledge.module_document_page_approval',
+                  self.module_document_page_approval)
+        set_param('knowledge.module_cmis_read',
+                  self.module_cmis_read)
+        set_param('knowledge.module_cmis_write',
+                  self.module_cmis_write)
diff --git a/document_knowledge/views/knowledge.xml b/document_knowledge/views/knowledge.xml
index 7f51af55..52d8d90f 100644
--- a/document_knowledge/views/knowledge.xml
+++ b/document_knowledge/views/knowledge.xml
@@ -20,7 +20,8 @@
         <filter name="user_documents" string="Documents"
                 domain="[('res_model', 'not like', 'ir.%'), ('res_model', '!=', False)]"/>
         <group string="Group by">
-          <filter name="group_model" string="Model" context="{'group_by': 'res_model'}"/>
+          <filter name="group_model" string="Model"
+                  context="{'group_by': 'res_model'}"/>
         </group>
       </search>
     </field>
@@ -28,26 +29,26 @@
 
   <!-- Top menu item -->
   <menuitem
-      id="menu_document_root"
-      name="Knowledge"
-      groups="base.group_system,knowledge.group_document_user"
-      sequence="116"/>
+          id="menu_document_root"
+          name="Knowledge"
+          groups="base.group_system,knowledge.group_document_user"
+          sequence="116"/>
 
   <menuitem
-      id="menu_document_configuration"
-      name="Configuration"
-      parent="menu_document_root"
-      sequence="50"/>
+          id="menu_document_configuration"
+          name="Configuration"
+          parent="menu_document_root"
+          sequence="50"/>
 
   <menuitem
-      id="menu_document_section"
-      name="Documents"
-      parent="menu_document_root"/>
+          id="menu_document_section"
+          name="Documents"
+          parent="menu_document_root"/>
 
   <menuitem
-      id="menu_document"
-      name="Documents"
-      action="knowledge_action_documents"
-      parent="menu_document_section"/>
+          id="menu_document"
+          name="Documents"
+          action="knowledge_action_documents"
+          parent="menu_document_section"/>
 
 </odoo>
diff --git a/document_knowledge/views/res_config.xml b/document_knowledge/views/res_config.xml
index d2f9feea..f24c004a 100644
--- a/document_knowledge/views/res_config.xml
+++ b/document_knowledge/views/res_config.xml
@@ -2,62 +2,65 @@
 <odoo>
 
   <record id="view_knowledge_configuration" model="ir.ui.view">
-    <field name="name">Configure Knowledge</field>
-    <field name="model">knowledge.config.settings</field>
+    <field name="name">res.config.settings.view.form.inherit.knowledge</field>
+    <field name="model">res.config.settings</field>
+    <field name="inherit_id" ref="base.res_config_settings_view_form"/>
+    <field name="priority" eval="90"/>
     <field name="arch" type="xml">
-      <form string="Configure Knowledge" class= "oe_form_configuration">
-        <header>
-          <button string="Apply" type="object" name="execute" class="oe_highlight"/>
-          or
-          <button string="Cancel" type="object" name="cancel" class="oe_link"/>
-        </header>
-        <separator string="Knowledge and Documents Management"/>
-        <group>
-          <label for="id" string="Documents"/>
-          <div>
-            <div>
-              <field name="module_document" class="oe_inline"/>
-              <label for="module_document"/>
+      <xpath expr="//div[hasclass('settings')]" position="inside">
+        <div class="app_settings_block" data-string="Knowledge"
+             string="Knowledge" data-key="knowledge">
+          <h2>Knowledge and Documents Management</h2>
+          <div class="row mt16 o_settings_container"
+               id="maintenance_mode_setting">
+            <div class="col-xs-12 col-md-12 o_setting_box">
+              <div class="o_setting_left_pane">
+                <field name="module_document"/>
+              </div>
+              <div class="o_setting_right_pane">
+                <label for="module_document"/>
+              </div>
             </div>
-            <div>
-              <field name="module_document_page" class="oe_inline"/>
-              <label for="module_document_page"/>
+            <div class="col-xs-12 col-md-12 o_setting_box">
+              <div class="o_setting_left_pane">
+                <field name="module_document_page"/>
+              </div>
+              <div class="o_setting_right_pane">
+                <label for="module_document_page"/>
+              </div>
             </div>
-            <div>
-              <field name="module_document_page_approval" class="oe_inline"/>
-              <label for="module_document_page_approval"/>
+            <div class="col-xs-12 col-md-12 o_setting_box">
+              <div class="o_setting_left_pane">
+                <field name="module_document_page_approval"/>
+              </div>
+              <div class="o_setting_right_pane">
+                <label for="module_document_page_approval"/>
+              </div>
             </div>
           </div>
-        </group>
-        <separator string="Connect with an external DMS"/>
-        <group>
-          <label for="id" string="Using CMIS"/>
-          <div>
-            <div>
-              <field name="module_cmis_read" class="oe_inline"/>
-              <label for="module_cmis_read"/>
+          <h2>Connect with an external DMS</h2>
+          <div class="row mt16 o_settings_container"
+               id="maintenance_notification_setting">
+            <div class="col-xs-12 col-md-12 o_setting_box">
+              <div class="o_setting_left_pane">
+                <field name="module_cmis_read"/>
+              </div>
+              <div class="o_setting_right_pane">
+                <label for="module_cmis_read"/>
+              </div>
             </div>
-            <div>
-              <field name="module_cmis_write" class="oe_inline"/>
-              <label for="module_cmis_write"/>
+            <div class="col-xs-12 col-md-12 o_setting_box">
+              <div class="o_setting_left_pane">
+                <field name="module_cmis_write"/>
+              </div>
+              <div class="o_setting_right_pane">
+                <label for="module_cmis_write"/>
+              </div>
             </div>
           </div>
-        </group>
-      </form>
+        </div>
+      </xpath>
     </field>
   </record>
 
-  <record id="action_knowledge_configuration" model="ir.actions.act_window">
-    <field name="name">Configure Knowledge</field>
-    <field name="res_model">knowledge.config.settings</field>
-    <field name="view_mode">form</field>
-    <field name="target">inline</field>
-  </record>
-
-  <menuitem id="menu_knowledge_configuration"
-            name="Settings"
-            parent="knowledge.menu_document_configuration"
-            sequence="19"
-            action="action_knowledge_configuration"/>
-
 </odoo>