diff --git a/addons/theme_bootswatch/views/theme.xml b/addons/theme_bootswatch/views/theme.xml
index 28aad9e7c5b..2cb5fda3612 100644
--- a/addons/theme_bootswatch/views/theme.xml
+++ b/addons/theme_bootswatch/views/theme.xml
@@ -2,6 +2,14 @@
 <openerp>
 <data>
 
+<!--
+     Apply Bootstrap less files
+-->
+
+    <record id="website.option_bootstrap_less" model="ir.ui.view">
+        <field name="application">always</field>
+    </record>
+
 <!--
      All Default Themes
 -->
diff --git a/addons/web/static/src/js/tour.js b/addons/web/static/src/js/tour.js
index 0a8ffe7d7ee..0179d3eda65 100644
--- a/addons/web/static/src/js/tour.js
+++ b/addons/web/static/src/js/tour.js
@@ -337,7 +337,7 @@ var Tour = {
             + (all ? '\nreferrer: ' + document.referrer : '' )
             + (step ? '\nelement: ' + Boolean(!step.element || ($(step.element).size() && $(step.element).is(":visible") && !$(step.element).is(":hidden"))) : '' )
             + (step ? '\nwaitNot: ' + Boolean(!step.waitNot || !$(step.waitNot).size()) : '' )
-            + (step ? '\nwaitFor: ' + Boolean(!step.waitFor || $(step.waitFor).size()) : '' );
+            + (step ? '\nwaitFor: ' + Boolean(!step.waitFor || $(step.waitFor).size()) : '' )
             + (all ? "\nlocalStorage: " + JSON.stringify(localStorage) : '' )
             + (all ? '\n\n' + $("body").html() : '' );
         Tour.log(message, true);
diff --git a/addons/website/static/src/js/website.theme.js b/addons/website/static/src/js/website.theme.js
index af23b6e3dc5..61655ea3e7b 100644
--- a/addons/website/static/src/js/website.theme.js
+++ b/addons/website/static/src/js/website.theme.js
@@ -244,14 +244,15 @@
 
     openerp.website.ready().done(function() {
         function theme_customize() {
-            var error = window.getComputedStyle(document.body, ':before').getPropertyValue('content');
-            if (error && error !== 'none') {
-                return themeError(eval(error));
-            }
             var Theme = openerp.website.Theme;
             if (Theme.open && !Theme.open.isDestroyed()) return;
             Theme.open = new Theme();
             Theme.open.appendTo("body");
+            
+            var error = window.getComputedStyle(document.body, ':before').getPropertyValue('content');
+            if (error && error !== 'none') {
+                themeError(eval(error));
+            }
         }
         $(document).on('click', "#theme_customize a",theme_customize);
         if ((window.location.hash || "").indexOf("theme=true") !== -1) {
diff --git a/addons/website/static/src/xml/website.theme.xml b/addons/website/static/src/xml/website.theme.xml
index 4a5f66267b6..16f4961d367 100644
--- a/addons/website/static/src/xml/website.theme.xml
+++ b/addons/website/static/src/xml/website.theme.xml
@@ -32,6 +32,8 @@
   <div id="theme_customize_modal" class="modal fade">
       <div class="modal-dialog">
           <div class="modal-content">
+              <input id="less" data-xmlid="website.option_bootstrap_less" style="display: none;"/>
+
               <div class="loading_backdrop"></div>
               <div class="modal-header">
                   <button type="button" class="close">×</button>
@@ -44,13 +46,13 @@
                           <td class=" text-center" width="50%">
                               <label class=" center-block">
                                   <div class="text-center" style="background-image: url(/website/static/src/img/theme/layout-full.gif); background-size: 100%; line-height: 40px;">FULL WIDTH</div>
-                                  <input name="layoutvar" type="radio" data-xmlid="" />
+                                  <input name="layoutvar" type="radio" data-xmlid=""/>
                               </label>                                 
                           </td>
                           <td class=" text-center">
                               <label class=" center-block">
                                  <div class="text-center" style="background-image: url(/website/static/src/img/theme/layout-boxed.gif); background-size: 100%; line-height: 40px;">BOXED</div>
-                                  <input name="layoutvar" type="radio" data-xmlid="website.option_layout_boxed"/>
+                                  <input name="layoutvar" type="radio" data-xmlid="website.option_layout_boxed" data-enable="less"/>
                               </label>
                           </td>
                       </tr>
@@ -62,37 +64,37 @@
                           <td>
                               <label class="chd-color-combi">
                                   <img src="/website/static/src/img/theme/variant-stone.gif" alt="Stone" class="chd-color-combi-img"/>
-                                  <input name="colorvar" type="radio" data-xmlid="" />
+                                  <input name="colorvar" type="radio" data-xmlid="" data-disable="less"/>
                               </label>
                           </td>
                           <td>
                               <label class="chd-color-combi">
                                   <img src="/website/static/src/img/theme/variant-emerald.gif" alt="Emerald" class="chd-color-combi-img"/>
-                                  <input name="colorvar" type="radio" data-xmlid="website.option_color_emerald" />
+                                  <input name="colorvar" type="radio" data-xmlid="website.option_color_emerald" data-enable="less"/>
                               </label>
                           </td>
                           <td>
                               <label class="chd-color-combi">
                                   <img src="/website/static/src/img/theme/variant-cobalt.gif" alt="Cobalt" class="chd-color-combi-img"/>
-                                  <input name="colorvar" type="radio" data-xmlid="website.option_color_cobalt" />
+                                  <input name="colorvar" type="radio" data-xmlid="website.option_color_cobalt" data-enable="less"/>
                               </label>
                           </td>
                           <td>
                               <label class="chd-color-combi">
                                   <img src="/website/static/src/img/theme/variant-amethyst.gif" alt="Amethyst" class="chd-color-combi-img"/>
-                                  <input name="colorvar" type="radio" data-xmlid="website.option_color_amethyst" />
+                                  <input name="colorvar" type="radio" data-xmlid="website.option_color_amethyst" data-enable="less"/>
                               </label>
                           </td>
                           <td>
                               <label class="chd-color-combi">
                                   <img src="/website/static/src/img/theme/variant-ruby.gif" alt="Blue" class="chd-color-combi-img"/>
-                                  <input name="colorvar" type="radio" data-xmlid="website.option_color_ruby" />
+                                  <input name="colorvar" type="radio" data-xmlid="website.option_color_ruby" data-enable="less"/>
                               </label>
                           </td>
                           <td>
                               <label class="chd-color-combi">
                                   <img src="/website/static/src/img/theme/variant-gold.gif" alt="Gold" class="chd-color-combi-img"/>
-                                  <input name="colorvar" type="radio" data-xmlid="website.option_color_gold" />
+                                  <input name="colorvar" type="radio" data-xmlid="website.option_color_gold" data-enable="less"/>
                               </label>
                           </td>
                       </tr>
@@ -115,7 +117,7 @@
                                   <div>
                                       <span style="font-family:Georgia, 'Times New Roman', Times, serif; font-size:11px" >Georgia</span>
                                       <span style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif; font-size:11px">/ Helvetica</span>
-                                    <input name="theme" type="radio" data-xmlid="website.option_font"/>
+                                    <input name="theme" type="radio" data-xmlid="website.option_font" data-enable="less"/>
                                   </div>
                               </label>
                           </td>
diff --git a/addons/website/views/themes.xml b/addons/website/views/themes.xml
index 397315585bc..e5309519ea2 100644
--- a/addons/website/views/themes.xml
+++ b/addons/website/views/themes.xml
@@ -6,17 +6,20 @@
      Theme
 -->
 
-    <template id="website.theme" name="Theme">
-        <!-- Boostrap Fallback if server can't compute less files -->
-        <link id="bootstrap_css" rel='stylesheet' href='/web/static/lib/bootstrap/css/bootstrap.css'/>
+<template id="website.theme" name="Theme">
+    <link rel="stylesheet" href='/website/static/src/css/website.css'/>
+    <!-- Boostrap Fallback if server can't compute less files -->
+    <link id="bootstrap_css" rel='stylesheet' href='/web/static/lib/bootstrap/css/bootstrap.css'/>
+</template>
 
-        <link rel="stylesheet" href='/website/static/src/css/website.css'/>
+<!-- Bootstrap Less File layout -->
 
-        <!-- Boostrap -->
+<template id="option_bootstrap_less" name="option_bootstrap_less" inherit_id="website.theme" optional="disabled">
+    <xpath expr="//link[@id='bootstrap_css']" position="replace">
         <link rel="stylesheet" href='/website/static/src/less/import_bootstrap.less'/>
-
-        <link rel="stylesheet" href='/website/static/src/less/colors.less'/>
-    </template>
+        <link rel="stylesheet" href='/website/static/src/less/colors.less' t-ignore="true"/>
+    </xpath>
+</template>
 
 <!-- Option layout -->