diff --git a/knowledge/data/ir_module_category.xml b/knowledge/data/ir_module_category.xml
index f17ca72f..5868e55b 100644
--- a/knowledge/data/ir_module_category.xml
+++ b/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/knowledge/models/res_config.py b/knowledge/models/res_config.py
index 61a48af3..831170df 100644
--- a/knowledge/models/res_config.py
+++ b/knowledge/models/res_config.py
@@ -6,7 +6,6 @@ from odoo import fields, models
 
 class KnowledgeConfigSettings(models.TransientModel):
 
-    _name = 'knowledge.config.settings'
     _inherit = 'res.config.settings'
 
     module_document = fields.Boolean(
@@ -39,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/knowledge/views/knowledge.xml b/knowledge/views/knowledge.xml
index 7f51af55..52d8d90f 100644
--- a/knowledge/views/knowledge.xml
+++ b/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/knowledge/views/res_config.xml b/knowledge/views/res_config.xml
index d2f9feea..b951c04b 100644
--- a/knowledge/views/res_config.xml
+++ b/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>
+</odoo>
\ No newline at end of file