diff --git a/addons/theme_bootswatch/views/theme.xml b/addons/theme_bootswatch/views/theme.xml
index f4fe365845e..27fa4fe8b6d 100644
--- a/addons/theme_bootswatch/views/theme.xml
+++ b/addons/theme_bootswatch/views/theme.xml
@@ -25,13 +25,13 @@
                   <td>
                     <label>
                       <img style="width: 120px; height: 70px;" src="/theme_bootswatch/static/src/less/amelia/thumbnail.png" alt="Amelia"/>
-                      <input name="theme" type="radio" data-xmlid="website.theme_amelia"/>
+                      <input name="theme" type="radio" data-xmlid="theme_bootswatch.theme_amelia"/>
                     </label>
                   </td>
                   <td>
                     <label>
                       <img style="width: 120px; height: 70px;" src="/theme_bootswatch/static/src/less/cerulean/thumbnail.png" alt="Cerulean"/>
-                      <input name="theme" type="radio" data-xmlid="website.theme_cerulean"/>
+                      <input name="theme" type="radio" data-xmlid="theme_bootswatch.theme_cerulean"/>
                     </label>
                   </td>
                 </tr>
@@ -39,19 +39,19 @@
                   <td>
                     <label>
                       <img style="width: 120px; height: 70px;" src="/theme_bootswatch/static/src/less/cosmo/thumbnail.png" alt="Cosmo"/>
-                      <input name="theme" type="radio" data-xmlid="website.theme_cosmo" data-disable="ee"/>
+                      <input name="theme" type="radio" data-xmlid="theme_bootswatch.theme_cosmo" data-disable="ee"/>
                     </label>
                   </td>
                   <td>
                     <label>
                       <img style="width: 120px; height: 70px;" src="/theme_bootswatch/static/src/less/cyborg/thumbnail.png" alt="Cyborg"/>
-                      <input name="theme" type="radio" data-xmlid="website.theme_cyborg"/>
+                      <input name="theme" type="radio" data-xmlid="theme_bootswatch.theme_cyborg"/>
                     </label>
                   </td>
                   <td>
                     <label>
                       <img style="width: 120px; height: 70px;" src="/theme_bootswatch/static/src/less/flatly/thumbnail.png" alt="Flatly"/>
-                      <input name="theme" type="radio" data-xmlid="website.theme_flatly"/>
+                      <input name="theme" type="radio" data-xmlid="theme_bootswatch.theme_flatly"/>
                     </label>
                   </td>
                 </tr>
@@ -59,19 +59,19 @@
                   <td>
                     <label>
                       <img style="width: 120px; height: 70px;" src="/theme_bootswatch/static/src/less/journal/thumbnail.png" alt="Journal"/>
-                      <input name="theme" type="radio" data-xmlid="website.theme_journal"/>
+                      <input name="theme" type="radio" data-xmlid="theme_bootswatch.theme_journal"/>
                     </label>
                   </td>
                   <td>
                     <label>
                       <img style="width: 120px; height: 70px;" src="/theme_bootswatch/static/src/less/readable/thumbnail.png" alt="Readable"/>
-                      <input name="theme" type="radio" data-xmlid="website.theme_readable"/>
+                      <input name="theme" type="radio" data-xmlid="theme_bootswatch.theme_readable"/>
                     </label>
                   </td>
                   <td>
                     <label>
                       <img style="width: 120px; height: 70px;" src="/theme_bootswatch/static/src/less/simplex/thumbnail.png" alt="Simplex"/>
-                      <input name="theme" type="radio" data-xmlid="website.theme_simplex"/>
+                      <input name="theme" type="radio" data-xmlid="theme_bootswatch.theme_simplex"/>
                     </label>
                   </td>
                 </tr>
@@ -79,19 +79,19 @@
                   <td>
                     <label>
                       <img style="width: 120px; height: 70px;" src="/theme_bootswatch/static/src/less/slate/thumbnail.png" alt="Slate"/>
-                      <input name="theme" type="radio" data-xmlid="website.theme_slate"/>
+                      <input name="theme" type="radio" data-xmlid="theme_bootswatch.theme_slate"/>
                     </label>
                   </td>
                   <td>
                     <label>
                       <img style="width: 120px; height: 70px;" src="/theme_bootswatch/static/src/less/spacelab/thumbnail.png" alt="Spacelab"/>
-                      <input name="theme" type="radio" data-xmlid="website.theme_spacelab"/>
+                      <input name="theme" type="radio" data-xmlid="theme_bootswatch.theme_spacelab"/>
                     </label>
                   </td>
                   <td>
                     <label>
                       <img style="width: 120px; height: 70px;" src="/theme_bootswatch/static/src/less/united/thumbnail.png" alt="United"/>
-                      <input name="theme" type="radio" data-xmlid="website.theme_united"/>
+                      <input name="theme" type="radio" data-xmlid="theme_bootswatch.theme_united"/>
                     </label>
                   </td>
                 </tr>
@@ -116,7 +116,7 @@
      All Default Themes
 -->
 
-    <template id="website.theme_amelia" name="Amelia" inherit_id="website.theme" active="False" customize_show="False">
+    <template id="theme_bootswatch.theme_amelia" name="Amelia" inherit_id="website.theme" active="False" customize_show="False">
         <xpath expr="//link[last()]" position="after">
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/amelia/bootswatch.less' t-ignore="true"/>
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/amelia/variables.less' t-ignore="true"/>
@@ -124,14 +124,14 @@
         </xpath>
     </template>
 
-    <template id="website.theme_cerulean" name="Cerulean" inherit_id="website.theme" active="False" customize_show="False">
+    <template id="theme_bootswatch.theme_cerulean" name="Cerulean" inherit_id="website.theme" active="False" customize_show="False">
         <xpath expr="//link[last()]" position="after">
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/cerulean/bootswatch.less' t-ignore="true"/>
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/cerulean/variables.less' t-ignore="true"/>
         </xpath>
     </template>
 
-    <template id="website.theme_cosmo" name="Cosmo" inherit_id="website.theme" active="False" customize_show="False">
+    <template id="theme_bootswatch.theme_cosmo" name="Cosmo" inherit_id="website.theme" active="False" customize_show="False">
         <xpath expr="//link[last()]" position="after">
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/cosmo/bootswatch.less' t-ignore="true"/>
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/cosmo/variables.less' t-ignore="true"/>
@@ -139,7 +139,7 @@
         </xpath>
     </template>
 
-    <template id="website.theme_cyborg" name="Cyborg" inherit_id="website.theme" active="False" customize_show="False">
+    <template id="theme_bootswatch.theme_cyborg" name="Cyborg" inherit_id="website.theme" active="False" customize_show="False">
         <xpath expr="//link[last()]" position="after">
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/cyborg/bootswatch.less' t-ignore="true"/>
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/cyborg/variables.less' t-ignore="true"/>
@@ -147,7 +147,7 @@
         </xpath>
     </template>
 
-    <template id="website.theme_flatly" name="Flatly" inherit_id="website.theme" active="False" customize_show="False">
+    <template id="theme_bootswatch.theme_flatly" name="Flatly" inherit_id="website.theme" active="False" customize_show="False">
         <xpath expr="//link[last()]" position="after">
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/flatly/bootswatch.less' t-ignore="true"/>
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/flatly/variables.less' t-ignore="true"/>
@@ -155,7 +155,7 @@
         </xpath>
     </template>
 
-    <template id="website.theme_journal" name="Journal" inherit_id="website.theme" active="False" customize_show="False">
+    <template id="theme_bootswatch.theme_journal" name="Journal" inherit_id="website.theme" active="False" customize_show="False">
         <xpath expr="//link[last()]" position="after">
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/journal/bootswatch.less' t-ignore="true"/>
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/journal/variables.less' t-ignore="true"/>
@@ -163,7 +163,7 @@
         </xpath>
     </template>
 
-    <template id="website.theme_readable" name="Readable" inherit_id="website.theme" active="False" customize_show="False">
+    <template id="theme_bootswatch.theme_readable" name="Readable" inherit_id="website.theme" active="False" customize_show="False">
         <xpath expr="//link[last()]" position="after">
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/readable/bootswatch.less' t-ignore="true"/>
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/readable/variables.less' t-ignore="true"/>
@@ -171,7 +171,7 @@
         </xpath>
     </template>
 
-    <template id="website.theme_simplex" name="Simplex" inherit_id="website.theme" active="False" customize_show="False">
+    <template id="theme_bootswatch.theme_simplex" name="Simplex" inherit_id="website.theme" active="False" customize_show="False">
         <xpath expr="//link[last()]" position="after">
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/simplex/bootswatch.less' t-ignore="true"/>
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/simplex/variables.less' t-ignore="true"/>
@@ -179,7 +179,7 @@
         </xpath>
     </template>
 
-    <template id="website.theme_slate" name="Slate" inherit_id="website.theme" active="False" customize_show="False">
+    <template id="theme_bootswatch.theme_slate" name="Slate" inherit_id="website.theme" active="False" customize_show="False">
         <xpath expr="//link[last()]" position="after">
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/slate/bootswatch.less' t-ignore="true"/>
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/slate/variables.less' t-ignore="true"/>
@@ -187,7 +187,7 @@
         </xpath>
     </template>
 
-    <template id="website.theme_spacelab" name="Spacelab" inherit_id="website.theme" active="False" customize_show="False">
+    <template id="theme_bootswatch.theme_spacelab" name="Spacelab" inherit_id="website.theme" active="False" customize_show="False">
         <xpath expr="//link[last()]" position="after">
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/spacelab/bootswatch.less' t-ignore="true"/>
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/spacelab/variables.less' t-ignore="true"/>
@@ -195,7 +195,7 @@
         </xpath>
     </template>
 
-    <template id="website.theme_united" name="United" inherit_id="website.theme" active="False" customize_show="False">
+    <template id="theme_bootswatch.theme_united" name="United" inherit_id="website.theme" active="False" customize_show="False">
         <xpath expr="//link[last()]" position="after">
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/united/bootswatch.less' t-ignore="true"/>
             <link rel="stylesheet" type="text/less" href='/theme_bootswatch/static/src/less/united/variables.less' t-ignore="true"/>