diff --git a/odoo-debrand/__manifest__.py b/odoo-debrand/__manifest__.py
index a4ca93cde..606c657cb 100644
--- a/odoo-debrand/__manifest__.py
+++ b/odoo-debrand/__manifest__.py
@@ -22,7 +22,7 @@
 ##############################################################################
 {
     'name': "Odoo Debranding",
-    'version': "10.0.1.0",
+    'version': "10.0.2.0",
     'summary': """Debrand Odoo""",
     'description': """Debrand Odoo""",
     'author': "Cybrosys Techno Solutions",
@@ -31,8 +31,7 @@
     'category': 'Tools',
     'depends': ['base', 'im_livechat', 'website'],
     'data': [
-        'views/views.xml',
-        'views/templates.xml'],
+        'views/views.xml'],
     'demo': [],
     'qweb': ["static/src/xml/*.xml"],
     'images': ['static/description/banner.jpg'],
diff --git a/odoo-debrand/doc/changelog.rst b/odoo-debrand/doc/changelog.rst
new file mode 100644
index 000000000..90b9df558
--- /dev/null
+++ b/odoo-debrand/doc/changelog.rst
@@ -0,0 +1,7 @@
+Changelog
+=========
+
+`10.0.2.0.0`
+------------
+- Fixed Crash Issue on Un-installing.
+
diff --git a/odoo-debrand/models/__init__.py b/odoo-debrand/models/__init__.py
index 5305644df..77bbdbd39 100644
--- a/odoo-debrand/models/__init__.py
+++ b/odoo-debrand/models/__init__.py
@@ -1,3 +1,4 @@
 # -*- coding: utf-8 -*-
 
-from . import models
\ No newline at end of file
+from . import models
+
diff --git a/odoo-debrand/views/templates.xml b/odoo-debrand/views/templates.xml
deleted file mode 100644
index 71a9d511c..000000000
--- a/odoo-debrand/views/templates.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<openerp>
-    <data>
-        <!-- <template id="listing"> -->
-        <!--   <ul> -->
-        <!--     <li t-foreach="objects" t-as="object"> -->
-        <!--       <a t-attf-href="#{ root }/objects/#{ object.id }"> -->
-        <!--         <t t-esc="object.display_name"/> -->
-        <!--       </a> -->
-        <!--     </li> -->
-        <!--   </ul> -->
-        <!-- </template> -->
-        <!-- <template id="object"> -->
-        <!--   <h1><t t-esc="object.display_name"/></h1> -->
-        <!--   <dl> -->
-        <!--     <t t-foreach="object._fields" t-as="field"> -->
-        <!--       <dt><t t-esc="field"/></dt> -->
-        <!--       <dd><t t-esc="object[field]"/></dd> -->
-        <!--     </t> -->
-        <!--   </dl> -->
-        <!-- </template> -->
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/odoo-debrand/views/views.xml b/odoo-debrand/views/views.xml
index 451cfb66c..e31d82e71 100644
--- a/odoo-debrand/views/views.xml
+++ b/odoo-debrand/views/views.xml
@@ -1,97 +1,100 @@
-<openerp>
-  <data>
-      <record id="debrand_config" model="ir.ui.view">
+<odoo>
+    <record id="debrand_config" model="ir.ui.view">
         <field name="name">Debranding Configuration</field>
         <field name="model">website.config.settings</field>
         <field name="inherit_id" ref="website.view_website_config_settings"/>
         <field name="arch" type="xml">
-        <xpath expr="//group[@name='social']" position="after">
-                <group name="debrand_config" string="Debranding Configurations">
-                    <label for="company_logo" string="Company Logo"/>
+            <xpath expr="//group[@name='social']" position="after">
+                    <group name="debrand_config" string="Debranding Configurations">
+                        <label for="company_logo" string="Company Logo"/>
+                            <div>
+                                <div id="company_logo" class="oe_inline">
+                                    <field name="company_logo"
+                                           widget="image"
+                                           class="oe_avatar"
+                                           options="{'preview_image': 'image_medium', 'size': [130, 130]}"
+                                    />
+                                </div>
+                            </div>
+                        <label for="company_favicon" string="Company Favicon"/>
+                            <div>
+                                <div id="company_favicon" class="oe_inline">
+                                    <field name="company_favicon"
+                                           widget="image"
+                                           class="oe_avatar"
+                                           options="{'preview_image': 'image_small', 'size': [30, 30]}"/>
+                                </div>
+                            </div>
+                        <label for="company_name" string="Company Name"/>
                         <div>
-                            <div id="company_logo" class="oe_inline">
-                                <field name="company_logo"
-                                       widget="image"
-                                       class="oe_avatar"
-                                       options="{'preview_image': 'image_medium', 'size': [130, 130]}"
-                                />
+                            <div id="company_name" class="oe_inline">
+                                <field name="company_name"/>
                             </div>
                         </div>
-                    <label for="company_favicon" string="Company Favicon"/>
+                        <label for="company_website" string="Company Website"/>
                         <div>
-                            <div id="company_favicon" class="oe_inline">
-                                <field name="company_favicon"
-                                       widget="image"
-                                       class="oe_avatar"
-                                       options="{'preview_image': 'image_small', 'size': [30, 30]}"/>
+                            <div id="company_website" class="oe_inline">
+                                <field name="company_website"/>
                             </div>
                         </div>
-                    <label for="company_name" string="Company Name"/>
-                    <div>
-                        <div id="company_name" class="oe_inline">
-                            <field name="company_name"/>
-                        </div>
-                    </div>
-                    <label for="company_website" string="Company Website"/>
-                    <div>
-                        <div id="company_website" class="oe_inline">
-                            <field name="company_website"/>
-                        </div>
-                    </div>
-                </group>
-        </xpath>
+                    </group>
+            </xpath>
         </field>
-      </record>
+    </record>
 
     <template id="login_layout" inherit_id="web.login_layout">
-       <xpath expr="//div[@class='text-center']" position="replace">
+        <xpath expr="//div[@class='text-center']" position="replace">
            <div class="text-center" t-if="not disable_footer">
-            <t t-if="not disable_database_manager">
-                <a class="" href="/web/database/manager">Manage Databases</a> |
-            </t>
-            <a t-att-href="request.env['website'].sudo().search([])[0].company_name or ''" target="_blank">
-           <span t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/></a>
-        </div>
-
-       </xpath>
+                <t t-if="not disable_database_manager">
+                    <a class="" href="/web/database/manager">Manage Databases</a> |
+                </t>
+                <a t-att-href="request.env['website'].sudo().search([])[0].company_name or ''" target="_blank">
+                <span t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/></a>
+           </div>
+        </xpath>
     </template>
+
     <template id="login_layout_secondary" inherit_id="web.menu_secondary">
-       <xpath expr="//div[@class='o_sub_menu_footer']" position="replace">
-       <div class="o_sub_menu_footer">
-            Powered by <a t-att-href="request.env['website'].sudo().search([])[0].company_website or ''" target="_blank">
-           <span t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/></a>
-        </div>
-       </xpath>
+        <xpath expr="//div[@class='o_sub_menu_footer']" position="replace">
+            <div class="o_sub_menu_footer">
+                Powered by <a t-att-href="request.env['website'].sudo().search([])[0].company_website or ''" target="_blank">
+               <span t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/></a>
+            </div>
+        </xpath>
     </template>
+
     <template id="login_layout_im_livechat" inherit_id="im_livechat.support_page">
-       <xpath expr="//body" position="replace">
-         <body>
-             <div class="main" style="opacity: 1;">
-                <h1 class="channel_name"><t t-esc="channel.name"/></h1>
-                <div>Website Live Chat Powered by <strong><t t-esc="request.env['website'].sudo().search([])[0].company_name or '"/></strong></div>
-            </div>
-         </body>
-       </xpath>
+        <xpath expr="//body" position="replace">
+            <body>
+                <div class="main" style="opacity: 1;">
+                    <h1 class="channel_name"><t t-esc="channel.name"/></h1>
+                    <div>Website Live Chat Powered by <strong><t t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/></strong></div>
+                </div>
+            </body>
+        </xpath>
     </template>
+
     <template id="login_layout" inherit_id="mail.message_user_assigned">
         <xpath expr="//p[last()]" position="replace">
             <p style="color:#9E588B;">Powered by <a t-att-href="request.env['website'].sudo().search([])[0].company_website or ''">
                 <t t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/></a>.</p>
         </xpath>
     </template>
-    <template id="website.layout_footer_copyright" inherit_id="website.layout" name="Footer Copyright">
-      <xpath expr="//footer" position="inside">
-          <div class="container mt16 mb8">
-              <div class="pull-right" t-if="not editable">
-                Powered by <a class="label label-danger" t-att-href="request.env['website'].sudo().search([])[0].company_website">
-                  <t t-esc="request.env['website'].sudo().search([])[0].company_name"/> </a>.
-              </div>
-              <div class="pull-left text-muted">
-                  Copyright &amp;copy; <span t-esc="request.env['website'].sudo().search([])[0].company_name"/>
+
+    <template id="layout_footer_copyright" inherit_id="website.layout" name="Footer Copyright">
+        <xpath expr="//footer" position="inside">
+              <div class="container mt16 mb8">
+                  <div class="pull-right" t-if="not editable">
+                    Powered by <a class="label label-danger" t-att-href="request.env['website'].sudo().search([])[0].company_website or ''">
+                      <t t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/> </a>.
+                  </div>
+                  <div class="pull-left text-muted">
+                      Copyright &amp;copy; <span t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/>
+                  </div>
               </div>
-          </div>
-      </xpath>
+        </xpath>
     </template>
+
     <template id="footer_extend" inherit_id="website.footer_custom">
         <xpath position="replace" expr="//h2"/>
     </template>
@@ -133,8 +136,8 @@
                             <a class="" href="/web/database/manager">Manage Databases</a> |
                         </t>
                         <t>
-                            <a t-att-href="request.env['website'].sudo().search([])[0].company_website" target="_blank">Powered by
-                                <span t-esc="request.env['website'].sudo().search([])[0].company_name"/></a>
+                            <a t-att-href="request.env['website'].sudo().search([])[0].company_website or ''" target="_blank">Powered by
+                                <span t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/></a>
                         </t>
 
                     </div>
@@ -142,5 +145,4 @@
             </div>
         </xpath>
     </template>
-  </data>
-</openerp>
\ No newline at end of file
+</odoo>
\ No newline at end of file