diff --git a/product_configurator/data/menu_configurable_product.xml b/product_configurator/data/menu_configurable_product.xml
index 63e21736c..3823aa8ca 100644
--- a/product_configurator/data/menu_configurable_product.xml
+++ b/product_configurator/data/menu_configurable_product.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <menuitem
         id="menu_product_configurable"
         name="Configurator"
@@ -45,7 +44,8 @@
         <field name="res_model">product.product</field>
         <field name="view_mode">kanban,form,tree</field>
         <field name="search_view_id" ref="product.product_search_form_view" />
-        <field name="view_id" eval="False" /> <!-- Force empty -->
+        <field name="view_id" eval="False" />
+        <!-- Force empty -->
         <field
             name="context"
         >{'default_config_ok': True, 'custom_create_variant': True, 'search_default_filter_config_ok': 1}</field>
@@ -128,5 +128,4 @@
         parent="menu_product_configurable_settings"
         sequence="50"
     />
-
 </odoo>
diff --git a/product_configurator/data/product_attribute.xml b/product_configurator/data/product_attribute.xml
index 5b7df2a41..1662d5b12 100644
--- a/product_configurator/data/product_attribute.xml
+++ b/product_configurator/data/product_attribute.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
-
     <record id="custom_attribute" model="product.attribute">
         <field name="name">Custom</field>
         <field name="active" eval="False" />
@@ -11,5 +10,4 @@
         <field name="attribute_id" ref="custom_attribute" />
         <field name="active" eval="True" />
     </record>
-
 </odoo>
diff --git a/product_configurator/demo/config_image_ids.xml b/product_configurator/demo/config_image_ids.xml
index 47d6d2f0b..0662f4323 100644
--- a/product_configurator/demo/config_image_ids.xml
+++ b/product_configurator/demo/config_image_ids.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <!-- Image Lines -->
 
     <record id="config_image_1" model="product.config.image">
@@ -152,5 +151,4 @@
         ])]"
         />
     </record>
-
 </odoo>
diff --git a/product_configurator/demo/product_attribute.xml b/product_configurator/demo/product_attribute.xml
index ded2454eb..001528376 100644
--- a/product_configurator/demo/product_attribute.xml
+++ b/product_configurator/demo/product_attribute.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <!-- == FUEL == -->
 
     <record id="product_attribute_fuel" model="product.attribute">
@@ -253,7 +252,6 @@
         <field name="product_id" ref="product_2_series_towhook" />
     </record>
 
-
     <!-- == Attribute Lines == -->
 
     <record
@@ -404,5 +402,4 @@
         <field name="required" eval="True" />
         <field name="multi" eval="True" />
     </record>
-
 </odoo>
diff --git a/product_configurator/demo/product_config_domain.xml b/product_configurator/demo/product_config_domain.xml
index e57d75f2a..a79602fe0 100644
--- a/product_configurator/demo/product_config_domain.xml
+++ b/product_configurator/demo/product_config_domain.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <!-- Configuration Domain and domain Lines -->
 
     <!-- Gasoline Engines -->
@@ -39,7 +38,6 @@
         />
     </record>
 
-
     <!-- Model Lines -->
 
     <record id="product_config_domain_218_engine" model="product.config.domain">
@@ -58,9 +56,6 @@
         />
     </record>
 
-
-
-
     <record id="product_config_domain_luxury_lines" model="product.config.domain">
         <field name="name">Luxury Lines</field>
     </record>
@@ -80,5 +75,4 @@
             ref('product_attribute_value_220d_xdrive')])]"
         />
     </record>
-
 </odoo>
diff --git a/product_configurator/demo/product_config_lines.xml b/product_configurator/demo/product_config_lines.xml
index 616bb7225..44f32e8f7 100644
--- a/product_configurator/demo/product_config_lines.xml
+++ b/product_configurator/demo/product_config_lines.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <!-- Configuration Restriction Lines -->
 
     <record id="product_config_line_gasoline_engines" model="product.config.line">
@@ -63,5 +62,4 @@
         />
         <field name="domain_id" ref="product_config_domain_luxury_lines" />
     </record>
-
 </odoo>
diff --git a/product_configurator/demo/product_config_step.xml b/product_configurator/demo/product_config_step.xml
index 797b7ebdc..7b383dbbe 100644
--- a/product_configurator/demo/product_config_step.xml
+++ b/product_configurator/demo/product_config_step.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <!-- Configuration Steps -->
 
     <record id="config_step_engine" model="product.config.step">
@@ -56,7 +55,7 @@
         />
     </record>
 
-   <record id="2_series_config_step_engine" model="product.config.step.line">
+    <record id="2_series_config_step_engine" model="product.config.step.line">
         <field name="product_tmpl_id" ref="bmw_2_series" />
         <field name="config_step_id" ref="config_step_engine" />
         <field
@@ -67,7 +66,7 @@
         />
     </record>
 
-   <record id="2_series_config_step_extras" model="product.config.step.line">
+    <record id="2_series_config_step_extras" model="product.config.step.line">
         <field name="product_tmpl_id" ref="bmw_2_series" />
         <field name="config_step_id" ref="config_step_extras" />
         <field
@@ -77,5 +76,4 @@
             ref('product_attribute_line_2_series_options')])]"
         />
     </record>
-
 </odoo>
diff --git a/product_configurator/demo/product_template.xml b/product_configurator/demo/product_template.xml
index e97284215..bf783b594 100644
--- a/product_configurator/demo/product_template.xml
+++ b/product_configurator/demo/product_template.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <!-- Product Category -->
 
     <record id="product_category_bmw" model="product.category">
@@ -266,5 +265,4 @@
             file="product_configurator/static/img/product-paint-silver.jpg"
         />
     </record>
-
 </odoo>
diff --git a/product_configurator/security/configurator_security.xml b/product_configurator/security/configurator_security.xml
index 8d7f835f0..b84348f58 100644
--- a/product_configurator/security/configurator_security.xml
+++ b/product_configurator/security/configurator_security.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="product_config_category" model="ir.module.category">
         <field name="name">Product Configurator</field>
     </record>
@@ -34,5 +33,4 @@
             name="groups_id"
         />
     </record>
-
 </odoo>
diff --git a/product_configurator/views/product_attribute_view.xml b/product_configurator/views/product_attribute_view.xml
index 5bd466c7a..99c7a1b54 100644
--- a/product_configurator/views/product_attribute_view.xml
+++ b/product_configurator/views/product_attribute_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <!-- Product Attributes -->
 
     <record id="product_attribute_tree_view" model="ir.ui.view">
@@ -59,7 +58,6 @@
                     invisible="not context.get('flag_config_ok') or not val_custom"
                     groups="product_configurator.group_product_configurator_manager"
                 >
-
                     <group>
                         <group>
                             <field name="custom_type" />
@@ -168,8 +166,11 @@
                     <div class="oe_left" style="width: 500px;">
                         <div class="oe_title" style="width: 390px;">
                             <label class="oe_edit_only" for="name" string="Value" />
-                            <h1><field name="name" class="oe_inline" /></h1>
-                            <label for="active" /><field name="active" />
+                            <h1>
+                                <field name="name" class="oe_inline" />
+                            </h1>
+                            <label for="active" />
+                            <field name="active" />
                         </div>
                     </div>
                     <group>
@@ -213,5 +214,4 @@
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/product_configurator/views/product_config_view.xml b/product_configurator/views/product_config_view.xml
index 80c3dc2fa..eee41f1a8 100644
--- a/product_configurator/views/product_config_view.xml
+++ b/product_configurator/views/product_config_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <!-- Configuration Steps -->
 
     <record id="config_step_form_view" model="ir.ui.view">
@@ -155,7 +154,9 @@
                 </header>
                 <sheet>
                     <group>
-                        <h1><field name="name" nolabel="1" /></h1>
+                        <h1>
+                            <field name="name" nolabel="1" />
+                        </h1>
                     </group>
                     <group>
                         <field name="product_tmpl_id" />
@@ -188,5 +189,4 @@
             </form>
         </field>
     </record>
-
 </odoo>
diff --git a/product_configurator/views/product_view.xml b/product_configurator/views/product_view.xml
index 26925f522..ef35cf6be 100644
--- a/product_configurator/views/product_view.xml
+++ b/product_configurator/views/product_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="product_template_form_view_config_inherited" model="ir.ui.view">
         <field name="name">product.template.common.form</field>
         <field name="model">product.template</field>
@@ -123,30 +122,30 @@
                     invisible="not config_ok"
                     groups="product_configurator.group_product_configurator"
                 >
-                <separator
+                    <separator
                         colspan="4"
                         string="Configuration Restrictions"
                         name="configurator_restrictions"
                     />
-                <field
+                    <field
                         name="config_line_ids"
                         readonly="not attribute_line_ids"
                         context="{'show_attribute': False}"
                     >
-                    <tree editable="bottom">
-                        <field name="sequence" widget="handle" />
-                        <field
+                        <tree editable="bottom">
+                            <field name="sequence" widget="handle" />
+                            <field
                                 name="attribute_line_id"
                                 domain="[('product_tmpl_id','=',parent.id)]"
                                 options="{'no_create': True, 'no_create_edit': True}"
                             />
-                        <!-- # TODO: Find a more elegant way to restrict the value_ids -->
-                        <field
+                            <!-- # TODO: Find a more elegant way to restrict the value_ids -->
+                            <field
                                 name="attr_line_val_ids"
                                 widget="many2many_tags"
                                 column_invisible="1"
                             />
-                        <field
+                            <field
                                 name="value_ids"
                                 widget="many2many_tags"
                                 readonly="not attribute_line_id"
@@ -154,68 +153,70 @@
                                 options="{'no_create': True, 'no_create_edit': True}"
                                 context="{'show_attribute': False}"
                             />
-                        <field
+                            <field
                                 name="domain_id"
                                 context="{'product_tmpl_id': product_tmpl_id or id or parent.id, 'product_attribute_ids': template_attribute_ids, 'form_view_ref': 'product_configurator.product_config_domain_form_view_template'}"
                             />
-                        <field name="product_tmpl_id" column_invisible="1" />
-                        <field name="template_attribute_ids" column_invisible="1" />
-
-                    </tree>
-                </field>
-                <separator
+                            <field name="product_tmpl_id" column_invisible="1" />
+                            <field name="template_attribute_ids" column_invisible="1" />
+                        </tree>
+                    </field>
+                    <separator
                         colspan="4"
                         string="Configuration Steps"
                         name="configurator_steps"
                     />
-                <field name="config_step_line_ids" readonly="not attribute_line_ids">
-                    <tree editable="bottom">
-                        <field name="sequence" widget="handle" />
-                        <field name="config_step_id" />
-                        <field
+                    <field
+                        name="config_step_line_ids"
+                        readonly="not attribute_line_ids"
+                    >
+                        <tree editable="bottom">
+                            <field name="sequence" widget="handle" />
+                            <field name="config_step_id" />
+                            <field
                                 name="attribute_line_ids"
                                 required="1"
                                 domain="[('product_tmpl_id', '=', parent.id)]"
                                 options="{'no_create': True, 'no_create_edit': True}"
                                 widget="many2many_tags"
                             />
-                    </tree>
-                </field>
-                <separator
+                        </tree>
+                    </field>
+                    <separator
                         colspan="4"
                         string="Configuration Images"
                         name="configurator_images"
                     />
-                <field name="config_image_ids">
-                    <tree editable="bottom">
-                        <field name="sequence" widget="handle" />
-                        <field name="name" />
-                        <field
+                    <field name="config_image_ids">
+                        <tree editable="bottom">
+                            <field name="sequence" widget="handle" />
+                            <field name="name" />
+                            <field
                                 name="value_ids"
                                 widget="many2many_tags"
                                 context="{'_cfg_product_tmpl_id': parent.id}"
                             />
-                        <field
+                            <field
                                 name="image_1920"
                                 widget="image"
                                 class="oe_prod_config_image"
                             />
-                    </tree>
-                </field>
-                <field name="attribute_line_val_ids" invisible="1" />
-                <field name="attribute_value_line_ids" invisible="1">
-                    <tree
+                        </tree>
+                    </field>
+                    <field name="attribute_line_val_ids" invisible="1" />
+                    <field name="attribute_value_line_ids" invisible="1">
+                        <tree
                             editable="bottom"
                             context="{'default_product_tmpl_id': self.id}"
                         >
-                        <field name="product_tmpl_id" invisible="1" />
-                        <field name="attribute_id" invisible="1" />
-                        <field name="sequence" widget="handle" />
-                        <field
+                            <field name="product_tmpl_id" invisible="1" />
+                            <field name="attribute_id" invisible="1" />
+                            <field name="sequence" widget="handle" />
+                            <field
                                 name="value_id"
                                 domain="[('id', 'in', parent.attribute_line_val_ids)]"
                             />
-                        <field
+                            <field
                                 name="value_ids"
                                 domain="[
                                 ('id', 'in', parent.attribute_line_val_ids),
@@ -223,9 +224,9 @@
                                ]"
                                 widget="many2many_tags"
                             />
-                    </tree>
-                </field>
-                <separator
+                        </tree>
+                    </field>
+                    <separator
                         string="Variant Name"
                         colspan="4"
                         groups="product_configurator.group_product_configurator_manager"
@@ -240,7 +241,6 @@
             <xpath expr="//field[@name='default_code']" position="attributes">
                 <attribute name="invisible">config_ok</attribute>
             </xpath>
-
         </field>
     </record>
 
@@ -359,11 +359,9 @@
                         name="reconfigure_product"
                         type="object"
                         class="fa fa-repeat fa-lg"
-                    >
-                    </a>
+                    />
                 </div>
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/product_configurator/views/res_config_settings_view.xml b/product_configurator/views/res_config_settings_view.xml
index 6db15af57..3bac35466 100644
--- a/product_configurator/views/res_config_settings_view.xml
+++ b/product_configurator/views/res_config_settings_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-
     <record id="configurator_settings_view_form" model="ir.ui.view">
         <field name="name">res.config.settings.view.form.inherit.sale</field>
         <field name="model">res.config.settings</field>
@@ -21,5 +20,4 @@
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/product_configurator/wizard/product_configurator_view.xml b/product_configurator/wizard/product_configurator_view.xml
index 485bd2286..cae08cbf7 100644
--- a/product_configurator/wizard/product_configurator_view.xml
+++ b/product_configurator/wizard/product_configurator_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="product_configurator_form" model="ir.ui.view">
         <field name="name">product.configurator</field>
         <field name="model">product.configurator</field>
@@ -93,5 +92,4 @@
             </form>
         </field>
     </record>
-
 </odoo>
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 000000000..294bcaef5
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,2 @@
+# generated from manifests external_dependencies
+mako