diff --git a/addons/mass_mailing/views/snippets_themes.xml b/addons/mass_mailing/views/snippets_themes.xml
index 2bce3bb239b..c718d5d2955 100644
--- a/addons/mass_mailing/views/snippets_themes.xml
+++ b/addons/mass_mailing/views/snippets_themes.xml
@@ -1,512 +1,510 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-<template id="email_designer_snippets">
-<ul>
-    <li class="active">
-        <a href="#email_designer_default_headers" class="scroll-link">
-            <span class="fa-stack fa-lg">
-                <i class="fa fa-square fa-stack-2x fa-inverse"></i>
-                <i class="fa fa-align-justify fa-stack-1x" style="margin-top: -0.15em; height: 0.9em; display: inline-block; overflow: hidden;"></i>
-                <i class="fa fa-arrow-up fa-stack-1x text-muted" style="margin-top: 0.25em; display: inline-block; font-size: 0.6em;"></i>
-            </span>
-        </a>
-    </li>
-    <li>
-        <a href="#email_designer_default_body" class="scroll-link">
-            <span class="fa-stack fa-lg">
-                <i class="fa fa-square fa-stack-2x fa-inverse"></i>
-                <i class="fa fa-align-left fa-stack-1x" style="margin-top: 0.05em;"></i>
-            </span>
-        </a>
-    </li>
-    <li>
-        <a href="#email_designer_default_extra" class="scroll-link">
-            <span class="fa-stack fa-lg">
-                <i class="fa fa-square fa-stack-2x fa-inverse"></i>
-                <i class="fa fa-align-left fa-stack-1x" style="display: inline-block; height: 0.93em; margin-top: 0.3em; overflow: hidden;"></i>
-            </span>
-        </a>
-    </li>
-    <li>
-        <a href="#email_designer_default_footer" class="scroll-link">
-            <span class="fa-stack fa-lg">
-                <i class="fa fa-square fa-stack-2x fa-inverse"></i>
-                <i class="fa fa-align-justify fa-stack-1x" style=" margin-top: 0.7em; height: 0.9em; display: inline-block; overflow: hidden;"></i>
-                <i class="fa fa-arrow-down fa-stack-1x text-muted" style="display: inline-block; font-size: 0.6em; margin-top: -0.15em;"></i>
-            </span>
-        </a>
-    </li>
-</ul>
+<odoo>
+<template id="email_designer_snippets" inherit_id="web_editor.snippets" primary="True">
+    <xpath expr="//ul[@id='snippets_menu']" position="replace">
+        <ul id="snippets_menu">
+            <li class="active">
+                <a href="#email_designer_default_headers" class="scroll-link">
+                    <span class="fa-stack fa-lg">
+                        <i class="fa fa-square fa-stack-2x fa-inverse"></i>
+                        <i class="fa fa-align-justify fa-stack-1x" style="margin-top: -0.15em; height: 0.9em; display: inline-block; overflow: hidden;"></i>
+                        <i class="fa fa-arrow-up fa-stack-1x text-muted" style="margin-top: 0.25em; display: inline-block; font-size: 0.6em;"></i>
+                    </span>
+                </a>
+            </li>
+            <li>
+                <a href="#email_designer_default_body" class="scroll-link">
+                    <span class="fa-stack fa-lg">
+                        <i class="fa fa-square fa-stack-2x fa-inverse"></i>
+                        <i class="fa fa-align-left fa-stack-1x" style="margin-top: 0.05em;"></i>
+                    </span>
+                </a>
+            </li>
+            <li>
+                <a href="#email_designer_default_extra" class="scroll-link">
+                    <span class="fa-stack fa-lg">
+                        <i class="fa fa-square fa-stack-2x fa-inverse"></i>
+                        <i class="fa fa-align-left fa-stack-1x" style="display: inline-block; height: 0.93em; margin-top: 0.3em; overflow: hidden;"></i>
+                    </span>
+                </a>
+            </li>
+            <li>
+                <a href="#email_designer_default_footer" class="scroll-link">
+                    <span class="fa-stack fa-lg">
+                        <i class="fa fa-square fa-stack-2x fa-inverse"></i>
+                        <i class="fa fa-align-justify fa-stack-1x" style=" margin-top: 0.7em; height: 0.9em; display: inline-block; overflow: hidden;"></i>
+                        <i class="fa fa-arrow-down fa-stack-1x text-muted" style="display: inline-block; font-size: 0.6em; margin-top: -0.15em;"></i>
+                    </span>
+                </a>
+            </li>
+        </ul>
+    </xpath>
 
-<div id="o_scroll">
+    <xpath expr="//div[@id='o_scroll']" position="replace">
+        <div id="o_scroll">
+            <div id="email_designer_default_headers" class="o_panel">
+                <div class="o_panel_header">
+                    <span class="fa-stack">
+                        <i class="fa fa-align-justify fa-stack-1x" style="margin-top: -0.15em; height: 0.9em; display: inline-block; overflow: hidden;"></i>
+                        <i class="fa fa-arrow-up fa-stack-1x" style="margin-top: 0.25em; display: inline-block; font-size: 0.6em;"></i>
+                    </span> Headers
+                </div>
+                <div class="o_panel_body">
+                    <div name="Center Logo" class="basic_theme o_mail_block_header_center_logo">
+                        <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
+                            <table style="margin: 0 auto;border-collapse:collapse;background:inherit;width:600px;color:inherit" cellpadding="0" cellspacing="0">
+                                <tbody>
+                                    <tr>
+                                        <td valign="center" style="text-align:center">
+                                            &amp;nbsp;
+                                            <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;">
+                                                <img class="padding-medium" src="/logo.png" style="height:auto;max-width:600px;width:200px" alt="Your Logo" />
+                                            </a>
+                                            &amp;nbsp;
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
 
-<div id="email_designer_default_headers" class="o_panel">
-    <div class="o_panel_header">
-        <span class="fa-stack">
-            <i class="fa fa-align-justify fa-stack-1x" style="margin-top: -0.15em; height: 0.9em; display: inline-block; overflow: hidden;"></i>
-            <i class="fa fa-arrow-up fa-stack-1x" style="margin-top: 0.25em; display: inline-block; font-size: 0.6em;"></i>
-        </span> Headers
-    </div>
-    <div class="o_panel_body">
-        <div name="Center Logo" class="basic_theme o_mail_block_header_center_logo">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
-                <table style="margin: 0 auto;border-collapse:collapse;background:inherit;width:600px;color:inherit" cellpadding="0" cellspacing="0">
-                    <tbody>
-                        <tr>
-                            <td valign="center" style="text-align:center">
-                                &amp;nbsp;
-                                <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;">
-                                    <img class="padding-medium" src="/logo.png" style="height:auto;max-width:600px;width:200px" alt="Your Logo" />
-                                </a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
+                    <div name="Center Text" class="basic_theme o_mail_block_header_center_text">
+                        <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
+                            <table style="margin: 0 auto;border-collapse:collapse;background:inherit;color:inherit;width:600px;color:inherit" cellpadding="0" cellspacing="0">
+                                <tbody>
+                                    <tr>
+                                        <td valign="center" style="text-align:center;font-size: 30px">
+                                            &amp;nbsp;
+                                            <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: inherit;">
+                                                <strong>My Company</strong>
+                                            </a>
+                                            &amp;nbsp;
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
 
-        <div name="Center Text" class="basic_theme o_mail_block_header_center_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
-                <table style="margin: 0 auto;border-collapse:collapse;background:inherit;color:inherit;width:600px;color:inherit" cellpadding="0" cellspacing="0">
-                    <tbody>
-                        <tr>
-                            <td valign="center" style="text-align:center;font-size: 30px">
-                                &amp;nbsp;
-                                <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: inherit;">
-                                    <strong>My Company</strong>
-                                </a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Logo - Social" class="basic_theme o_mail_block_header_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
-                <table cellspacing="0" cellpadding="0" style="width:600px;border-collapse:collapse;background:inherit;color:inherit">
-                    <tr>
-                        <td valign="center" width="270" style="padding:10px 10px 10px 5px;">
-                            &amp;nbsp;
-                            <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;">
-                                <img src="/logo.png" style="padding:10px;height:auto;max-width:600px;width:200px" alt="Your Logo" />
-                            </a>
-                            &amp;nbsp;
-                        </td>
-                        <td valign="center" width="270" style="padding:10px 15px 10px 10px">
-                            <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse;background:inherit;color:inherit">
+                    <div name="Logo - Social" class="basic_theme o_mail_block_header_social">
+                        <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
+                            <table cellspacing="0" cellpadding="0" style="width:600px;border-collapse:collapse;background:inherit;color:inherit">
                                 <tr>
-                                    <td align="right">
-                                        <a t-att-href="(website.social_facebook) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_facebook.png" style="height:auto;max-width:70px" alt="social icon"/></a>
+                                    <td valign="center" width="270" style="padding:10px 10px 10px 5px;">
+                                        &amp;nbsp;
+                                        <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;">
+                                            <img src="/logo.png" style="padding:10px;height:auto;max-width:600px;width:200px" alt="Your Logo" />
+                                        </a>
+                                        &amp;nbsp;
                                     </td>
-                                    <td align="right" style="padding-left:5px">
-                                        <a t-att-href="(website.social_twitter) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_twitter.png" style="height:auto;max-width:70px" alt="social icon" /></a>
-                                    </td>
-                                    <td align="right" style="padding-left:5px">
-                                        <a t-att-href="(website.social_googleplus) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_googleplus.png" style="height:auto;max-width:70px" alt="social icon" /></a>
-                                    </td>
-                                    <td align="right" style="padding-left:5px">
-                                        <a t-att-href="(website.social_linkedin) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_linkedin.png" style="height:auto;max-width:70px" alt="social icon" /></a>
-                                    </td>
-                                    <td align="right" style="padding-left:5px">
-                                        <a href="#"><img src="/mass_mailing/static/src/img/theme_imgs/social_rss.png" style="height:auto;max-width:70px" alt="social icon" /></a>
+                                    <td valign="center" width="270" style="padding:10px 15px 10px 10px">
+                                        <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse;background:inherit;color:inherit">
+                                            <tr>
+                                                <td align="right">
+                                                    <a t-att-href="(website.social_facebook) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_facebook.png" style="height:auto;max-width:70px" alt="social icon"/></a>
+                                                </td>
+                                                <td align="right" style="padding-left:5px">
+                                                    <a t-att-href="(website.social_twitter) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_twitter.png" style="height:auto;max-width:70px" alt="social icon" /></a>
+                                                </td>
+                                                <td align="right" style="padding-left:5px">
+                                                    <a t-att-href="(website.social_googleplus) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_googleplus.png" style="height:auto;max-width:70px" alt="social icon" /></a>
+                                                </td>
+                                                <td align="right" style="padding-left:5px">
+                                                    <a t-att-href="(website.social_linkedin) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_linkedin.png" style="height:auto;max-width:70px" alt="social icon" /></a>
+                                                </td>
+                                                <td align="right" style="padding-left:5px">
+                                                    <a href="#"><img src="/mass_mailing/static/src/img/theme_imgs/social_rss.png" style="height:auto;max-width:70px" alt="social icon" /></a>
+                                                </td>
+                                            </tr>
+                                        </table>
                                     </td>
                                 </tr>
                             </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
+                        </div>
+                    </div>
 
-        <div name="Text - Social" class="basic_theme o_mail_block_header_text_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
-                <table cellspacing="0" cellpadding="0" style="width:600px;border-collapse:collapse;background:inherit;color:inherit">
-                    <tr>
-                        <td valign="center" width="270" style="padding:10px 10px 10px 5px;font-size: 30px">
-                            &amp;nbsp;
-                            <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: inherit">
-                                <strong>My Company</strong>
-                            </a>
-                            &amp;nbsp;
-                        </td>
-                        <td valign="center" width="270" style="padding:10px 15px 10px 10px">
-                            <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse;background:inherit;color:inherit">
+                    <div name="Text - Social" class="basic_theme o_mail_block_header_text_social">
+                        <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
+                            <table cellspacing="0" cellpadding="0" style="width:600px;border-collapse:collapse;background:inherit;color:inherit">
                                 <tr>
-                                    <td align="right">
-                                        <a t-att-href="(website.social_facebook) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_facebook.png" style="height:auto;max-width:70px" alt="social icon" /></a>
+                                    <td valign="center" width="270" style="padding:10px 10px 10px 5px;font-size: 30px">
+                                        &amp;nbsp;
+                                        <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: inherit">
+                                            <strong>My Company</strong>
+                                        </a>
+                                        &amp;nbsp;
                                     </td>
-                                    <td align="right" style="padding-left:5px">
-                                        <a t-att-href="(website.social_twitter) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_twitter.png" style="height:auto;max-width:70px" alt="social icon" /></a>
-                                    </td>
-                                    <td align="right" style="padding-left:5px">
-                                        <a t-att-href="(website.social_googleplus) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_googleplus.png" style="height:auto;max-width:70px" alt="social icon" /></a>
-                                    </td>
-                                    <td align="right" style="padding-left:5px">
-                                        <a t-att-href="(website.social_linkedin) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_linkedin.png" style="height:auto;max-width:70px" alt="social icon" /></a>
-                                    </td>
-                                    <td align="right" style="padding-left:5px">
-                                        <a href="#"><img src="/mass_mailing/static/src/img/theme_imgs/social_rss.png" style="height:auto;max-width:70px" alt="social icon" /></a>
+                                    <td valign="center" width="270" style="padding:10px 15px 10px 10px">
+                                        <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse;background:inherit;color:inherit">
+                                            <tr>
+                                                <td align="right">
+                                                    <a t-att-href="(website.social_facebook) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_facebook.png" style="height:auto;max-width:70px" alt="social icon" /></a>
+                                                </td>
+                                                <td align="right" style="padding-left:5px">
+                                                    <a t-att-href="(website.social_twitter) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_twitter.png" style="height:auto;max-width:70px" alt="social icon" /></a>
+                                                </td>
+                                                <td align="right" style="padding-left:5px">
+                                                    <a t-att-href="(website.social_googleplus) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_googleplus.png" style="height:auto;max-width:70px" alt="social icon" /></a>
+                                                </td>
+                                                <td align="right" style="padding-left:5px">
+                                                    <a t-att-href="(website.social_linkedin) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_linkedin.png" style="height:auto;max-width:70px" alt="social icon" /></a>
+                                                </td>
+                                                <td align="right" style="padding-left:5px">
+                                                    <a href="#"><img src="/mass_mailing/static/src/img/theme_imgs/social_rss.png" style="height:auto;max-width:70px" alt="social icon" /></a>
+                                                </td>
+                                            </tr>
+                                        </table>
                                     </td>
                                 </tr>
                             </table>
-                        </td>
-                    </tr>
-                </table>
+                        </div>
+                    </div>
+                </div>
             </div>
-        </div>
-    </div>
-</div>
-<div id="email_designer_default_body" class="o_panel">
-    <div class="o_panel_header">
-        <span class="fa-stack">
-            <i class="fa fa-align-left fa-stack-1x"></i>
-        </span> Body
-        </div>
-    <div class="o_panel_body">
-        <div name="Title - Subtitle" class="basic_theme o_mail_block_title_sub">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#777777">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;background:inherit;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="text-align:center;padding-bottom:10px">
-                                <p style="margin:0;font-size:36px">Check this out!</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="font-size:20px; text-align:center; padding: 0 5px">
-                                <p style="margin:0">Come check out my stuff!</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
+            <div id="email_designer_default_body" class="o_panel">
+                <div class="o_panel_header">
+                    <span class="fa-stack">
+                        <i class="fa fa-align-left fa-stack-1x"></i>
+                    </span> Body
+                    </div>
+                <div class="o_panel_body">
+                    <div name="Title - Subtitle" class="basic_theme o_mail_block_title_sub">
+                        <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#777777">
+                            <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;background:inherit;color:inherit">
+                                <tbody>
+                                    <tr>
+                                        <td style="text-align:center;padding-bottom:10px">
+                                            <p style="margin:0;font-size:36px">Check this out!</p>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td style="font-size:20px; text-align:center; padding: 0 5px">
+                                            <p style="margin:0">Come check out my stuff!</p>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
 
-        <div name="Text-Image" class="basic_theme o_mail_block_text_image">
-            <div style="padding:0px; margin:auto;width:600px;background-color:#fff;color:#777777">
-                <table cellpadding="0" cellspacing="0" width="600" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td align="left" style="padding:20px;font-size:14px" class="col_mv bg-color">
-                                <p style="margin:0;font-size:30px">Your order has shipped!</p>
-                                <p style="margin:0">Dear Bob,</p>
-                                <p style="margin:0">
-                                    We would like you to know that your order has shipped! To track your order or make any changes please click the "my order" button below.
-                                </p>
-                                <a href="#" style="-webkit-user-select: none; padding: 6px 12px; font-size: 14px; line-height: 20px; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; color: rgb(255, 255, 255); border: 1px solid rgb(228, 55, 37); text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: rgb(231, 76, 60);">Your Order</a>
-                                &amp;nbsp;
-                            </td>
-                            <td style="padding-top:20px;padding-bottom:0;vertical-align:middle;width:200px;" class="bg-color col_mv">
-                                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse;background:inherit">
+                    <div name="Text-Image" class="basic_theme o_mail_block_text_image">
+                        <div style="padding:0px; margin:auto;width:600px;background-color:#fff;color:#777777">
+                            <table cellpadding="0" cellspacing="0" width="600" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit">
+                                <tbody>
+                                    <tr>
+                                        <td align="left" style="padding:20px;font-size:14px" class="col_mv bg-color">
+                                            <p style="margin:0;font-size:30px">Your order has shipped!</p>
+                                            <p style="margin:0">Dear Bob,</p>
+                                            <p style="margin:0">
+                                                We would like you to know that your order has shipped! To track your order or make any changes please click the "my order" button below.
+                                            </p>
+                                            <a href="#" style="-webkit-user-select: none; padding: 6px 12px; font-size: 14px; line-height: 20px; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; color: rgb(255, 255, 255); border: 1px solid rgb(228, 55, 37); text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: rgb(231, 76, 60);">Your Order</a>
+                                            &amp;nbsp;
+                                        </td>
+                                        <td style="padding-top:20px;padding-bottom:0;vertical-align:middle;width:200px;" class="bg-color col_mv">
+                                            <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse;background:inherit">
+                                                <tbody>
+                                                    <tr>
+                                                        <td style="vertical-align:middle;text-align:center">
+                                                            &amp;nbsp;
+                                                            <span class="fa fa-10x fa-music"></span>
+                                                            &amp;nbsp;
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+
+                    <div name="Image Title" class="basic_theme o_mail_block_title_text">
+                        <div class="snippet_row bg-color" style="padding:0px; margin:auto;width:600px;background: #fff repeat top /100%;color:#777777">
+                            <table cellpadding="0" cellspacing="0" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit;width:600px">
+                                <tbody>
+                                    <tr>
+                                        <td align="left" style="padding:20px">
+                                            <p style="margin:0;font-size:30px">Your order has shipped!</p>
+                                            <p style="margin:0;font-size:14px">
+                                                Dear Bob,<br/>
+                                                We would like you to know that your order has shipped! To track your order or make any changes please click the "my order" button below.
+                                            </p>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td style="text-align:center;width:200px;">
+                                            &amp;nbsp;
+                                            <span class="fa fa-10x fa-music"></span>
+                                            &amp;nbsp;
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+
+                    <div name="Content Image" class="basic_theme o_mail_block_text_image">
+                        <div style="padding:0px; margin:auto;width:600px;background-color:#fff;color:#777777">
+                            <table cellpadding="0" cellspacing="0" width="600" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit">
+                                <tbody>
+                                    <tr>
+                                        <td align="left" style="padding:20px" class="col_mv bg-color">
+                                            <p style="margin:0;font-size:14px">
+                                                We would like you to know that your order has shipped! To track your order or make any changes please click the "my order" button below.
+                                            </p>
+                                        </td>
+                                        <td style="text-align:center;vertical-align:middle;width:200px;" class="col_mv bg-color">
+                                            &amp;nbsp;
+                                            <span class="fa fa-10x fa-music"></span>
+                                            &amp;nbsp;
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+
+                    <div name="Image Content" class="basic_theme o_mail_block_image_text">
+                        <div style="padding:0px; margin:auto;width:600px;background-color:#fff;color:#777777">
+                            <table cellpadding="0" cellspacing="0" width="600" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit">
+                                <tbody>
+                                    <tr>
+                                        <td style="text-align:center;vertical-align:middle;width:200px;" class="col_mv bg-color">
+                                            &amp;nbsp;
+                                            <span class="fa fa-10x fa-music"></span>
+                                            &amp;nbsp;
+                                        </td>
+                                        <td style="padding:20px" class="col_mv bg-color">
+                                            <p style="margin:0;font-size:14px">
+                                                We would like you to know that your order has shipped! To track your order or make any changes please click the "my order" button below.
+                                            </p>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+
+                    <div name="Button" class="basic_theme o_mail_block_button">
+                        <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#777777">
+                            <table style="width:600px;text-align:center;margin:0 auto;border-collapse:collapse;background:inherit;color:inherit">
+                                <tr>
+                                    <td class="row" style="padding:10px 0;text-align:center">
+                                        &amp;nbsp;
+                                        <a href="#" style="-webkit-user-select: none; padding: 6px 12px; font-size: 14px; line-height: 20px; color: rgb(255,255,255); border: none; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: rgb(101,101,101);border-radius:4px">My Account</a>
+                                        &amp;nbsp;
+                                    </td>
+                                </tr>
+                            </table>
+                        </div>
+                    </div>
+
+                    <div name="Three Columns" class="basic_theme o_mail_block_three_cols">
+                        <div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#000;color:#777777">
+                            <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background:inherit;color:inherit">
+                                <tbody>
+                                    <tr>
+                                        <td style="padding:30px 15px;width:33%;text-align:center;background-color:#fff;color:#777777;font-size:14px" class="col_mv bg-color">
+                                            &amp;nbsp;
+                                            <span class="fa fa-check fa-3x"></span>
+                                            &amp;nbsp;
+                                            <p style="margin:0;font-size:24px;font-weight:bold">Step 1</p>
+                                            <p style="margin:0">    
+                                                We need you to update your account information. If there is ever a problem with your account, this information will make it easier for you to log back in.
+                                            </p>
+                                        </td>
+                                        <td style="vertical-align:top; padding: 30px 15px; width:34%;text-align:center;background-color:#fff;color:#777777;font-size:14px" class="col_mv bg-color">
+                                            &amp;nbsp;
+                                            <span class="fa fa-truck fa-3x"></span>
+                                            &amp;nbsp;
+                                            <p style="margin:0;font-size:24px;font-weight:bold">Step 2</p>
+                                            <p style="margin:0">
+                                                We need you to update your account information. If there is ever a problem with your account, this information will make it easier for you to log back in.
+                                            </p>
+                                        </td>
+                                        <td style="vertical-align:top; padding: 30px 15px; width:33%;text-align:center;background-color:#fff;color:#777777;font-size:14px" class="col_mv bg-color">
+                                            &amp;nbsp;
+                                            <span class="fa fa-usd fa-3x"></span>
+                                            &amp;nbsp;
+                                            <p style="margin:0;font-size:24px;font-weight:bold">Step 3</p>
+                                            <p style="margin:0">
+                                                We need you to update your account information. If there is ever a problem with your account, this information will make it easier for you to log back in.
+                                            </p>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+
+                    <div name="Text Block" class="basic_theme o_mail_block_simple_text">
+                        <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#777777">
+                            <table style="width:100%;text-align:justify;margin:0 auto;background:inherit;color:inherit;border-collapse:collapse;color:inherit">
+                                <tr>
+                                    <td style="padding:10px 30px;font-size:14px">
+                                        <p style="margin:0">Dear ${object.name}</p>
+                                        <p style="margin:0">Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assists with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.<br/></p>
+                                        <p style="margin:0">Great stories are for everyone even when only written for just one person. If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest.</p>
+                                        <p style="margin:0">Kind Regards,</p>
+                                        <p style="margin:0">Michael Fletcher</p>
+                                    </td>
+                                </tr>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div id="email_designer_default_extra" class="o_panel">
+                <div class="o_panel_header">
+                    <span class="fa-stack">
+                        <i class="fa fa-align-left fa-stack-1x" style="display: inline-block; height: 0.93em; margin-top: 0.3em; overflow: hidden;"></i>
+                    </span> Extra
+                </div>
+                <div class="o_panel_body">
+                    <div name="Separator" class="basic_theme o_mail_block_footer_seprator">
+                        <div style="padding:0px;width:600px;margin:auto;color:#777777;background-color:#FFFFFF">
+                            <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;border-collapse:collapse;background:inherit;color:inherit">
+                                <tbody>
+                                    <tr>
+                                        <td valign="top" style="width:600px">
+                                            <div>
+                                                <hr width="100%" style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0"/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+
+                    <div name="Tag Line" class="basic_theme o_mail_block_footer_tag_line">
+                        <div class="bg-color" style="padding:0px;width:600px;margin:auto;background:#fff;color:#777777">
+                            <table style="margin: 0 auto;border-collapse:collapse;background:inherit;color:inherit;width:600px" cellpadding="0" cellspacing="0">
+                                <tbody>
+                                    <tr>
+                                        <td valign="center" style="text-align:center;padding:5px">
+                                            <p style="margin:0;color:inherit;font-size:18px">Apps That Help You Grow Your Business</p>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div id="email_designer_default_footer" class="o_panel">
+                <div class="o_panel_header">
+                    <span class="fa-stack">
+                        <i class="fa fa-align-justify fa-stack-1x" style=" margin-top: 0.7em; height: 0.9em; display: inline-block; overflow: hidden;"></i>
+                        <i class="fa fa-arrow-down fa-stack-1x" style="display: inline-block; font-size: 0.6em; margin-top: -0.15em;"></i>
+                    </span> Footers
+                </div>
+                <div class="o_panel_body">
+                    <div t-if="website" name="Social + Text" class="basic_theme o_mail_block_footer_social">
+                        <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
+                            <table style="margin: 0 auto;border-collapse:collapse;background:inherit;color:inherit;width:600px" cellpadding="0" cellspacing="0">
+                                <tbody>
+                                    <tr>
+                                        <td valign="center" style="padding:10px 15px 10px 10px">
+                                            <table border="0" cellpadding="0" cellspacing="0" align="center" style="border-collapse:collapse;color:inherit">
+                                                <tr>
+                                                    <td align="right">
+                                                        &amp;nbsp;
+                                                        <a t-att-href="(website.social_facebook) or '#'">
+                                                            <img src="/mass_mailing/static/src/img/theme_imgs/social_facebook.png" style="height:auto;max-width:70px" alt="social icon" />
+                                                        </a>
+                                                    </td>
+                                                    <td align="right" style="padding-left:5px">
+                                                        <a t-att-href="(website.social_twitter) or '#'">
+                                                            <img src="/mass_mailing/static/src/img/theme_imgs/social_twitter.png" style="height:auto;max-width:70px" alt="social icon" />
+                                                        </a>
+                                                    </td>
+                                                    <td align="right" style="padding-left:5px">
+                                                        <a t-att-href="(website.social_googleplus) or '#'">
+                                                            <img src="/mass_mailing/static/src/img/theme_imgs/social_googleplus.png" style="height:auto;max-width:70px" alt="social icon" />
+                                                        </a>
+                                                    </td>
+                                                    <td align="right" style="padding-left:5px">
+                                                        <a t-att-href="(website.social_linkedin) or '#'">
+                                                            <img src="/mass_mailing/static/src/img/theme_imgs/social_linkedin.png" style="height:auto;max-width:70px" alt="social icon" />
+                                                        </a>
+                                                    </td>
+                                                    <td align="right" style="padding-left:5px">
+                                                        <a href="#">
+                                                            <img src="/mass_mailing/static/src/img/theme_imgs/social_rss.png" style="height:auto;max-width:70px" alt="social icon" />
+                                                        </a>
+                                                        &amp;nbsp;
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td style="font-size:12px;text-align:center;padding:10px">
+                                            &amp;nbsp;
+                                            <a style="color:inherit" href="/unsubscribe_from_list">Unsubscribe</a> | <a style="color:inherit" href="/page/contactus">Contact</a>
+                                            &amp;nbsp;
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+
+                    <div name="Text + Copyright" class="basic_theme o_mail_block_footer_copyright">
+                        <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#777777">
+                            <table cellspacing="0" cellpadding="0" style="margin:auto;width:600px;border-collapse:collapse;background:inherit;color:inherit">
+                                <tbody>
+                                    <tr>
+                                        <td style="font-size:12px;text-align:center;padding:10px">
+                                            &amp;nbsp;
+                                            <a style="color:inherit" href="/unsubscribe_from_list">Unsubscribe</a>
+                                            <t t-if="website"> | <a style="color:inherit" href="/page/contactus">Contact</a> </t>
+                                            &amp;nbsp;
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td style="font-size:12px;text-align:center;padding-bottom:10px">
+                                            <p style="margin:0">© 2014 All Rights Reserved</p>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+
+                    <div name="Text Only" class="basic_theme o_mail_block_footer_text">
+                        <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#777777">
+                            <center>
+                                <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto; width:600px; border-collapse:collapse;background:inherit;color:inherit">
                                     <tbody>
                                         <tr>
-                                            <td style="vertical-align:middle;text-align:center">
+                                            <td valign="middle" align="right" style="font-size:12px;padding:20px;text-align:center">
                                                 &amp;nbsp;
-                                                <span class="fa fa-10x fa-music"></span>
+                                                <t t-if="website">
+                                                    <a style="color:inherit" href="/page/contactus">Contact Us</a> | 
+                                                    <a style="color:inherit" t-att-href="(website.social_facebook) or '#'">Facebook</a> | 
+                                                    <a style="color:inherit" t-att-href="(website.social_twitter) or '#'">Twitter</a> | 
+                                                    <a style="color:inherit" href="#">Support</a> | 
+                                                </t>
+                                                <a href="/unsubscribe_from_list" style="color:inherit">Unsubscribe</a>
                                                 &amp;nbsp;
                                             </td>
                                         </tr>
                                     </tbody>
                                 </table>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
+                            </center>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
+    </xpath>
 
-        <div name="Image Title" class="basic_theme o_mail_block_title_text">
-            <div class="snippet_row bg-color" style="padding:0px; margin:auto;width:600px;background: #fff repeat top /100%;color:#777777">
-                <table cellpadding="0" cellspacing="0" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit;width:600px">
-                    <tbody>
-                        <tr>
-                            <td align="left" style="padding:20px">
-                                <p style="margin:0;font-size:30px">Your order has shipped!</p>
-                                <p style="margin:0;font-size:14px">
-                                    Dear Bob,<br/>
-                                    We would like you to know that your order has shipped! To track your order or make any changes please click the "my order" button below.
-                                </p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center;width:200px;">
-                                &amp;nbsp;
-                                <span class="fa fa-10x fa-music"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Content Image" class="basic_theme o_mail_block_text_image">
-            <div style="padding:0px; margin:auto;width:600px;background-color:#fff;color:#777777">
-                <table cellpadding="0" cellspacing="0" width="600" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td align="left" style="padding:20px" class="col_mv bg-color">
-                                <p style="margin:0;font-size:14px">
-                                    We would like you to know that your order has shipped! To track your order or make any changes please click the "my order" button below.
-                                </p>
-                            </td>
-                            <td style="text-align:center;vertical-align:middle;width:200px;" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-10x fa-music"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Image Content" class="basic_theme o_mail_block_image_text">
-            <div style="padding:0px; margin:auto;width:600px;background-color:#fff;color:#777777">
-                <table cellpadding="0" cellspacing="0" width="600" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="text-align:center;vertical-align:middle;width:200px;" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-10x fa-music"></span>
-                                &amp;nbsp;
-                            </td>
-                            <td style="padding:20px" class="col_mv bg-color">
-                                <p style="margin:0;font-size:14px">
-                                    We would like you to know that your order has shipped! To track your order or make any changes please click the "my order" button below.
-                                </p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Button" class="basic_theme o_mail_block_button">
-            <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#777777">
-                <table style="width:600px;text-align:center;margin:0 auto;border-collapse:collapse;background:inherit;color:inherit">
-                    <tr>
-                        <td class="row" style="padding:10px 0;text-align:center">
-                            &amp;nbsp;
-                            <a href="#" style="-webkit-user-select: none; padding: 6px 12px; font-size: 14px; line-height: 20px; color: rgb(255,255,255); border: none; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: rgb(101,101,101);border-radius:4px">My Account</a>
-                            &amp;nbsp;
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Three Columns" class="basic_theme o_mail_block_three_cols">
-            <div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#000;color:#777777">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background:inherit;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="padding:30px 15px;width:33%;text-align:center;background-color:#fff;color:#777777;font-size:14px" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-check fa-3x"></span>
-                                &amp;nbsp;
-                                <p style="margin:0;font-size:24px;font-weight:bold">Step 1</p>
-                                <p style="margin:0">    
-                                    We need you to update your account information. If there is ever a problem with your account, this information will make it easier for you to log back in.
-                                </p>
-                            </td>
-                            <td style="vertical-align:top; padding: 30px 15px; width:34%;text-align:center;background-color:#fff;color:#777777;font-size:14px" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-truck fa-3x"></span>
-                                &amp;nbsp;
-                                <p style="margin:0;font-size:24px;font-weight:bold">Step 2</p>
-                                <p style="margin:0">
-                                    We need you to update your account information. If there is ever a problem with your account, this information will make it easier for you to log back in.
-                                </p>
-                            </td>
-                            <td style="vertical-align:top; padding: 30px 15px; width:33%;text-align:center;background-color:#fff;color:#777777;font-size:14px" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-usd fa-3x"></span>
-                                &amp;nbsp;
-                                <p style="margin:0;font-size:24px;font-weight:bold">Step 3</p>
-                                <p style="margin:0">
-                                    We need you to update your account information. If there is ever a problem with your account, this information will make it easier for you to log back in.
-                                </p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text Block" class="basic_theme o_mail_block_simple_text">
-            <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#777777">
-                <table style="width:100%;text-align:justify;margin:0 auto;background:inherit;color:inherit;border-collapse:collapse;color:inherit">
-                    <tr>
-                        <td style="padding:10px 30px;font-size:14px">
-                            <p style="margin:0">Dear ${object.name}</p>
-                            <p style="margin:0">Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assists with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.<br/></p>
-                            <p style="margin:0">Great stories are for everyone even when only written for just one person. If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest.</p>
-                            <p style="margin:0">Kind Regards,</p>
-                            <p style="margin:0">Michael Fletcher</p>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </div>
-</div>
-<div id="email_designer_default_extra" class="o_panel">
-    <div class="o_panel_header">
-        <span class="fa-stack">
-            <i class="fa fa-align-left fa-stack-1x" style="display: inline-block; height: 0.93em; margin-top: 0.3em; overflow: hidden;"></i>
-        </span> Extra
-    </div>
-    <div class="o_panel_body">
-        <div name="Separator" class="basic_theme o_mail_block_footer_seprator">
-            <div style="padding:0px;width:600px;margin:auto;color:#777777;background-color:#FFFFFF">
-                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;border-collapse:collapse;background:inherit;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td valign="top" style="width:600px">
-                                <div>
-                                    <hr width="100%" style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0"/>
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Tag Line" class="basic_theme o_mail_block_footer_tag_line">
-            <div class="bg-color" style="padding:0px;width:600px;margin:auto;background:#fff;color:#777777">
-                <table style="margin: 0 auto;border-collapse:collapse;background:inherit;color:inherit;width:600px" cellpadding="0" cellspacing="0">
-                    <tbody>
-                        <tr>
-                            <td valign="center" style="text-align:center;padding:5px">
-                                <p style="margin:0;color:inherit;font-size:18px">Apps That Help You Grow Your Business</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-</div>
-<div id="email_designer_default_footer" class="o_panel">
-    <div class="o_panel_header">
-        <span class="fa-stack">
-            <i class="fa fa-align-justify fa-stack-1x" style=" margin-top: 0.7em; height: 0.9em; display: inline-block; overflow: hidden;"></i>
-            <i class="fa fa-arrow-down fa-stack-1x" style="display: inline-block; font-size: 0.6em; margin-top: -0.15em;"></i>
-        </span> Footers
-    </div>
-    <div class="o_panel_body">
-        <div t-if="website" name="Social + Text" class="basic_theme o_mail_block_footer_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
-                <table style="margin: 0 auto;border-collapse:collapse;background:inherit;color:inherit;width:600px" cellpadding="0" cellspacing="0">
-                    <tbody>
-                        <tr>
-                            <td valign="center" style="padding:10px 15px 10px 10px">
-                                <table border="0" cellpadding="0" cellspacing="0" align="center" style="border-collapse:collapse;color:inherit">
-                                    <tr>
-                                        <td align="right">
-                                            &amp;nbsp;
-                                            <a t-att-href="(website.social_facebook) or '#'">
-                                                <img src="/mass_mailing/static/src/img/theme_imgs/social_facebook.png" style="height:auto;max-width:70px" alt="social icon" />
-                                            </a>
-                                        </td>
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="(website.social_twitter) or '#'">
-                                                <img src="/mass_mailing/static/src/img/theme_imgs/social_twitter.png" style="height:auto;max-width:70px" alt="social icon" />
-                                            </a>
-                                        </td>
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="(website.social_googleplus) or '#'">
-                                                <img src="/mass_mailing/static/src/img/theme_imgs/social_googleplus.png" style="height:auto;max-width:70px" alt="social icon" />
-                                            </a>
-                                        </td>
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="(website.social_linkedin) or '#'">
-                                                <img src="/mass_mailing/static/src/img/theme_imgs/social_linkedin.png" style="height:auto;max-width:70px" alt="social icon" />
-                                            </a>
-                                        </td>
-                                        <td align="right" style="padding-left:5px">
-                                            <a href="#">
-                                                <img src="/mass_mailing/static/src/img/theme_imgs/social_rss.png" style="height:auto;max-width:70px" alt="social icon" />
-                                            </a>
-                                            &amp;nbsp;
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding:10px">
-                                &amp;nbsp;
-                                <a style="color:inherit" href="/unsubscribe_from_list">Unsubscribe</a> | <a style="color:inherit" href="/page/contactus">Contact</a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text + Copyright" class="basic_theme o_mail_block_footer_copyright">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#777777">
-                <table cellspacing="0" cellpadding="0" style="margin:auto;width:600px;border-collapse:collapse;background:inherit;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding:10px">
-                                &amp;nbsp;
-                                <a style="color:inherit" href="/unsubscribe_from_list">Unsubscribe</a>
-                                <t t-if="website"> | <a style="color:inherit" href="/page/contactus">Contact</a> </t>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding-bottom:10px">
-                                <p style="margin:0">© 2014 All Rights Reserved</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text Only" class="basic_theme o_mail_block_footer_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#777777">
-                <center>
-                    <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto; width:600px; border-collapse:collapse;background:inherit;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td valign="middle" align="right" style="font-size:12px;padding:20px;text-align:center">
-                                    &amp;nbsp;
-                                    <t t-if="website">
-                                        <a style="color:inherit" href="/page/contactus">Contact Us</a> | 
-                                        <a style="color:inherit" t-att-href="(website.social_facebook) or '#'">Facebook</a> | 
-                                        <a style="color:inherit" t-att-href="(website.social_twitter) or '#'">Twitter</a> | 
-                                        <a style="color:inherit" href="#">Support</a> | 
-                                    </t>
-                                    <a href="/unsubscribe_from_list" style="color:inherit">Unsubscribe</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </center>
-            </div>
-        </div>
-    </div>
-</div>
-
-</div>
-
-<div id="snippet_options" class="hidden">
-    <t t-call="web_editor.snippet_options"/>
-    <t t-call="mass_mailing.snippet_options"/>
-</div>
+    <xpath expr="//div[@id='snippet_options']" position="inside">
+        <t t-call="mass_mailing.snippet_options"/>
+    </xpath>
 </template>
-
-</data>
-</openerp>
+</odoo>
diff --git a/addons/web_editor/views/snippets.xml b/addons/web_editor/views/snippets.xml
index 9a1fd1200a6..f177f1149fd 100644
--- a/addons/web_editor/views/snippets.xml
+++ b/addons/web_editor/views/snippets.xml
@@ -1,49 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
+<odoo>
 <template id="snippets">
+    <ul id="snippets_menu">
+        <li class="active">
+            <a href="#snippet_structure" class="scroll-link">
+                <span class="fa-stack fa-lg">
+                    <i class="fa fa-square fa-stack-2x fa-inverse"></i>
+                </span>
+            </a>
+        </li>
+    </ul>
 
-
-<ul>
-    <li class="active">
-        <a href="#snippet_structure" class="scroll-link">
-            <span class="fa-stack fa-lg">
-                <i class="fa fa-square fa-stack-2x fa-inverse"></i>
-            </span>
-        </a>
-    </li>
-</ul>
-
-
-<div id="o_scroll">
-    <div id="snippet_structure" class="o_panel">
-        <div class="o_panel_header">
-            <span class="fa-stack">
-                <i class="fa fa-th-large fa-stack-1x"></i>
-            </span> First Panel
-        </div>
-        <div class="o_panel_body">
-
+    <div id="o_scroll">
+        <div id="snippet_structure" class="o_panel">
+            <div class="o_panel_header">
+                <i class="fa fa-th-large"/> First Panel
+            </div>
+            <div class="o_panel_body"/>
         </div>
     </div>
-</div>
 
-
-<div id="snippet_options" class="hidden">
-    <t t-call="web_editor.snippet_options"/>
-</div>
+    <div id="snippet_options" class="hidden">
+        <t t-call="web_editor.snippet_options"/>
+    </div>
 </template>
 
 <!-- options (data-selector, data-drop-in, data-drop-near, data-js to link js object ) -->
-
 <template id="snippet_options">
     <!-- t-field -->
-
     <div data-js='many2one'
-        data-selector="[data-oe-many2one-model]:not([data-oe-readonly])"
-        data-no-check="true">
-    </div>
+         data-selector="[data-oe-many2one-model]:not([data-oe-readonly])"
+         data-no-check="true"/>
 </template>
-
-</data>
-</openerp>
+</odoo>
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 62269ba2a6c..f75146a4a5d 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -697,95 +697,98 @@
     </section>
 </template>
 
+<!-- Snippets menu -->
+<template id="snippets" inherit_id="web_editor.snippets" primary="True">
+    <xpath expr="//ul[@id='snippets_menu']" position="replace">
+        <ul id="snippets_menu">
+            <li class="active structure">
+                <a href="#snippet_structure" class="scroll-link">
+                    <i class="fa fa-th-large"/>
+                </a>
+            </li>
+            <li class="content">
+                <a href="#snippet_content" class="scroll-link">
+                    <i class="fa fa-indent"/>
+                </a>
+            </li>
+            <li class="feature">
+                <a href="#snippet_feature" class="scroll-link">
+                    <i class="fa fa-check-square"/>
+                </a>
+            </li>
+            <li class="effect">
+                <a href="#snippet_effect" class="scroll-link">
+                    <i class="fa fa-magic icon-fix"/>
+                </a>
+            </li>
+        </ul>
+    </xpath>
 
-<template id="snippets">
-<ul id="snippets_menu">
-    <li class="active structure">
-        <a href="#snippet_structure" class="scroll-link">
-            <i class="material-icons">&#xE8F1;</i>
-        </a>
-    </li>
-    <li class="content">
-        <a href="#snippet_content" class="scroll-link">
-            <i class="material-icons">&#xE8AA;</i>
-        </a>
-    </li>
-    <li class="feature">
-        <a href="#snippet_feature" class="scroll-link">
-            <i class="material-icons">&#xE8B8;</i>
-        </a>
-    </li>
-    <li class="effect">
-        <a href="#snippet_effect" class="scroll-link">
-            <i class="fa fa-magic icon-fix"></i>
-        </a>
-    </li>
-</ul>
+    <xpath expr="//div[@id='o_scroll']" position="replace">
+        <div id="o_scroll">
+            <div id="snippet_structure" class="o_panel">
+                <div class="o_panel_header">
+                    <i class="fa fa-th-large"/> Structure
+                </div>
+                <div class="o_panel_body">
+                    <t t-snippet="website.s_title" t-thumbnail="/website/static/src/img/blocks/block_title.png"/>
+                    <t t-snippet="website.s_banner" t-thumbnail="/website/static/src/img/blocks/block_banner.png"/>
+                    <t t-snippet="website.s_text_image" t-thumbnail="/website/static/src/img/blocks/block_text_image.png"/>
+                    <t t-snippet="website.s_image_text" t-thumbnail="/website/static/src/img/blocks/block_image_text.png"/>
+                    <t t-snippet="website.s_big_message" t-thumbnail="/website/static/src/img/blocks/block_jumbotron.png"/>
+                    <t t-snippet="website.s_text_block" t-thumbnail="/website/static/src/img/blocks/block_text_block.png"/>
+                    <t t-snippet="website.s_features" t-thumbnail="/website/static/src/img/blocks/block_features.png"/>
+                    <t t-snippet="website.s_big_picture" t-thumbnail="/website/static/src/img/blocks/block_big_picture.png"/>
+                    <t t-snippet="website.s_three_columns" t-thumbnail="/website/static/src/img/blocks/block_three_columns.png"/>
+                </div>
+            </div>
 
-<div id="o_scroll">
-<div id="snippet_structure" class="o_panel">
-    <div class="o_panel_header">
-        <i class="material-icons">&#xE8F1;</i> Structure
-    </div>
-    <div class="o_panel_body">
-        <t t-snippet="website.s_title" t-thumbnail="/website/static/src/img/blocks/block_title.png"/>
-        <t t-snippet="website.s_banner" t-thumbnail="/website/static/src/img/blocks/block_banner.png"/>
-        <t t-snippet="website.s_text_image" t-thumbnail="/website/static/src/img/blocks/block_text_image.png"/>
-        <t t-snippet="website.s_image_text" t-thumbnail="/website/static/src/img/blocks/block_image_text.png"/>
-        <t t-snippet="website.s_big_message" t-thumbnail="/website/static/src/img/blocks/block_jumbotron.png"/>
-        <t t-snippet="website.s_text_block" t-thumbnail="/website/static/src/img/blocks/block_text_block.png"/>
-        <t t-snippet="website.s_features" t-thumbnail="/website/static/src/img/blocks/block_features.png"/>
-        <t t-snippet="website.s_big_picture" t-thumbnail="/website/static/src/img/blocks/block_big_picture.png"/>
-        <t t-snippet="website.s_three_columns" t-thumbnail="/website/static/src/img/blocks/block_three_columns.png"/>
-    </div>
-</div>
+            <div id="snippet_content" class="o_panel">
+                <div class="o_panel_header">
+                    <i class="fa fa-indent"/> Content
+                </div>
+                <div class="o_panel_body">
+                    <t t-snippet="website.s_well" t-thumbnail="/website/static/src/img/blocks/block_well.png"/>
+                    <t t-snippet="website.s_quote" t-thumbnail="/website/static/src/img/blocks/block_quote.png"/>
+                    <t t-snippet="website.s_panel" t-thumbnail="/website/static/src/img/blocks/block_panel.png"/>
+                    <t t-snippet="website.s_image_floating" t-thumbnail="/website/static/src/img/blocks/block_text_image.png"/>
+                    <t t-snippet="website.s_share" t-thumbnail="/website/static/src/img/blocks/block_button.png"/>
+                </div>
+            </div>
 
-<div id="snippet_content" class="o_panel">
-    <div class="o_panel_header">
-        <i class="material-icons">&#xE8AA;</i> Content
-    </div>
-    <div class="o_panel_body">
-        <t t-snippet="website.s_well" t-thumbnail="/website/static/src/img/blocks/block_well.png"/>
-        <t t-snippet="website.s_quote" t-thumbnail="/website/static/src/img/blocks/block_quote.png"/>
-        <t t-snippet="website.s_panel" t-thumbnail="/website/static/src/img/blocks/block_panel.png"/>
-        <t t-snippet="website.s_image_floating" t-thumbnail="/website/static/src/img/blocks/block_text_image.png"/>
-        <t t-snippet="website.s_share" t-thumbnail="/website/static/src/img/blocks/block_button.png"/>
-    </div>
-</div>
+            <div id="snippet_feature" class="o_panel">
+                <div class="o_panel_header">
+                    <i class="fa fa-check-square"/> Feature
+                </div>
+                <div class="o_panel_body">
+                    <t t-snippet="website.s_image_gallery" t-thumbnail="/website/static/src/img/blocks/block_image_gallery.png"/>
+                    <t t-snippet="website.s_comparisons" t-thumbnail="/website/static/src/img/blocks/block_comparison.png"/>
+                    <t t-snippet="website.s_button" t-thumbnail="/website/static/src/img/blocks/block_button.png"/>
+                    <t t-snippet="website.s_references" t-thumbnail="/website/static/src/img/blocks/block_references.png"/>
+                    <t t-snippet="website.s_faq_collapse" t-thumbnail="/website/static/src/img/blocks/block_faq.png"/>
+                    <t t-snippet="website.s_quotes_slider" t-thumbnail="/website/static/src/img/blocks/block_quotes_slider.png"/>
+                    <t t-snippet="website.s_feature_grid" t-thumbnail="/website/static/src/img/blocks/block_three_columns.png"/>
+                </div>
+            </div>
 
-<div id="snippet_feature" class="o_panel">
-    <div class="o_panel_header">
-        <i class="material-icons">&#xE8B8;</i> Feature
-    </div>
-    <div class="o_panel_body">
-        <t t-snippet="website.s_image_gallery" t-thumbnail="/website/static/src/img/blocks/block_image_gallery.png"/>
-        <t t-snippet="website.s_comparisons" t-thumbnail="/website/static/src/img/blocks/block_comparison.png"/>
-        <t t-snippet="website.s_button" t-thumbnail="/website/static/src/img/blocks/block_button.png"/>
-        <t t-snippet="website.s_references" t-thumbnail="/website/static/src/img/blocks/block_references.png"/>
-        <t t-snippet="website.s_faq_collapse" t-thumbnail="/website/static/src/img/blocks/block_faq.png"/>
-        <t t-snippet="website.s_quotes_slider" t-thumbnail="/website/static/src/img/blocks/block_quotes_slider.png"/>
-        <t t-snippet="website.s_feature_grid" t-thumbnail="/website/static/src/img/blocks/block_three_columns.png"/>
-    </div>
-</div>
+            <div id="snippet_effect" class="o_panel">
+                <div class="o_panel_header">
+                    <i class="fa fa-magic icon-fix"/> Effect
+                </div>
+                <div class="o_panel_body">
+                    <t t-snippet="website.s_parallax" t-thumbnail="/website/static/src/img/blocks/block_parallax.png"/>
+                    <t t-snippet="website.s_parallax_slider" t-thumbnail="/website/static/src/img/blocks/block_quotes_slider.png"/>
+                </div>
+            </div>
+        </div>
+    </xpath>
 
-<div id="snippet_effect" class="o_panel">
-    <div class="o_panel_header">
-        <i class="fa fa-magic icon-fix"></i> Effect
-    </div>
-    <div class="o_panel_body">
-        <t t-snippet="website.s_parallax" t-thumbnail="/website/static/src/img/blocks/block_parallax.png"/>
-        <t t-snippet="website.s_parallax_slider" t-thumbnail="/website/static/src/img/blocks/block_quotes_slider.png"/>
-    </div>
-</div>
-</div>
-
-<div id="snippet_options" class="hidden">
-    <t t-call="website.snippet_options"/>
-</div>
+    <xpath expr="//div[@id='snippet_options']/t" position="attributes">
+        <attribute name="t-call">website.snippet_options</attribute>
+    </xpath>
 </template>
 
 <template id="snippet_options">
-
     <t t-call="web_editor.snippet_options"/>
 
     <div data-js='blog-style'