diff --git a/.DINAR/build-date.txt b/.DINAR/build-date.txt
new file mode 100644
index 000000000..a9e6d6f5c
--- /dev/null
+++ b/.DINAR/build-date.txt
@@ -0,0 +1 @@
+April 3, 2020
diff --git a/.github/workflows/DINAR-pr.yml b/.github/workflows/DINAR-pr.yml
index 6d8196cbb..ff86aa13f 100644
--- a/.github/workflows/DINAR-pr.yml
+++ b/.github/workflows/DINAR-pr.yml
@@ -154,17 +154,30 @@ jobs:
           mkdir new-deps/
           # create dummy file to be sure that Artifact will be uploaded
           echo ok > new-deps/.empty
+          echo "::set-env name=ARTIFACT::empty"
       - name: Prepare DINAR with additional dependencies
         if: env.PR_MODULES_DEPS != '' || env.PR_DEPS != ''
         run: |
           # Save artifacts for local run and for integrations Tests
           bash DINAR/workflow-files/save-docker-layers.sh new-deps/
           echo "${{ env.PR_MODULES_DEPS }}" > new-deps/modules.txt
+          echo "::set-env name=ARTIFACT::yes"
       - name: Save DINAR with dependencies
         uses: actions/upload-artifact@v1
         with:
           name: new-deps
           path: new-deps/
+      - name: HOW TO RUN QUICK TESTS LOCALLY
+        if: always()
+        run: |
+          export MODULES=${{ env.PR_MODULES }}
+          export LOAD_MODULES=${{ env.PR_MODULES_LOAD }}
+          export PR_NUM=${{ github.event.number }}
+          export VERSION=${{ github.event.pull_request.base.ref }}
+          export REVISION_PR=${{ github.event.pull_request.head.sha}}
+          export DINAR_REPO="itpp-labs/DINAR-fork"
+          export ODOO_EXTRA_ARG=--test-enable
+          bash DINAR/workflow-files/how-to-run-locally.sh ${{ secrets.GITHUB_TOKEN }}
       - name: Test updated modules
         if: env.PR_MODULES != ''
         run: |
@@ -221,7 +234,6 @@ jobs:
           sudo apt-get install jq
       - name: HOW TO RUN TESTS LOCALLY
         if: always()
-        # TODO make similar for Quick Tests
         run: |
           export MODULES=${{ env.ALL_MODULES }}
           export LOAD_MODULES=${{ env.ALL_MODULES_LOAD }}
diff --git a/.github/workflows/DINAR.yml b/.github/workflows/DINAR.yml
index 9fb0fec48..00439259b 100644
--- a/.github/workflows/DINAR.yml
+++ b/.github/workflows/DINAR.yml
@@ -34,10 +34,27 @@ jobs:
               echo "DINAR_TOKEN is not set"
               exit 1
           fi
+
+  check-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check that this branch needs docker images
+        run: |
+          REF=${GITHUB_BASE_REF:-${GITHUB_REF}}
+          BRANCH=${REF##*/}
+          CHECK=$( echo "$BRANCH" | grep -E "^(master|[0-9]+\.[0-9]+)(-dev-.+)?$" || true)
+          if [ -z "$CHECK" ]
+          then
+              echo "This branch is not supposed to be a target of pull requests, so docker image is not needed."
+              echo "For information check https://github.com/itpp-labs/DINAR/issues/60"
+              exit 1
+          fi
+
   rebuild-images:
     runs-on: ubuntu-latest
     needs:
       - check-secret
+      - check-branch
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -60,7 +77,12 @@ jobs:
         run: |
           bash DINAR/workflow-files/configure-docker.sh ${{ secrets.DINAR_TOKEN }}
 
-      - name: dinar-odoo-base
+          cat <<- EOF > REPO/.DINAR/image/.netrc
+          machine github.com
+          login $GITHUB_ACTOR
+          password ${{ secrets.DINAR_TOKEN }}
+          EOF
+      - name: Build ${{ env.IMAGE_ODOO_BASE }}
         uses: elgohr/Publish-Docker-Github-Action@master
         env:
           LOCAL_CUSTOM_DIR: ./image
diff --git a/.github/workflows/repo2store.yml b/.github/workflows/repo2store.yml
index 39116651c..b5b39aab3 100644
--- a/.github/workflows/repo2store.yml
+++ b/.github/workflows/repo2store.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Checkout REPO
         uses: actions/checkout@v2-beta
         with:
-          fetch-depth: 100
+          fetch-depth: 0
           # custom token is not needed for fetching REPO,
           # but the action makes some magic with authentication headers
           # which are used on pushing to REPO-store
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3d8138dd3..dcd432d96 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -42,7 +42,7 @@ repos:
         name: prettier xml plugin
         additional_dependencies:
           - "prettier@1.19.1"
-          - "@prettier/plugin-xml@0.5.0"
+          - "@prettier/plugin-xml@0.7.2"
         files: \.xml$
   - repo: https://github.com/pre-commit/mirrors-eslint
     rev: v6.8.0
@@ -88,11 +88,11 @@ repos:
         name: pylint with optional checks
         args: ["--rcfile=.pylintrc", "--exit-zero"]
         verbose: true
-        additional_dependencies: ["pylint-odoo==3.0.3"]
+        additional_dependencies: ["pylint-odoo==3.1.0"]
       - id: pylint
         name: pylint with mandatory checks
         args: ["--rcfile=.pylintrc-mandatory"]
-        additional_dependencies: ["pylint-odoo==3.0.3"]
+        additional_dependencies: ["pylint-odoo==3.1.0"]
   - repo: https://github.com/asottile/pyupgrade
     rev: v1.26.2
     hooks:
diff --git a/.prettierrc.yml b/.prettierrc.yml
index 0b7d15a5f..fc5f3a7c4 100644
--- a/.prettierrc.yml
+++ b/.prettierrc.yml
@@ -5,3 +5,4 @@ printWidth: 88
 proseWrap: always
 semi: true
 trailingComma: "es5"
+xmlWhitespaceSensitivity: "ignore"
diff --git a/auth_signup_confirmation/data/config.xml b/auth_signup_confirmation/data/config.xml
index 1a7255947..4e98e6c39 100644
--- a/auth_signup_confirmation/data/config.xml
+++ b/auth_signup_confirmation/data/config.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <openerp>
-<data noupdate="1">
-
-    <record id="url_singup_thankyou" model="ir.config_parameter">
-        <field name="key">auth_signup_confirmation.url_singup_thankyou</field>
-        <field name="value">/web/signup/thankyou/</field>
-    </record>
-
-</data>
+    <data noupdate="1">
+        <record id="url_singup_thankyou" model="ir.config_parameter">
+            <field name="key">auth_signup_confirmation.url_singup_thankyou</field>
+            <field name="value">/web/signup/thankyou/</field>
+        </record>
+    </data>
 </openerp>
diff --git a/autostaging_project_task/views.xml b/autostaging_project_task/views.xml
index e59e47ac3..f5f44271e 100644
--- a/autostaging_project_task/views.xml
+++ b/autostaging_project_task/views.xml
@@ -4,14 +4,13 @@
     Copyright 2019 Artem Rafailov <https://it-projects.info/team/Ommo73/>
     License MIT (https://opensource.org/licenses/MIT). -->
 <openerp>
-  <data>
+    <data>
         <record id="mt_autostaging" model="mail.message.subtype">
             <field name="name">Autostaging</field>
             <field name="res_model">project.task</field>
             <field name="default" eval="False" />
             <field name="description">Autostaging</field>
         </record>
-
         <record id="mt_autostaging_project" model="mail.message.subtype">
             <field name="name">Autostaging</field>
             <field name="res_model">project.project</field>
@@ -19,7 +18,6 @@
             <field name="parent_id" ref="mt_autostaging" />
             <field name="relation_field">project_id</field>
         </record>
-
         <record id="view_project_form_autostaging_enabled" model="ir.ui.view">
             <field name="name">project.form.allow.automove</field>
             <field name="model">project.project</field>
@@ -29,11 +27,10 @@
                     <xpath expr="//group[@name='misc']" position="inside">
                         <label for="autostaging_enabled" string="Autostaging enabled" />
                         <field name="autostaging_enabled" />
-                     </xpath>
+                    </xpath>
                 </data>
             </field>
         </record>
-
         <record id="view_project_task_type_form_autostaging" model="ir.ui.view">
             <field name="name">project.task.type.form.autostaging</field>
             <field name="model">project.task.type</field>
@@ -50,14 +47,14 @@
                             <field
                                 name="autostaging_idle_timeout"
                                 attrs="{'required': [('autostaging_enabled','=',True)], 'readonly':[('autostaging_enabled', '=', False)]}"
-                            > <span>days</span> </field>
+                            >
+                                <span>days</span>
+                            </field>
                         </group>
                     </xpath>
                 </data>
             </field>
         </record>
-
-
         <record id="view_project_task_type_tree_autostaging" model="ir.ui.view">
             <field name="name">project.task.type.tree.autostaging</field>
             <field name="model">project.task.type</field>
@@ -70,7 +67,6 @@
                 </data>
             </field>
         </record>
-
         <record id="view_project_task_form_autostaging" model="ir.ui.view">
             <field name="name">project.task.form.autostaging</field>
             <field name="model">project.task</field>
@@ -93,6 +89,5 @@
                 </data>
             </field>
         </record>
-
     </data>
 </openerp>
diff --git a/base_attendance/report/res_partner_badge.xml b/base_attendance/report/res_partner_badge.xml
index dac0a9a96..3ac015931 100644
--- a/base_attendance/report/res_partner_badge.xml
+++ b/base_attendance/report/res_partner_badge.xml
@@ -3,7 +3,6 @@
     Copyright 2018-2019 Kolushov Alexandr <https://it-projects.info/team/KolushovAlexandr>
     License MIT (https://opensource.org/licenses/MIT).-->
 <odoo>
-
     <report
         id="hr_partner_print_badge"
         string="Print Badge"
@@ -13,7 +12,6 @@
         file="base_attendance.print_partner_badge"
         print_report_name="'Print Badge - %s' % (object.name).replace('/', '')"
     />
-
     <template id="print_partner_badge">
         <t t-call="web.basic_layout">
             <div class="page">
@@ -48,23 +46,37 @@
                             </td>
                             <td style="width:67%" valign="center">
                                 <table style="width:155pt; height:85pt">
-                                    <tr><th><div
+                                    <tr>
+                                        <th>
+                                            <div
                                                 style="font-size:15pt; margin-bottom:0pt;margin-top:0pt;"
                                                 align="center"
-                                            ><t t-esc="partner.name" /></div></th></tr>
+                                            >
+                                                <t t-esc="partner.name" />
+                                            </div>
+                                        </th>
+                                    </tr>
                                     <!--<tr><td><div align="center" style="font-size:10pt;margin-bottom:5pt;"><t t-esc="partner.job_id.name"/></div></td></tr>-->
-                                    <tr><td><div
+                                    <tr>
+                                        <td>
+                                            <div
                                                 align="center"
                                                 style="font-size:10pt;margin-bottom:5pt;"
-                                            ><t
-                                                    t-esc="partner.function"
-                                                /></div></td></tr>
-                                    <tr><td><img
+                                            >
+                                                <t t-esc="partner.function" />
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <img
                                                 t-if="partner.barcode"
                                                 t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', partner.barcode, 600, 120)"
                                                 style="max-height:50pt;max-width:100%;"
                                                 align="center"
-                                            /></td></tr>
+                                            />
+                                        </td>
+                                    </tr>
                                 </table>
                             </td>
                         </table>
diff --git a/base_attendance/security/res_attendance_security.xml b/base_attendance/security/res_attendance_security.xml
index 210f4fe5c..71dffba15 100644
--- a/base_attendance/security/res_attendance_security.xml
+++ b/base_attendance/security/res_attendance_security.xml
@@ -8,13 +8,11 @@
         <field name="description">Helps you manage the partner attendances.</field>
         <field name="sequence">15</field>
     </record>
-
     <record id="group_res_attendance" model="res.groups">
         <field name="name">Read Only</field>
         <field name="category_id" ref="module_category_attendance" />
         <field name="comment">The user will gain access to see attendances menu.</field>
     </record>
-
     <record id="group_manual_attendance" model="res.groups">
         <field name="name">Manual Attendances</field>
         <field name="category_id" ref="module_category_attendance" />
@@ -26,21 +24,18 @@
             name="comment"
         >The user will gain access to manage partners attendance.</field>
     </record>
-
     <record id="group_hr_attendance_manager" model="res.groups">
         <field name="name">Manager</field>
         <field name="category_id" ref="module_category_attendance" />
         <field name="implied_ids" eval="[(4, ref('group_manual_attendance'))]" />
         <field name="users" eval="[(4, ref('base.user_root'))]" />
     </record>
-
     <record id="base.user_admin" model="res.users">
         <field
             name="groups_id"
             eval="[(4,ref('base_attendance.group_hr_attendance_manager'))]"
         />
     </record>
-
     <record id="group_hr_attendance_use_pin" model="res.groups">
         <field name="name">Enable PIN use (for Partner Attendance)</field>
         <field name="category_id" ref="base.module_category_hidden" />
@@ -48,9 +43,7 @@
             name="comment"
         >The user will have to enter his PIN to check in and out manually at the company screen.</field>
     </record>
-
     <data noupdate="1">
-
         <record id="hr_attendance_rule_attendance_manager" model="ir.rule">
             <field name="name">attendance officer: full access</field>
             <field name="model_id" ref="model_res_partner_attendance" />
@@ -60,6 +53,5 @@
                 eval="[(4,ref('base_attendance.group_hr_attendance_manager'))]"
             />
         </record>
-
     </data>
 </odoo>
diff --git a/base_attendance/static/src/xml/attendance.xml b/base_attendance/static/src/xml/attendance.xml
index e45ff2eeb..4de36a644 100644
--- a/base_attendance/static/src/xml/attendance.xml
+++ b/base_attendance/static/src/xml/attendance.xml
@@ -7,7 +7,6 @@
         <div class="oe_hr_attendance_status fa fa-user">
         </div>
     </t>
-
     <t t-name="BaseAttendanceKioskMode">
         <div class="o_hr_attendance_kiosk_mode_container">
             <div class="o_hr_attendance_kiosk_mode">
@@ -22,7 +21,6 @@
             <div class="o_hr_attendance_clock" />
         </div>
     </t>
-
     <t t-name="BaseAttendanceKioskConfirm">
         <div class="o_hr_attendance_kiosk_mode_container">
             <div class="o_hr_attendance_kiosk_mode">
@@ -52,11 +50,13 @@
                         <div class="row">
                             <div class="col-8 offset-2">
                                 <div class="row">
-                                    <div class="col-4 offset-4"><input
+                                    <div class="col-4 offset-4">
+                                        <input
                                             class="o_hr_attendance_PINbox"
                                             type="password"
                                             disabled="true"
-                                        /></div>
+                                        />
+                                    </div>
                                 </div>
                                 <div class="row o_hr_attendance_pin_pad">
                                     <t
@@ -68,7 +68,9 @@
                                         >
                                             <a
                                                 t-attf-class="btn btn-primary btn-block btn-lg o_hr_attendance_btn-round-corners {{ 'o_hr_attendance_pin_pad_button_' + btn_name }}"
-                                            ><t t-esc="btn_name" /></a>
+                                            >
+                                                <t t-esc="btn_name" />
+                                            </a>
                                         </div>
                                     </t>
                                 </div>
@@ -88,7 +90,6 @@
             <div class="o_hr_attendance_clock" />
         </div>
     </t>
-
     <t t-name="BaseAttendanceGreetingMessage">
         <div class="o_hr_attendance_message_container">
             <div class="o_hr_attendance_message">
@@ -105,7 +106,6 @@
                         </h2>
                         <h3 class="o_hr_attendance_random_message" />
                         <h2 class="o_hr_attendance_warning_message" />
-
                     </t>
                     <t t-if="!widget.attendance.check_out">
                         <h1 class="o_hr_attendance_validation checkin">
diff --git a/base_attendance/views/res_attendance_view.xml b/base_attendance/views/res_attendance_view.xml
index a78f32b2e..07fff20c0 100644
--- a/base_attendance/views/res_attendance_view.xml
+++ b/base_attendance/views/res_attendance_view.xml
@@ -3,9 +3,7 @@
      Copyright 2018-2019 Kolushov Alexandr <https://it-projects.info/team/KolushovAlexandr>
      License MIT (https://opensource.org/licenses/MIT).-->
 <odoo>
-
     <!-- views -->
-
     <record id="view_attendance_tree" model="ir.ui.view">
         <field name="name">res.partner.attendance.tree</field>
         <field name="model">res.partner.attendance</field>
@@ -17,7 +15,6 @@
             </tree>
         </field>
     </record>
-
     <record id="hr_attendance_view_form" model="ir.ui.view">
         <field name="name">res.partner.attendance.form</field>
         <field name="model">res.partner.attendance</field>
@@ -33,7 +30,6 @@
             </form>
         </field>
     </record>
-
     <record id="hr_attendance_view_filter" model="ir.ui.view">
         <field name="name">res_partner_attendance_view_filter</field>
         <field name="model">res.partner.attendance</field>
@@ -73,7 +69,6 @@
             </search>
         </field>
     </record>
-
     <record id="hr_attendance_view_pivot" model="ir.ui.view">
         <field name="name">res.partner.attendance.pivot</field>
         <field name="model">res.partner.attendance</field>
@@ -85,7 +80,6 @@
             </pivot>
         </field>
     </record>
-
     <record id="hr_attendance_view_graph" model="ir.ui.view">
         <field name="name">res.partner.attendance.graph</field>
         <field name="model">res.partner.attendance</field>
@@ -97,9 +91,7 @@
             </graph>
         </field>
     </record>
-
     <!-- actions -->
-
     <record id="hr_attendance_action" model="ir.actions.act_window">
         <field name="name">Attendances</field>
         <field name="res_model">res.partner.attendance</field>
@@ -113,7 +105,6 @@
             >Please make sure you're using the correct filter if you expected to see any.</p>
         </field>
     </record>
-
     <record
         id="base_attendance_action_partner_attendances"
         model="ir.actions.act_window"
@@ -129,15 +120,14 @@
             <p>No attendance records to display.</p>
         </field>
     </record>
-
     <record id="hr_attendance_action_graph" model="ir.actions.act_window">
         <field name="name">Attendance Analysis</field>
         <field name="res_model">res.partner.attendance</field>
         <field name="view_type">form</field>
         <field name="view_mode">pivot,graph</field>
-        <field name="view_id" />  <!-- force empty -->
+        <field name="view_id" />
+        <!-- force empty -->
     </record>
-
     <record id="hr_attendance_action_graph_filtered" model="ir.actions.act_window">
         <field name="name">Attendance Analysis</field>
         <field name="res_model">res.partner.attendance</field>
@@ -147,9 +137,9 @@
             'search_default_department_id': [active_id],
             'default_department_id': active_id}
         </field>
-        <field name="view_id" />  <!-- force empty -->
+        <field name="view_id" />
+        <!-- force empty -->
     </record>
-
     <record model="ir.actions.server" id="hr_attendance_action_kiosk_mode">
         <field name="name">Get to the Kiosk Mode</field>
         <field name="type">ir.actions.server</field>
@@ -167,12 +157,10 @@ action = {
 }
         </field>
     </record>
-
     <record id="hr_attendance_action_greeting_message" model="ir.actions.client">
         <field name="name">Message</field>
         <field name="tag">base_attendance_greeting_message</field>
     </record>
-
     <!--Partner kanban view specifically for base_attendance (to check in/out) -->
     <record id="res_partner_kiosk_attendance_view" model="ir.ui.view">
         <field name="name">res.partner.kanban.attendance</field>
@@ -220,10 +208,14 @@ action = {
                                 <ul>
                                     <li
                                         t-if="record.parent_id.raw_value and !record.function.raw_value"
-                                    ><field name="parent_id" /></li>
+                                    >
+                                        <field name="parent_id" />
+                                    </li>
                                     <li
                                         t-if="!record.parent_id.raw_value and record.function.raw_value"
-                                    ><field name="function" /></li>
+                                    >
+                                        <field name="function" />
+                                    </li>
                                     <li
                                         t-if="record.parent_id.raw_value and record.function.raw_value"
                                     ><field name="function" /> at <field
@@ -231,10 +223,14 @@ action = {
                                         /></li>
                                     <li
                                         t-if="record.city.raw_value and !record.country_id.raw_value"
-                                    ><field name="city" /></li>
+                                    >
+                                        <field name="city" />
+                                    </li>
                                     <li
                                         t-if="!record.city.raw_value and record.country_id.raw_value"
-                                    ><field name="country_id" /></li>
+                                    >
+                                        <field name="country_id" />
+                                    </li>
                                     <li
                                         t-if="record.city.raw_value and record.country_id.raw_value"
                                     ><field name="city" />, <field
@@ -243,7 +239,9 @@ action = {
                                     <li
                                         t-if="record.email.raw_value"
                                         class="o_text_overflow"
-                                    ><field name="email" /></li>
+                                    >
+                                        <field name="email" />
+                                    </li>
                                 </ul>
                             </div>
                         </div>
@@ -252,7 +250,6 @@ action = {
             </kanban>
         </field>
     </record>
-
     <record model="ir.ui.view" id="res_partner_kanban_view">
         <field name="name">res.partner.kanban</field>
         <field name="model">res.partner</field>
@@ -265,7 +262,9 @@ action = {
         <field name="arch" type="xml">
             <xpath expr="//strong[hasclass('oe_partner_heading')]" position="replace">
                 <div class="col-xs-11" style="padding:0px">
-                    <strong><field name="name" /></strong>
+                    <strong>
+                        <field name="name" />
+                    </strong>
                 </div>
                 <div class="col-xs-1" style="padding:0px">
                     <field name="attendance_state" invisible="1" />
@@ -293,7 +292,6 @@ action = {
             </xpath>
         </field>
     </record>
-
     <record id="res_partner_action_kanban_view" model="ir.actions.act_window">
         <field name="name">Customers</field>
         <field name="res_model">res.partner</field>
@@ -313,7 +311,6 @@ action = {
             </p>
         </field>
     </record>
-
     <record id="view_partner_form_inherit_base_attendance" model="ir.ui.view">
         <field name="name">res.partner.form</field>
         <field name="model">res.partner</field>
@@ -331,7 +328,6 @@ action = {
             </field>
             <xpath expr="//button[hasclass('oe_stat_button')]" position="before">
                 <field name="attendance_state" invisible="1" />
-
                 <button
                     name="%(base_attendance_action_partner_attendances)d"
                     class="oe_stat_button"
@@ -362,9 +358,7 @@ action = {
             </page>
         </field>
     </record>
-
     <!-- Menus -->
-
     <menuitem
         id="menu_base_attendance_root"
         name="Partner Attendances"
@@ -372,7 +366,6 @@ action = {
         groups="group_res_attendance"
         web_icon="base_attendance,static/description/icon.png"
     />
-
     <menuitem
         id="menu_hr_attendance_manage_attendances"
         name="Manage Attendances"
@@ -380,7 +373,6 @@ action = {
         sequence="20"
         groups="base_attendance.group_res_attendance"
     />
-
     <menuitem
         id="menu_hr_attendance_view_attendances"
         name="Attendances"
@@ -389,7 +381,6 @@ action = {
         groups="base_attendance.group_res_attendance"
         action="hr_attendance_action"
     />
-
     <menuitem
         id="menu_hr_attendance_view_partners_kanban"
         name="Partners"
@@ -398,7 +389,6 @@ action = {
         groups="base_attendance.group_hr_attendance_manager"
         action="base.action_partner_form"
     />
-
     <menuitem
         id="menu_hr_attendance_kiosk_mode"
         name="Kiosk Mode"
@@ -407,7 +397,6 @@ action = {
         groups="base_attendance.group_hr_attendance_manager"
         action="hr_attendance_action_kiosk_mode"
     />
-
     <menuitem
         id="menu_hr_attendance_report"
         name="Reports"
@@ -416,9 +405,7 @@ action = {
         groups="base_attendance.group_hr_attendance_manager"
         action="hr_attendance_action_graph"
     />
-
     <!--IR CRON-->
-
     <record model="ir.cron" id="base_attendance_autocheckout">
         <field name="name">Partner Shift Autocheckout</field>
         <field name="active" eval="False" />
@@ -430,5 +417,4 @@ action = {
         <field name="state">code</field>
         <field name="code">model.autocheckout_close_shifts()</field>
     </record>
-
 </odoo>
diff --git a/base_attendance/views/res_config_view.xml b/base_attendance/views/res_config_view.xml
index 8e0cdf11e..629d2715b 100644
--- a/base_attendance/views/res_config_view.xml
+++ b/base_attendance/views/res_config_view.xml
@@ -32,7 +32,6 @@
             </form>
         </field>
     </record>
-
     <record id="action_hr_attendance_settings" model="ir.actions.act_window">
         <field name="name">Attendance Settings</field>
         <field name="res_model">res.config.settings</field>
@@ -40,7 +39,6 @@
         <field name="target">inline</field>
         <field name="view_id" ref="hr_attendance_view_config" />
     </record>
-
     <menuitem
         id="base_attendance.menu_hr_attendance_settings"
         name="Configuration"
diff --git a/base_import_map/views/base_import_map_templates.xml b/base_import_map/views/base_import_map_templates.xml
index aba3948cc..ccaea9831 100644
--- a/base_import_map/views/base_import_map_templates.xml
+++ b/base_import_map/views/base_import_map_templates.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-        <template
+    <template
         id="assets_backend"
         name="base_import_map assets"
         inherit_id="web.assets_backend"
     >
-            <xpath expr="." position="inside">
-                <script
+        <xpath expr="." position="inside">
+            <script
                 type="text/javascript"
                 src="/base_import_map/static/src/js/base_import_map.js"
             />
-            </xpath>
-        </template>
+        </xpath>
+    </template>
 </odoo>
diff --git a/base_import_map/views/base_import_map_view.xml b/base_import_map/views/base_import_map_view.xml
index 9efaacdaa..42b7c18ff 100644
--- a/base_import_map/views/base_import_map_view.xml
+++ b/base_import_map/views/base_import_map_view.xml
@@ -1,53 +1,48 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
-        <record model="ir.ui.view" id="base_import_map_form">
-            <field name="name">base_import_map.map.form</field>
-            <field name="model">base_import_map.map</field>
-            <field name="arch" type="xml">
-                <form>
-                    <sheet>
-                        <group>
-                            <field name="name" string="Name" />
-                            <field name="file_read_hook" />
-                            <field name="model_id" string="Model" />
-                            <field name="line_ids" string="Lines">
-                                <tree editable="bottom">
-                                    <field name="column_number" />
-                                    <field name="field_name" />
-                                </tree>
-                            </field>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="base_import_map_tree">
-            <field name="name">base_import_map.map.tree</field>
-            <field name="model">base_import_map.map</field>
-            <field name="arch" type="xml">
-                <tree>
-                    <field name="name" string="Name" />
-                    <field name="model_id" string="Model" />
-                </tree>
-            </field>
-        </record>
-
-        <record id="action_base_import_map" model="ir.actions.act_window">
-            <field name="name">Import Settings</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">base_import_map.map</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="base_import_map.base_import_map_tree" />
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <menuitem
+    <record model="ir.ui.view" id="base_import_map_form">
+        <field name="name">base_import_map.map.form</field>
+        <field name="model">base_import_map.map</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <field name="name" string="Name" />
+                        <field name="file_read_hook" />
+                        <field name="model_id" string="Model" />
+                        <field name="line_ids" string="Lines">
+                            <tree editable="bottom">
+                                <field name="column_number" />
+                                <field name="field_name" />
+                            </tree>
+                        </field>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="base_import_map_tree">
+        <field name="name">base_import_map.map.tree</field>
+        <field name="model">base_import_map.map</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name" string="Name" />
+                <field name="model_id" string="Model" />
+            </tree>
+        </field>
+    </record>
+    <record id="action_base_import_map" model="ir.actions.act_window">
+        <field name="name">Import Settings</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">base_import_map.map</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="base_import_map.base_import_map_tree" />
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem
         id="menu_user_interface"
         name="Import Settings"
         parent="base.next_id_2"
         action="action_base_import_map"
     />
-
 </odoo>
diff --git a/customer_marketing/views/res_partner_views.xml b/customer_marketing/views/res_partner_views.xml
index ec4d2abbc..446f2ec86 100644
--- a/customer_marketing/views/res_partner_views.xml
+++ b/customer_marketing/views/res_partner_views.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="view_partner_form" model="ir.ui.view">
         <field name="name">res.partner.form</field>
         <field name="model">res.partner</field>
@@ -22,5 +21,4 @@
             </data>
         </field>
     </record>
-
 </odoo>
diff --git a/delivery_sequence/views.xml b/delivery_sequence/views.xml
index a84438964..9adcd6dd9 100644
--- a/delivery_sequence/views.xml
+++ b/delivery_sequence/views.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<openerp><data>
-
-<record id="view_delivery_carrier_tree" model="ir.ui.view">
-    <field name="model">delivery.carrier</field>
-    <field name="inherit_id" ref="delivery.view_delivery_carrier_tree" />
-    <field name="arch" type="xml">
-        <xpath expr="//field[@name='name']" position="before">
-            <field name="sequence" invisible="1" />
-        </xpath>
-    </field>
-</record>
-
-</data></openerp>
+<openerp>
+    <data>
+        <record id="view_delivery_carrier_tree" model="ir.ui.view">
+            <field name="model">delivery.carrier</field>
+            <field name="inherit_id" ref="delivery.view_delivery_carrier_tree" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='name']" position="before">
+                    <field name="sequence" invisible="1" />
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/hr_public_holidays_ics_import/views/hr_public_holidays_view.xml b/hr_public_holidays_ics_import/views/hr_public_holidays_view.xml
index fd0571364..5d3e1e931 100644
--- a/hr_public_holidays_ics_import/views/hr_public_holidays_view.xml
+++ b/hr_public_holidays_ics_import/views/hr_public_holidays_view.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <openerp>
-  <data>
-
-    <record id="view_public_holidays_form" model="ir.ui.view">
-      <field name="name">hr.holidays.public.form</field>
-      <field name="model">hr.holidays.public</field>
-      <field name="inherit_id" ref="hr_public_holidays.view_public_holidays_form" />
-      <field name="arch" type="xml">
-        <xpath expr="//field[@name='line_ids']" position="before">
-          <button
+    <data>
+        <record id="view_public_holidays_form" model="ir.ui.view">
+            <field name="name">hr.holidays.public.form</field>
+            <field name="model">hr.holidays.public</field>
+            <field
+                name="inherit_id"
+                ref="hr_public_holidays.view_public_holidays_form"
+            />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='line_ids']" position="before">
+                    <button
                         name="%(action_view_import_ics_wizard)d"
                         string="Import from ics"
                         type="action"
                         class="btn-primary"
                         colspan="4"
                     />
-        </xpath>
-      </field>
-    </record>
-
-  </data>
+                </xpath>
+            </field>
+        </record>
+    </data>
 </openerp>
diff --git a/hr_public_holidays_ics_import/wizard/import_ics.xml b/hr_public_holidays_ics_import/wizard/import_ics.xml
index 26523466f..f7bbea40c 100644
--- a/hr_public_holidays_ics_import/wizard/import_ics.xml
+++ b/hr_public_holidays_ics_import/wizard/import_ics.xml
@@ -1,40 +1,41 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <openerp>
-  <data>
-
-    <record id="view_import_ics_wizard" model="ir.ui.view">
-      <field name="name">Import holidays from ics file</field>
-      <field name="model">hr_public_holidays.import_ics_wizard</field>
-      <field name="arch" type="xml">
-        <form string="Import ics">
-          <p class="oe_grey">
+    <data>
+        <record id="view_import_ics_wizard" model="ir.ui.view">
+            <field name="name">Import holidays from ics file</field>
+            <field name="model">hr_public_holidays.import_ics_wizard</field>
+            <field name="arch" type="xml">
+                <form string="Import ics">
+                    <p class="oe_grey">
             Select *.ics file to import holidays
           </p>
-          <group>
-            <field name="ics_file_name" readonly="1" invisible="1" />
-            <field name="ics_file" filename="ics_file_name" widget="binary" />
-          </group>
-          <footer>
-            <button
+                    <group>
+                        <field name="ics_file_name" readonly="1" invisible="1" />
+                        <field
+                            name="ics_file"
+                            filename="ics_file_name"
+                            widget="binary"
+                        />
+                    </group>
+                    <footer>
+                        <button
                             name="import_ics"
                             string="Import"
                             type="object"
                             class="btn-primary"
                         />
-            <button string="Cancel" class="btn-default" special="cancel" />
-          </footer>
-        </form>
-      </field>
-    </record>
-
-    <record id="action_view_import_ics_wizard" model="ir.actions.act_window">
-      <field name="name">Import from ics</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">hr_public_holidays.import_ics_wizard</field>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-  </data>
+                        <button string="Cancel" class="btn-default" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+        <record id="action_view_import_ics_wizard" model="ir.actions.act_window">
+            <field name="name">Import from ics</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr_public_holidays.import_ics_wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    </data>
 </openerp>
diff --git a/hr_rule_input_compute/security/hr_rule_input_compute_security.xml b/hr_rule_input_compute/security/hr_rule_input_compute_security.xml
index 59b622437..6e359f452 100644
--- a/hr_rule_input_compute/security/hr_rule_input_compute_security.xml
+++ b/hr_rule_input_compute/security/hr_rule_input_compute_security.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="0">
-        <record id="group_hr_rule_input_compute" model="res.groups">
-            <field
-            name="name"
-        >Enable to edit "Python Code" field for salary inputs</field>
-        </record>
+    <record id="group_hr_rule_input_compute" model="res.groups">
+        <field name="name">Enable to edit "Python Code" field for salary inputs</field>
+    </record>
 </odoo>
diff --git a/hr_rule_input_compute/views/hr_payroll_views.xml b/hr_rule_input_compute/views/hr_payroll_views.xml
index 9177abcc2..443b9da01 100644
--- a/hr_rule_input_compute/views/hr_payroll_views.xml
+++ b/hr_rule_input_compute/views/hr_payroll_views.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="hr_salary_rule_form" model="ir.ui.view">
         <field name="name">hr.salary.rule.form</field>
         <field name="model">hr.salary.rule</field>
@@ -13,7 +12,6 @@
             </xpath>
         </field>
     </record>
-
     <record id="hr_salary_rule_input_editable_form" model="ir.ui.view">
         <field name="name">hr.salary.rule.form</field>
         <field name="model">hr.salary.rule</field>
@@ -29,5 +27,4 @@
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/ir_actions_todo_repeat/views.xml b/ir_actions_todo_repeat/views.xml
index 9fe69dcf8..62a80c3e6 100644
--- a/ir_actions_todo_repeat/views.xml
+++ b/ir_actions_todo_repeat/views.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <openerp>
     <data>
-
         <record id="config_wizard_step_view_form_repeat" model="ir.ui.view">
             <field name="model">ir.actions.todo</field>
             <field name="name">Config Wizard Steps</field>
@@ -12,6 +11,5 @@
                 </field>
             </field>
         </record>
-
     </data>
 </openerp>
diff --git a/ir_attachment_google_cloud_storage/README.rst b/ir_attachment_google_cloud_storage/README.rst
new file mode 100644
index 000000000..e47810af7
--- /dev/null
+++ b/ir_attachment_google_cloud_storage/README.rst
@@ -0,0 +1,51 @@
+.. image:: https://img.shields.io/badge/license-MIT-blue.svg
+   :target: https://opensource.org/licenses/MIT
+   :alt: License: MIT
+
+=================================
+ Google Cloud Storage Attachment Storage
+=================================
+
+TODO description intro
+
+TODO detailed description
+
+Credits
+=======
+
+Contributors
+------------
+* `Eugene Molotov <https://it-projects.info/team/em230418>`__:
+
+      * :one::zero: init version of the module
+
+Sponsors
+--------
+* `IT-Projects LLC <https://it-projects.info>`__
+
+Maintainers
+-----------
+* `IT-Projects LLC <https://it-projects.info>`__
+
+      To get a guaranteed support
+      you are kindly requested to purchase the module
+      at `odoo apps store <https://apps.odoo.com/apps/modules/12.0/ir_attachment_google_drive/>`__.
+
+      Thank you for understanding!
+
+      `IT-Projects Team <https://www.it-projects.info/team>`__
+
+Further information
+===================
+
+Demo: http://runbot.it-projects.info/demo/misc-addons/12.0
+
+HTML Description: https://apps.odoo.com/apps/modules/12.0/ir_attachment_google_drive/
+
+Usage instructions: `<doc/index.rst>`_
+
+Changelog: `<doc/changelog.rst>`_
+
+Notifications on updates: `via Atom <https://github.com/it-projects-llc/misc-addons/commits/12.0/ir_attachment_google_drive.atom>`_, `by Email <https://blogtrottr.com/?subscribe=https://github.com/it-projects-llc/misc-addons/commits/12.0/ir_attachment_google_drive.atom>`_
+
+Tested on Odoo 12.0 a827d3015c6994bc3c779f9ba5cd270d8bdd8edd
diff --git a/ir_attachment_google_cloud_storage/__init__.py b/ir_attachment_google_cloud_storage/__init__.py
new file mode 100644
index 000000000..1d99e04b6
--- /dev/null
+++ b/ir_attachment_google_cloud_storage/__init__.py
@@ -0,0 +1,3 @@
+# License MIT (https://opensource.org/licenses/MIT).
+
+from . import models
diff --git a/ir_attachment_google_cloud_storage/__manifest__.py b/ir_attachment_google_cloud_storage/__manifest__.py
new file mode 100644
index 000000000..29bcde55f
--- /dev/null
+++ b/ir_attachment_google_cloud_storage/__manifest__.py
@@ -0,0 +1,39 @@
+# Copyright 2020 Eugene Molotov <https://it-projects.info/team/em230418>
+# License MIT (https://opensource.org/licenses/MIT).
+
+{
+    "name": """Google Cloud Storage Attachment Storage""",
+    "summary": """TODO description intro""",
+    "category": "Extra Tools",
+    # "live_test_url": "http://apps.it-projects.info/shop/product/DEMO-URL?version=12.0",
+    "images": [],
+    "version": "12.0.1.0.0",
+    "application": False,
+    "author": "IT-Projects LLC, Eugene Molotov",
+    "support": "apps@it-projects.info",
+    "website": "https://apps.odoo.com/apps/modules/12.0/ir_attachment_google_drive/",
+    "license": "Other OSI approved licence",  # MIT
+    # "price": 9.00,
+    # "currency": "EUR",
+    "depends": ["base", "base_setup"],
+    "external_dependencies": {"python": ["google.cloud.storage"], "bin": []},
+    "data": ["views/res_config_settings_views.xml"],
+    "demo": [],
+    "qweb": [],
+    "post_load": None,
+    "pre_init_hook": None,
+    "post_init_hook": None,
+    "uninstall_hook": None,
+    "auto_install": False,
+    "installable": True,
+    # "demo_title": "Google Drive Attachment Storage",
+    # "demo_addons": [
+    # ],
+    # "demo_addons_hidden": [
+    # ],
+    # "demo_url": "DEMO-URL",
+    # "demo_summary": "TODO description intro",
+    # "demo_images": [
+    #    "images/MAIN_IMAGE",
+    # ]
+}
diff --git a/ir_attachment_google_cloud_storage/doc/changelog.rst b/ir_attachment_google_cloud_storage/doc/changelog.rst
new file mode 100644
index 000000000..5583eb326
--- /dev/null
+++ b/ir_attachment_google_cloud_storage/doc/changelog.rst
@@ -0,0 +1,4 @@
+`1.0.0`
+-------
+
+- **Init version**
diff --git a/ir_attachment_google_cloud_storage/doc/index.rst b/ir_attachment_google_cloud_storage/doc/index.rst
new file mode 100644
index 000000000..d3870a75f
--- /dev/null
+++ b/ir_attachment_google_cloud_storage/doc/index.rst
@@ -0,0 +1,35 @@
+=================================
+ Google Drive Attachment Storage
+=================================
+
+Installation
+============
+{Instruction about things to do before actual installation}
+
+* {OPTIONAL }`Activate longpolling <https://odoo-development.readthedocs.io/en/latest/admin/longpolling.html>`__
+* {Additional notes if any}
+* `Install <https://odoo-development.readthedocs.io/en/latest/odoo/usage/install-module.html>`__ this module in a usual way
+
+Configuration
+=============
+
+{Instruction how to configure the module before start to use it}
+
+* `Log in as SUPERUSER <https://odoo-development.readthedocs.io/en/latest/odoo/usage/login-as-superuser.html>`__
+* `Activate Developer Mode <https://odoo-development.readthedocs.io/en/latest/odoo/usage/debug-mode.html>`__
+* Open menu ``[[ {Menu} ]] >> {Submenu} >> {Subsubmenu}``
+* Click ``[{Button Name}]``
+
+Usage
+=====
+
+{Instruction for daily usage. It should describe how to check that module works. What shall user do and what would user get.}
+
+* Open menu ``[[ {Menu} ]]>> {Submenu} >> {Subsubmenu}``
+* Click ``[{Button Name}]``
+* RESULT: {what user gets, how the modules changes default behaviour}
+
+Uninstallation
+==============
+
+{Optional section for uninstallation notes. Delete it if you don't have notes for uninstallation.}
diff --git a/ir_attachment_google_cloud_storage/models/__init__.py b/ir_attachment_google_cloud_storage/models/__init__.py
new file mode 100644
index 000000000..fcf9596c4
--- /dev/null
+++ b/ir_attachment_google_cloud_storage/models/__init__.py
@@ -0,0 +1,4 @@
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
+
+from . import ir_attachment
+from . import res_config_settings
diff --git a/ir_attachment_google_cloud_storage/models/ir_attachment.py b/ir_attachment_google_cloud_storage/models/ir_attachment.py
new file mode 100644
index 000000000..3a8410b6e
--- /dev/null
+++ b/ir_attachment_google_cloud_storage/models/ir_attachment.py
@@ -0,0 +1,125 @@
+# Copyright 2020 Eugene Molotov <https://it-projects.info/team/em230418>
+# License MIT (https://opensource.org/licenses/MIT).
+
+import base64
+import json
+import logging
+
+from odoo import api, models
+from odoo.tools import human_size
+
+_logger = logging.getLogger(__name__)
+_logger.setLevel(logging.DEBUG)
+
+PREFIX = "google_cloud_storage://"
+
+
+class IrAttachment(models.Model):
+
+    _inherit = "ir.attachment"
+
+    # это нагло скопировано с ir_attachment_url
+    @api.multi
+    def _filter_protected_attachments(self):
+        return self.filtered(
+            lambda r: r.res_model not in ["ir.ui.view", "ir.ui.menu"]
+            or not r.name.startswith("/web/content/")
+            or not r.name.startswith("/web/static/")
+        )
+
+    def _inverse_datas(self):
+        our_records = self._filter_protected_attachments()
+
+        if our_records:
+            # make sure, you can use google drive
+            # otherwise - use default behaviour
+            try:
+                bucket = self.env["res.config.settings"].get_google_cloud_storage_bucket()
+            except Exception:
+                _logger.exception(
+                    "Google Cloud Storage is not configured properly. Keeping attachments as usual"
+                )
+                return super(IrAttachment, self)._inverse_datas()
+
+        for attach in our_records:
+            bin_value = base64.b64decode(attach.datas)
+            checksum = self._compute_checksum(bin_value)
+            fname = self._file_write_google_cloud_storage(bucket, bin_value, checksum)
+            vals = {
+                "file_size": len(bin_value),
+                "checksum": checksum,
+                "index_content": self._index(
+                    bin_value, attach.datas_fname, attach.mimetype
+                ),
+                "store_fname": fname,
+                "db_datas": False,
+                "type": "binary",
+                "datas_fname": attach.datas_fname,
+            }
+            super(IrAttachment, attach.sudo()).write(vals)
+
+        return super(IrAttachment, self - our_records)._inverse_datas()
+
+    def _file_read(self, fname, bin_size=False):
+        if not fname.startswith(PREFIX):
+            return super(IrAttachment, self)._file_read(fname, bin_size)
+
+        bucket = self.env["res.config.settings"].get_google_cloud_storage_bucket()
+
+        file_id = fname[len(PREFIX) :]
+        _logger.debug("reading file with id {}".format(file_id))
+
+        blob = bucket.get_blob(file_id)
+
+        if bin_size:
+            return human_size(blob.size)
+        else:
+            return base64.b64encode(blob.download_as_string())
+
+    def _file_write_google_cloud_storage(self, bucket, bin_value, checksum):
+        file_id = "odoo/{}".format(checksum)
+
+        blob = bucket.blob(file_id)
+        blob.upload_from_string(bin_value)
+
+        _logger.debug("uploaded file with id {}".format(file_id))
+        return PREFIX + file_id
+
+    def _file_delete(self, fname):
+        if not fname.startswith(PREFIX):
+            return super(IrAttachment, self)._file_delete(fname)
+
+        bucket = self.env["res.config.settings"].get_google_cloud_storage_bucket()
+
+        file_id = fname[len(PREFIX) :]
+        _logger.debug("deleting file with id {}".format(file_id))
+
+        blob = bucket.get_blob(file_id)
+
+        blob.delete()
+
+    def force_storage_google_cloud_storage(self):
+        bucket = self.env["res.config.settings"].get_google_cloud_storage_bucket()
+
+        attachment_ids = self._search([
+            ('store_fname', 'not ilike', PREFIX),
+            ('store_fname', '!=', False),
+            ('res_model', 'not in', ["ir.ui.view", "ir.ui.menu"]),
+        ])
+
+        _logger.info("%s attachments to store to google cloud storage" % len(attachment_ids))
+        for attach in map(self.browse, attachment_ids):
+            _logger.info("storing %s", repr(attach))
+
+            old_store_fname = attach.store_fname
+            data = self._file_read(old_store_fname, bin_size=False)
+            bin_data = base64.b64decode(data) if data else b''
+            checksum = self._compute_checksum(bin_data) if not attach.checksum else attach.checksum
+
+            new_store_fname = self._file_write_google_cloud_storage(bucket, bin_data, checksum)
+            attach.write({
+                'store_fname': new_store_fname,
+            })
+            self._file_delete(old_store_fname)
+
+        self.env.cr.commit()
diff --git a/ir_attachment_google_cloud_storage/models/res_config_settings.py b/ir_attachment_google_cloud_storage/models/res_config_settings.py
new file mode 100644
index 000000000..770f7bdde
--- /dev/null
+++ b/ir_attachment_google_cloud_storage/models/res_config_settings.py
@@ -0,0 +1,95 @@
+# Copyright 2020 Eugene Molotov <https://it-projects.info/team/em230418>
+# License MIT (https://opensource.org/licenses/MIT).
+
+from odoo import api, fields, models
+from google.oauth2 import service_account
+from google.cloud import storage
+import json
+import os
+
+GOOGLE_APPLICATION_CREDENTIALS = os.environ.get("GOOGLE_APPLICATION_CREDENTIALS")
+GCS_BUCKETNAME = os.environ.get("GCS_BUCKETNAME")
+
+class ResConfigSettings(models.TransientModel):
+
+    _inherit = "res.config.settings"
+
+    def _compute_is_in_env(self):
+        self.is_google_cloud_storage_credentials_in_env = bool(GOOGLE_APPLICATION_CREDENTIALS)
+        self.is_google_cloud_storage_bucket_in_env = bool(GCS_BUCKETNAME)
+
+    is_google_cloud_storage_credentials_in_env = fields.Boolean(compute=_compute_is_in_env, store=False)
+    is_google_cloud_storage_bucket_in_env = fields.Boolean(compute=_compute_is_in_env, store=False)
+
+    google_cloud_storage_credentials = fields.Char(
+        string="Google Application Credentials (for Google Cloud Storage)",
+        config_parameter="google_cloud_storage.credentials"
+    )
+    google_cloud_storage_bucket = fields.Char(
+        string="Bucket (for Google Cloud Storage)",
+        config_parameter="google_cloud_storage.bucket"
+    )
+
+
+    def get_google_cloud_storage_client(self):
+        credentials = None
+
+        if GOOGLE_APPLICATION_CREDENTIALS:
+            with open(GOOGLE_APPLICATION_CREDENTIALS, "r") as f:
+                credentials = f.read()
+        else:
+            icp = self.env["ir.config_parameter"].sudo()
+            credentials = icp.get_param("google_cloud_storage.credentials")
+
+        if not credentials:
+            raise Exception("No Google Cloud Storage credendtials given")
+
+        return storage.Client(
+            None,
+            credentials=service_account.Credentials.from_service_account_info(
+                json.loads(credentials)
+            )
+        )
+
+    def get_google_cloud_storage_bucket(self):
+        client = self.get_google_cloud_storage_client()
+        bucket = None
+
+        if GCS_BUCKETNAME:
+            bucket = GCS_BUCKETNAME
+        else:
+            icp = self.env["ir.config_parameter"].sudo()
+            bucket = icp.get_param("google_cloud_storage.bucket")
+
+        if not bucket:
+            raise Exception("No Google Cloud Storage bucket given")
+
+        return client.get_bucket(bucket)
+
+
+    @api.model
+    def get_values(self):
+        res = super(ResConfigSettings, self).get_values()
+        icp = self.env["ir.config_parameter"].sudo()
+
+        res.update(
+            google_cloud_storage_credentials=icp.get_param(
+                "google_cloud_storage.credentials", ""
+            ),
+            google_cloud_storage_bucket=icp.get_param(
+                "google_cloud_storage.bucket", ""
+            ),
+        )
+        return res
+
+    def set_values(self):
+        super(ResConfigSettings, self).set_values()
+        icp = self.env["ir.config_parameter"].sudo()
+        icp.set_param(
+            "google_cloud_storage.credentials",
+            self.google_cloud_storage_credentials or "{}",
+        )
+        icp.set_param(
+            "google_cloud_storage.bucket",
+            self.google_cloud_storage_bucket or "",
+        )
diff --git a/ir_attachment_google_cloud_storage/static/description/icon.png b/ir_attachment_google_cloud_storage/static/description/icon.png
new file mode 100644
index 000000000..b43a0a135
Binary files /dev/null and b/ir_attachment_google_cloud_storage/static/description/icon.png differ
diff --git a/ir_attachment_google_cloud_storage/views/res_config_settings_views.xml b/ir_attachment_google_cloud_storage/views/res_config_settings_views.xml
new file mode 100644
index 000000000..d3f461142
--- /dev/null
+++ b/ir_attachment_google_cloud_storage/views/res_config_settings_views.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2020 Eugene Molotov <https://it-projects.info/team/em230418>
+     License MIT (https://opensource.org/licenses/MIT). -->
+<odoo>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.base_setup</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='module_google_drive']/../.." position="after">
+                <div class="col-12 col-lg-6 o_setting_box">
+                    <div class="o_setting_left_pane">
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="google_cloud_storage_credentials"/>
+                        <field name="is_google_cloud_storage_credentials_in_env" attrs="{'invisible': 1}"/>
+                        <field name="google_cloud_storage_credentials" widget="text" attrs="{'invisible': [('is_google_cloud_storage_credentials_in_env', '=', True)]}"/>
+                        <p attrs="{'invisible': [('is_google_cloud_storage_credentials_in_env', '=', False)]}">Defined in enviroment</p>
+                    </div>
+                    <div class="o_setting_left_pane">
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="google_cloud_storage_bucket"/>
+                        <field name="is_google_cloud_storage_bucket_in_env" attrs="{'invisible': 1}"/>
+                        <field name="google_cloud_storage_bucket" attrs="{'invisible': [('is_google_cloud_storage_bucket_in_env', '=', True)]}"/>
+                        <p attrs="{'invisible': [('is_google_cloud_storage_bucket_in_env', '=', False)]}">Defined in environment</p>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/ir_attachment_s3/views/res_config_settings_views.xml b/ir_attachment_s3/views/res_config_settings_views.xml
index 31b76096b..7abb3c18f 100644
--- a/ir_attachment_s3/views/res_config_settings_views.xml
+++ b/ir_attachment_s3/views/res_config_settings_views.xml
@@ -1,88 +1,97 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-  <record id="res_config_settings_view_form" model="ir.ui.view">
-    <field name="name">res.config.settings.view.form.inherit.ir_attachment_s3</field>
-    <field name="model">res.config.settings</field>
-    <field name="priority" eval="11" />
-    <field name="inherit_id" ref="base.res_config_settings_view_form" />
-    <field name="arch" type="xml">
-      <xpath expr="//div[hasclass('settings')]" position="inside">
-        <div
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field
+            name="name"
+        >res.config.settings.view.form.inherit.ir_attachment_s3</field>
+        <field name="model">res.config.settings</field>
+        <field name="priority" eval="11" />
+        <field name="inherit_id" ref="base.res_config_settings_view_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//div[hasclass('settings')]" position="inside">
+                <div
                     class="app_settings_block"
                     data-string="S3 Attachment Storage"
                     data-key="ir_attachment_s3"
                     groups="base.group_system"
                 >
-          <h2>S3 Attachment Strorage</h2>
-          <div class="row mt16 o_settings_container">
-            <div class="col-xs-12 col-md-6 o_setting_box">
-              <div class="o_setting_right_pane">
-                <div class="content-group">
-                  <div class="mt16 row">
-                    <label
+                    <h2>S3 Attachment Strorage</h2>
+                    <div class="row mt16 o_settings_container">
+                        <div class="col-xs-12 col-md-6 o_setting_box">
+                            <div class="o_setting_right_pane">
+                                <div class="content-group">
+                                    <div class="mt16 row">
+                                        <label
                                             for="s3_bucket"
                                             string="S3 bucket name"
                                             class="col-xs-3 col-md-3 o_light_label"
                                         />
-                    <field name="s3_bucket" class="oe_inline" />
-                  </div>
-                </div>
-                <div class="content-group">
-                  <div class="mt16 row">
-                    <label
+                                        <field name="s3_bucket" class="oe_inline" />
+                                    </div>
+                                </div>
+                                <div class="content-group">
+                                    <div class="mt16 row">
+                                        <label
                                             for="s3_access_key_id"
                                             string="S3 access key id"
                                             class="col-xs-3 col-md-3 o_light_label"
                                         />
-                    <field name="s3_access_key_id" class="oe_inline" />
-                  </div>
-                </div>
-                <div class="content-group">
-                  <div class="mt16 row">
-                    <label
+                                        <field
+                                            name="s3_access_key_id"
+                                            class="oe_inline"
+                                        />
+                                    </div>
+                                </div>
+                                <div class="content-group">
+                                    <div class="mt16 row">
+                                        <label
                                             for="s3_secret_key"
                                             string="S3 secret key"
                                             class="col-xs-3 col-md-3 o_light_label"
                                         />
-                    <field name="s3_secret_key" class="oe_inline" password="True" />
-                  </div>
-                </div>
-                <div class="content-group">
-                  <div class="mt16 row">
-                    <label
+                                        <field
+                                            name="s3_secret_key"
+                                            class="oe_inline"
+                                            password="True"
+                                        />
+                                    </div>
+                                </div>
+                                <div class="content-group">
+                                    <div class="mt16 row">
+                                        <label
                                             for="s3_condition"
                                             string="S3 condition"
                                             class="col-xs-3 col-md-3 o_light_label"
                                         />
-                    <field name="s3_condition" class="oe_inline" />
-                  </div>
-                </div>
-                <div class="content-group">
-                  <div class="mt16">
-                    <button
+                                        <field name="s3_condition" class="oe_inline" />
+                                    </div>
+                                </div>
+                                <div class="content-group">
+                                    <div class="mt16">
+                                        <button
                                             name="upload_existing"
                                             type="object"
                                             string="Upload existing attachments"
                                         />
-                  </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </xpath>
-    </field>
-  </record>
-  <record id="ir_attachment_s3_config_settings_action" model="ir.actions.act_window">
-    <field name="name">Settings</field>
-    <field name="type">ir.actions.act_window</field>
-    <field name="res_model">res.config.settings</field>
-    <field name="view_id" ref="res_config_settings_view_form" />
-    <field name="view_mode">form</field>
-    <field name="target">inline</field>
-    <field name="context">{'module' : 'ir_attachment_s3'}</field>
-  </record>
-  <menuitem
+            </xpath>
+        </field>
+    </record>
+    <record id="ir_attachment_s3_config_settings_action" model="ir.actions.act_window">
+        <field name="name">Settings</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">res.config.settings</field>
+        <field name="view_id" ref="res_config_settings_view_form" />
+        <field name="view_mode">form</field>
+        <field name="target">inline</field>
+        <field name="context">{'module' : 'ir_attachment_s3'}</field>
+    </record>
+    <menuitem
         id="menu_s3_settings"
         name="S3 Settings"
         parent="base.next_id_9"
diff --git a/ir_attachment_url/demo/ir_attachment.xml b/ir_attachment_url/demo/ir_attachment.xml
index c1aa33b50..3c99ed03c 100644
--- a/ir_attachment_url/demo/ir_attachment.xml
+++ b/ir_attachment_url/demo/ir_attachment.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="test_url_attachment" model="ir.attachment">
         <field name="name">test_attachment</field>
         <field name="type">url</field>
@@ -8,5 +7,4 @@
             name="url"
         >https://en.wikipedia.org/wiki/Iceland#/media/File:Gullfoss,_an_iconic_waterfall_of_Iceland.jpg</field>
     </record>
-
 </odoo>
diff --git a/ir_attachment_url/static/src/xml/ir_attachment_url.xml b/ir_attachment_url/static/src/xml/ir_attachment_url.xml
index 15789f290..7c14ef7ee 100644
--- a/ir_attachment_url/static/src/xml/ir_attachment_url.xml
+++ b/ir_attachment_url/static/src/xml/ir_attachment_url.xml
@@ -5,7 +5,6 @@
             <span class="fa fa-at fa-lg o_link_address_button" title="Link" />
         </t>
     </t>
-
     <t t-name="AttachmentURL">
         <div class="input_url">
             <span t-if="widget.get('effective_readonly')" />
diff --git a/ir_attachment_url/views/ir_attachment_res_config.xml b/ir_attachment_url/views/ir_attachment_res_config.xml
index 51628639a..361b20773 100644
--- a/ir_attachment_url/views/ir_attachment_res_config.xml
+++ b/ir_attachment_url/views/ir_attachment_res_config.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
-        <record id="view_ir_attachment_settings" model="ir.ui.view">
-            <field name="name">ir attachment settings</field>
-            <field name="model">ir.attachment.config.settings</field>
-            <field name="arch" type="xml">
-                <form
+    <record id="view_ir_attachment_settings" model="ir.ui.view">
+        <field name="name">ir attachment settings</field>
+        <field name="model">ir.attachment.config.settings</field>
+        <field name="arch" type="xml">
+            <form
                 string="Settings needed for the method of saving attachments"
                 class="oe_form_configuration"
             >
-                    <header>
+                <header>
                         <button
                         string="Apply"
                         type="object"
@@ -24,27 +23,23 @@
                         class="oe_link"
                     />
                     </header>
-                    <div>
-                        <group string="ir.attachment settings">
-                            <field name="ir_attachment_url_storage" />
-                        </group>
-                    </div>
-
-                </form>
-            </field>
-        </record>
-
-        <record id="action_ir_attachment_settings" model="ir.actions.act_window">
-            <field name="name">Attachments settings</field>
-            <field name="res_model">ir.attachment.config.settings</field>
-            <field name="view_mode">form</field>
-            <field name="target">inline</field>
-        </record>
-
-        <menuitem
+                <div>
+                    <group string="ir.attachment settings">
+                        <field name="ir_attachment_url_storage" />
+                    </group>
+                </div>
+            </form>
+        </field>
+    </record>
+    <record id="action_ir_attachment_settings" model="ir.actions.act_window">
+        <field name="name">Attachments settings</field>
+        <field name="res_model">ir.attachment.config.settings</field>
+        <field name="view_mode">form</field>
+        <field name="target">inline</field>
+    </record>
+    <menuitem
         id="menu_ir_attachment_settings"
         parent="base.next_id_9"
         action="action_ir_attachment_settings"
     />
-
 </odoo>
diff --git a/ir_attachment_url/views/ir_attachment_url_template.xml b/ir_attachment_url/views/ir_attachment_url_template.xml
index 24ac31097..20148c7e5 100644
--- a/ir_attachment_url/views/ir_attachment_url_template.xml
+++ b/ir_attachment_url/views/ir_attachment_url_template.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-        <template
+    <template
         id="assets_backend"
         name="ir Attachment URL Assets Backend"
         inherit_id="web.assets_backend"
     >
-            <xpath expr="." position="inside">
-                <script
+        <xpath expr="." position="inside">
+            <script
                 type="text/javascript"
                 src="/ir_attachment_url/static/src/js/ir_attachment_url.js"
             />
-                <link
+            <link
                 rel="stylesheet"
                 href="/ir_attachment_url/static/src/css/ir_attachment_url.css"
             />
-            </xpath>
-        </template>
+        </xpath>
+    </template>
 </odoo>
diff --git a/odoo_backup_sh/data/odoo_backup_sh_data.xml b/odoo_backup_sh/data/odoo_backup_sh_data.xml
index 95f795089..25ef4bd47 100644
--- a/odoo_backup_sh/data/odoo_backup_sh_data.xml
+++ b/odoo_backup_sh/data/odoo_backup_sh_data.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- pylint: disable=file-not-used -->
 <odoo noupdate="1">
-
     <record id="ir_cron_odoo_backup_sh_fetch_notifications" model="ir.cron">
         <field name="name">Odoo-backup.sh: fetch notifications</field>
         <field name="model_id" ref="model_odoo_backup_sh_notification" />
@@ -13,10 +12,8 @@
         <field name="doall" eval="True" />
         <field name="active" eval="True" />
     </record>
-
     <record id="mail_activity_data_notification" model="mail.activity.type">
         <field name="name">Notification</field>
         <field name="icon">fa-info</field>
     </record>
-
 </odoo>
diff --git a/odoo_backup_sh/demo/demo.xml b/odoo_backup_sh/demo/demo.xml
index 7000c084a..60265e5c0 100644
--- a/odoo_backup_sh/demo/demo.xml
+++ b/odoo_backup_sh/demo/demo.xml
@@ -5,7 +5,6 @@ License MIT (https://opensource.org/licenses/MIT).
 -->
 <odoo>
     <function name="install_simulation" model="odoo_backup_sh.config" />
-
     <record id="base.user_demo" model="res.users">
         <field name="groups_id" eval="[(4, ref('odoo_backup_sh.group_user'))]" />
     </record>
diff --git a/odoo_backup_sh/demo/tour_views.xml b/odoo_backup_sh/demo/tour_views.xml
index 613588a89..d92529e4d 100644
--- a/odoo_backup_sh/demo/tour_views.xml
+++ b/odoo_backup_sh/demo/tour_views.xml
@@ -4,7 +4,6 @@ Copyright 2018 Stanislav Krotov <https://it-projects.info/team/ufaks>
 License MIT (https://opensource.org/licenses/MIT).
 -->
 <odoo>
-
     <template
         id="assets_backend_demo"
         inherit_id="web.assets_backend"
@@ -17,5 +16,4 @@ License MIT (https://opensource.org/licenses/MIT).
             />
         </xpath>
     </template>
-
 </odoo>
diff --git a/odoo_backup_sh/security/security_groups.xml b/odoo_backup_sh/security/security_groups.xml
index 12922dccf..af7aa8922 100644
--- a/odoo_backup_sh/security/security_groups.xml
+++ b/odoo_backup_sh/security/security_groups.xml
@@ -3,12 +3,10 @@
     <record model="ir.module.category" id="backup_category">
         <field name="name">Backup</field>
     </record>
-
     <record model="res.groups" id="group_user">
         <field name="name">User</field>
         <field name="category_id" ref="backup_category" />
     </record>
-
     <record model="res.groups" id="group_manager">
         <field name="name">Manager</field>
         <field name="category_id" ref="backup_category" />
diff --git a/odoo_backup_sh/static/src/xml/dashboard.xml b/odoo_backup_sh/static/src/xml/dashboard.xml
index 68c4863f7..1af79e9d7 100644
--- a/odoo_backup_sh/static/src/xml/dashboard.xml
+++ b/odoo_backup_sh/static/src/xml/dashboard.xml
@@ -4,7 +4,6 @@ Copyright 2018 Stanislav Krotov <https://it-projects.info/team/ufaks>
 License MIT (https://opensource.org/licenses/MIT).
 -->
 <templates id="template" xml:space="preserve">
-
     <t t-name="odoo_backup_sh.BackupDashboardMain">
         <div class="container-fluid o_backup_dashboard">
             <div class="row o_dashboard_common">
@@ -27,9 +26,8 @@ License MIT (https://opensource.org/licenses/MIT).
                         Update Info
                     </div>
                     -->
-
-                  <t t-if="widget.dashboard_basic()">
-                    <div
+                    <t t-if="widget.dashboard_basic()">
+                        <div
                             class="o_inner_box o_dashboard_action o_dashboard_configure_s3_credentials"
                             title="Set S3 credentials"
                             name="odoo_backup_sh.action_backup_settings"
@@ -37,12 +35,12 @@ License MIT (https://opensource.org/licenses/MIT).
                         <i class="fab fa-aws fa-3x" /><br />
                         Configure S3
                     </div>
-                    <!-- IAP is disabled
+                        <!-- IAP is disabled
                     <div class="o_inner_box o_dashboard_get_s3_credentials" title="Purchase S3 access via odoo.com">
                         <i class="fab fa-aws fa-3x"/><br/>
                         Get S3 storage
                     </div>-->
-                    <a
+                        <a
                             target="_blank"
                             t-att-href="widget.modules.odoo_backup_sh_dropbox.url"
                             class="o_inner_box o_dashboard_use_dropbox"
@@ -51,7 +49,7 @@ License MIT (https://opensource.org/licenses/MIT).
                         <i class="fa fa-dropbox fa-3x" /><br />
                         Use Dropbox
                     </a>
-                    <a
+                        <a
                             target="_blank"
                             t-att-href="widget.modules.odoo_backup_sh_google_disk.url"
                             class="o_inner_box o_dashboard_use_google_disk"
@@ -60,9 +58,9 @@ License MIT (https://opensource.org/licenses/MIT).
                         <i class="fab fa-google-drive fa-3x" /><br />
                         Use Google Drive
                     </a>
-                  </t>
-                  <t t-if="widget.dashboard_configure_dropbox()">
-                    <div
+                    </t>
+                    <t t-if="widget.dashboard_configure_dropbox()">
+                        <div
                             class="o_inner_box o_dashboard_action o_dashboard_configure_dropbox"
                             title=""
                             name="odoo_backup_sh.action_backup_settings"
@@ -70,9 +68,9 @@ License MIT (https://opensource.org/licenses/MIT).
                         <i class="fa fa-dropbox fa-3x" /><br />
                         Configure Dropbox
                     </div>
-                  </t>
-                  <t t-if="widget.dashboard_configure_google_disk()">
-                    <div
+                    </t>
+                    <t t-if="widget.dashboard_configure_google_disk()">
+                        <div
                             class="o_inner_box o_dashboard_action o_dashboard_configure_google_disk"
                             title=""
                             name="odoo_backup_sh.action_backup_settings"
@@ -80,16 +78,16 @@ License MIT (https://opensource.org/licenses/MIT).
                         <i class="fab fa-google-drive fa-3x" /><br />
                         Configure Google Drive
                     </div>
-                  </t>
-                  <!-- iap is disabled
+                    </t>
+                    <!-- iap is disabled
                   <t t-if="widget.dashboard_offer_iap()">
                     <div class="o_inner_box o_dashboard_get_s3_credentials" title="Purchase S3 access via odoo.com">
                         <i class="fab fa-aws fa-3x"/><br/>
                         Extra backups to S3
                     </div>
                   </t>-->
-                  <t t-if="widget.dashboard_iap()">
-                    <a
+                    <t t-if="widget.dashboard_iap()">
+                        <a
                             target="_blank"
                             t-att-href="widget.up_balance_url"
                             class="o_inner_box o_dashboard_action"
@@ -98,9 +96,9 @@ License MIT (https://opensource.org/licenses/MIT).
                         <i class="fa fa-money fa-3x" /><br />
                         Go to Balance
                     </a>
-                  </t>
-                  <t t-if="widget.dashboard_offer_extra_module()">
-                    <a
+                    </t>
+                    <t t-if="widget.dashboard_offer_extra_module()">
+                        <a
                             target="_blank"
                             t-att-href="widget.modules.odoo_backup_sh_dropbox.url"
                             class="o_inner_box o_dashboard_use_dropbox"
@@ -109,7 +107,7 @@ License MIT (https://opensource.org/licenses/MIT).
                         <i class="fa fa-dropbox fa-3x" /><br />
                         Extra backups to Dropbox
                     </a>
-                    <a
+                        <a
                             target="_blank"
                             t-att-href="widget.modules.odoo_backup_sh_google_disk.url"
                             class="o_inner_box o_dashboard_use_google_disk"
@@ -118,48 +116,45 @@ License MIT (https://opensource.org/licenses/MIT).
                         <i class="fab fa-google-drive fa-3x" /><br />
                         Extra backups to Google Drive
                     </a>
-
-                  </t>
-
+                    </t>
                 </div>
             </div>
             <div class="o_backup_dashboard_note_section">
-              <t t-if="widget.show_nocontent_msg">
-                <t t-if="widget.dashboard_can_backup()">
-                <div class="o_backup_dashboard_nocontent">
-                    <p class="o_backup_dashboard_nocontent_create">
+                <t t-if="widget.show_nocontent_msg">
+                    <t t-if="widget.dashboard_can_backup()">
+                        <div class="o_backup_dashboard_nocontent">
+                            <p class="o_backup_dashboard_nocontent_create">
                         Click to add a new Database
                     </p>
-                    <p>
+                            <p>
                         The application helps you easily manage your databases:<br />
                         Auto/manual backup, auto rotation, remote storage for your backups, detailed statistics, etc.
                     </p>
-                </div>
-                </t>
-                <t t-if="!widget.dashboard_can_backup()">
-
-                  <t t-if="widget.dashboard_basic()">
-                    <div class="o_backup_dashboard_nocontent">
-                      <p class="o_backup_dashboard_nocontent_create">
+                        </div>
+                    </t>
+                    <t t-if="!widget.dashboard_can_backup()">
+                        <t t-if="widget.dashboard_basic()">
+                            <div class="o_backup_dashboard_nocontent">
+                                <p class="o_backup_dashboard_nocontent_create">
                         Choose storage for backups
                       </p>
-                      <p>
+                                <p>
                       </p>
-                    </div>
-                  </t>
-                  <t
+                            </div>
+                        </t>
+                        <t
                             t-if="widget.dashboard_configure_google_disk() or widget.dashboard_configure_dropbox()"
                         >
-                    <div class="o_backup_dashboard_nocontent">
-                      <p class="o_backup_dashboard_nocontent_create">
+                            <div class="o_backup_dashboard_nocontent">
+                                <p class="o_backup_dashboard_nocontent_create">
                         Finish configuration
                       </p>
-                      <p>
+                                <p>
                       </p>
-                    </div>
-                  </t>
+                            </div>
+                        </t>
+                    </t>
                 </t>
-              </t>
                 <t t-foreach="widget.notifications" t-as="notification">
                     <div
                         class="o_backup_dashboard_notification"
@@ -195,7 +190,6 @@ License MIT (https://opensource.org/licenses/MIT).
             />
         </div>
     </t>
-
     <t t-name="odoo_backup_sh.config_cards">
         <t t-foreach="configs" t-as="config">
             <div
@@ -204,13 +198,17 @@ License MIT (https://opensource.org/licenses/MIT).
                 t-att-data-service="config.storage_service"
             >
                 <div class="backup_card_title">
-                    <span title="Database Name"><t t-esc="config.database" /></span>
+                    <span title="Database Name">
+                        <t t-esc="config.database" />
+                    </span>
                     <t t-if="!config.active">
                         <span class="o_kanban_card_warning">
                             <i class="fa fa-warning" title="Warning" />
                             <p
                             >The current configuration with scheduled auto backups had not activated.</p>
-                            <p><strong>Setting have not been set!</strong></p>
+                            <p>
+                                <strong>Setting have not been set!</strong>
+                            </p>
                         </span>
                     </t>
                     <span
@@ -220,14 +218,13 @@ License MIT (https://opensource.org/licenses/MIT).
                         <i class="fa fa-pencil" title="Edit Backup Config" />
                     </span>
                 </div>
-                <div class="backup_storage_service_title o_hidden"><span
-                        id="backup_storage_type"
-                        title="Backup Storage Type"
-                    >
-                    <t t-if="config.storage_service == 'odoo_backup_sh'">
+                <div class="backup_storage_service_title o_hidden">
+                    <span id="backup_storage_type" title="Backup Storage Type">
+                        <t t-if="config.storage_service == 'odoo_backup_sh'">
                         S3
                     </t>
-                </span></div>
+                    </span>
+                </div>
                 <div class="backup_card_content">
                     <button
                         type="object"
@@ -243,9 +240,8 @@ License MIT (https://opensource.org/licenses/MIT).
             </div>
         </t>
     </t>
-
     <t t-name="odoo_backup_sh.error_msg">
-        <strong>Error: </strong><t t-value="error_msg" />
+        <strong>Error: </strong>
+        <t t-value="error_msg" />
     </t>
-
 </templates>
diff --git a/odoo_backup_sh/views/odoo_backup_sh_templates.xml b/odoo_backup_sh/views/odoo_backup_sh_templates.xml
index f460a56b8..e1693e41e 100644
--- a/odoo_backup_sh/views/odoo_backup_sh_templates.xml
+++ b/odoo_backup_sh/views/odoo_backup_sh_templates.xml
@@ -4,7 +4,6 @@ Copyright 2018 Stanislav Krotov <https://it-projects.info/team/ufaks>
 License MIT (https://opensource.org/licenses/MIT).
 -->
 <odoo>
-
     <template
         id="assets_backend"
         inherit_id="web.assets_backend"
@@ -32,5 +31,4 @@ License MIT (https://opensource.org/licenses/MIT).
             />
         </xpath>
     </template>
-
 </odoo>
diff --git a/odoo_backup_sh/views/odoo_backup_sh_views.xml b/odoo_backup_sh/views/odoo_backup_sh_views.xml
index 4133c8699..bcd3f28dd 100644
--- a/odoo_backup_sh/views/odoo_backup_sh_views.xml
+++ b/odoo_backup_sh/views/odoo_backup_sh_views.xml
@@ -6,20 +6,16 @@ Copyright 2019 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
 License MIT (https://opensource.org/licenses/MIT).
 -->
 <odoo>
-
-
     <record id="backup_dashboard" model="ir.actions.client">
         <field name="name">Dashboard</field>
         <field name="tag">backup_dashboard</field>
     </record>
-
     <record id="ir_actions_server_backup_dashboard" model="ir.actions.server">
         <field name="name">Backups: Dashboard</field>
         <field name="model_id" ref="odoo_backup_sh.model_odoo_backup_sh_config" />
         <field name="state">code</field>
         <field name="code">action = model.action_dashboard_redirect()</field>
     </record>
-
     <record model="ir.actions.server" id="download_backup">
         <field name="name">Download backup</field>
         <field name="model_id" ref="model_odoo_backup_sh_backup_info" />
@@ -28,7 +24,6 @@ License MIT (https://opensource.org/licenses/MIT).
             action = model.download_backup_action()
         </field>
     </record>
-
     <!--
         Show information about a Storage Service of Database after install additional modules only.
         Additional modules:
@@ -61,7 +56,6 @@ License MIT (https://opensource.org/licenses/MIT).
             </form>
         </field>
     </record>
-
     <record id='odoo_backup_sh_backup_tree' model='ir.ui.view'>
         <field name="name">odoo_backup_sh.backup_info.tree</field>
         <field name="model">odoo_backup_sh.backup_info</field>
@@ -75,7 +69,6 @@ License MIT (https://opensource.org/licenses/MIT).
             </tree>
         </field>
     </record>
-
     <record id="odoo_backup_sh_backup_graph" model="ir.ui.view">
         <field name="name">odoo_backup_sh.backup_info.graph</field>
         <field name="model">odoo_backup_sh.backup_info</field>
@@ -86,7 +79,6 @@ License MIT (https://opensource.org/licenses/MIT).
             </graph>
         </field>
     </record>
-
     <record model="ir.ui.view" id="odoo_backup_sh_backup_search">
         <field name="name">odoo_backup_sh.backup_info.search</field>
         <field name="model">odoo_backup_sh.backup_info</field>
@@ -132,7 +124,6 @@ License MIT (https://opensource.org/licenses/MIT).
             </search>
         </field>
     </record>
-
     <record id='odoo_backup_sh_backup_action' model='ir.actions.act_window'>
         <field name="name">Backups</field>
         <field name="res_model">odoo_backup_sh.backup_info</field>
@@ -144,7 +135,6 @@ License MIT (https://opensource.org/licenses/MIT).
             }
         </field>
     </record>
-
     <record id="view_odoo_backup_sh_notification_kanban" model="ir.ui.view">
         <field name="name">odoo_backup_sh.notification.kanban</field>
         <field name="model">odoo_backup_sh.notification</field>
@@ -209,7 +199,6 @@ License MIT (https://opensource.org/licenses/MIT).
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
-
     <record id='odoo_backup_sh_config_form' model='ir.ui.view'>
         <field name="name">odoo_backup_sh.config.form</field>
         <field name="model">odoo_backup_sh.config</field>
@@ -225,19 +214,25 @@ License MIT (https://opensource.org/licenses/MIT).
                     />
                 </header>
                 <sheet>
-                  <div class="oe_button_box" name="button_box">
-                    <button
+                    <div class="oe_button_box" name="button_box">
+                        <button
                             class="oe_stat_button"
                             name="action_list_backups"
                             type="object"
                             icon="fa-database"
                         >
-                        <field name="backup_count" string="backups" widget="statinfo" />
-                    </button>
-                  </div>
+                            <field
+                                name="backup_count"
+                                string="backups"
+                                widget="statinfo"
+                            />
+                        </button>
+                    </div>
                     <div class="oe_title">
                         <label for="database" class="oe_edit_only" />
-                        <h1><field name="database" /></h1>
+                        <h1>
+                            <field name="database" />
+                        </h1>
                     </div>
                     <field
                         nolabel="1"
@@ -299,79 +294,75 @@ License MIT (https://opensource.org/licenses/MIT).
                         <field name="unlimited_time_frame" invisible="1" />
                         <field name="common_rotation" invisible="1" />
                         <group col="4" colspan="4">
-                          <group>
-                            <field name="hourly_rotation" />
-                          </group>
-                          <group>
-                            <field
+                            <group>
+                                <field name="hourly_rotation" />
+                            </group>
+                            <group>
+                                <field
                                     name="hourly_limit"
                                     attrs="{'invisible': [('hourly_rotation', '!=', 'limited')]}"
                                 />
-                          </group>
+                            </group>
                         </group>
-
                         <group
                             col="4"
                             colspan="4"
                             attrs="{'invisible': [('common_rotation', '!=', 'limited'), ('unlimited_time_frame', '=', 'hour')]}"
                         >
-                          <group>
-                            <field name="daily_rotation" />
-                          </group>
-                          <group>
-                            <field
+                            <group>
+                                <field name="daily_rotation" />
+                            </group>
+                            <group>
+                                <field
                                     name="daily_limit"
                                     attrs="{'invisible': [('daily_rotation', '!=', 'limited')]}"
                                 />
-                          </group>
+                            </group>
                         </group>
-
                         <group
                             col="4"
                             colspan="4"
                             attrs="{'invisible': [('common_rotation', '!=', 'limited'), ('unlimited_time_frame', 'in', ['hour', 'day'])]}"
                         >
-                          <group>
-                            <field name="weekly_rotation" />
-                          </group>
-                          <group>
-                            <field
+                            <group>
+                                <field name="weekly_rotation" />
+                            </group>
+                            <group>
+                                <field
                                     name="weekly_limit"
                                     attrs="{'invisible': [('weekly_rotation', '!=', 'limited')]}"
                                 />
-                          </group>
+                            </group>
                         </group>
-
                         <group
                             col="4"
                             colspan="4"
                             attrs="{'invisible': [('common_rotation', '!=', 'limited'), ('unlimited_time_frame', 'in', ['day', 'hour', 'week'])]}"
                         >
-                          <group>
-                            <field name="monthly_rotation" />
-                          </group>
-                          <group>
-                            <field
+                            <group>
+                                <field name="monthly_rotation" />
+                            </group>
+                            <group>
+                                <field
                                     name="monthly_limit"
                                     attrs="{'invisible': [('monthly_rotation', '!=', 'limited')]}"
                                 />
-                          </group>
+                            </group>
                         </group>
-
                         <group
                             col="4"
                             colspan="4"
                             attrs="{'invisible': [('common_rotation', '!=', 'limited'), ('unlimited_time_frame', 'in', ['day', 'hour', 'week', 'month'])]}"
                         >
-                          <group>
-                            <field name="yearly_rotation" />
-                          </group>
-                          <group>
-                            <field
+                            <group>
+                                <field name="yearly_rotation" />
+                            </group>
+                            <group>
+                                <field
                                     name="yearly_limit"
                                     attrs="{'invisible': [('yearly_rotation', '!=', 'limited')]}"
                                 />
-                          </group>
+                            </group>
                         </group>
                         <p
                             colspan="4"
@@ -442,7 +433,6 @@ License MIT (https://opensource.org/licenses/MIT).
             </form>
         </field>
     </record>
-
     <record id='odoo_backup_sh_config_tree' model='ir.ui.view'>
         <field name="name">odoo_backup_sh.config.tree</field>
         <field name="model">odoo_backup_sh.config</field>
@@ -452,22 +442,22 @@ License MIT (https://opensource.org/licenses/MIT).
             </tree>
         </field>
     </record>
-
     <record id='action_backup_config' model='ir.actions.act_window'>
         <field name="name">Backup Configurations</field>
         <field name="res_model">odoo_backup_sh.config</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
-
     <!-- delete remote backups wizard -->
     <record id="delete_remote_backup_wizard_view" model="ir.ui.view">
         <field name="name">Delete Remote Backups</field>
         <field name="model">odoo_backup_sh.delete_remote_backup_wizard</field>
         <field name="arch" type="xml">
             <form string="Confirmation">
-                <div><strong
-                    >Are you sure you want to delete this record from remote storage?</strong></div>
+                <div>
+                    <strong
+                    >Are you sure you want to delete this record from remote storage?</strong>
+                </div>
                 <footer>
                     <button
                         string="Ok"
@@ -480,7 +470,6 @@ License MIT (https://opensource.org/licenses/MIT).
             </form>
         </field>
     </record>
-
     <act_window
         id="delete_remote_backup_wizard_action"
         name="Delete Remote Backups"
@@ -491,7 +480,6 @@ License MIT (https://opensource.org/licenses/MIT).
         key2="client_action_multi"
         target="new"
     />
-
     <menuitem
         name="Backups"
         id="menu_backup_root"
@@ -529,7 +517,6 @@ License MIT (https://opensource.org/licenses/MIT).
         sequence="30"
         groups="base.group_no_one"
     />
-
     <record id="res_config_settings_view_form" model="ir.ui.view">
         <field name="name">res.config.settings.view.form.inherit.odoo.backup</field>
         <field name="model">res.config.settings</field>
@@ -537,7 +524,6 @@ License MIT (https://opensource.org/licenses/MIT).
         <field name="inherit_id" ref="base.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
-
                 <div
                     class="app_settings_block"
                     data-string="Backups"
@@ -546,83 +532,77 @@ License MIT (https://opensource.org/licenses/MIT).
                     groups="base.group_system"
                 >
                     <h2>S3 Storage</h2>
-
                     <div class="row mt16 o_settings_container" name="backup_services">
-                      <div class="col-12 col-lg-6 o_setting_box">
-                        <div class="o_setting_left_pane">
+                        <div class="col-12 col-lg-6 o_setting_box">
+                            <div class="o_setting_left_pane">
                           &amp;nbsp;
                         </div>
-                        <div class="o_setting_right_pane">
-                          <div class="text-muted">
+                            <div class="o_setting_right_pane">
+                                <div class="text-muted">
                             Paste your S3 credentials here
                           </div>
-                          <div class="content-group">
-                            <div class="mt16 row">
-                              <field
+                                <div class="content-group">
+                                    <div class="mt16 row">
+                                        <field
                                             name="odoo_backup_sh_odoo_oauth_uid"
                                             invisible="1"
                                         />
-                              <field name="private_s3_dir_changed" invisible="1" />
-
-                              <label
+                                        <field
+                                            name="private_s3_dir_changed"
+                                            invisible="1"
+                                        />
+                                        <label
                                             for="odoo_backup_sh_amazon_bucket_name"
                                             class="col-4 col-lg-4 o_light_label"
                                         />
-                              <field
+                                        <field
                                             name="odoo_backup_sh_amazon_bucket_name"
                                             nolabel="1"
                                         />
-
-                              <label
+                                        <label
                                             for="odoo_backup_sh_private_s3_dir"
                                             class="col-4 col-lg-4 o_light_label"
                                             attrs="{'invisible': [('odoo_backup_sh_odoo_oauth_uid', '!=', '')]}"
                                         />
-                              <field
+                                        <field
                                             name="odoo_backup_sh_private_s3_dir"
                                             nolabel="1"
                                             attrs="{'invisible': [('odoo_backup_sh_odoo_oauth_uid', '!=', '')]}"
                                         />
-
-                              <label
+                                        <label
                                             for="odoo_backup_sh_amazon_access_key_id"
                                             string="Access Key ID"
                                             class="col-4 col-lg-4 o_light_label"
                                         />
-                              <field
+                                        <field
                                             name="odoo_backup_sh_amazon_access_key_id"
                                             nolabel="1"
                                         />
-
-                              <label
+                                        <label
                                             for="odoo_backup_sh_amazon_secret_access_key"
                                             string="Secret Access Key"
                                             class="col-4 col-lg-4 o_light_label"
                                         />
-                              <field
+                                        <field
                                             name="odoo_backup_sh_amazon_secret_access_key"
                                             password="1"
                                             nolabel="1"
                                         />
-
-
-                            </div>
-                            <div
+                                    </div>
+                                    <div
                                         class="mt16 text-warning"
                                         attrs="{'invisible': [('private_s3_dir_changed', '=', False)]}"
                                     >Note that on changing Folder, backups will be synced with new folder only<br
                                         /><span
                                             attrs="{'invisible': [('odoo_backup_sh_private_s3_dir', '=', '')]}"
                                         >Be sure, that the folder exists in the bucket</span></div>
-
-                            <!-- IAP is disabled
+                                    <!-- IAP is disabled
                             <button name="%(odoo_backup_sh.ir_actions_server_backup_dashboard)d" type="action" string="Get Credentials" class="btn btn-primary" icon="fa-lock" attrs="{'invisible': [('odoo_backup_sh_amazon_secret_access_key', '!=', '')]}"/>
                             -->
-                          </div>
+                                </div>
+                            </div>
                         </div>
-                      </div>
                     </div>
-
                     <h2
                         attrs="{'invisible': ['|', ('available_module_odoo_backup_sh_google_disk', '=', False), ('available_module_odoo_backup_sh_dropbox', '=', False)]}"
                     >Other Storage</h2>
@@ -651,7 +631,7 @@ License MIT (https://opensource.org/licenses/MIT).
                                     attrs="{'invisible': [('module_odoo_backup_sh_google_disk','=',False)]}"
                                     id="msg_module_odoo_backup_sh_google_disk"
                                 >
-                                  <div class="mt16 text-warning"><strong
+                                    <div class="mt16 text-warning"><strong
                                         >Save</strong> this page and come back here to set up the feature.</div>
                                 </div>
                             </div>
@@ -680,7 +660,7 @@ License MIT (https://opensource.org/licenses/MIT).
                                     attrs="{'invisible': [('module_odoo_backup_sh_dropbox','=',False)]}"
                                     id="msg_module_odoo_backup_sh_dropbox"
                                 >
-                                  <div class="mt16 text-warning"><strong
+                                    <div class="mt16 text-warning"><strong
                                         >Save</strong> this page and come back here to set up the feature.</div>
                                 </div>
                             </div>
@@ -690,7 +670,6 @@ License MIT (https://opensource.org/licenses/MIT).
             </xpath>
         </field>
     </record>
-
     <record id="action_backup_settings" model="ir.actions.act_window">
         <field name="name">Settings</field>
         <field name="type">ir.actions.act_window</field>
@@ -700,7 +679,6 @@ License MIT (https://opensource.org/licenses/MIT).
         <field name="target">inline</field>
         <field name="context">{'module' : 'odoo_backup_sh'}</field>
     </record>
-
     <menuitem
         name="Settings"
         id="menu_settings"
@@ -709,5 +687,4 @@ License MIT (https://opensource.org/licenses/MIT).
         groups="base.group_system"
         sequence="100"
     />
-
 </odoo>
diff --git a/odoo_backup_sh_dropbox/static/src/xml/dashboard.xml b/odoo_backup_sh_dropbox/static/src/xml/dashboard.xml
index 0052c2639..669b85a3a 100644
--- a/odoo_backup_sh_dropbox/static/src/xml/dashboard.xml
+++ b/odoo_backup_sh_dropbox/static/src/xml/dashboard.xml
@@ -4,7 +4,6 @@ Copyright 2019 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
 License MIT (https://opensource.org/licenses/MIT).
 -->
 <templates id="template" xml:space="preserve">
-
     <t t-extend="odoo_backup_sh.BackupDashboardMain">
         <t t-jquery=".kanban_group_buttons" t-operation="append">
             <button
@@ -14,7 +13,6 @@ License MIT (https://opensource.org/licenses/MIT).
             >Dropbox</button>
         </t>
     </t>
-
     <t t-extend="odoo_backup_sh.config_cards">
         <t t-jquery="#backup_storage_type" t-operation="append">
             <t t-if="config.storage_service == 'dropbox'">
@@ -22,5 +20,4 @@ License MIT (https://opensource.org/licenses/MIT).
             </t>
         </t>
     </t>
-
 </templates>
diff --git a/odoo_backup_sh_dropbox/views/odoo_backup_sh_dropbox_templates.xml b/odoo_backup_sh_dropbox/views/odoo_backup_sh_dropbox_templates.xml
index 8e31a8da7..dae7a4457 100644
--- a/odoo_backup_sh_dropbox/views/odoo_backup_sh_dropbox_templates.xml
+++ b/odoo_backup_sh_dropbox/views/odoo_backup_sh_dropbox_templates.xml
@@ -4,7 +4,6 @@ Copyright 2019 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
 License MIT (https://opensource.org/licenses/MIT).
 -->
 <odoo>
-
     <template
         id="assets_backend"
         inherit_id="web.assets_backend"
@@ -17,5 +16,4 @@ License MIT (https://opensource.org/licenses/MIT).
             />
         </xpath>
     </template>
-
 </odoo>
diff --git a/odoo_backup_sh_dropbox/views/odoo_backup_sh_views.xml b/odoo_backup_sh_dropbox/views/odoo_backup_sh_views.xml
index 9c01af1e1..469b4bef5 100644
--- a/odoo_backup_sh_dropbox/views/odoo_backup_sh_views.xml
+++ b/odoo_backup_sh_dropbox/views/odoo_backup_sh_views.xml
@@ -4,7 +4,6 @@ Copyright 2019 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
 License MIT (https://opensource.org/licenses/MIT).
 -->
 <odoo>
-
     <record id='odoo_backup_sh_config_form' model='ir.ui.view'>
         <field name="name">odoo_backup_sh.config.form</field>
         <field name="model">odoo_backup_sh.config</field>
@@ -15,7 +14,6 @@ License MIT (https://opensource.org/licenses/MIT).
             </xpath>
         </field>
     </record>
-
     <record id='odoo_backup_sh_backup_form' model='ir.ui.view'>
         <field name="name">odoo_backup_sh.backup_info.form</field>
         <field name="model">odoo_backup_sh.backup_info</field>
@@ -26,7 +24,6 @@ License MIT (https://opensource.org/licenses/MIT).
             </xpath>
         </field>
     </record>
-
     <record id='odoo_backup_sh_backup_tree' model='ir.ui.view'>
         <field name="name">odoo_backup_sh.backup_info.tree</field>
         <field name="model">odoo_backup_sh.backup_info</field>
@@ -37,5 +34,4 @@ License MIT (https://opensource.org/licenses/MIT).
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/odoo_backup_sh_dropbox/views/res_config_settings_views.xml b/odoo_backup_sh_dropbox/views/res_config_settings_views.xml
index 3d00dce12..eec103526 100644
--- a/odoo_backup_sh_dropbox/views/res_config_settings_views.xml
+++ b/odoo_backup_sh_dropbox/views/res_config_settings_views.xml
@@ -4,7 +4,6 @@ Copyright 2019 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
 License MIT (https://opensource.org/licenses/MIT).
 -->
 <odoo>
-
     <record id="res_config_settings_view_form" model="ir.ui.view">
         <field name="name">res.config.settings.view.form.inherit.odoo.backup</field>
         <field name="model">res.config.settings</field>
@@ -36,5 +35,4 @@ License MIT (https://opensource.org/licenses/MIT).
             </div>
         </field>
     </record>
-
 </odoo>
diff --git a/odoo_backup_sh_google_disk/static/src/xml/dashboard.xml b/odoo_backup_sh_google_disk/static/src/xml/dashboard.xml
index 27d5b5d19..c117ca6d0 100644
--- a/odoo_backup_sh_google_disk/static/src/xml/dashboard.xml
+++ b/odoo_backup_sh_google_disk/static/src/xml/dashboard.xml
@@ -4,7 +4,6 @@ Copyright 2019 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
 License MIT (https://opensource.org/licenses/MIT).
 -->
 <templates id="template" xml:space="preserve">
-
     <t t-extend="odoo_backup_sh.BackupDashboardMain">
         <t t-jquery=".kanban_group_buttons" t-operation="append">
             <button
@@ -14,7 +13,6 @@ License MIT (https://opensource.org/licenses/MIT).
             >Google Drive</button>
         </t>
     </t>
-
     <t t-extend="odoo_backup_sh.config_cards">
         <t t-jquery="#backup_storage_type" t-operation="append">
             <t t-if="config.storage_service == 'google_drive'">
@@ -22,5 +20,4 @@ License MIT (https://opensource.org/licenses/MIT).
             </t>
         </t>
     </t>
-
 </templates>
diff --git a/odoo_backup_sh_google_disk/views/odoo_backup_sh_google_drive_templates.xml b/odoo_backup_sh_google_disk/views/odoo_backup_sh_google_drive_templates.xml
index 3b172c6e7..39771db39 100644
--- a/odoo_backup_sh_google_disk/views/odoo_backup_sh_google_drive_templates.xml
+++ b/odoo_backup_sh_google_disk/views/odoo_backup_sh_google_drive_templates.xml
@@ -4,7 +4,6 @@ Copyright 2019 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
 License MIT (https://opensource.org/licenses/MIT).
 -->
 <odoo>
-
     <template
         id="assets_backend"
         inherit_id="web.assets_backend"
@@ -17,5 +16,4 @@ License MIT (https://opensource.org/licenses/MIT).
             />
         </xpath>
     </template>
-
 </odoo>
diff --git a/odoo_backup_sh_google_disk/views/odoo_backup_sh_views.xml b/odoo_backup_sh_google_disk/views/odoo_backup_sh_views.xml
index 9c01af1e1..469b4bef5 100644
--- a/odoo_backup_sh_google_disk/views/odoo_backup_sh_views.xml
+++ b/odoo_backup_sh_google_disk/views/odoo_backup_sh_views.xml
@@ -4,7 +4,6 @@ Copyright 2019 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
 License MIT (https://opensource.org/licenses/MIT).
 -->
 <odoo>
-
     <record id='odoo_backup_sh_config_form' model='ir.ui.view'>
         <field name="name">odoo_backup_sh.config.form</field>
         <field name="model">odoo_backup_sh.config</field>
@@ -15,7 +14,6 @@ License MIT (https://opensource.org/licenses/MIT).
             </xpath>
         </field>
     </record>
-
     <record id='odoo_backup_sh_backup_form' model='ir.ui.view'>
         <field name="name">odoo_backup_sh.backup_info.form</field>
         <field name="model">odoo_backup_sh.backup_info</field>
@@ -26,7 +24,6 @@ License MIT (https://opensource.org/licenses/MIT).
             </xpath>
         </field>
     </record>
-
     <record id='odoo_backup_sh_backup_tree' model='ir.ui.view'>
         <field name="name">odoo_backup_sh.backup_info.tree</field>
         <field name="model">odoo_backup_sh.backup_info</field>
@@ -37,5 +34,4 @@ License MIT (https://opensource.org/licenses/MIT).
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/odoo_backup_sh_google_disk/views/res_config_settings_views.xml b/odoo_backup_sh_google_disk/views/res_config_settings_views.xml
index f30d5b30f..533fa9c9b 100644
--- a/odoo_backup_sh_google_disk/views/res_config_settings_views.xml
+++ b/odoo_backup_sh_google_disk/views/res_config_settings_views.xml
@@ -4,7 +4,6 @@ Copyright 2019 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
 License MIT (https://opensource.org/licenses/MIT).
 -->
 <odoo>
-
     <record id="res_config_settings_view_form" model="ir.ui.view">
         <field name="name">res.config.settings.view.form.inherit.odoo.backup</field>
         <field name="model">res.config.settings</field>
@@ -32,10 +31,8 @@ License MIT (https://opensource.org/licenses/MIT).
                         href="https://apps.odoo.com/apps/modules/12.0/odoo_backup_sh_google_disk/"
                         target="_blank"
                     ><i class="fa fa-fw fa-arrow-right" />Documentation</a>
-
                 </div>
             </div>
         </field>
     </record>
-
 </odoo>
diff --git a/pad_crm/crm_lead.xml b/pad_crm/crm_lead.xml
index 37d64dd63..c59584834 100644
--- a/pad_crm/crm_lead.xml
+++ b/pad_crm/crm_lead.xml
@@ -3,22 +3,22 @@
     Copyright 2019 Artem Rafailov <https://it-projects.info/team/Ommo73/>
     License MIT (https://opensource.org/licenses/MIT).-->
 <odoo>
-        <record id="crm_case_form_view_oppor" model="ir.ui.view">
-            <field name="model">crm.lead</field>
-            <field name="inherit_id" ref="crm.crm_case_form_view_oppor" />
-            <field name="arch" type="xml">
-                <field name="description" position="replace">
-                    <field name="description_pad" widget="pad" />
-                </field>
+    <record id="crm_case_form_view_oppor" model="ir.ui.view">
+        <field name="model">crm.lead</field>
+        <field name="inherit_id" ref="crm.crm_case_form_view_oppor" />
+        <field name="arch" type="xml">
+            <field name="description" position="replace">
+                <field name="description_pad" widget="pad" />
             </field>
-        </record>
-        <record id="crm_case_form_view_leads" model="ir.ui.view">
-            <field name="model">crm.lead</field>
-            <field name="inherit_id" ref="crm.crm_case_form_view_leads" />
-            <field name="arch" type="xml">
-                <field name="description" position="replace">
-                    <field name="description_pad" widget="pad" />
-                </field>
+        </field>
+    </record>
+    <record id="crm_case_form_view_leads" model="ir.ui.view">
+        <field name="model">crm.lead</field>
+        <field name="inherit_id" ref="crm.crm_case_form_view_leads" />
+        <field name="arch" type="xml">
+            <field name="description" position="replace">
+                <field name="description_pad" widget="pad" />
             </field>
-        </record>
+        </field>
+    </record>
 </odoo>
diff --git a/pad_crm/template.xml b/pad_crm/template.xml
index 079947eac..690cb9065 100644
--- a/pad_crm/template.xml
+++ b/pad_crm/template.xml
@@ -2,13 +2,13 @@
 <!--Copyright 2019 Artem Rafailov <https://it-projects.info/team/Ommo73/>
     License MIT (https://opensource.org/licenses/MIT).-->
 <odoo>
-        <template
+    <template
         id="assets_backend"
         name="pad_crm_assets_backend"
         inherit_id="web.assets_backend"
     >
-            <xpath expr="." position="inside">
-                <link rel="stylesheet" href="/pad_crm/static/src/css/pad_crm.css" />
-            </xpath>
-        </template>
+        <xpath expr="." position="inside">
+            <link rel="stylesheet" href="/pad_crm/static/src/css/pad_crm.css" />
+        </xpath>
+    </template>
 </odoo>
diff --git a/product_category_taxes/views.xml b/product_category_taxes/views.xml
index c9870b7e0..c63c1c4a6 100644
--- a/product_category_taxes/views.xml
+++ b/product_category_taxes/views.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <openerp>
     <data>
-
         <record id="product_category_taxes_form" model="ir.ui.view">
             <field name="name">product_category_taxes.form</field>
             <field name="model">product.category</field>
@@ -17,6 +16,5 @@
                 </group>
             </field>
         </record>
-
     </data>
 </openerp>
diff --git a/product_details/views/product_detail.xml b/product_details/views/product_detail.xml
index 4c1fa332f..a8c268ca9 100644
--- a/product_details/views/product_detail.xml
+++ b/product_details/views/product_detail.xml
@@ -4,7 +4,6 @@
     # Copyright 2018 Kolushov Alexandr <https://it-projects.info/team/KolushovAlexandr>
     # License MIT (https://opensource.org/licenses/MIT). -->
 <odoo>
-
     <record id='product_details_product_template_form_view' model='ir.ui.view'>
         <field name="name">product.template.common.form</field>
         <field name="model">product.template</field>
@@ -39,5 +38,4 @@
             </data>
         </field>
     </record>
-
 </odoo>
diff --git a/product_tags/product_view.xml b/product_tags/product_view.xml
index f36c6d92a..8ac0d7d2a 100644
--- a/product_tags/product_view.xml
+++ b/product_tags/product_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <openerp>
     <data>
-
         <record id="product_tag_form" model="ir.ui.view">
             <field name="name">product.tag.view.form</field>
             <field name="model">product.tag</field>
@@ -23,7 +22,6 @@
                 </form>
             </field>
         </record>
-
         <record id="product_tag_tree" model="ir.ui.view">
             <field name="name">product.tag.view.tree</field>
             <field name="model">product.tag</field>
@@ -34,7 +32,6 @@
                 </tree>
             </field>
         </record>
-
         <record id="product_tag_list" model="ir.ui.view">
             <field name="name">Product Tags</field>
             <field name="model">product.tag</field>
@@ -45,7 +42,6 @@
                 </tree>
             </field>
         </record>
-
         <record id="product_tag_search" model="ir.ui.view">
             <field name="name">product.tag.view.search</field>
             <field name="model">product.tag</field>
@@ -71,7 +67,6 @@
             parent="sale.prod_config_main"
             sequence="3"
         />
-
         <record id="product_template_tag_search_inherit" model="ir.ui.view">
             <field name="name">product.template.tag.view.search</field>
             <field name="model">product.template</field>
@@ -86,7 +81,6 @@
                 </field>
             </field>
         </record>
-
         <record id="product_template_form_inherit" model="ir.ui.view">
             <field name="name">product.template.view.form</field>
             <field name="model">product.template</field>
@@ -101,9 +95,7 @@
                 </xpath>
             </field>
         </record>
-
         <!--  kanban view   -->
-
         <record model="ir.ui.view" id="product_template_kanban">
             <field name="name">Product Template Tag Kanban</field>
             <field name="model">product.template</field>
@@ -111,12 +103,12 @@
             <field name="arch" type="xml">
                 <div name="tags" position="inside">
                     <ul>
-                        <li><field name="tag_ids" /></li>
+                        <li>
+                            <field name="tag_ids" />
+                        </li>
                     </ul>
                 </div>
             </field>
         </record>
-
-
     </data>
 </openerp>
diff --git a/production_lot_details/data/security_demo.xml b/production_lot_details/data/security_demo.xml
index 2a454e0da..2dcfd7543 100644
--- a/production_lot_details/data/security_demo.xml
+++ b/production_lot_details/data/security_demo.xml
@@ -3,14 +3,12 @@
     # Copyright 2017 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
     # License MIT (https://opensource.org/licenses/MIT). -->
 <odoo>
-
-        <record model="res.groups" id="base.group_user">
-            <field
+    <record model="res.groups" id="base.group_user">
+        <field
             name="implied_ids"
             eval="[
                 (4, ref('stock.group_production_lot')),
             ]"
         />
-        </record>
-
+    </record>
 </odoo>
diff --git a/production_lot_details/views/production_lot_detail.xml b/production_lot_details/views/production_lot_detail.xml
index 1dfc8049c..dab1d382c 100644
--- a/production_lot_details/views/production_lot_detail.xml
+++ b/production_lot_details/views/production_lot_detail.xml
@@ -4,7 +4,6 @@
     # Copyright 2018 Kolushov Alexandr <https://it-projects.info/team/KolushovAlexandr>
     # License MIT (https://opensource.org/licenses/MIT). -->
 <odoo>
-
     <record id='production_lot_details_form_view' model='ir.ui.view'>
         <field name="name">stock.production.lot.form</field>
         <field name="model">stock.production.lot</field>
@@ -23,5 +22,4 @@
             </data>
         </field>
     </record>
-
 </odoo>
diff --git a/project_task_search_custom/views/project_task_search_custom.xml b/project_task_search_custom/views/project_task_search_custom.xml
index bd97d6f48..6f7958a26 100644
--- a/project_task_search_custom/views/project_task_search_custom.xml
+++ b/project_task_search_custom/views/project_task_search_custom.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <openerp>
-  <data>
-    <record model="ir.ui.view" id="task_search_custom_view">
-      <field name="model">project.task</field>
-      <field name="inherit_id" ref="project.view_task_search_form" />
-      <field name="arch" type="xml">
-        <xpath expr="//search/field[@name='name']" position="attributes">
-         <attribute
+    <data>
+        <record model="ir.ui.view" id="task_search_custom_view">
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_search_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//search/field[@name='name']" position="attributes">
+                    <attribute
                         name="filter_domain"
                     >['|', '|', ('name', 'ilike', self), ('description', 'ilike', self), ('message_ids.body', 'ilike', self)]</attribute>
-        </xpath>
-        <xpath expr="//search/field[@name='name']" position="after">
-            <field name="name" string="Name" />
-        </xpath>
-      </field>
-    </record>
-  </data>
+                </xpath>
+                <xpath expr="//search/field[@name='name']" position="after">
+                    <field name="name" string="Name" />
+                </xpath>
+            </field>
+        </record>
+    </data>
 </openerp>
diff --git a/project_task_subtask/data/subscription_template.xml b/project_task_subtask/data/subscription_template.xml
index 865750414..dd6c3c222 100644
--- a/project_task_subtask/data/subscription_template.xml
+++ b/project_task_subtask/data/subscription_template.xml
@@ -4,23 +4,22 @@
     License MIT (https://opensource.org/licenses/MIT). -->
 <odoo>
     <record id="subtasks_subtype" model="mail.message.subtype">
-      <field name="name">All checklist updates</field>
-      <field name="res_model">project.task</field>
-      <field
+        <field name="name">All checklist updates</field>
+        <field name="res_model">project.task</field>
+        <field
             name="description"
         >Subscribe to checklist updates of other users. By default you are notified on checklist items to and from you only.</field>
-      <field name="default" eval="False" />
+        <field name="default" eval="False" />
     </record>
-
     <record id="all_subtask_subtype" model="mail.message.subtype">
-    <field name="name">All checklist updates</field>
-    <field
+        <field name="name">All checklist updates</field>
+        <field
             name="description"
         >Subscribe to checklist updates of other users. By default you are notified on checklist items to and from you only.</field>
-    <field name="sequence">10</field>
-    <field name="res_model">project.project</field>
-    <field name="parent_id" eval="ref('subtasks_subtype')" />
-    <field name="relation_field">project_id</field>
-    <field name="default" eval="True" />
+        <field name="sequence">10</field>
+        <field name="res_model">project.project</field>
+        <field name="parent_id" eval="ref('subtasks_subtype')" />
+        <field name="relation_field">project_id</field>
+        <field name="default" eval="True" />
     </record>
 </odoo>
diff --git a/project_task_subtask/demo/project_task_subtask_demo.xml b/project_task_subtask/demo/project_task_subtask_demo.xml
index 48a4ad1b4..afb0c201e 100644
--- a/project_task_subtask/demo/project_task_subtask_demo.xml
+++ b/project_task_subtask/demo/project_task_subtask_demo.xml
@@ -4,8 +4,8 @@
     License MIT (https://opensource.org/licenses/MIT). -->
 <odoo noupdate="1">
     <record id="project_task_subtask_1" model="project.task.subtask">
-      <field name="name">test subtask</field>
-      <field name="user_id" eval="ref('base.user_demo')" />
-      <field name="task_id" eval="ref('project.project_task_1')" />
+        <field name="name">test subtask</field>
+        <field name="user_id" eval="ref('base.user_demo')" />
+        <field name="task_id" eval="ref('project.project_task_1')" />
     </record>
 </odoo>
diff --git a/project_task_subtask/static/src/xml/templates.xml b/project_task_subtask/static/src/xml/templates.xml
index 9be9c19c9..b06436a7c 100644
--- a/project_task_subtask/static/src/xml/templates.xml
+++ b/project_task_subtask/static/src/xml/templates.xml
@@ -14,5 +14,4 @@
             type="button"
         >Unsort</button>
     </t>
-
 </template>
diff --git a/project_task_subtask/views/project_task_subtask.xml b/project_task_subtask/views/project_task_subtask.xml
index a6da81571..d6fc967e5 100644
--- a/project_task_subtask/views/project_task_subtask.xml
+++ b/project_task_subtask/views/project_task_subtask.xml
@@ -7,149 +7,161 @@
     License MIT (https://opensource.org/licenses/MIT). -->
 <odoo>
     <record id="view_task_form2" model="ir.ui.view">
-      <field name="name">project.task.form</field>
-      <field name="model">project.task</field>
-      <field name="inherit_id" ref="project.view_task_form2" />
-      <field name="arch" type="xml">
-        <xpath expr="//page[1]" position="before">
-          <page string="Checklist">
-            <field name="default_user" invisible='True' />
-            <field name="subtask_ids" context="{'default_user_id': default_user}">
-              <tree
+        <field name="name">project.task.form</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project.view_task_form2" />
+        <field name="arch" type="xml">
+            <xpath expr="//page[1]" position="before">
+                <page string="Checklist">
+                    <field name="default_user" invisible='True' />
+                    <field
+                        name="subtask_ids"
+                        context="{'default_user_id': default_user}"
+                    >
+                        <tree
                             editable="bottom"
                             decoration-danger="recolor == True"
                             decoration-muted="state == 'cancelled'"
                             decoration-success="state == 'done'"
                             decoration-info="state == 'waiting'"
                         >
-                  <field name="name" />
-                  <field name="recolor" invisible='True' />
-                  <field name="user_id" />
-                  <field name="state" />
-                  <field name="hide_button" invisible='True' />
-                  <button
+                            <field name="name" />
+                            <field name="recolor" invisible='True' />
+                            <field name="user_id" />
+                            <field name="state" />
+                            <field name="hide_button" invisible='True' />
+                            <button
                                 name="change_state_done"
                                 string="Change state to DONE"
                                 type="object"
                                 icon="fa-check"
                                 attrs="{'invisible': ['|', ('state', 'in',['done', 'cancelled']), ('hide_button', '=', True)]}"
                             />
-                  <button
+                            <button
                                 name="change_state_todo"
                                 string="Change state to TODO"
                                 type="object"
                                 icon="fa-caret-square-o-right"
                                 attrs="{'invisible': [ '|',('state', '=', 'todo'), ('hide_button', '=', True)]}"
                             />
-                  <button
+                            <button
                                 name="change_state_waiting"
                                 type="object"
                                 string="Change state to Waiting"
                                 icon="fa-pause"
                                 attrs="{'invisible': [ '|',('state', '=', 'waiting'), ('hide_button', '=', True)]}"
                             />
-                  <button
+                            <button
                                 name="change_state_cancelled"
                                 type="object"
                                 string="Change state to CANCELLED"
                                 icon="fa-ban"
                                 attrs="{'invisible': [ '|',('state', '=', 'cancelled'), ('hide_button', '=', True)]}"
                             />
-                  <field name="reviewer_id" />
-                  <field name="deadline" />
-                </tree>
-            </field>
-          </page>
-        </xpath>
-      </field>
+                            <field name="reviewer_id" />
+                            <field name="deadline" />
+                        </tree>
+                    </field>
+                </page>
+            </xpath>
+        </field>
     </record>
-
     <record id="view_task_kanban_subtasks" model="ir.ui.view">
-      <field name="name">project.task.kanban.subtasks</field>
-      <field name="model">project.task</field>
-      <field name="inherit_id" ref="project.view_task_kanban" />
-      <field name="arch" type="xml">
-        <xpath expr="//field[@name ='tag_ids']" position="after">
-            <field name="completion" invisible="1" />
-            <field name="subtask_ids" invisible="1" />
-            <field name="kanban_subtasks" invisible="1" />
-            <field name="completion_xml" invisible="1" />
-        </xpath>
-        <xpath expr="//div[hasclass('o_kanban_record_bottom')]" position="before">
-          <div>
-             <t t-raw="record.completion_xml.raw_value" />
-             <t t-raw="record.kanban_subtasks.raw_value" />
-          </div>
-        </xpath>
-      </field>
+        <field name="name">project.task.kanban.subtasks</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project.view_task_kanban" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name ='tag_ids']" position="after">
+                <field name="completion" invisible="1" />
+                <field name="subtask_ids" invisible="1" />
+                <field name="kanban_subtasks" invisible="1" />
+                <field name="completion_xml" invisible="1" />
+            </xpath>
+            <xpath expr="//div[hasclass('o_kanban_record_bottom')]" position="before">
+                <div>
+                    <t t-raw="record.completion_xml.raw_value" />
+                    <t t-raw="record.kanban_subtasks.raw_value" />
+                </div>
+            </xpath>
+        </field>
     </record>
-
     <record model="ir.ui.view" id="view_id">
-      <field name="name">project.task.subtask</field>
-      <field name="model">project.task.subtask</field>
-      <field name="arch" type="xml">
-        <form string="Subtask Message">
-          <sheet>
-            <group>
-              <field name="name" />
-              <field name="user_id" />
-              <field name="state" />
-              <field name="task_id" />
-            </group>
-          </sheet>
-        </form>
-      </field>
+        <field name="name">project.task.subtask</field>
+        <field name="model">project.task.subtask</field>
+        <field name="arch" type="xml">
+            <form string="Subtask Message">
+                <sheet>
+                    <group>
+                        <field name="name" />
+                        <field name="user_id" />
+                        <field name="state" />
+                        <field name="task_id" />
+                    </group>
+                </sheet>
+            </form>
+        </field>
     </record>
-
     <record id="project_task_subtask_view_search" model="ir.ui.view">
-      <field name="name">project.task.subtask.filter</field>
-      <field name="model">project.task.subtask</field>
-      <field name="arch" type="xml">
-        <search string="Filter">
-          <field name="name" string="Description" />
-          <filter string="My" domain="[('user_id','=',uid)]" name="my_subtask" />
-          <separator />
-          <filter string="TODO" domain="[('state','=','todo')]" name="done_subtask" />
-          <group expand="0" string="Group By">
-            <filter string="Project" domain="[]" context="{'group_by':'project_id'}" />
-            <filter string="Task" domain="[]" context="{'group_by':'task_id'}" />
-            <filter string="User" domain="[]" context="{'group_by':'user_id'}" />
-            <filter string="State" domain="[]" context="{'group_by':'state'}" />
-          </group>
-        </search>
-      </field>
+        <field name="name">project.task.subtask.filter</field>
+        <field name="model">project.task.subtask</field>
+        <field name="arch" type="xml">
+            <search string="Filter">
+                <field name="name" string="Description" />
+                <filter string="My" domain="[('user_id','=',uid)]" name="my_subtask" />
+                <separator />
+                <filter
+                    string="TODO"
+                    domain="[('state','=','todo')]"
+                    name="done_subtask"
+                />
+                <group expand="0" string="Group By">
+                    <filter
+                        string="Project"
+                        domain="[]"
+                        context="{'group_by':'project_id'}"
+                    />
+                    <filter
+                        string="Task"
+                        domain="[]"
+                        context="{'group_by':'task_id'}"
+                    />
+                    <filter
+                        string="User"
+                        domain="[]"
+                        context="{'group_by':'user_id'}"
+                    />
+                    <filter string="State" domain="[]" context="{'group_by':'state'}" />
+                </group>
+            </search>
+        </field>
     </record>
-
     <record model="ir.ui.view" id="subtask_list_view">
-      <field name="name">subtask.list.form</field>
-      <field name="model">project.task.subtask</field>
-      <field name="arch" type="xml">
-        <tree>
-          <field name="name" />
-          <field name="user_id" />
-          <field name="reviewer_id" />
-          <field name="task_id" />
-          <field name="task_state" />
-        </tree>
-      </field>
+        <field name="name">subtask.list.form</field>
+        <field name="model">project.task.subtask</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name" />
+                <field name="user_id" />
+                <field name="reviewer_id" />
+                <field name="task_id" />
+                <field name="task_state" />
+            </tree>
+        </field>
     </record>
-
     <record id="action_view_subtask" model="ir.actions.act_window">
-      <field name="name">Checklist</field>
-      <field name="res_model">project.task.subtask</field>
-      <field name="view_mode">tree,form</field>
-      <field name="context">{
+        <field name="name">Checklist</field>
+        <field name="res_model">project.task.subtask</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{
       'search_default_my_subtask': 1,
       'search_default_done_subtask': 1,
       }
       </field>
     </record>
-
     <menuitem
         name="Checklist"
         parent="project.menu_project_management"
         id="menu_action_view_subtask"
         action="action_view_subtask"
     />
-
 </odoo>
diff --git a/project_timelog/data/project_timelog_data.xml b/project_timelog/data/project_timelog_data.xml
index 9f6fc8cf3..8b30d5996 100644
--- a/project_timelog/data/project_timelog_data.xml
+++ b/project_timelog/data/project_timelog_data.xml
@@ -1,94 +1,87 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="0">
-        <!--if user offline then timer will stop-->
-        <record id="ir_cron_check_stop_timer" model="ir.cron">
-            <field name="name">Offline stop timer</field>
-            <field name="active" eval="True" />
-            <field name="model_id" ref="model_res_users" />
-            <field name="state">code</field>
-            <field name="code">model.check_stop_timer()</field>
-            <field name="user_id" ref="base.user_root" />
-            <field name='interval_number'>5</field>
-            <field name='interval_type'>minutes</field>
-            <field name="numbercall">-1</field>
-        </record>
-
-        <!--new status for yesterday's timelogs-->
-        <record id="ir_cron_nonactive_new_timer_status" model="ir.cron">
-            <field name="name">Nonactive new status</field>
-            <field name="active" eval="True" />
-            <field name="model_id" ref="model_account_analytic_line" />
-            <field name="state">code</field>
-            <field name="code">model.subtask_new_status()</field>
-            <field name="user_id" ref="base.user_root" />
-            <field name='interval_number'>1</field>
-            <field name='interval_type'>days</field>
-            <field name="numbercall">-1</field>
-            <field
+    <!--if user offline then timer will stop-->
+    <record id="ir_cron_check_stop_timer" model="ir.cron">
+        <field name="name">Offline stop timer</field>
+        <field name="active" eval="True" />
+        <field name="model_id" ref="model_res_users" />
+        <field name="state">code</field>
+        <field name="code">model.check_stop_timer()</field>
+        <field name="user_id" ref="base.user_root" />
+        <field name='interval_number'>5</field>
+        <field name='interval_type'>minutes</field>
+        <field name="numbercall">-1</field>
+    </record>
+    <!--new status for yesterday's timelogs-->
+    <record id="ir_cron_nonactive_new_timer_status" model="ir.cron">
+        <field name="name">Nonactive new status</field>
+        <field name="active" eval="True" />
+        <field name="model_id" ref="model_account_analytic_line" />
+        <field name="state">code</field>
+        <field name="code">model.subtask_new_status()</field>
+        <field name="user_id" ref="base.user_root" />
+        <field name='interval_number'>1</field>
+        <field name='interval_type'>days</field>
+        <field name="numbercall">-1</field>
+        <field
             name="nextcall"
             eval="(DateTime.now() + timedelta(days=1)).strftime('%Y-%m-%d 00:00:00')"
         />
-        </record>
-
-        <!--clear stopline for yesterday's date-->
-        <record id="ir_cron_clear_stopline_datetime" model="ir.cron">
-            <field name="name">Clear stopline datetime</field>
-            <field name="active" eval="True" />
-            <field name="model_id" ref="model_project_task" />
-            <field name="state">code</field>
-            <field name="code">model.clear_stopline_datetime()</field>
-            <field name="user_id" ref="base.user_root" />
-            <field name='interval_number'>1</field>
-            <field name='interval_type'>days</field>
-            <field name="numbercall">-1</field>
-            <field
+    </record>
+    <!--clear stopline for yesterday's date-->
+    <record id="ir_cron_clear_stopline_datetime" model="ir.cron">
+        <field name="name">Clear stopline datetime</field>
+        <field name="active" eval="True" />
+        <field name="model_id" ref="model_project_task" />
+        <field name="state">code</field>
+        <field name="code">model.clear_stopline_datetime()</field>
+        <field name="user_id" ref="base.user_root" />
+        <field name='interval_number'>1</field>
+        <field name='interval_type'>days</field>
+        <field name="numbercall">-1</field>
+        <field
             name="nextcall"
             eval="(DateTime.now() + timedelta(days=1)).strftime('%Y-%m-%d 00:00:00')"
         />
-        </record>
-
-        <!--if stopline is not false. If date/time in stopline is current date/time then timer will stop-->
-        <record id="ir_cron_stopline" model="ir.cron">
-            <field name="name">Stopline</field>
-            <field name="active" eval="True" />
-            <field name="model_id" ref="model_project_task" />
-            <field name="state">code</field>
-            <field name="code">model.stopline_timer()</field>
-            <field name="user_id" ref="base.user_root" />
-            <field name='interval_number'>1</field>
-            <field name='interval_type'>minutes</field>
-            <field name="numbercall">-1</field>
-            <field
+    </record>
+    <!--if stopline is not false. If date/time in stopline is current date/time then timer will stop-->
+    <record id="ir_cron_stopline" model="ir.cron">
+        <field name="name">Stopline</field>
+        <field name="active" eval="True" />
+        <field name="model_id" ref="model_project_task" />
+        <field name="state">code</field>
+        <field name="code">model.stopline_timer()</field>
+        <field name="user_id" ref="base.user_root" />
+        <field name='interval_number'>1</field>
+        <field name='interval_type'>minutes</field>
+        <field name="numbercall">-1</field>
+        <field
             name="nextcall"
             eval="(DateTime.now() + timedelta(days=1)).strftime('%Y-%m-%d 00:00:00')"
         />
-        </record>
-
-        <record id="mt_timelog_stopline" model="mail.message.subtype">
-            <field name="name">Stopline changed</field>
-            <field name="res_model">project.task</field>
-            <field name="default" eval="True" />
-            <field name="description">Stopline changed</field>
-        </record>
-
-        <record id="mt_timelog_stopline_change" model="mail.message.subtype">
-            <field name="name">Stopline changed</field>
-            <field name="sequence" eval="10" />
-            <field name="res_model">project.project</field>
-            <field name="parent_id" eval="ref('mt_timelog_stopline')" />
-            <field name="relation_field">project_id</field>
-        </record>
-
-        <record id="rule_auto_stop_timer" model="base.automation">
-            <field name="name">Set timer info</field>
-            <field name="model_id" ref="project_timelog.model_project_task" />
-            <field name="state">code</field>
-            <field name="code">
+    </record>
+    <record id="mt_timelog_stopline" model="mail.message.subtype">
+        <field name="name">Stopline changed</field>
+        <field name="res_model">project.task</field>
+        <field name="default" eval="True" />
+        <field name="description">Stopline changed</field>
+    </record>
+    <record id="mt_timelog_stopline_change" model="mail.message.subtype">
+        <field name="name">Stopline changed</field>
+        <field name="sequence" eval="10" />
+        <field name="res_model">project.project</field>
+        <field name="parent_id" eval="ref('mt_timelog_stopline')" />
+        <field name="relation_field">project_id</field>
+    </record>
+    <record id="rule_auto_stop_timer" model="base.automation">
+        <field name="name">Set timer info</field>
+        <field name="model_id" ref="project_timelog.model_project_task" />
+        <field name="state">code</field>
+        <field name="code">
                 record.set_stage_timer()
             </field>
-            <field name="trigger">on_write</field>
-            <field name="active" eval="True" />
-        </record>
-
-        <function model="timelog.config.settings" name="init_timer_parametrs" />
+        <field name="trigger">on_write</field>
+        <field name="active" eval="True" />
+    </record>
+    <function model="timelog.config.settings" name="init_timer_parametrs" />
 </odoo>
diff --git a/project_timelog/static/src/xml/menu.xml b/project_timelog/static/src/xml/menu.xml
index e3382df79..1d902975b 100644
--- a/project_timelog/static/src/xml/menu.xml
+++ b/project_timelog/static/src/xml/menu.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <templates id="template" xml:space="preserve">
-
     <header t-extend="Menu">
         <t t-jquery=".o_menu_systray" t-operation="after">
             <ul class="timelog oe_timelog_placeholder" style="float: right">
@@ -8,7 +7,6 @@
             </ul>
         </t>
     </header>
-
     <t t-name="timelog.timer">
         <li class="timelog" id="timelog_timer">
             <div id="clock0" class="clock">
@@ -21,5 +19,4 @@
             </div>
         </li>
     </t>
-
 </templates>
diff --git a/project_timelog/views/project_timelog_templates.xml b/project_timelog/views/project_timelog_templates.xml
index b83cd09b3..c64f135e1 100644
--- a/project_timelog/views/project_timelog_templates.xml
+++ b/project_timelog/views/project_timelog_templates.xml
@@ -1,32 +1,32 @@
 <odoo>
-        <template
+    <template
         id="assets_backend"
         name="Project timelog assets"
         inherit_id="web.assets_backend"
     >
-            <xpath expr="." position="inside">
-                <link
+        <xpath expr="." position="inside">
+            <link
                 rel="stylesheet"
                 type="text/less"
                 href="/project_timelog/static/src/css/timer_button.css"
             />
-                <link
+            <link
                 rel="stylesheet"
                 type="text/css"
                 href="/project_timelog/static/src/css/timer.css"
             />
-                <script
+            <script
                 type="text/javascript"
                 src="/project_timelog/static/src/js/timelog.js"
             />
-                <script
+            <script
                 type="text/javascript"
                 src="/project_timelog/static/lib/online.js"
             />
-                <script
+            <script
                 type="text/javascript"
                 src="/project_timelog/static/src/js/tour.js"
             />
-            </xpath>
-        </template>
+        </xpath>
+    </template>
 </odoo>
diff --git a/project_timelog/views/project_timelog_views.xml b/project_timelog/views/project_timelog_views.xml
index fe1ffec97..267a933a6 100644
--- a/project_timelog/views/project_timelog_views.xml
+++ b/project_timelog/views/project_timelog_views.xml
@@ -1,479 +1,459 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
-        <record model="ir.ui.view" id="view_task_form2_inherited">
-            <field name="name">project.task.form.inherited</field>
-            <field name="model">project.task</field>
-            <field name="inherit_id" ref="hr_timesheet.view_task_form2_inherited" />
-            <field name="priority" eval="999" />
-            <field name="arch" type="xml">
-                <xpath
+    <record model="ir.ui.view" id="view_task_form2_inherited">
+        <field name="name">project.task.form.inherited</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="hr_timesheet.view_task_form2_inherited" />
+        <field name="priority" eval="999" />
+        <field name="arch" type="xml">
+            <xpath
                 expr="//field[@name='timesheet_ids']/tree/field[@name='name']"
                 position="attributes"
             >
-                    <attribute name="invisible">1</attribute>
-                </xpath>
-                <xpath
+                <attribute name="invisible">1</attribute>
+            </xpath>
+            <xpath
                 expr="//field[@name='timesheet_ids']/tree/field[@name='date']"
                 position="before"
             >
-                    <field name="status" invisible="1" />
-                    <field
+                <field name="status" invisible="1" />
+                <field
                     name="name"
                     attrs="{'readonly': [('status', '=', 'nonactive')]}"
                 />
-                </xpath>
-                <xpath
+            </xpath>
+            <xpath
                 expr="//field[@name='timesheet_ids']/tree/field[@name='date']"
                 position="attributes"
             >
-                    <attribute name="readonly">1</attribute>
-                </xpath>
-                <xpath
+                <attribute name="readonly">1</attribute>
+            </xpath>
+            <xpath
                 expr="//field[@name='timesheet_ids']/tree/field[@name='user_id']"
                 position="attributes"
             >
-                    <attribute name="readonly">1</attribute>
-                </xpath>
-                <xpath
+                <attribute name="readonly">1</attribute>
+            </xpath>
+            <xpath
                 expr="//field[@name='timesheet_ids']/tree/field[@name='employee_id']"
                 position="attributes"
             >
-                    <attribute name="readonly">1</attribute>
-                </xpath>
-                <xpath
+                <attribute name="readonly">1</attribute>
+            </xpath>
+            <xpath
                 expr="//field[@name='timesheet_ids']/tree/field[@name='unit_amount']"
                 position="attributes"
             >
-                    <attribute name="readonly">1</attribute>
-                </xpath>
-                <xpath
+                <attribute name="readonly">1</attribute>
+            </xpath>
+            <xpath
                 expr="//field[@name='timesheet_ids']/tree/field[@name='name']"
                 position="after"
             >
-                    <field name="user_current" invisible="1" />
-                    <field name="task_allow_logs" invisible="1" />
-                    <button
+                <field name="user_current" invisible="1" />
+                <field name="task_allow_logs" invisible="1" />
+                <button
                     name="play_timer"
                     class="log-start-timer"
                     type="object"
                     attrs="{'invisible': ['|','|','|',('status','=','play'), ('user_current', '=', False), ('status', '=', 'nonactive'), ('task_allow_logs', '=', False)]}"
                 />
-                    <button
+                <button
                     name="stop_timer"
                     class="log-stop-timer"
                     type="object"
                     attrs="{'invisible': ['|','|','|',('status','=','stop'), ('status','=','nonactive'), ('status','=','active'), ('user_current', '=', False)]}"
                 />
-                    <field name="stage_id" readonly="1" />
-                </xpath>
-            </field>
-        </record>
-
-        <record id="view_task_form2" model="ir.ui.view">
-            <field name="name">project.task.form</field>
-            <field name="model">project.task</field>
-            <field name="inherit_id" ref="project.view_task_form2" />
-            <field name="priority" eval="999" />
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='date_deadline']" position="after">
-                    <field name="datetime_stopline" readonly="1" />
-                </xpath>
-            </field>
-        </record>
-
-        <record id="view_task_form3" model="ir.ui.view">
-            <field name="name">project.task.form</field>
-            <field name="model">project.task</field>
-            <field name="inherit_id" ref="project_timelog.view_task_form2" />
-            <field
+                <field name="stage_id" readonly="1" />
+            </xpath>
+        </field>
+    </record>
+    <record id="view_task_form2" model="ir.ui.view">
+        <field name="name">project.task.form</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project.view_task_form2" />
+        <field name="priority" eval="999" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='date_deadline']" position="after">
+                <field name="datetime_stopline" readonly="1" />
+            </xpath>
+        </field>
+    </record>
+    <record id="view_task_form3" model="ir.ui.view">
+        <field name="name">project.task.form</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project_timelog.view_task_form2" />
+        <field
             name="groups_id"
             eval="[(6, 0, [ref('project.group_project_manager') ])]"
         />
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='datetime_stopline']" position="attributes">
-                    <attribute name="readonly">0</attribute>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="task_type_edit" model="ir.ui.view">
-            <field name="name">project.task.type.form</field>
-            <field name="model">project.task.type</field>
-            <field name="inherit_id" ref="project.task_type_edit" />
-            <field name="arch" type="xml">
-                <xpath expr="//group" position="inside">
-                    <group>
-                        <field name="allow_log_time" />
-                    </group>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="task_type_tree" model="ir.ui.view">
-            <field name="name">project.task.type.tree</field>
-            <field name="model">project.task.type</field>
-            <field name="inherit_id" ref="project.task_type_tree" />
-            <field name="arch" type="xml">
-                <xpath expr="//tree" position="inside">
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='datetime_stopline']" position="attributes">
+                <attribute name="readonly">0</attribute>
+            </xpath>
+        </field>
+    </record>
+    <record id="task_type_edit" model="ir.ui.view">
+        <field name="name">project.task.type.form</field>
+        <field name="model">project.task.type</field>
+        <field name="inherit_id" ref="project.task_type_edit" />
+        <field name="arch" type="xml">
+            <xpath expr="//group" position="inside">
+                <group>
                     <field name="allow_log_time" />
-                </xpath>
-            </field>
-        </record>
-
-        <record id="view_my_timelog_form" model="ir.ui.view">
-            <field name="name">timelog</field>
-            <field name="model">project.timelog</field>
-            <field name="arch" type="xml">
-                <form string="Edit timelog" create="false">
-                    <sheet>
+                </group>
+            </xpath>
+        </field>
+    </record>
+    <record id="task_type_tree" model="ir.ui.view">
+        <field name="name">project.task.type.tree</field>
+        <field name="model">project.task.type</field>
+        <field name="inherit_id" ref="project.task_type_tree" />
+        <field name="arch" type="xml">
+            <xpath expr="//tree" position="inside">
+                <field name="allow_log_time" />
+            </xpath>
+        </field>
+    </record>
+    <record id="view_my_timelog_form" model="ir.ui.view">
+        <field name="name">timelog</field>
+        <field name="model">project.timelog</field>
+        <field name="arch" type="xml">
+            <form string="Edit timelog" create="false">
+                <sheet>
+                    <group>
                         <group>
-                            <group>
-                                <field name="task_id" string="Task" readonly="1" />
-                                <field
+                            <field name="task_id" string="Task" readonly="1" />
+                            <field
                                 name="work_id"
                                 string="Subtask"
                                 help="Subtask name"
                                 readonly="1"
                             />
-                                <field
+                            <field
                                 name="stage_id"
                                 string="Stage"
                                 help="Stage name"
                                 readonly="1"
                             />
-                            </group>
-                            <group>
-                                <field
+                        </group>
+                        <group>
+                            <field
                                 name="start_datetime"
                                 string="Start datetime"
                                 help="The time when you start the timer"
                                 readonly="1"
                             />
-                                <field
+                            <field
                                 name="end_datetime"
                                 string="End datetime"
                                 help="The time when you end the timer"
                                 readonly="1"
                             />
-                                <field
+                            <field
                                 name="duration"
                                 string="Duration"
                                 widget="float_time"
                                 help="Total time, before taking into account errors"
                                 readonly="1"
                             />
-                            </group>
                         </group>
+                    </group>
+                    <group>
                         <group>
-                            <group><field
+                            <field
                                 name="time_correction"
                                 string="Time correction"
                                 help="To correct the mistake of the recorded time"
                                 widget="float_time"
-                            /></group>
-                            <group><field
+                            />
+                        </group>
+                        <group>
+                            <field
                                 name="corrected_duration"
                                 string="Corrected duration"
                                 widget="float_time"
                                 help="Total time, after taking into account errors"
                                 readonly="1"
-                            /></group>
+                            />
                         </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record id="view_my_timelog" model="ir.ui.view">
-            <field name="name">timelog</field>
-            <field name="model">project.timelog</field>
-            <field name="arch" type="xml">
-                <tree create="0" edit="1">
-                    <field name="work_id" string="Subtask" />
-                    <field name="start_datetime" />
-                    <field name="end_datetime" />
-                    <field name="stage_id" />
-                    <field name="duration" string="Duration" widget="float_time" />
-                    <field
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record id="view_my_timelog" model="ir.ui.view">
+        <field name="name">timelog</field>
+        <field name="model">project.timelog</field>
+        <field name="arch" type="xml">
+            <tree create="0" edit="1">
+                <field name="work_id" string="Subtask" />
+                <field name="start_datetime" />
+                <field name="end_datetime" />
+                <field name="stage_id" />
+                <field name="duration" string="Duration" widget="float_time" />
+                <field
                     name="corrected_duration"
                     string="Corrected Duration"
                     widget="float_time"
                     sum="Total Duration"
                 />
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_timelog" model="ir.ui.view">
-            <field name="name">timelog</field>
-            <field name="model">project.timelog</field>
-            <field name="arch" type="xml">
-                <tree create="0" edit="1">
-                    <field name="user_id" string="User" />
-                    <field name="work_id" string="Subtask" />
-                    <field name="start_datetime" />
-                    <field name="end_datetime" />
-                    <field name="stage_id" />
-                    <field name="duration" string="Duration" widget="float_time" />
-                    <field
+            </tree>
+        </field>
+    </record>
+    <record id="view_timelog" model="ir.ui.view">
+        <field name="name">timelog</field>
+        <field name="model">project.timelog</field>
+        <field name="arch" type="xml">
+            <tree create="0" edit="1">
+                <field name="user_id" string="User" />
+                <field name="work_id" string="Subtask" />
+                <field name="start_datetime" />
+                <field name="end_datetime" />
+                <field name="stage_id" />
+                <field name="duration" string="Duration" widget="float_time" />
+                <field
                     name="corrected_duration"
                     string="Corrected Duration"
                     widget="float_time"
                     sum="Total Duration"
                 />
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_timelog_graph" model="ir.ui.view">
-            <field name="name">timelog.graph</field>
-            <field name="model">project.timelog</field>
-            <field name="arch" type="xml">
-                <graph string="Timelog" type="pivot">
-                    <field
+            </tree>
+        </field>
+    </record>
+    <record id="view_timelog_graph" model="ir.ui.view">
+        <field name="name">timelog.graph</field>
+        <field name="model">project.timelog</field>
+        <field name="arch" type="xml">
+            <graph string="Timelog" type="pivot">
+                <field
                     name="corrected_duration_active"
                     type="measure"
                     widget="float_time"
                 />
-                </graph>
-            </field>
-        </record>
-
-        <record id="view_timelog_calendar" model="ir.ui.view">
-            <field name="name">timelog.calendar</field>
-            <field name="model">project.timelog</field>
-            <field name="arch" type="xml">
-                <calendar
+            </graph>
+        </field>
+    </record>
+    <record id="view_timelog_calendar" model="ir.ui.view">
+        <field name="name">timelog.calendar</field>
+        <field name="model">project.timelog</field>
+        <field name="arch" type="xml">
+            <calendar
                 color="user_id"
                 date_start="start_datetime"
                 date_stop="end_datetime_active"
                 string="Timelog"
             >
-                    <field name="work_name" />
-                    <field name="task_name" />
-                </calendar>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="timelog_search_view">
-            <field name="name">timelog.search</field>
-            <field name="model">project.timelog</field>
-            <field name="arch" type="xml">
-                <search>
-                    <field name="work_id" />
-                    <field name="stage_id" />
-                    <field name="duration" />
-                    <field name="corrected_duration" />
-                    <field name="user_id" string="User" />
-                    <field name="start_datetime" />
-                    <field name="end_datetime" />
-                    <filter
+                <field name="work_name" />
+                <field name="task_name" />
+            </calendar>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="timelog_search_view">
+        <field name="name">timelog.search</field>
+        <field name="model">project.timelog</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="work_id" />
+                <field name="stage_id" />
+                <field name="duration" />
+                <field name="corrected_duration" />
+                <field name="user_id" string="User" />
+                <field name="start_datetime" />
+                <field name="end_datetime" />
+                <filter
                     name="today"
                     string="Today"
                     domain="[('start_datetime', '&gt;=',  datetime.datetime.combine(context_today(), datetime.time(0,0,0))), '|', ('end_datetime', '=', False), ('end_datetime', '&lt;=', datetime.datetime.combine(context_today(), datetime.time(23,59,59)))]"
                 />
-                    <separator />
-                    <filter
+                <separator />
+                <filter
                     name="week"
                     string="This week (monday)"
                     domain="[('start_datetime', '&gt;=', ((context_today()+relativedelta(weeks=-1, days=1, weekday=0)).strftime('%%Y-%%m-%%d'))+' '+'00:00:00'), '|', ('end_datetime', '=', False),
                                                                         ('end_datetime', '&lt;=', ((context_today()+relativedelta(weeks=0, weekday=6)).strftime('%%Y-%%m-%%d'))+' '+'23:59:59')]"
                 />
-                    <filter
+                <filter
                     name="week_sunday"
                     string="This week (sunday)"
                     domain="[('start_datetime', '&gt;=', ((context_today()+relativedelta(weeks=-1, days=1, weekday=-1)).strftime('%%Y-%%m-%%d'))+' '+'00:00:00'), '|', ('end_datetime', '=', False),
                                                                         ('end_datetime', '&lt;=', ((context_today()+relativedelta(weeks=0, weekday=5)).strftime('%%Y-%%m-%%d'))+' '+'23:59:59')]"
                 />
-                    <group string="Group By">
-                        <filter
+                <group string="Group By">
+                    <filter
                         name="group_projects"
                         string="Projects"
                         domain="[]"
                         context="{'group_by':'project_name'}"
                     />
-                        <filter
+                    <filter
                         name="group_tasks"
                         string="Tasks"
                         domain="[]"
                         context="{'group_by':'task_name'}"
                     />
-                        <filter
+                    <filter
                         name="group_subtasks"
                         string="Subtasks"
                         domain="[]"
                         context="{'group_by':'work_id'}"
                     />
-                        <filter
+                    <filter
                         name="group_start_date"
                         string="Start Date"
                         domain="[]"
                         context="{'group_by':'start_datetime'}"
                         help="Start date"
                     />
-                        <filter
+                    <filter
                         name="group_users"
                         string="Users"
                         context="{'group_by':'user_id'}"
                         groups="project.group_project_manager"
                     />
-                        <filter
+                    <filter
                         name="group_create_date"
                         string="Creation date"
                         context="{'group_by': 'create_date'}"
                     />
-
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="action_my_timelog" model="ir.actions.act_window">
-            <field name="name">My Timelog</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">project.timelog</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="project_timelog.view_my_timelog" />
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('user_id', '=', uid)]</field>
-            <field name="context">{
+                </group>
+            </search>
+        </field>
+    </record>
+    <record id="action_my_timelog" model="ir.actions.act_window">
+        <field name="name">My Timelog</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">project.timelog</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="project_timelog.view_my_timelog" />
+        <field name="view_mode">tree,form,calendar,graph</field>
+        <field name="domain">[('user_id', '=', uid)]</field>
+        <field name="context">{
                 'search_default_today': 1,
                 'search_default_group_tasks': 1,
                 'search_default_group_subtasks': 1,
                 }
             </field>
-        </record>
-
-        <record id="action_timelog" model="ir.actions.act_window">
-            <field name="name">Timelog</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">project.timelog</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="project_timelog.view_timelog" />
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="context">{
+    </record>
+    <record id="action_timelog" model="ir.actions.act_window">
+        <field name="name">Timelog</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">project.timelog</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="project_timelog.view_timelog" />
+        <field name="view_mode">tree,form,calendar,graph</field>
+        <field name="context">{
                 'search_default_group_users': 1,
                 'search_default_group_tasks': 1,
                 'search_default_group_subtasks': 1,
                 }
             </field>
-        </record>
-
-        <!-- Work -->
-        <record id="view_project_task_work_ext_tree" model="ir.ui.view">
-            <field name="name">account.analytic.line.ext.tree</field>
-            <field name="model">account.analytic.line</field>
-            <field name="arch" type="xml">
-                <tree>
-                    <field name="user_id" invisible="1" />
-                    <field name="name" readonly="1" />
-                    <field name="account_id" readonly="1" />
-                    <field name="unit_amount" string="Hours" readonly="1" sum="Total" />
-                    <field name="date" readonly="1" />
-                    <field name="company_id" readonly="1" />
-                    <field name="task_id" invisible="1" />
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_project_task_work_ext_filter" model="ir.ui.view">
-            <field name="name">account.analytic.line.ext.search</field>
-            <field name="model">account.analytic.line</field>
-            <field name="arch" type="xml">
-                <search string="Project Task Work">
-                    <group col="10" colspan="4">
-                        <field name="name" />
-                        <field name="user_id" />
-                        <field name="date" />
-                        <field name="task_id" />
-                        <field name="company_id" />
-                    </group>
-                    <newline />
-                    <group expand="1" string="Group By...">
-                        <filter
+    </record>
+    <!-- Work -->
+    <record id="view_project_task_work_ext_tree" model="ir.ui.view">
+        <field name="name">account.analytic.line.ext.tree</field>
+        <field name="model">account.analytic.line</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="user_id" invisible="1" />
+                <field name="name" readonly="1" />
+                <field name="account_id" readonly="1" />
+                <field name="unit_amount" string="Hours" readonly="1" sum="Total" />
+                <field name="date" readonly="1" />
+                <field name="company_id" readonly="1" />
+                <field name="task_id" invisible="1" />
+            </tree>
+        </field>
+    </record>
+    <record id="view_project_task_work_ext_filter" model="ir.ui.view">
+        <field name="name">account.analytic.line.ext.search</field>
+        <field name="model">account.analytic.line</field>
+        <field name="arch" type="xml">
+            <search string="Project Task Work">
+                <group col="10" colspan="4">
+                    <field name="name" />
+                    <field name="user_id" />
+                    <field name="date" />
+                    <field name="task_id" />
+                    <field name="company_id" />
+                </group>
+                <newline />
+                <group expand="1" string="Group By...">
+                    <filter
                         name="partner"
                         string="Partner"
                         icon="terp-go-month"
                         domain="[]"
                         context="{'group_by':'partner_id'}"
                     />
-                        <separator orientation="vertical" />
-                        <filter
+                    <separator orientation="vertical" />
+                    <filter
                         name="project"
                         string="Project"
                         icon="terp-partner"
                         domain="[]"
                         context="{'group_by':'project_id'}"
                     />
-                        <separator orientation="vertical" />
-                        <filter
+                    <separator orientation="vertical" />
+                    <filter
                         name="project issue"
                         string="Project Issue"
                         icon="terp-stock_effects-object-colorize"
                         domain="[]"
                         context="{'group_by':'issue_id'}"
                     />
-                        <separator orientation="vertical" />
-                        <filter
+                    <separator orientation="vertical" />
+                    <filter
                         name="task"
                         string="Task"
                         icon="terp-go-month"
                         domain="[]"
                         context="{'group_by':'task_id'}"
                     />
-                        <separator orientation="vertical" />
-                        <separator orientation="vertical" />
-                        <filter
+                    <separator orientation="vertical" />
+                    <separator orientation="vertical" />
+                    <filter
                         name="company"
                         string="Company"
                         icon="terp-go-month"
                         domain="[]"
                         context="{'group_by':'company_id'}"
                     />
-                        <separator orientation="vertical" />
-                        <filter
+                    <separator orientation="vertical" />
+                    <filter
                         name="date"
                         string="Date"
                         icon="terp-go-month"
                         domain="[]"
                         context="{'group_by':'date'}"
                     />
-                        <separator orientation="vertical" />
-                        <filter
+                    <separator orientation="vertical" />
+                    <filter
                         name="user"
                         string="User"
                         icon="terp-go-month"
                         domain="[]"
                         context="{'group_by':'user_id'}"
                     />
-                    </group>
-               </search>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_work">
-            <field name="name">Task Works</field>
-            <field name="res_model">account.analytic.line</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
-        </record>
-
-        <menuitem
-        id="menu_timelog_content"
-        name="Timelog"
-        parent="project.menu_main_pm"
-    />
-
-        <menuitem
+                </group>
+            </search>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_work">
+        <field name="name">Task Works</field>
+        <field name="res_model">account.analytic.line</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+    </record>
+    <menuitem id="menu_timelog_content" name="Timelog" parent="project.menu_main_pm" />
+    <menuitem
         sequence="0"
         id="menu_new_my_timelog_content"
         parent="menu_timelog_content"
         name="My Timelog"
         action="action_my_timelog"
     />
-
-        <menuitem
+    <menuitem
         sequence="1"
         id="menu_new_timelog_content"
         parent="menu_timelog_content"
@@ -481,8 +461,7 @@
         name="All Timelogs"
         action="action_timelog"
     />
-
-        <menuitem
+    <menuitem
         sequence="2"
         id="menu_work"
         parent="menu_timelog_content"
diff --git a/project_timelog/views/res_config_view.xml b/project_timelog/views/res_config_view.xml
index b4684c494..55ea9e9ff 100644
--- a/project_timelog/views/res_config_view.xml
+++ b/project_timelog/views/res_config_view.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-        <record id="view_config_settings" model="ir.ui.view">
-            <field name="name">timelog settings</field>
-            <field name="model">timelog.config.settings</field>
-            <field name="priority" eval="20" />
-            <field name="arch" type="xml">
-                <form string="Configure Project" class="oe_form_configuration">
-                    <header>
+    <record id="view_config_settings" model="ir.ui.view">
+        <field name="name">timelog settings</field>
+        <field name="model">timelog.config.settings</field>
+        <field name="priority" eval="20" />
+        <field name="arch" type="xml">
+            <form string="Configure Project" class="oe_form_configuration">
+                <header>
                         <button
                         string="Apply"
                         type="object"
@@ -21,98 +21,96 @@
                         class="oe_link"
                     />
                     </header>
-                    <separator string="Timelog Management" />
-                    <group>
-                        <label for="id" string="Subtasks" />
+                <separator string="Timelog Management" />
+                <group>
+                    <label for="id" string="Subtasks" />
+                    <div>
                         <div>
-                            <div>
-                                <label for="time_warning_subtasks" />
-                                <field
+                            <label for="time_warning_subtasks" />
+                            <field
                                 name="time_warning_subtasks"
                                 class="oe_inline"
                                 widget="float_time"
                             />
-                            </div>
-                            <div>
-                                <label for="time_subtasks" />
-                                <field
+                        </div>
+                        <div>
+                            <label for="time_subtasks" />
+                            <field
                                 name="time_subtasks"
                                 class="oe_inline"
                                 widget="float_time"
                             />
-                            </div>
                         </div>
-                    </group>
-                    <group>
-                        <label for="id" string="Day" />
+                    </div>
+                </group>
+                <group>
+                    <label for="id" string="Day" />
+                    <div>
                         <div>
-                            <div>
-                                <label for="normal_time_day" />
-                                <field
+                            <label for="normal_time_day" />
+                            <field
                                 name="normal_time_day"
                                 class="oe_inline"
                                 widget="float_time"
                             />
-                            </div>
-                            <div>
-                                <label for="good_time_day" />
-                                <field
+                        </div>
+                        <div>
+                            <label for="good_time_day" />
+                            <field
                                 name="good_time_day"
                                 class="oe_inline"
                                 widget="float_time"
                             />
-                            </div>
                         </div>
-                    </group>
-                    <group>
-                        <label for="id" string="Week" />
+                    </div>
+                </group>
+                <group>
+                    <label for="id" string="Week" />
+                    <div>
                         <div>
-                            <div>
-                                <label for="normal_time_week" />
-                                <field
+                            <label for="normal_time_week" />
+                            <field
                                 name="normal_time_week"
                                 class="oe_inline"
                                 widget="float_time"
                             />
-                            </div>
-                            <div>
-                                <label for="good_time_week" />
-                                <field
+                        </div>
+                        <div>
+                            <label for="good_time_week" />
+                            <field
                                 name="good_time_week"
                                 class="oe_inline"
                                 widget="float_time"
                             />
-                            </div>
-                            <div>
-                                <label for="first_weekday" />
-                                <field
+                        </div>
+                        <div>
+                            <label for="first_weekday" />
+                            <field
                                 name="first_weekday"
                                 class="oe_inline"
                                 required="1"
                             />
-                            </div>
                         </div>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_config_settings" model="ir.actions.act_window">
-            <field name="name">Configure Timelog</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">timelog.config.settings</field>
-            <field name="view_mode">form</field>
-            <field name="target">inline</field>
-        </record>
-
-        <menuitem
+                    </div>
+                </group>
+            </form>
+        </field>
+    </record>
+    <record id="action_config_settings" model="ir.actions.act_window">
+        <field name="name">Configure Timelog</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">timelog.config.settings</field>
+        <field name="view_mode">form</field>
+        <field name="target">inline</field>
+    </record>
+    <menuitem
         id="main_menu"
         name="Timelog"
         parent="base.menu_administration"
         sequence="1"
         groups="base.group_no_one"
     />
-        <menuitem
+    <menuitem
         id="menu_timelog_config"
         name="Settings"
         parent="main_menu"
diff --git a/reminder_base/views/reminder_base_views.xml b/reminder_base/views/reminder_base_views.xml
index 33695a3b5..ce6e8b339 100644
--- a/reminder_base/views/reminder_base_views.xml
+++ b/reminder_base/views/reminder_base_views.xml
@@ -1,63 +1,63 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-  <record model="ir.ui.view" id="view_calendar_event_form">
-    <field name="model">calendar.event</field>
-    <field name="inherit_id" ref="calendar.view_calendar_event_form" />
-    <field name="arch" type="xml">
-      <xpath expr="//label[@for='description']" position="after">
-        <field name="reminder_res_id" invisible="1" />
-        <button
+    <record model="ir.ui.view" id="view_calendar_event_form">
+        <field name="model">calendar.event</field>
+        <field name="inherit_id" ref="calendar.view_calendar_event_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//label[@for='description']" position="after">
+                <field name="reminder_res_id" invisible="1" />
+                <button
                     string="Open Related Record"
                     name="open_reminder_object"
                     type="object"
                     attrs="{'invisible':[('reminder_res_id', '=', 0)]}"
                 />
-      </xpath>
-    </field>
-  </record>
-  <record model="ir.ui.view" id="view_calendar_event_form_popup">
-    <field name="model">calendar.event</field>
-    <field name="inherit_id" ref="calendar.view_calendar_event_form_popup" />
-    <field name="arch" type="xml">
-      <xpath expr="//field[@name='attendee_status']" position="after">
-        <field name="reminder_res_id" invisible="1" />
-        <div attrs="{'invisible':[('reminder_res_id', '=', 0)]}">
-          <button
+            </xpath>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_calendar_event_form_popup">
+        <field name="model">calendar.event</field>
+        <field name="inherit_id" ref="calendar.view_calendar_event_form_popup" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='attendee_status']" position="after">
+                <field name="reminder_res_id" invisible="1" />
+                <div attrs="{'invisible':[('reminder_res_id', '=', 0)]}">
+                    <button
                         string="Open Related Record"
                         name="open_reminder_object"
                         type="object"
                     />
-        </div>
-      </xpath>
-    </field>
-  </record>
-  <!-- TODO: can we remove this? -->
-  <record id="calendar_alarm_view_form" model="ir.ui.view">
-    <field name="name">calendar.alarm.form</field>
-    <field name="model">calendar.alarm</field>
-    <field name="inherit_id" ref="calendar.calendar_alarm_view_form" />
-    <field name="priority" eval="1000" />
-    <field name="arch" type="xml">
-      <xpath expr="//field[@name='type']" position="replace">
-        <field name="type" />
-      </xpath>
-    </field>
-  </record>
-  <!-- reminder.admin -->
-  <record id="view_reminder_admin" model="ir.ui.view">
-    <field name="name">Reminder Administration</field>
-    <field name="model">reminder.admin</field>
-    <field name="arch" type="xml">
-      <form string="Reminder Administration">
-        <p
+                </div>
+            </xpath>
+        </field>
+    </record>
+    <!-- TODO: can we remove this? -->
+    <record id="calendar_alarm_view_form" model="ir.ui.view">
+        <field name="name">calendar.alarm.form</field>
+        <field name="model">calendar.alarm</field>
+        <field name="inherit_id" ref="calendar.calendar_alarm_view_form" />
+        <field name="priority" eval="1000" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='type']" position="replace">
+                <field name="type" />
+            </xpath>
+        </field>
+    </record>
+    <!-- reminder.admin -->
+    <record id="view_reminder_admin" model="ir.ui.view">
+        <field name="name">Reminder Administration</field>
+        <field name="model">reminder.admin</field>
+        <field name="arch" type="xml">
+            <form string="Reminder Administration">
+                <p
                 >In the main, this tool is used after installation or before uninstallation Reminder module</p>
-        <group>
-          <field name="model" class="oe_inline" />
-          <field name="events_count" />
-          <field name="action" class="oe_inline" />
-        </group>
-        <footer>
-          <div><button
+                <group>
+                    <field name="model" class="oe_inline" />
+                    <field name="events_count" />
+                    <field name="action" class="oe_inline" />
+                </group>
+                <footer>
+                    <div><button
                             name="action_execute"
                             string="Execute"
                             type="object"
@@ -65,19 +65,19 @@
                         /> or
                             <button special="cancel" string="Close" class="oe_link" />
                         </div>
-        </footer>
-      </form>
-    </field>
-  </record>
-  <record id="action_reminder_admin" model="ir.actions.act_window">
-    <field name="name">Reminder administration</field>
-    <field name="type">ir.actions.act_window</field>
-    <field name="res_model">reminder.admin</field>
-    <field name="view_type">form</field>
-    <field name="view_mode">form</field>
-    <field name="target">new</field>
-  </record>
-  <menuitem
+                </footer>
+            </form>
+        </field>
+    </record>
+    <record id="action_reminder_admin" model="ir.actions.act_window">
+        <field name="name">Reminder administration</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">reminder.admin</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+    <menuitem
         id="menu_reminder_admin"
         parent="calendar.menu_calendar_configuration"
         action="action_reminder_admin"
diff --git a/reminder_crm_next_action/views.xml b/reminder_crm_next_action/views.xml
index 8ad441559..e05fe4526 100644
--- a/reminder_crm_next_action/views.xml
+++ b/reminder_crm_next_action/views.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<openerp><data>
-
-<record model="ir.ui.view" id="crm_case_form_view_oppor">
-    <field name="model">crm.lead</field>
-    <field name="inherit_id" ref="crm.crm_case_form_view_oppor" />
-    <field name="arch" type="xml">
-        <xpath expr="//field[@name='date_deadline']" position="before">
-            <field
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="crm_case_form_view_oppor">
+            <field name="model">crm.lead</field>
+            <field name="inherit_id" ref="crm.crm_case_form_view_oppor" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='date_deadline']" position="before">
+                    <field
                         name="reminder_alarm_ids"
                         widget="many2many_tags"
                         attrs="{'readonly':[('date_action','=',False)]}"
                         string="Reminders"
                     />
-        </xpath>
-    </field>
-</record>
-
-</data></openerp>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/reminder_hr_recruitment/views.xml b/reminder_hr_recruitment/views.xml
index 45ad991ed..cebddbaf9 100644
--- a/reminder_hr_recruitment/views.xml
+++ b/reminder_hr_recruitment/views.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<openerp><data>
-
-<record model="ir.ui.view" id="hr_recruitment_form_view_applications">
-    <field name="model">hr.applicant</field>
-    <field name="inherit_id" ref="hr_recruitment.crm_case_form_view_job" />
-    <field name="arch" type="xml">
-        <xpath expr="//field[@name='priority']" position="before">
-            <field
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="hr_recruitment_form_view_applications">
+            <field name="model">hr.applicant</field>
+            <field name="inherit_id" ref="hr_recruitment.crm_case_form_view_job" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='priority']" position="before">
+                    <field
                         name="reminder_alarm_ids"
                         widget="many2many_tags"
                         attrs="{'readonly':[('date_action','=',False)]}"
                         string="Reminders"
                     />
-        </xpath>
-    </field>
-</record>
-
-</data></openerp>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/reminder_issue_deadline/views.xml b/reminder_issue_deadline/views.xml
index a9d7fb8a5..009ad5c21 100644
--- a/reminder_issue_deadline/views.xml
+++ b/reminder_issue_deadline/views.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<openerp><data>
-
-<record model="ir.ui.view" id="project_issue_form_view_sdesk">
-    <field name="model">project.issue</field>
-    <field name="inherit_id" ref="service_desk_issue.project_issue_form_view_sdesk" />
-    <field name="arch" type="xml">
-        <xpath expr="//field[@name='date_deadline']" position="after">
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="project_issue_form_view_sdesk">
+            <field name="model">project.issue</field>
             <field
+                name="inherit_id"
+                ref="service_desk_issue.project_issue_form_view_sdesk"
+            />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='date_deadline']" position="after">
+                    <field
                         name="reminder_alarm_ids"
                         widget="many2many_tags"
                         attrs="{'readonly':[('date_deadline','=',False)]}"
                         string="Reminders"
                     />
-        </xpath>
-    </field>
-</record>
-
-</data></openerp>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/reminder_task_deadline/views/reminder_task_deadline_views.xml b/reminder_task_deadline/views/reminder_task_deadline_views.xml
index 1b58c5749..52198369c 100644
--- a/reminder_task_deadline/views/reminder_task_deadline_views.xml
+++ b/reminder_task_deadline/views/reminder_task_deadline_views.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<openerp><data>
-
-<record model="ir.ui.view" id="reminder_task_deadline_view_form">
-    <field name="model">project.task</field>
-    <field name="inherit_id" ref="project.view_task_form2" />
-    <field name="arch" type="xml">
-        <xpath expr="//field[@name='date_deadline']" position="after">
-          <field
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="reminder_task_deadline_view_form">
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_form2" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='date_deadline']" position="after">
+                    <field
                         name="reminder_alarm_ids"
                         widget="many2many_tags"
                         attrs="{'readonly':[('date_deadline','=',False)]}"
                         string="Reminders"
                     />
-        </xpath>
-    </field>
-</record>
-
-</data></openerp>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/requirements.txt b/requirements.txt
index fb6a5f151..171c44107 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,3 +5,4 @@ pretty_bad_protocol
 requests_mock
 dropbox
 google-api-python-client
+google-cloud-storage
diff --git a/res_partner_skype/views.xml b/res_partner_skype/views.xml
index ad1fda54a..a68976189 100644
--- a/res_partner_skype/views.xml
+++ b/res_partner_skype/views.xml
@@ -7,16 +7,16 @@
 <openerp>
     <data>
         <record id="view_partner_form_skype" model="ir.ui.view">
-          <field name="name">res.partner.form.skype</field>
-          <field name="model">res.partner</field>
-          <field name="inherit_id" ref="base.view_partner_form" />
-          <field name="arch" type="xml">
+            <field name="name">res.partner.form.skype</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="arch" type="xml">
                 <data>
-                  <xpath expr="//field[@name='email']" position="after">
-                    <field name="skype" widget="skype" />
-                  </xpath>
+                    <xpath expr="//field[@name='email']" position="after">
+                        <field name="skype" widget="skype" />
+                    </xpath>
                 </data>
-             </field>
+            </field>
         </record>
-     </data>
+    </data>
 </openerp>
diff --git a/res_users_signature/security/res_users_signature_security.xml b/res_users_signature/security/res_users_signature_security.xml
index 282f034bb..e0a7f6f4b 100644
--- a/res_users_signature/security/res_users_signature_security.xml
+++ b/res_users_signature/security/res_users_signature_security.xml
@@ -2,9 +2,9 @@
     # Copyright 2019 Anvar kildebekov <https://it-projects.info/team/fedoranvar>
     # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).-->
 <odoo>
-        <record id="administrator" model="res.groups">
-            <field name="name">Signature administrator</field>
-            <field name="comment">the user will have access to edit signatures</field>
-            <field name="users" eval="[(4, ref('base.user_admin'))]" />
-        </record>
+    <record id="administrator" model="res.groups">
+        <field name="name">Signature administrator</field>
+        <field name="comment">the user will have access to edit signatures</field>
+        <field name="users" eval="[(4, ref('base.user_admin'))]" />
+    </record>
 </odoo>
diff --git a/res_users_signature/views/res_users_signature_views.xml b/res_users_signature/views/res_users_signature_views.xml
index 352b05fca..8c3b99ff6 100644
--- a/res_users_signature/views/res_users_signature_views.xml
+++ b/res_users_signature/views/res_users_signature_views.xml
@@ -2,102 +2,90 @@
     # Copyright 2019 Anvar kildebekov <https://it-projects.info/team/fedoranvar>
     # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).-->
 <odoo>
-
-        <record id="view_users_form" model="ir.ui.view">
-            <field name="name">res.users.form</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form" />
-            <field name="priority">99</field>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='signature']" position="replace">
-                    <field name="signature_id" />
-                    <field
+    <record id="view_users_form" model="ir.ui.view">
+        <field name="name">res.users.form</field>
+        <field name="model">res.users</field>
+        <field name="inherit_id" ref="base.view_users_form" />
+        <field name="priority">99</field>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='signature']" position="replace">
+                <field name="signature_id" />
+                <field
                     name="signature"
                     attrs="{'readonly':[('signature_id', '!=', False)]}"
                 />
-                </xpath>
-            </field>
-        </record>
-
-        <record id="view_users_form_simple_modif" model="ir.ui.view">
-            <field name="name">res.users.preferences.form</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form_simple_modif" />
-            <field name="priority">99</field>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='signature']" position="replace">
-                    <field name="partner_id" invisible="1" />
-                    <field name="signature_id" />
-                    <field
+            </xpath>
+        </field>
+    </record>
+    <record id="view_users_form_simple_modif" model="ir.ui.view">
+        <field name="name">res.users.preferences.form</field>
+        <field name="model">res.users</field>
+        <field name="inherit_id" ref="base.view_users_form_simple_modif" />
+        <field name="priority">99</field>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='signature']" position="replace">
+                <field name="partner_id" invisible="1" />
+                <field name="signature_id" />
+                <field
                     name="signature"
                     attrs="{'readonly':[('signature_id', '!=', False)]}"
                 />
-                </xpath>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_res_users_signature_tree">
-            <field name="name">res.users.signature.tree</field>
-            <field name="model">res.users.signature</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree>
-                    <field name="name" />
-                    <field name="comment" />
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_res_users_signature">
-            <field name="name">res.users.signature.form</field>
-            <field name="model">res.users.signature</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Signature">
-                    <header>
-                        <button
+            </xpath>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_res_users_signature_tree">
+        <field name="name">res.users.signature.tree</field>
+        <field name="model">res.users.signature</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name" />
+                <field name="comment" />
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_res_users_signature">
+        <field name="name">res.users.signature.form</field>
+        <field name="model">res.users.signature</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Signature">
+                <header>
+                    <button
                         name="action_update_signature"
                         string="Update signatures"
                         type="object"
                     />
-                    </header>
-                    <group>
-                        <field name="name" class="oe_inline" />
-                        <field name="comment" class="oe_inline" />
-                        <field
-                        name="user_ids"
-                        widget="many2many_tags"
-                        class="oe_inline"
-                    />
-                    </group>
-                    <field name="template" />
-                </form>
-            </field>
-        </record>
-
-        <record id="ir_update_signature_multi" model="ir.actions.server">
-            <field name="name">Update signatures</field>
-            <field name="model_id" ref="model_res_users_signature" />
-            <field name="binding_model_id" ref="model_res_users_signature" />
-            <field name="state">code</field>
-            <field name="code">
+                </header>
+                <group>
+                    <field name="name" class="oe_inline" />
+                    <field name="comment" class="oe_inline" />
+                    <field name="user_ids" widget="many2many_tags" class="oe_inline" />
+                </group>
+                <field name="template" />
+            </form>
+        </field>
+    </record>
+    <record id="ir_update_signature_multi" model="ir.actions.server">
+        <field name="name">Update signatures</field>
+        <field name="model_id" ref="model_res_users_signature" />
+        <field name="binding_model_id" ref="model_res_users_signature" />
+        <field name="state">code</field>
+        <field name="code">
                 self.action_update_signature(cr, uid, context['active_ids'], context=context)
             </field>
-        </record>
-
-        <record id="action_res_users_signature" model="ir.actions.act_window">
-            <field name="name">Signatures</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.users.signature</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_res_users_signature_tree" />
-            <field name="help">Create and manage signature templates</field>
-        </record>
-
-        <menuitem
+    </record>
+    <record id="action_res_users_signature" model="ir.actions.act_window">
+        <field name="name">Signatures</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">res.users.signature</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="view_res_users_signature_tree" />
+        <field name="help">Create and manage signature templates</field>
+    </record>
+    <menuitem
         action="action_res_users_signature"
         id="menu_action_res_users_signature"
         parent="base.menu_users"
     />
-
 </odoo>
diff --git a/sale_order_hide_tax/security/security.xml b/sale_order_hide_tax/security/security.xml
index 39c759b12..4b256c721 100644
--- a/sale_order_hide_tax/security/security.xml
+++ b/sale_order_hide_tax/security/security.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <openerp>
-  <data>
-    <record id="show_taxes_column_in_sale_orders" model="res.groups">
-      <field name="name">Sales / See taxes</field>
-    </record>
-  </data>
+    <data>
+        <record id="show_taxes_column_in_sale_orders" model="res.groups">
+            <field name="name">Sales / See taxes</field>
+        </record>
+    </data>
 </openerp>
diff --git a/sale_order_hide_tax/views/view.xml b/sale_order_hide_tax/views/view.xml
index cfa645c7c..856839832 100644
--- a/sale_order_hide_tax/views/view.xml
+++ b/sale_order_hide_tax/views/view.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <openerp>
     <data>
-      <record id="view_order_form_without_tax" model="ir.ui.view">
-        <field name="name">sale.order.form.without.tax</field>
-        <field name="model">sale.order</field>
-        <field name="inherit_id" ref="sale.view_order_form" />
-        <field name="arch" type="xml">
-          <xpath expr="//tree/field[@name='tax_id']" position="attributes">
-            <attribute
+        <record id="view_order_form_without_tax" model="ir.ui.view">
+            <field name="name">sale.order.form.without.tax</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//tree/field[@name='tax_id']" position="attributes">
+                    <attribute
                         name="groups"
                     >sale_order_hide_tax.show_taxes_column_in_sale_orders</attribute>
-          </xpath>
-          <!--
+                </xpath>
+                <!--
           <xpath expr="//field[@name='amount_tax']" position="attributes">
             <attribute name="groups">sale_order_hide_tax.show_taxes_column_in_sale_orders</attribute>
           </xpath>
           -->
-        </field>
-      </record>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/theme_kit/data/theme_data.xml b/theme_kit/data/theme_data.xml
index bef73157c..8126bc51d 100644
--- a/theme_kit/data/theme_data.xml
+++ b/theme_kit/data/theme_data.xml
@@ -2,253 +2,240 @@
 <!-- Copyright 2016 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
      License MIT (https://opensource.org/licenses/MIT). -->
 <odoo>
-        <!--Template Burger King-->
-        <record model="theme_kit.top_panel" id="burger_king_top_panel">
-            <field name="name">Burger King</field>
-            <field name="top_panel_bg">#ED7902</field>
-            <field name="top_panel_bg_active">True</field>
-            <field name="top_panel_border">#994E01</field>
-            <field name="top_panel_border_active">True</field>
-            <field name="top_panel_font">#FFFFFF</field>
-            <field name="top_panel_font_active">True</field>
-            <field name="top_panel_active_item_font">#762823</field>
-            <field name="top_panel_active_item_font_active">True</field>
-            <field name="top_panel_active_item_bg">#FDBD10</field>
-            <field name="top_panel_active_item_bg_active">True</field>
-            <field name="top_panel_hover_item_font">#762823</field>
-            <field name="top_panel_hover_item_font_active">True</field>
-            <field name="top_panel_hover_item_bg">#FDBD10</field>
-            <field name="top_panel_hover_item_bg_active">True</field>
-        </record>
-
-        <record model="theme_kit.left_panel" id="burger_king_left_panel">
-            <field name="name">Burger King</field>
-            <field name="left_panel_bg">#ED7902</field>
-            <field name="left_panel_bg_active">True</field>
-            <field name="left_panel_main_menu"> #59291C</field>
-            <field name="left_panel_main_menu_active">True</field>
-            <field name="left_panel_sub_menu">#FFFFFF</field>
-            <field name="left_panel_sub_menu_active">True</field>
-            <field name="left_panel_active_item_font">#762823</field>
-            <field name="left_panel_active_item_font_active">True</field>
-            <field name="left_panel_active_item_bg">#FDBD10</field>
-            <field name="left_panel_active_item_bg_active">True</field>
-            <field name="left_panel_hover_item_font">#762823</field>
-            <field name="left_panel_hover_item_font_active">True</field>
-            <field name="left_panel_hover_item_bg">#FDBD10</field>
-            <field name="left_panel_hover_item_bg_active">True</field>
-        </record>
-
-        <record model="theme_kit.content" id="burger_king_content">
-            <field name="name">Burger King</field>
-            <field name="content_bg">#FDDE63</field>
-            <field name="content_bg_active">True</field>
-            <field name="content_button">#EC1C24</field>
-            <field name="content_button_active">True</field>
-            <field name="content_form_title">#EC1C24</field>
-            <field name="content_form_title_active">True</field>
-            <field name="content_form_link">#EC1C24</field>
-            <field name="content_form_link_active">True</field>
-            <field name="content_loader">#FDDE63</field>
-            <field name="content_loader_active">True</field>
-            <field name="content_loader_text">#000000</field>
-            <field name="content_loader_text_active">True</field>
-        </record>
-
-        <record model="theme_kit.theme" id="burger_king_theme">
-            <field name="name">Burger King</field>
-            <field name="top_panel_id" ref="burger_king_top_panel" />
-            <field name="left_panel_id" ref="burger_king_left_panel" />
-            <field name="content_id" ref="burger_king_content" />
-        </record>
-        <!--Template You Tube-->
-        <record model="theme_kit.top_panel" id="you_tube_top_panel">
-            <field name="name">You Tube</field>
-            <field name="top_panel_bg">#FFFFFF</field>
-            <field name="top_panel_bg_active">True</field>
-            <field name="top_panel_border">#EBEBEB</field>
-            <field name="top_panel_border_active">True</field>
-            <field name="top_panel_font">#444444</field>
-            <field name="top_panel_font_active">True</field>
-            <field name="top_panel_active_item_font">#FFFFFF</field>
-            <field name="top_panel_active_item_font_active">True</field>
-            <field name="top_panel_active_item_bg">#CD201F</field>
-            <field name="top_panel_active_item_bg_active">True</field>
-            <field name="top_panel_hover_item_font">#FFFFFF</field>
-            <field name="top_panel_hover_item_font_active">True</field>
-            <field name="top_panel_hover_item_bg">#444444</field>
-            <field name="top_panel_hover_item_bg_active">True</field>
-        </record>
-
-        <record model="theme_kit.left_panel" id="you_tube_left_panel">
-            <field name="name">You Tube</field>
-            <field name="left_panel_bg">#FFFFFF</field>
-            <field name="left_panel_bg_active">True</field>
-            <field name="left_panel_main_menu">#CD201F</field>
-            <field name="left_panel_main_menu_active">True</field>
-            <field name="left_panel_sub_menu">#444444</field>
-            <field name="left_panel_sub_menu_active">True</field>
-            <field name="left_panel_active_item_font">#FFFFFF</field>
-            <field name="left_panel_active_item_font_active">True</field>
-            <field name="left_panel_active_item_bg">#CD201F</field>
-            <field name="left_panel_active_item_bg_active">True</field>
-            <field name="left_panel_hover_item_font">#FFFFFF</field>
-            <field name="left_panel_hover_item_font_active">True</field>
-            <field name="left_panel_hover_item_bg">#444444</field>
-            <field name="left_panel_hover_item_bg_active">True</field>
-        </record>
-
-        <record model="theme_kit.content" id="you_tube_content">
-            <field name="name">You Tube</field>
-            <field name="content_bg">#F1F1F1</field>
-            <field name="content_bg_active">True</field>
-            <field name="content_button">#CD201F</field>
-            <field name="content_button_active">True</field>
-            <field name="content_form_title">#CD201F</field>
-            <field name="content_form_title_active">True</field>
-            <field name="content_form_link">#CD201F</field>
-            <field name="content_form_link_active">True</field>
-            <field name="content_form_text">#444444</field>
-            <field name="content_form_text_active">True</field>
-            <field name="content_text">#444444</field>
-            <field name="content_text_active">True</field>
-            <field name="content_loader">#CD201F</field>
-            <field name="content_loader_active">True</field>
-            <field name="content_loader_text">#FFFFFF</field>
-            <field name="content_loader_text_active">True</field>
-        </record>
-
-        <record model="theme_kit.theme" id="you_tube_theme">
-            <field name="name">You Tube</field>
-            <field name="top_panel_id" ref="you_tube_top_panel" />
-            <field name="left_panel_id" ref="you_tube_left_panel" />
-            <field name="content_id" ref="you_tube_content" />
-        </record>
-        <!--Template Coca-Cola-->
-        <record model="theme_kit.top_panel" id="cola_top_panel">
-            <field name="name">Coca-Cola</field>
-            <field name="top_panel_bg">#ED1C16</field>
-            <field name="top_panel_bg_active">True</field>
-            <field name="top_panel_border">#000000</field>
-            <field name="top_panel_border_active">True</field>
-            <field name="top_panel_font">#FFFFFF</field>
-            <field name="top_panel_font_active">True</field>
-            <field name="top_panel_active_item_font">#FFFFFF</field>
-            <field name="top_panel_active_item_font_active">True</field>
-            <field name="top_panel_active_item_bg">#000000</field>
-            <field name="top_panel_active_item_bg_active">True</field>
-            <field name="top_panel_hover_item_font">#FFFFFF</field>
-            <field name="top_panel_hover_item_font_active">True</field>
-            <field name="top_panel_hover_item_bg">#000000</field>
-            <field name="top_panel_hover_item_bg_active">True</field>
-        </record>
-
-        <record model="theme_kit.left_panel" id="cola_left_panel">
-            <field name="name">Coca-Cola</field>
-            <field name="left_panel_bg">#ED1C16</field>
-            <field name="left_panel_bg_active">True</field>
-            <field name="left_panel_main_menu">#FFFFFF</field>
-            <field name="left_panel_main_menu_active">True</field>
-            <field name="left_panel_sub_menu">#FFFFFF</field>
-            <field name="left_panel_sub_menu_active">True</field>
-            <field name="left_panel_active_item_font">#FFFFFF</field>
-            <field name="left_panel_active_item_font_active">True</field>
-            <field name="left_panel_active_item_bg">#000000</field>
-            <field name="left_panel_active_item_bg_active">True</field>
-            <field name="left_panel_hover_item_font">#FFFFFF</field>
-            <field name="left_panel_hover_item_font_active">True</field>
-            <field name="left_panel_hover_item_bg">#000000</field>
-            <field name="left_panel_hover_item_bg_active">True</field>
-        </record>
-
-        <record model="theme_kit.content" id="cola_content">
-            <field name="name">Coca-Cola</field>
-            <field name="content_bg">#FFFFFF</field>
-            <field name="content_bg_active">True</field>
-            <field name="content_button">#ED1C16</field>
-            <field name="content_button_active">True</field>
-            <field name="content_form_title">#ED1C16</field>
-            <field name="content_form_title_active">True</field>
-            <field name="content_form_link">#ED1C16</field>
-            <field name="content_form_link_active">True</field>
-            <field name="content_form_text">#000000</field>
-            <field name="content_form_text_active">True</field>
-            <field name="content_text">#000000</field>
-            <field name="content_text_active">True</field>
-            <field name="content_loader">#000000</field>
-            <field name="content_loader_active">True</field>
-            <field name="content_loader_text">#FFFFFF</field>
-            <field name="content_loader_text_active">True</field>
-        </record>
-
-        <record model="theme_kit.theme" id="cola_theme">
-            <field name="name">Coca-Cola</field>
-            <field name="top_panel_id" ref="cola_top_panel" />
-            <field name="left_panel_id" ref="cola_left_panel" />
-            <field name="content_id" ref="cola_content" />
-        </record>
-        <!--Template IKEA-->
-        <record model="theme_kit.top_panel" id="ikea_top_panel">
-            <field name="name">IKEA</field>
-            <field name="top_panel_bg">#003399</field>
-            <field name="top_panel_bg_active">True</field>
-            <field name="top_panel_border">#002369</field>
-            <field name="top_panel_border_active">True</field>
-            <field name="top_panel_font">#FFCC00</field>
-            <field name="top_panel_font_active">True</field>
-            <field name="top_panel_active_item_font">#003399</field>
-            <field name="top_panel_active_item_font_active">True</field>
-            <field name="top_panel_active_item_bg">#FFCC00</field>
-            <field name="top_panel_active_item_bg_active">True</field>
-            <field name="top_panel_hover_item_font">#003399</field>
-            <field name="top_panel_hover_item_font_active">True</field>
-            <field name="top_panel_hover_item_bg">#FFCC00</field>
-            <field name="top_panel_hover_item_bg_active">True</field>
-        </record>
-
-        <record model="theme_kit.left_panel" id="ikea_left_panel">
-            <field name="name">IKEA</field>
-            <field name="left_panel_bg">#003399</field>
-            <field name="left_panel_bg_active">True</field>
-            <field name="left_panel_main_menu">#FFCC00</field>
-            <field name="left_panel_main_menu_active">True</field>
-            <field name="left_panel_sub_menu">#FFCC00</field>
-            <field name="left_panel_sub_menu_active">True</field>
-            <field name="left_panel_active_item_font">#003399</field>
-            <field name="left_panel_active_item_font_active">True</field>
-            <field name="left_panel_active_item_bg">#FFCC00</field>
-            <field name="left_panel_active_item_bg_active">True</field>
-            <field name="left_panel_hover_item_font">#003399</field>
-            <field name="left_panel_hover_item_font_active">True</field>
-            <field name="left_panel_hover_item_bg">#FFCC00</field>
-            <field name="left_panel_hover_item_bg_active">True</field>
-        </record>
-
-        <record model="theme_kit.content" id="ikea_content">
-            <field name="name">IKEA</field>
-            <field name="content_bg">#FFCC00</field>
-            <field name="content_bg_active">True</field>
-            <field name="content_button">#003399</field>
-            <field name="content_button_active">True</field>
-            <field name="content_form_title">#003399</field>
-            <field name="content_form_title_active">True</field>
-            <field name="content_form_link">#003399</field>
-            <field name="content_form_link_active">True</field>
-            <field name="content_form_text">#003399</field>
-            <field name="content_form_text_active">True</field>
-            <field name="content_text">#003399</field>
-            <field name="content_text_active">True</field>
-            <field name="content_loader">#FFCC00</field>
-            <field name="content_loader_active">True</field>
-            <field name="content_loader_text">#000000</field>
-            <field name="content_loader_text_active">True</field>
-        </record>
-
-        <record model="theme_kit.theme" id="ikea_theme">
-            <field name="name">IKEA</field>
-            <field name="top_panel_id" ref="ikea_top_panel" />
-            <field name="left_panel_id" ref="ikea_left_panel" />
-            <field name="content_id" ref="ikea_content" />
-        </record>
-
+    <!--Template Burger King-->
+    <record model="theme_kit.top_panel" id="burger_king_top_panel">
+        <field name="name">Burger King</field>
+        <field name="top_panel_bg">#ED7902</field>
+        <field name="top_panel_bg_active">True</field>
+        <field name="top_panel_border">#994E01</field>
+        <field name="top_panel_border_active">True</field>
+        <field name="top_panel_font">#FFFFFF</field>
+        <field name="top_panel_font_active">True</field>
+        <field name="top_panel_active_item_font">#762823</field>
+        <field name="top_panel_active_item_font_active">True</field>
+        <field name="top_panel_active_item_bg">#FDBD10</field>
+        <field name="top_panel_active_item_bg_active">True</field>
+        <field name="top_panel_hover_item_font">#762823</field>
+        <field name="top_panel_hover_item_font_active">True</field>
+        <field name="top_panel_hover_item_bg">#FDBD10</field>
+        <field name="top_panel_hover_item_bg_active">True</field>
+    </record>
+    <record model="theme_kit.left_panel" id="burger_king_left_panel">
+        <field name="name">Burger King</field>
+        <field name="left_panel_bg">#ED7902</field>
+        <field name="left_panel_bg_active">True</field>
+        <field name="left_panel_main_menu"> #59291C</field>
+        <field name="left_panel_main_menu_active">True</field>
+        <field name="left_panel_sub_menu">#FFFFFF</field>
+        <field name="left_panel_sub_menu_active">True</field>
+        <field name="left_panel_active_item_font">#762823</field>
+        <field name="left_panel_active_item_font_active">True</field>
+        <field name="left_panel_active_item_bg">#FDBD10</field>
+        <field name="left_panel_active_item_bg_active">True</field>
+        <field name="left_panel_hover_item_font">#762823</field>
+        <field name="left_panel_hover_item_font_active">True</field>
+        <field name="left_panel_hover_item_bg">#FDBD10</field>
+        <field name="left_panel_hover_item_bg_active">True</field>
+    </record>
+    <record model="theme_kit.content" id="burger_king_content">
+        <field name="name">Burger King</field>
+        <field name="content_bg">#FDDE63</field>
+        <field name="content_bg_active">True</field>
+        <field name="content_button">#EC1C24</field>
+        <field name="content_button_active">True</field>
+        <field name="content_form_title">#EC1C24</field>
+        <field name="content_form_title_active">True</field>
+        <field name="content_form_link">#EC1C24</field>
+        <field name="content_form_link_active">True</field>
+        <field name="content_loader">#FDDE63</field>
+        <field name="content_loader_active">True</field>
+        <field name="content_loader_text">#000000</field>
+        <field name="content_loader_text_active">True</field>
+    </record>
+    <record model="theme_kit.theme" id="burger_king_theme">
+        <field name="name">Burger King</field>
+        <field name="top_panel_id" ref="burger_king_top_panel" />
+        <field name="left_panel_id" ref="burger_king_left_panel" />
+        <field name="content_id" ref="burger_king_content" />
+    </record>
+    <!--Template You Tube-->
+    <record model="theme_kit.top_panel" id="you_tube_top_panel">
+        <field name="name">You Tube</field>
+        <field name="top_panel_bg">#FFFFFF</field>
+        <field name="top_panel_bg_active">True</field>
+        <field name="top_panel_border">#EBEBEB</field>
+        <field name="top_panel_border_active">True</field>
+        <field name="top_panel_font">#444444</field>
+        <field name="top_panel_font_active">True</field>
+        <field name="top_panel_active_item_font">#FFFFFF</field>
+        <field name="top_panel_active_item_font_active">True</field>
+        <field name="top_panel_active_item_bg">#CD201F</field>
+        <field name="top_panel_active_item_bg_active">True</field>
+        <field name="top_panel_hover_item_font">#FFFFFF</field>
+        <field name="top_panel_hover_item_font_active">True</field>
+        <field name="top_panel_hover_item_bg">#444444</field>
+        <field name="top_panel_hover_item_bg_active">True</field>
+    </record>
+    <record model="theme_kit.left_panel" id="you_tube_left_panel">
+        <field name="name">You Tube</field>
+        <field name="left_panel_bg">#FFFFFF</field>
+        <field name="left_panel_bg_active">True</field>
+        <field name="left_panel_main_menu">#CD201F</field>
+        <field name="left_panel_main_menu_active">True</field>
+        <field name="left_panel_sub_menu">#444444</field>
+        <field name="left_panel_sub_menu_active">True</field>
+        <field name="left_panel_active_item_font">#FFFFFF</field>
+        <field name="left_panel_active_item_font_active">True</field>
+        <field name="left_panel_active_item_bg">#CD201F</field>
+        <field name="left_panel_active_item_bg_active">True</field>
+        <field name="left_panel_hover_item_font">#FFFFFF</field>
+        <field name="left_panel_hover_item_font_active">True</field>
+        <field name="left_panel_hover_item_bg">#444444</field>
+        <field name="left_panel_hover_item_bg_active">True</field>
+    </record>
+    <record model="theme_kit.content" id="you_tube_content">
+        <field name="name">You Tube</field>
+        <field name="content_bg">#F1F1F1</field>
+        <field name="content_bg_active">True</field>
+        <field name="content_button">#CD201F</field>
+        <field name="content_button_active">True</field>
+        <field name="content_form_title">#CD201F</field>
+        <field name="content_form_title_active">True</field>
+        <field name="content_form_link">#CD201F</field>
+        <field name="content_form_link_active">True</field>
+        <field name="content_form_text">#444444</field>
+        <field name="content_form_text_active">True</field>
+        <field name="content_text">#444444</field>
+        <field name="content_text_active">True</field>
+        <field name="content_loader">#CD201F</field>
+        <field name="content_loader_active">True</field>
+        <field name="content_loader_text">#FFFFFF</field>
+        <field name="content_loader_text_active">True</field>
+    </record>
+    <record model="theme_kit.theme" id="you_tube_theme">
+        <field name="name">You Tube</field>
+        <field name="top_panel_id" ref="you_tube_top_panel" />
+        <field name="left_panel_id" ref="you_tube_left_panel" />
+        <field name="content_id" ref="you_tube_content" />
+    </record>
+    <!--Template Coca-Cola-->
+    <record model="theme_kit.top_panel" id="cola_top_panel">
+        <field name="name">Coca-Cola</field>
+        <field name="top_panel_bg">#ED1C16</field>
+        <field name="top_panel_bg_active">True</field>
+        <field name="top_panel_border">#000000</field>
+        <field name="top_panel_border_active">True</field>
+        <field name="top_panel_font">#FFFFFF</field>
+        <field name="top_panel_font_active">True</field>
+        <field name="top_panel_active_item_font">#FFFFFF</field>
+        <field name="top_panel_active_item_font_active">True</field>
+        <field name="top_panel_active_item_bg">#000000</field>
+        <field name="top_panel_active_item_bg_active">True</field>
+        <field name="top_panel_hover_item_font">#FFFFFF</field>
+        <field name="top_panel_hover_item_font_active">True</field>
+        <field name="top_panel_hover_item_bg">#000000</field>
+        <field name="top_panel_hover_item_bg_active">True</field>
+    </record>
+    <record model="theme_kit.left_panel" id="cola_left_panel">
+        <field name="name">Coca-Cola</field>
+        <field name="left_panel_bg">#ED1C16</field>
+        <field name="left_panel_bg_active">True</field>
+        <field name="left_panel_main_menu">#FFFFFF</field>
+        <field name="left_panel_main_menu_active">True</field>
+        <field name="left_panel_sub_menu">#FFFFFF</field>
+        <field name="left_panel_sub_menu_active">True</field>
+        <field name="left_panel_active_item_font">#FFFFFF</field>
+        <field name="left_panel_active_item_font_active">True</field>
+        <field name="left_panel_active_item_bg">#000000</field>
+        <field name="left_panel_active_item_bg_active">True</field>
+        <field name="left_panel_hover_item_font">#FFFFFF</field>
+        <field name="left_panel_hover_item_font_active">True</field>
+        <field name="left_panel_hover_item_bg">#000000</field>
+        <field name="left_panel_hover_item_bg_active">True</field>
+    </record>
+    <record model="theme_kit.content" id="cola_content">
+        <field name="name">Coca-Cola</field>
+        <field name="content_bg">#FFFFFF</field>
+        <field name="content_bg_active">True</field>
+        <field name="content_button">#ED1C16</field>
+        <field name="content_button_active">True</field>
+        <field name="content_form_title">#ED1C16</field>
+        <field name="content_form_title_active">True</field>
+        <field name="content_form_link">#ED1C16</field>
+        <field name="content_form_link_active">True</field>
+        <field name="content_form_text">#000000</field>
+        <field name="content_form_text_active">True</field>
+        <field name="content_text">#000000</field>
+        <field name="content_text_active">True</field>
+        <field name="content_loader">#000000</field>
+        <field name="content_loader_active">True</field>
+        <field name="content_loader_text">#FFFFFF</field>
+        <field name="content_loader_text_active">True</field>
+    </record>
+    <record model="theme_kit.theme" id="cola_theme">
+        <field name="name">Coca-Cola</field>
+        <field name="top_panel_id" ref="cola_top_panel" />
+        <field name="left_panel_id" ref="cola_left_panel" />
+        <field name="content_id" ref="cola_content" />
+    </record>
+    <!--Template IKEA-->
+    <record model="theme_kit.top_panel" id="ikea_top_panel">
+        <field name="name">IKEA</field>
+        <field name="top_panel_bg">#003399</field>
+        <field name="top_panel_bg_active">True</field>
+        <field name="top_panel_border">#002369</field>
+        <field name="top_panel_border_active">True</field>
+        <field name="top_panel_font">#FFCC00</field>
+        <field name="top_panel_font_active">True</field>
+        <field name="top_panel_active_item_font">#003399</field>
+        <field name="top_panel_active_item_font_active">True</field>
+        <field name="top_panel_active_item_bg">#FFCC00</field>
+        <field name="top_panel_active_item_bg_active">True</field>
+        <field name="top_panel_hover_item_font">#003399</field>
+        <field name="top_panel_hover_item_font_active">True</field>
+        <field name="top_panel_hover_item_bg">#FFCC00</field>
+        <field name="top_panel_hover_item_bg_active">True</field>
+    </record>
+    <record model="theme_kit.left_panel" id="ikea_left_panel">
+        <field name="name">IKEA</field>
+        <field name="left_panel_bg">#003399</field>
+        <field name="left_panel_bg_active">True</field>
+        <field name="left_panel_main_menu">#FFCC00</field>
+        <field name="left_panel_main_menu_active">True</field>
+        <field name="left_panel_sub_menu">#FFCC00</field>
+        <field name="left_panel_sub_menu_active">True</field>
+        <field name="left_panel_active_item_font">#003399</field>
+        <field name="left_panel_active_item_font_active">True</field>
+        <field name="left_panel_active_item_bg">#FFCC00</field>
+        <field name="left_panel_active_item_bg_active">True</field>
+        <field name="left_panel_hover_item_font">#003399</field>
+        <field name="left_panel_hover_item_font_active">True</field>
+        <field name="left_panel_hover_item_bg">#FFCC00</field>
+        <field name="left_panel_hover_item_bg_active">True</field>
+    </record>
+    <record model="theme_kit.content" id="ikea_content">
+        <field name="name">IKEA</field>
+        <field name="content_bg">#FFCC00</field>
+        <field name="content_bg_active">True</field>
+        <field name="content_button">#003399</field>
+        <field name="content_button_active">True</field>
+        <field name="content_form_title">#003399</field>
+        <field name="content_form_title_active">True</field>
+        <field name="content_form_link">#003399</field>
+        <field name="content_form_link_active">True</field>
+        <field name="content_form_text">#003399</field>
+        <field name="content_form_text_active">True</field>
+        <field name="content_text">#003399</field>
+        <field name="content_text_active">True</field>
+        <field name="content_loader">#FFCC00</field>
+        <field name="content_loader_active">True</field>
+        <field name="content_loader_text">#000000</field>
+        <field name="content_loader_text_active">True</field>
+    </record>
+    <record model="theme_kit.theme" id="ikea_theme">
+        <field name="name">IKEA</field>
+        <field name="top_panel_id" ref="ikea_top_panel" />
+        <field name="left_panel_id" ref="ikea_left_panel" />
+        <field name="content_id" ref="ikea_content" />
+    </record>
 </odoo>
diff --git a/theme_kit/views/ir_attachment.xml b/theme_kit/views/ir_attachment.xml
index 8a5cccad2..d3dbccbb4 100644
--- a/theme_kit/views/ir_attachment.xml
+++ b/theme_kit/views/ir_attachment.xml
@@ -2,21 +2,21 @@
 <!-- Copyright 2016 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
      License MIT (https://opensource.org/licenses/MIT). -->
 <odoo>
-        <record id="ir_attachment_login_bg_action" model="ir.actions.act_window">
-            <field name="name">Login page wallpapers</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">ir.attachment</field>
-            <field name="view_type">form</field>
-            <field name="view_id" eval="False" />
-            <field name="search_view_id" ref="base.view_attachment_search" />
-            <field
+    <record id="ir_attachment_login_bg_action" model="ir.actions.act_window">
+        <field name="name">Login page wallpapers</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">ir.attachment</field>
+        <field name="view_type">form</field>
+        <field name="view_id" eval="False" />
+        <field name="search_view_id" ref="base.view_attachment_search" />
+        <field
             name="context"
         >{"default_use_as_background": 1, "default_public": 1, "default_name": "Wallpaper"}}}}</field>
-            <field name="domain">[('use_as_background', '=', True)]</field>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
+        <field name="domain">[('use_as_background', '=', True)]</field>
+        <field name="help" type="html">
+            <p class="oe_view_nocontent_create">
                     Click here to add new Wallpapers.
                 </p>
-            </field>
-        </record>
+        </field>
+    </record>
 </odoo>
diff --git a/theme_kit/views/res_config.xml b/theme_kit/views/res_config.xml
index 9a6eb3adb..1b6596914 100644
--- a/theme_kit/views/res_config.xml
+++ b/theme_kit/views/res_config.xml
@@ -3,98 +3,95 @@
      Copyright 2016,2018 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
      License MIT (https://opensource.org/licenses/MIT). -->
 <odoo>
-        <menuitem
+    <menuitem
         id="main_menu"
         name="Brand Kit"
         parent="base.menu_administration"
         sequence="1"
         groups="base.group_no_one"
     />
-
-        <record id="view_config" model="ir.ui.view">
-            <field name="name">Brand settings</field>
-            <field name="model">theme_kit.config</field>
-            <field name="arch" type="xml">
-                <form
-                string="Theme Settings"
-                class="oe_form_configuration o_base_settings"
-            >
-                    <div class="o_control_panel">
-                        <div class="o_panel">
-                            <div
+    <record id="view_config" model="ir.ui.view">
+        <field name="name">Brand settings</field>
+        <field name="model">theme_kit.config</field>
+        <field name="arch" type="xml">
+            <form string="Theme Settings" class="oe_form_configuration o_base_settings">
+                <div class="o_control_panel">
+                    <div class="o_panel">
+                        <div
                             class="title h2 mb0 mt4 text-muted hidden-xs"
                         >Theme Settings</div>
-                        </div>
-                        <header>
-                            <button
+                    </div>
+                    <header>
+                        <button
                             string="Save"
                             type="object"
                             name="execute"
                             class="oe_highlight"
                         />
-                            <button string="Discard" type="object" name="cancel" />
-                        </header>
-                    </div>
-                    <div class="o_setting_container">
-                        <div class="settings">
-                            <div
+                        <button string="Discard" type="object" name="cancel" />
+                    </header>
+                </div>
+                <div class="o_setting_container">
+                    <div class="settings">
+                        <div
                             class="app_settings_block"
                             data-string="Logo"
                             string="Logo"
                             data-key="logo"
                         >
-                                <h2>Logo</h2>
-                                <div class="row mt16 o_settings_container">
-                                    <div class="col-xs-12 col-md-6 o_setting_box">
-                                        <div class="o_setting_right_pane">
-                                            <label for="company_logo" />
-                                            <div class="text-muted">
+                            <h2>Logo</h2>
+                            <div class="row mt16 o_settings_container">
+                                <div class="col-xs-12 col-md-6 o_setting_box">
+                                    <div class="o_setting_right_pane">
+                                        <label for="company_logo" />
+                                        <div class="text-muted">
                                                 Set the company logo of your website
                                             </div>
-                                            <div class="content-group">
-                                                <div class="mt16 row">
-                                                    <field
+                                        <div class="content-group">
+                                            <div class="mt16 row">
+                                                <field
                                                     name="company_logo"
                                                     class="col-xs-3 col-md-3 oe_avatar"
                                                     widget="image"
                                                 />
-                                                </div>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-xs-12 col-md-6 o_setting_box">
-                                        <div class="o_setting_right_pane">
-                                            <label for="favicon_id" />
-                                            <div class="text-muted">
+                                </div>
+                                <div class="col-xs-12 col-md-6 o_setting_box">
+                                    <div class="o_setting_right_pane">
+                                        <label for="favicon_id" />
+                                        <div class="text-muted">
                                                 Set the company favicon of your website
                                             </div>
-                                            <div class="content-group">
-                                                <div class="mt16 row">
-                                                    <field
+                                        <div class="content-group">
+                                            <div class="mt16 row">
+                                                <field
                                                     name="favicon_id"
                                                     class="col-xs-3 col-md-3 oe_inline"
                                                 />
-                                                </div>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-xs-12 col-md-6 o_setting_box">
-                                        <div class="o_setting_right_pane">
-                                            <label for="wallpapers_count" />
-                                            <div class="text-muted">
+                                </div>
+                                <div class="col-xs-12 col-md-6 o_setting_box">
+                                    <div class="o_setting_right_pane">
+                                        <label for="wallpapers_count" />
+                                        <div class="text-muted">
                                                 test test test
                                             </div>
-                                            <div class="content-group">
-                                                <div class="mt16 row">
-                                                    <field
+                                        <div class="content-group">
+                                            <div class="mt16 row">
+                                                <field
                                                     name="wallpapers_count"
                                                     class="col-xs-3 col-md-3 oe_inline"
-                                                /><span
+                                                />
+                                                <span
                                                     class="oe_form_field oe_inline"
                                                 > wallpaper(s)</span>
-                                                </div>
-                                                <div class="mt16">
-                                                    <button
+                                            </div>
+                                            <div class="mt16">
+                                                <button
                                                     type="action"
                                                     icon="fa-cogs"
                                                     name="%(theme_kit.ir_attachment_login_bg_action)d"
@@ -102,120 +99,120 @@
                                                     string="Configure wallpapers"
                                                     class="oe_link"
                                                 />
-                                                    <div class="text-muted">
+                                                <div class="text-muted">
                                                         These wallpapers are randomly shown on login page
                                                     </div>
-                                                </div>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
-                                <h2>Theme</h2>
-                                <div class="row mt16 o_settings_container">
-                                    <div class="col-xs-12 col-md-6 o_setting_box">
-                                        <div class="o_setting_right_pane">
-                                            <label for="theme_id" />
-                                            <div class="text-muted">
+                            </div>
+                            <h2>Theme</h2>
+                            <div class="row mt16 o_settings_container">
+                                <div class="col-xs-12 col-md-6 o_setting_box">
+                                    <div class="o_setting_right_pane">
+                                        <label for="theme_id" />
+                                        <div class="text-muted">
                                                 Set the theme of your website
                                             </div>
-                                            <div class="content-group">
-                                                <div class="mt16 row">
-                                                    <field
+                                        <div class="content-group">
+                                            <div class="mt16 row">
+                                                <field
                                                     name="theme_id"
                                                     class="col-xs-3 col-md-3 oe_inline"
                                                 />
-                                                </div>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
-                                <h2>Name</h2>
-                                <div class="row mt16 o_settings_container">
-                                    <div class="col-xs-12 col-md-6 o_setting_box">
-                                        <div class="o_setting_right_pane">
-                                            <label for="page_title" />
-                                            <div class="content-group">
-                                                <div class="mt16">
-                                                    <field
+                            </div>
+                            <h2>Name</h2>
+                            <div class="row mt16 o_settings_container">
+                                <div class="col-xs-12 col-md-6 o_setting_box">
+                                    <div class="o_setting_right_pane">
+                                        <label for="page_title" />
+                                        <div class="content-group">
+                                            <div class="mt16">
+                                                <field
                                                     name="page_title"
                                                     placeholder="CompanyName"
                                                 />
-                                                    <div class="text-muted">
-                                                        <p
+                                                <div class="text-muted">
+                                                    <p
                                                         class="mt0"
                                                     >Page Title is used in Browser Tab name, for example<br
                                                         />
                                                             <ul>
-                                                                <li><em
-                                                                >[Page Title]</em></li>
-                                                                <li>#inbox - <em
+                                                            <li>
+                                                                <em>[Page Title]</em>
+                                                            </li>
+                                                            <li>#inbox - <em
                                                                 >[Page Title]</em></li>
-                                                                <li>Dashboard - <em
+                                                            <li>Dashboard - <em
                                                                 >[Page Title]</em></li>
-                                                            </ul>
+                                                        </ul>
                                                         </p>
-                                                    </div>
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-xs-12 col-md-6 o_setting_box">
-                                        <div class="o_setting_right_pane">
-                                            <label for="system_name" />
-                                            <div class="content-group">
-                                                <div class="mt16">
-                                                    <field
+                                </div>
+                                <div class="col-xs-12 col-md-6 o_setting_box">
+                                    <div class="o_setting_right_pane">
+                                        <label for="system_name" />
+                                        <div class="content-group">
+                                            <div class="mt16">
+                                                <field
                                                     name="system_name"
                                                     placeholder="CompanyName's Portal"
                                                 />
-                                                    <div class="text-muted">
-                                                        <p
+                                                <div class="text-muted">
+                                                    <p
                                                         class="mt0"
                                                     >System Name is used in context like followings:</p>
-                                                        <ul>
-                                                            <li><em
+                                                    <ul>
+                                                        <li><em
                                                             >[System Name]</em> helps you easily track all activities related to a customer; discussions, history of business opportunities, documents, etc.</li>
-                                                            <!--<li><em>[System Name]</em> needs your permission to enable desktop notifications.</li>-->
-                                                            <li><em
+                                                        <!--<li><em>[System Name]</em> needs your permission to enable desktop notifications.</li>-->
+                                                        <li><em
                                                             >[System Name]</em> has now the permission to send you native notifications on this device.</li>
-                                                            <li><em
+                                                        <li><em
                                                             >[System Name]</em> Warning - Warning<br
                                                             />
                                                             You can not remove the admin user as it is used internally for resources created by <em
                                                             >[System Name]</em> (updates, module installation, ...)</li>
-                                                            <li>etc.</li>
-                                                        </ul>
-                                                    </div>
+                                                        <li>etc.</li>
+                                                    </ul>
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
-                                <h2>Documentation</h2>
-                                <div class="row mt16 o_settings_container">
-                                    <div class="col-xs-12 col-md-6 o_setting_box">
-                                        <div class="o_setting_right_pane">
-                                            <label for="new_documentation_website" />
-                                            <div class="content-group">
-                                                <div class="mt16">
-                                                    <field
+                            </div>
+                            <h2>Documentation</h2>
+                            <div class="row mt16 o_settings_container">
+                                <div class="col-xs-12 col-md-6 o_setting_box">
+                                    <div class="o_setting_right_pane">
+                                        <label for="new_documentation_website" />
+                                        <div class="content-group">
+                                            <div class="mt16">
+                                                <field
                                                     name="new_documentation_website"
                                                     placeholder="DocumentationWebsite"
                                                 />
-                                                    <div class="text-muted">
-                                                        <p
+                                                <div class="text-muted">
+                                                    <p
                                                         class="mt0"
                                                     >Replaces links to documentation to custom website, for example<br
                                                         />
                                                             <ul>
-                                                                <li><em
+                                                            <li><em
                                                                 >"Help"</em> in Import tool</li>
-                                                                <li><em
+                                                            <li><em
                                                                 >"How-to"</em> in paypal</li>
-                                                                <li>etc.</li>
-                                                            </ul>
+                                                            <li>etc.</li>
+                                                        </ul>
                                                         </p>
-                                                    </div>
                                                 </div>
                                             </div>
                                         </div>
@@ -224,22 +221,21 @@
                             </div>
                         </div>
                     </div>
-                </form>
-            </field>
-        </record>
-
-        <record id="config_action" model="ir.actions.act_window">
-            <field name="name">Brand settings</field>
-            <field name="res_model">theme_kit.config</field>
-            <field name="view_mode">form</field>
-            <field name="target">inline</field>
-        </record>
-        <menuitem
+                </div>
+            </form>
+        </field>
+    </record>
+    <record id="config_action" model="ir.actions.act_window">
+        <field name="name">Brand settings</field>
+        <field name="res_model">theme_kit.config</field>
+        <field name="view_mode">form</field>
+        <field name="target">inline</field>
+    </record>
+    <menuitem
         id="config_menu"
         name="Brand"
         parent="main_menu"
         sequence="1"
         action="config_action"
     />
-
 </odoo>
diff --git a/theme_kit/views/templates.xml b/theme_kit/views/templates.xml
index 643606dd0..a66e92fe0 100644
--- a/theme_kit/views/templates.xml
+++ b/theme_kit/views/templates.xml
@@ -3,17 +3,17 @@
      Copyright 2018 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
      License MIT (https://opensource.org/licenses/MIT). -->
 <odoo noupdate="1">
-        <template id="theme_kit.custom_css">
-            <style type="text/css">
+    <template id="theme_kit.custom_css">
+        <style type="text/css">
             </style>
-            <script type="text/javascript">
+        <script type="text/javascript">
             </script>
-        </template>
-        <template id="webclient_script" inherit_id="web.webclient_bootstrap">
-            <xpath expr="." position="inside">
-                <t t-call="theme_kit.custom_css" />
-            </xpath>
-        </template>
-        <template id="theme_kit.dummy">
+    </template>
+    <template id="webclient_script" inherit_id="web.webclient_bootstrap">
+        <xpath expr="." position="inside">
+            <t t-call="theme_kit.custom_css" />
+        </xpath>
+    </template>
+    <template id="theme_kit.dummy">
         </template>
 </odoo>
diff --git a/theme_kit/views/theme.xml b/theme_kit/views/theme.xml
index 69d67e7aa..251260552 100644
--- a/theme_kit/views/theme.xml
+++ b/theme_kit/views/theme.xml
@@ -3,568 +3,560 @@
      Copyright 2016 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
      License MIT (https://opensource.org/licenses/MIT). -->
 <odoo>
-        <record id="theme_view_tree" model="ir.ui.view">
-            <field name="name">theme_kit.theme.tree</field>
-            <field name="model">theme_kit.theme</field>
-            <field name="arch" type="xml">
-                <tree>
-                    <field name="name" />
-                </tree>
-            </field>
-        </record>
-
-        <record id="theme_view_form" model="ir.ui.view">
-            <field name="name">theme_kit.theme.form</field>
-            <field name="model">theme_kit.theme</field>
-            <field name="arch" type="xml">
-                <form string="Color scheme">
-                    <sheet>
-                        <div class="oe_title">
-                            <label for="name" class="oe_edit_only" />
-                            <h1>
-                                <field name="name" />
-                            </h1>
-                        </div>
-                        <group>
-                            <group string="Top panel">
-                                <field name="top_panel_id" />
-                            </group>
-                            <group string="Left panel">
-                                <field name="left_panel_id" />
-                            </group>
+    <record id="theme_view_tree" model="ir.ui.view">
+        <field name="name">theme_kit.theme.tree</field>
+        <field name="model">theme_kit.theme</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name" />
+            </tree>
+        </field>
+    </record>
+    <record id="theme_view_form" model="ir.ui.view">
+        <field name="name">theme_kit.theme.form</field>
+        <field name="model">theme_kit.theme</field>
+        <field name="arch" type="xml">
+            <form string="Color scheme">
+                <sheet>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only" />
+                        <h1>
+                            <field name="name" />
+                        </h1>
+                    </div>
+                    <group>
+                        <group string="Top panel">
+                            <field name="top_panel_id" />
                         </group>
-                        <group>
-                            <group string="Content">
-                                <field name="content_id" />
-                            </group>
+                        <group string="Left panel">
+                            <field name="left_panel_id" />
                         </group>
-                            <group string="Custom setting">
-                                <field name="custom_css" />
-                                <field name="custom_js" />
-                            </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-        <record id="theme_top_panel_view_form" model="ir.ui.view">
-            <field name="name">theme_kit.top_panel.form</field>
-            <field name="model">theme_kit.top_panel</field>
-            <field name="arch" type="xml">
-                <form string="Color scheme">
-                    <sheet>
-                        <div class="oe_title">
-                            <label for="name" class="oe_edit_only" />
-                            <h1>
-                                <field name="name" />
-                            </h1>
-                        </div>
-                        <group>
-                            <group string="Top panel">
-                                <div>
-                                    <label for="top_panel_bg" />
-                                    <field
+                    </group>
+                    <group>
+                        <group string="Content">
+                            <field name="content_id" />
+                        </group>
+                    </group>
+                    <group string="Custom setting">
+                        <field name="custom_css" />
+                        <field name="custom_js" />
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record id="theme_top_panel_view_form" model="ir.ui.view">
+        <field name="name">theme_kit.top_panel.form</field>
+        <field name="model">theme_kit.top_panel</field>
+        <field name="arch" type="xml">
+            <form string="Color scheme">
+                <sheet>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only" />
+                        <h1>
+                            <field name="name" />
+                        </h1>
+                    </div>
+                    <group>
+                        <group string="Top panel">
+                            <div>
+                                <label for="top_panel_bg" />
+                                <field
                                     name="top_panel_bg_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="top_panel_bg"
                                     widget="color"
                                     attrs="{'readonly':[('top_panel_bg_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="top_panel_border" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="top_panel_border" />
+                                <field
                                     name="top_panel_border_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="top_panel_border"
                                     class="oe_inline"
                                     attrs="{'readonly':[('top_panel_border_active','=',False)]}"
                                     widget="color"
                                 />
-                                </div>
-                                <div>
-                                    <label for="top_panel_font" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="top_panel_font" />
+                                <field
                                     name="top_panel_font_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="top_panel_font"
                                     widget="color"
                                     attrs="{'readonly':[('top_panel_font_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="top_panel_active_item_font" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="top_panel_active_item_font" />
+                                <field
                                     name="top_panel_active_item_font_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="top_panel_active_item_font"
                                     widget="color"
                                     attrs="{'readonly':[('top_panel_active_item_font_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="top_panel_active_item_bg" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="top_panel_active_item_bg" />
+                                <field
                                     name="top_panel_active_item_bg_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="top_panel_active_item_bg"
                                     widget="color"
                                     attrs="{'readonly':[('top_panel_active_item_bg_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="top_panel_hover_item_font" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="top_panel_hover_item_font" />
+                                <field
                                     name="top_panel_hover_item_font_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="top_panel_hover_item_font"
                                     widget="color"
                                     attrs="{'readonly':[('top_panel_hover_item_font_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="top_panel_hover_item_bg" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="top_panel_hover_item_bg" />
+                                <field
                                     name="top_panel_hover_item_bg_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="top_panel_hover_item_bg"
                                     widget="color"
                                     attrs="{'readonly':[('top_panel_hover_item_bg_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                            </group>
+                            </div>
                         </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-        <record id="theme_left_panel_view_form" model="ir.ui.view">
-            <field name="name">theme_kit.left_panel.form</field>
-            <field name="model">theme_kit.left_panel</field>
-            <field name="arch" type="xml">
-                <form string="Color scheme">
-                    <sheet>
-                        <div class="oe_title">
-                            <label for="name" class="oe_edit_only" />
-                            <h1>
-                                <field name="name" />
-                            </h1>
-                        </div>
-                        <group>
-                            <group string="Left panel">
-                                <div>
-                                    <label for="left_panel_bg" />
-                                    <field
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record id="theme_left_panel_view_form" model="ir.ui.view">
+        <field name="name">theme_kit.left_panel.form</field>
+        <field name="model">theme_kit.left_panel</field>
+        <field name="arch" type="xml">
+            <form string="Color scheme">
+                <sheet>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only" />
+                        <h1>
+                            <field name="name" />
+                        </h1>
+                    </div>
+                    <group>
+                        <group string="Left panel">
+                            <div>
+                                <label for="left_panel_bg" />
+                                <field
                                     name="left_panel_bg_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="left_panel_bg"
                                     class="oe_inline"
                                     attrs="{'readonly':[('left_panel_bg_active','=',False)]}"
                                     widget="color"
                                 />
-                                </div>
-                                <div>
-                                    <label for="left_panel_main_menu" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="left_panel_main_menu" />
+                                <field
                                     name="left_panel_main_menu_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="left_panel_main_menu"
                                     class="oe_inline"
                                     attrs="{'readonly':[('left_panel_main_menu_active','=',False)]}"
                                     widget="color"
                                 />
-                                </div>
-                                <div>
-                                    <label for="left_panel_sub_menu" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="left_panel_sub_menu" />
+                                <field
                                     name="left_panel_sub_menu_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="left_panel_sub_menu"
                                     widget="color"
                                     attrs="{'readonly':[('left_panel_sub_menu_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="left_panel_active_item_font" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="left_panel_active_item_font" />
+                                <field
                                     name="left_panel_active_item_font_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="left_panel_active_item_font"
                                     widget="color"
                                     attrs="{'readonly':[('left_panel_active_item_font_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="left_panel_active_item_bg" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="left_panel_active_item_bg" />
+                                <field
                                     name="left_panel_active_item_bg_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="left_panel_active_item_bg"
                                     widget="color"
                                     attrs="{'readonly':[('left_panel_active_item_bg_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="left_panel_hover_item_font" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="left_panel_hover_item_font" />
+                                <field
                                     name="left_panel_hover_item_font_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="left_panel_hover_item_font"
                                     widget="color"
                                     attrs="{'readonly':[('left_panel_hover_item_font_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="left_panel_hover_item_bg" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="left_panel_hover_item_bg" />
+                                <field
                                     name="left_panel_hover_item_bg_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="left_panel_hover_item_bg"
                                     widget="color"
                                     attrs="{'readonly':[('left_panel_hover_item_bg_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                            </group>
+                            </div>
                         </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-        <record id="theme_content_view_form" model="ir.ui.view">
-            <field name="name">theme_kit.content.form</field>
-            <field name="model">theme_kit.content</field>
-            <field name="arch" type="xml">
-                <form string="Color scheme">
-                    <sheet>
-                        <div class="oe_title">
-                            <label for="name" class="oe_edit_only" />
-                            <h1>
-                                <field name="name" />
-                            </h1>
-                        </div>
-                        <group>
-                            <group string="Content">
-                                <div>
-                                    <label for="content_bg" />
-                                    <field
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record id="theme_content_view_form" model="ir.ui.view">
+        <field name="name">theme_kit.content.form</field>
+        <field name="model">theme_kit.content</field>
+        <field name="arch" type="xml">
+            <form string="Color scheme">
+                <sheet>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only" />
+                        <h1>
+                            <field name="name" />
+                        </h1>
+                    </div>
+                    <group>
+                        <group string="Content">
+                            <div>
+                                <label for="content_bg" />
+                                <field
                                     name="content_bg_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="content_bg"
                                     widget="color"
                                     attrs="{'readonly':[('content_bg_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="content_button" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="content_button" />
+                                <field
                                     name="content_button_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="content_button"
                                     widget="color"
                                     attrs="{'readonly':[('content_button_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="content_form" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="content_form" />
+                                <field
                                     name="content_form_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="content_form"
                                     widget="color"
                                     attrs="{'readonly':[('content_form_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="content_form_text" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="content_form_text" />
+                                <field
                                     name="content_form_text_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="content_form_text"
                                     widget="color"
                                     attrs="{'readonly':[('content_form_text_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="content_form_title" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="content_form_title" />
+                                <field
                                     name="content_form_title_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="content_form_title"
                                     widget="color"
                                     attrs="{'readonly':[('content_form_title_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="content_text" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="content_text" />
+                                <field
                                     name="content_text_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="content_text"
                                     widget="color"
                                     attrs="{'readonly':[('content_text_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="content_form_link" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="content_form_link" />
+                                <field
                                     name="content_form_link_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="content_form_link"
                                     widget="color"
                                     attrs="{'readonly':[('content_form_link_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="content_loader" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="content_loader" />
+                                <field
                                     name="content_loader_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="content_loader"
                                     widget="color"
                                     attrs="{'readonly':[('content_loader_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="content_loader_text" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="content_loader_text" />
+                                <field
                                     name="content_loader_text_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="content_loader_text"
                                     widget="color"
                                     attrs="{'readonly':[('content_loader_text_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="content_statusbar_bg" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="content_statusbar_bg" />
+                                <field
                                     name="content_statusbar_bg_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="content_statusbar_bg"
                                     widget="color"
                                     attrs="{'readonly':[('content_statusbar_bg_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="content_statusbar_element" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="content_statusbar_element" />
+                                <field
                                     name="content_statusbar_element_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="content_statusbar_element"
                                     widget="color"
                                     attrs="{'readonly':[('content_statusbar_element_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="content_statusbar_font_color" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="content_statusbar_font_color" />
+                                <field
                                     name="content_statusbar_font_color_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="content_statusbar_font_color"
                                     widget="color"
                                     attrs="{'readonly':[('content_statusbar_font_color_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="content_main_menu_font_color" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="content_main_menu_font_color" />
+                                <field
                                     name="content_main_menu_font_color_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="content_main_menu_font_color"
                                     widget="color"
                                     attrs="{'readonly':[('content_main_menu_font_color_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-                                <div>
-                                    <label for="content_footer_color" />
-                                    <field
+                            </div>
+                            <div>
+                                <label for="content_footer_color" />
+                                <field
                                     name="content_footer_color_active"
                                     nolabel="1"
                                     class="oe_inline"
                                 />
-                                    <field
+                                <field
                                     name="content_footer_color"
                                     widget="color"
                                     attrs="{'readonly':[('content_footer_color_active','=',False)]}"
                                     class="oe_inline"
                                 />
-                                </div>
-
-                            </group>
+                            </div>
                         </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record id="theme_action" model="ir.actions.act_window">
-            <field name="name">Color Scheme</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">theme_kit.theme</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <record id="theme_top_panel_action" model="ir.actions.act_window">
-            <field name="name">Color Top Panel</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">theme_kit.top_panel</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <record id="theme_left_panel_action" model="ir.actions.act_window">
-            <field name="name">Color Left Panel</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">theme_kit.left_panel</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <record id="theme_content_action" model="ir.actions.act_window">
-            <field name="name">Color Content</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">theme_kit.content</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <menuitem
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record id="theme_action" model="ir.actions.act_window">
+        <field name="name">Color Scheme</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">theme_kit.theme</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <record id="theme_top_panel_action" model="ir.actions.act_window">
+        <field name="name">Color Top Panel</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">theme_kit.top_panel</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <record id="theme_left_panel_action" model="ir.actions.act_window">
+        <field name="name">Color Left Panel</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">theme_kit.left_panel</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <record id="theme_content_action" model="ir.actions.act_window">
+        <field name="name">Color Content</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">theme_kit.content</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem
         id="theme_menu"
         name="Color Schemes"
         parent="main_menu"
         sequence="1"
         action="theme_action"
     />
-        <menuitem
+    <menuitem
         id="theme_color_setting"
         name="Color Details"
         sequence="2"
         parent="main_menu"
     />
-            <menuitem
+    <menuitem
         id="theme_top_panel_menu"
         name="Color Top Panel"
         parent="theme_color_setting"
         sequence="1"
         action="theme_top_panel_action"
     />
-            <menuitem
+    <menuitem
         id="theme_left_panel_menu"
         name="Color Left Panel"
         parent="theme_color_setting"
         sequence="2"
         action="theme_left_panel_action"
     />
-            <menuitem
+    <menuitem
         id="theme_conten_menu"
         name="Color Content"
         parent="theme_color_setting"
         sequence="3"
         action="theme_content_action"
     />
-
 </odoo>
diff --git a/web_debranding/data.xml b/web_debranding/data.xml
index 0888c8d65..cfed84c67 100644
--- a/web_debranding/data.xml
+++ b/web_debranding/data.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-<!--Copyright 2015-2018 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
+    <!--Copyright 2015-2018 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
     Copyright 2017 Ilmir Karamov <https://it-projects.info/team/ilmir-k>
     License MIT (https://opensource.org/licenses/MIT).-->
-        <record id="default_logo_module" model="ir.config_parameter">
-            <field name="key">web_debranding.default_logo_module</field>
-            <field name="value">web_debranding</field>
-        </record>
-        <record id="base.main_partner" model="res.partner">
-            <field name="image" />
-        </record>
-        <record id="base.partner_root" model="res.partner">
-            <field name="name">Bot</field>
-            <field name="email">bot@example.com</field>
-        </record>
+    <record id="default_logo_module" model="ir.config_parameter">
+        <field name="key">web_debranding.default_logo_module</field>
+        <field name="value">web_debranding</field>
+    </record>
+    <record id="base.main_partner" model="res.partner">
+        <field name="image" />
+    </record>
+    <record id="base.partner_root" model="res.partner">
+        <field name="name">Bot</field>
+        <field name="email">bot@example.com</field>
+    </record>
 </odoo>
diff --git a/web_debranding/js.xml b/web_debranding/js.xml
index 66bb4f684..fba9a9ea2 100644
--- a/web_debranding/js.xml
+++ b/web_debranding/js.xml
@@ -1,45 +1,42 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-<!--Copyright 2015-2018 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
+    <!--Copyright 2015-2018 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
     Copyright 2015 igallyamov <https://github.com/igallyamov>
     Copyright 2016 Stanislav Krotov <https://it-projects.info/team/ufaks>
     Copyright 2017 Ilmir Karamov <https://it-projects.info/team/ilmir-k>
     License MIT (https://opensource.org/licenses/MIT).-->
-        <template
+    <template
         id="debranding_title_js"
         name="Debranding title JS"
         inherit_id="web.assets_backend"
     >
-            <xpath expr="." position="inside">
-                <link rel="stylesheet" href="/web_debranding/static/src/css/web.css" />
-                <script
+        <xpath expr="." position="inside">
+            <link rel="stylesheet" href="/web_debranding/static/src/css/web.css" />
+            <script
                 type="text/javascript"
                 src="/web_debranding/static/src/js/base.js"
             />
-                <script
+            <script
                 type="text/javascript"
                 src="/web_debranding/static/src/js/dialog.js"
             />
-                <script
+            <script
                 type="text/javascript"
                 src="/web_debranding/static/src/js/dashboard.js"
             />
-                <script
+            <script
                 type="text/javascript"
                 src="/web_debranding/static/src/js/field_upgrade.js"
             />
-                <script
+            <script
                 type="text/javascript"
                 src="/web_debranding/static/src/js/native_notifications.js"
             />
-                <script
-                type="text/javascript"
-                src="/web_debranding/static/src/js/bot.js"
-            />
-                <script
+            <script type="text/javascript" src="/web_debranding/static/src/js/bot.js" />
+            <script
                 type="text/javascript"
                 src="/web_debranding/static/src/js/user_menu.js"
             />
-            </xpath>
-        </template>
+        </xpath>
+    </template>
 </odoo>
diff --git a/web_debranding/pre_install.xml b/web_debranding/pre_install.xml
index 1816021f6..a2b780f15 100644
--- a/web_debranding/pre_install.xml
+++ b/web_debranding/pre_install.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-        <function model="ir.config_parameter" name="create_debranding_parameters" />
-        <function model="ir.translation" name="decorated_clear_caches" />
-        <function model="ir.ui.view" name="_create_debranding_views" />
+    <function model="ir.config_parameter" name="create_debranding_parameters" />
+    <function model="ir.translation" name="decorated_clear_caches" />
+    <function model="ir.ui.view" name="_create_debranding_views" />
 </odoo>
diff --git a/web_debranding/static/src/xml/web.xml b/web_debranding/static/src/xml/web.xml
index cb6c1bb1f..ed5eb4f35 100644
--- a/web_debranding/static/src/xml/web.xml
+++ b/web_debranding/static/src/xml/web.xml
@@ -5,19 +5,17 @@
     License MIT (https://opensource.org/licenses/MIT).-->
 <templates>
     <t t-extend="mail.client_action">
-      <t t-jquery=".o_mail_request_permission" t-operation="inner">
+        <t t-jquery=".o_mail_request_permission" t-operation="inner">
         Your permission is required to <a href="#"> enable desktop notifications</a>.
       </t>
     </t>
-
     <t t-extend="AppSwitcher.Content">
-      <t t-jquery=".o_application_switcher_footer" t-operation="replace">
-          <div class="o_app_switcher_footer">
-              <img src="/web/binary/company_logo" />
-          </div>
-      </t>
+        <t t-jquery=".o_application_switcher_footer" t-operation="replace">
+            <div class="o_app_switcher_footer">
+                <img src="/web/binary/company_logo" />
+            </div>
+        </t>
     </t>
-
     <t t-extend="UserMenu.Actions">
         <t t-jquery="a[data-menu='documentation']" t-operation="replace" />
         <t t-jquery="a[data-menu='support']" t-operation="replace" />
@@ -34,15 +32,16 @@
                 href="?debug=assets"
                 data-menu="debugassets"
                 role="menuitem"
-            ><em>Developer mode<br /> (with assets)</em></a>
+            >
+                <em>Developer mode<br /> (with assets)</em>
+            </a>
         </t>
         <!-- It leads to warning in Odoo EE in browser console, because such selector doesn't exist there -->
         <t t-jquery="div.dropdown-divider" t-operation="replace" />
     </t>
-
-<!-- enterprise: hide database expiration panel -->
-<!-- WARNING: running odoo instance with uncommented lines below may be illegal -->
-<!--
+    <!-- enterprise: hide database expiration panel -->
+    <!-- WARNING: running odoo instance with uncommented lines below may be illegal -->
+    <!--
    <t t-extend="WebClient.database_expiration_panel">
        <t t-jquery=".database_expiration_panel">
            $(this).empty();
diff --git a/web_debranding/views.xml b/web_debranding/views.xml
index b20f19f2d..8e7aab305 100644
--- a/web_debranding/views.xml
+++ b/web_debranding/views.xml
@@ -6,22 +6,21 @@
     Copyright 2017 auyeung112002 <https://github.com/auyeung112002>
     License MIT (https://opensource.org/licenses/MIT).-->
 <odoo>
-
     <template id="login_layout" inherit_id="web.login_layout" priority="8">
-       <xpath expr="//div[@t-if='not disable_footer']" position="replace" />
+        <xpath expr="//div[@t-if='not disable_footer']" position="replace" />
     </template>
-
     <template id="web_layout" inherit_id="web.layout">
-       <xpath expr="//title" position="replace"><title t-esc="title" /></xpath>
-       <xpath expr="//link[@rel='shortcut icon']" position="replace">
-           <t
+        <xpath expr="//title" position="replace">
+            <title t-esc="title" />
+        </xpath>
+        <xpath expr="//link[@rel='shortcut icon']" position="replace">
+            <t
                 t-set="favicon"
                 t-value="request and request.env['ir.config_parameter'].sudo().get_param('web_debranding.favicon_url', '')"
             />
-           <t t-if="favicon">
-               <link rel="shortcut icon" t-att-href="favicon" type="image/x-icon" />
-           </t>
-       </xpath>
+            <t t-if="favicon">
+                <link rel="shortcut icon" t-att-href="favicon" type="image/x-icon" />
+            </t>
+        </xpath>
     </template>
-
 </odoo>
diff --git a/web_gantt8/views/web_gantt.xml b/web_gantt8/views/web_gantt.xml
index 8ed14f49c..c9f2b7f3a 100644
--- a/web_gantt8/views/web_gantt.xml
+++ b/web_gantt8/views/web_gantt.xml
@@ -14,7 +14,6 @@
                     rel="stylesheet"
                     href="/web_gantt8/static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css"
                 />
-
                 <script
                     type="text/javascript"
                     src="/web_gantt8/static/lib/dhtmlxGantt/sources/dhtmlxcommon.js"
diff --git a/web_multi_attachment_base/static/src/xml/web_kanban.xml b/web_multi_attachment_base/static/src/xml/web_kanban.xml
index 667a6010a..d727dea9c 100644
--- a/web_multi_attachment_base/static/src/xml/web_kanban.xml
+++ b/web_multi_attachment_base/static/src/xml/web_kanban.xml
@@ -2,7 +2,6 @@
     Copyright 2018 Kolushov Alexandr <https://it-projects.info/team/KolushovAlexandr>
     License MIT (https://opensource.org/licenses/MIT).-->
 <template>
-
     <t t-name="DropAttachments.select_files_button">
         <label
             for="file-upload"
@@ -20,11 +19,9 @@
             />
         </label>
     </t>
-
     <t t-extend="KanbanView.buttons">
         <t t-jquery="button.o-kanban-button-new" t-operation="after">
             <t t-call="DropAttachments.select_files_button" />
         </t>
     </t>
-
 </template>
diff --git a/web_preview/static/src/xml/media_tree_view_widget.xml b/web_preview/static/src/xml/media_tree_view_widget.xml
index cbd0bf773..91ab56f21 100644
--- a/web_preview/static/src/xml/media_tree_view_widget.xml
+++ b/web_preview/static/src/xml/media_tree_view_widget.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <templates id="template" xml:space="preserve">
-
     <!--<t t-extend="HiddenInputFile">-->
-        <!--<t t-jquery="input[name='ufile']:eq(1)" t-operation="replace">-->
-            <!--<input t-if="widget.image_only" type="file" class="o_input_file" name="ufile" accept="image/*"/>-->
-        <!--</t>-->
+    <!--<t t-jquery="input[name='ufile']:eq(1)" t-operation="replace">-->
+    <!--<input t-if="widget.image_only" type="file" class="o_input_file" name="ufile" accept="image/*"/>-->
+    <!--</t>-->
     <!--</t>-->
-
     <t t-extend="FieldBinaryImage-img">
         <t t-jquery="img" t-operation="replace">
             <!--VIDEO-->
@@ -106,7 +104,6 @@
                     t-att-width="widget.nodeOptions.size ? widget.nodeOptions.size[0] : widget.attrs.img_width || widget.attrs.width"
                     t-att-height="widget.nodeOptions.size ? widget.nodeOptions.size[1] : widget.attrs.img_height || widget.attrs.height"
                 />
-
                 <div class="g-hidden">
                     <div
                         class="box-modal"
@@ -123,5 +120,4 @@
             </t>
         </t>
     </t>
-
 </templates>
diff --git a/web_preview/views/web_preview_template.xml b/web_preview/views/web_preview_template.xml
index 4e2218e97..f8d1c5db3 100644
--- a/web_preview/views/web_preview_template.xml
+++ b/web_preview/views/web_preview_template.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-        <template
+    <template
         id="assets_backend"
         name="Web Preview Assets Backend"
         inherit_id="web.assets_backend"
     >
-            <xpath expr="." position="inside">
-                <script
+        <xpath expr="." position="inside">
+            <script
                 type="text/javascript"
                 src="/web_preview/static/lib/js/jquery.arcticmodal.js"
             />
-                <script
+            <script
                 type="text/javascript"
                 src="/web_preview/static/src/js/media_form_widget.js"
             />
-                <!--<script type="text/javascript" src="/web_preview/static/src/js/media_kanban_widget.js"></script>-->
-                <link
+            <!--<script type="text/javascript" src="/web_preview/static/src/js/media_kanban_widget.js"></script>-->
+            <link
                 rel="stylesheet"
                 href="/web_preview/static/src/css/jquery.arcticmodal.css"
             />
-                <link rel="stylesheet" href="/web_preview/static/src/css/simple.css" />
-                <link rel="stylesheet" href="/web_preview/static/src/css/styles.css" />
-                <link
+            <link rel="stylesheet" href="/web_preview/static/src/css/simple.css" />
+            <link rel="stylesheet" href="/web_preview/static/src/css/styles.css" />
+            <link
                 rel="stylesheet"
                 href="/web_preview/static/src/less/image_controls.less"
             />
-            </xpath>
-        </template>
+        </xpath>
+    </template>
 </odoo>
diff --git a/web_website/demo/assets_demo.xml b/web_website/demo/assets_demo.xml
index 8484aaaaf..a6f694605 100644
--- a/web_website/demo/assets_demo.xml
+++ b/web_website/demo/assets_demo.xml
@@ -2,11 +2,9 @@
 <!-- Copyright 2018 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
      License MIT (https://opensource.org/licenses/MIT). -->
 <odoo>
-
     <template id="assets_backend_demo" inherit_id="web.assets_backend">
         <xpath expr="." position="inside">
             <script type="text/javascript" src="/web_website/static/src/js/tour.js" />
         </xpath>
     </template>
-
 </odoo>
diff --git a/web_website/demo/res_users_demo.xml b/web_website/demo/res_users_demo.xml
index 8d6588d59..de8f17f08 100644
--- a/web_website/demo/res_users_demo.xml
+++ b/web_website/demo/res_users_demo.xml
@@ -2,10 +2,8 @@
 <!-- Copyright 2018 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
      License MIT (https://opensource.org/licenses/MIT). -->
 <odoo>
-
     <!-- test_ui is assumed that root has multi-website access -->
     <record id="base.user_admin" model="res.users">
         <field name="groups_id" eval="[(4,ref('web_website.group_multi_website'))]" />
     </record>
-
 </odoo>
diff --git a/web_website/static/src/xml/qweb.xml b/web_website/static/src/xml/qweb.xml
index 68a8b2a73..d6d724a14 100644
--- a/web_website/static/src/xml/qweb.xml
+++ b/web_website/static/src/xml/qweb.xml
@@ -2,10 +2,9 @@
 <!-- Copyright 2018 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
      License MIT (https://opensource.org/licenses/MIT). -->
 <templates id="template" xml:space="preserve">
-
-<t t-name="SwitchWebsiteMenu">
-    <li class="o_switch_website_menu">
-        <a
+    <t t-name="SwitchWebsiteMenu">
+        <li class="o_switch_website_menu">
+            <a
                 class="dropdown-toggle"
                 data-toggle="dropdown"
                 aria-expanded="false"
@@ -13,12 +12,11 @@
                 aria-label="Dropdown menu"
                 title="Dropdown menu"
             >
-            <span
+                <span
                     t-attf-class="#{widget.isMobile ? 'fa fa-building-o' : 'oe_topbar_name'}"
                 />
-        </a>
-        <div class="dropdown-menu dropdown-menu-right" role="menu" />
-    </li>
-</t>
-
+            </a>
+            <div class="dropdown-menu dropdown-menu-right" role="menu" />
+        </li>
+    </t>
 </templates>
diff --git a/web_website/views/assets.xml b/web_website/views/assets.xml
index 1af99d096..78b5bc43f 100644
--- a/web_website/views/assets.xml
+++ b/web_website/views/assets.xml
@@ -2,7 +2,6 @@
 <!-- Copyright 2018 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
      License MIT (https://opensource.org/licenses/MIT). -->
 <odoo>
-
     <template id="assets_backend" inherit_id="web.assets_backend">
         <xpath expr="." position="inside">
             <script
@@ -11,5 +10,4 @@
             />
         </xpath>
     </template>
-
 </odoo>
diff --git a/web_website/views/ir_property_views.xml b/web_website/views/ir_property_views.xml
index 0a701e786..f3fe15196 100644
--- a/web_website/views/ir_property_views.xml
+++ b/web_website/views/ir_property_views.xml
@@ -2,7 +2,6 @@
 <!-- Copyright 2018 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
      License MIT (https://opensource.org/licenses/MIT). -->
 <odoo>
-
     <record id="ir_property_view_search" model="ir.ui.view">
         <field name="name">ir.property.search</field>
         <field name="model">ir.property</field>
@@ -13,7 +12,6 @@
             </xpath>
         </field>
     </record>
-
     <record id="ir_property_view" model="ir.ui.view">
         <field name="name">ir.property.form</field>
         <field name="model">ir.property</field>
@@ -24,7 +22,6 @@
             </xpath>
         </field>
     </record>
-
     <record id="ir_property_view_tree" model="ir.ui.view">
         <field name="name">ir.property.tree</field>
         <field name="model">ir.property</field>
@@ -35,5 +32,4 @@
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/web_website/views/res_config_settings_views.xml b/web_website/views/res_config_settings_views.xml
index af947a746..5b001a7b3 100644
--- a/web_website/views/res_config_settings_views.xml
+++ b/web_website/views/res_config_settings_views.xml
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-  <record id="res_config_settings_view_form" model="ir.ui.view">
-    <field name="name">res.config.settings.view.form.inherit.web.website</field>
-    <field name="model">res.config.settings</field>
-    <field name="inherit_id" ref="base_setup.res_config_settings_view_form" />
-    <field name="arch" type="xml">
-      <xpath expr="//div[@name='multi_company']" position="after">
-        <h2>Multi Website for Backend</h2>
-        <div class="row mt16 o_settings_container" name="multi_website">
-          <div class="col-xs-12 col-md-6 o_setting_box">
-            <div class="o_setting_left_pane">
-              <field name="group_multi_website" />
-            </div>
-            <div class="o_setting_right_pane">
-              <label string="Multi-website" for="group_multi_website" />
-              <div class="text-muted"> Show Website Switcher in backend </div>
-            </div>
-          </div>
-        </div>
-      </xpath>
-    </field>
-  </record>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.web.website</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="base_setup.res_config_settings_view_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='multi_company']" position="after">
+                <h2>Multi Website for Backend</h2>
+                <div class="row mt16 o_settings_container" name="multi_website">
+                    <div class="col-xs-12 col-md-6 o_setting_box">
+                        <div class="o_setting_left_pane">
+                            <field name="group_multi_website" />
+                        </div>
+                        <div class="o_setting_right_pane">
+                            <label string="Multi-website" for="group_multi_website" />
+                            <div
+                                class="text-muted"
+                            > Show Website Switcher in backend </div>
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
 </odoo>
diff --git a/web_website/views/res_users_views.xml b/web_website/views/res_users_views.xml
index fc182121f..73d2400fe 100644
--- a/web_website/views/res_users_views.xml
+++ b/web_website/views/res_users_views.xml
@@ -2,7 +2,6 @@
 <!-- Copyright 2018 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
      License MIT (https://opensource.org/licenses/MIT). -->
 <odoo>
-
     <record id="view_users_form" model="ir.ui.view">
         <field name="name">res.users.form</field>
         <field name="model">res.users</field>
@@ -28,9 +27,6 @@
                     />
                 </group>
             </xpath>
-
         </field>
     </record>
-
-
 </odoo>