diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
index d56a0c83ac3..322fead594a 100644
--- a/addons/mass_mailing/__openerp__.py
+++ b/addons/mass_mailing/__openerp__.py
@@ -37,14 +37,6 @@ professional emails and reuse templates in a few clicks.
         'views/snippets_themes.xml',
         'views/snippets_themes_options.xml',
         'views/theme_list.xml',
-        'views/theme/neopolitan_snippets.xml',
-        'views/theme/skyline_snippets.xml',
-        'views/theme/narrative_snippets.xml',
-        'views/theme/sunday_snippets.xml',
-        'views/theme/go_snippets.xml',
-        'views/theme/airmail_snippets.xml',
-        'views/theme/zenflat_snippets.xml',
-        'views/theme/cleave_snippets.xml',
     ],
     'qweb': [],
     'demo': [
diff --git a/addons/mass_mailing/views/theme/airmail_snippets.xml b/addons/mass_mailing/views/theme/airmail_snippets.xml
deleted file mode 100644
index e85e4a0e044..00000000000
--- a/addons/mass_mailing/views/theme/airmail_snippets.xml
+++ /dev/null
@@ -1,710 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="email_designer_snippets_airmail" inherit_id="email_designer_snippets" name="Email airmail Snippets">
-    <xpath expr="//div[@id='email_designer_default_headers']/div[2]" position="inside">
-        <div name="Center Logo" class="airmail o_mail_block_header_center_logo">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #f9f8f8 repeat top /100%">
-                <div style=" width:600px; background-image: url('/mass_mailing/static/src/img/theme_imgs/airmail.png'); background-repeat: repeat-x; background-size: contain; height: 7px; background-position:-2% 0%; display:block"/>
-                <table width="100%" cellspacing="0" cellpadding="0" border="0" style="border-collapse:collapse;width:600px;">
-                    <tbody>
-                      <tr>
-                          <td width="100%" valign="top" style="text-align:center">
-                                &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>
-                      </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Center Text" class="airmail o_mail_block_header_center_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #f9f8f8 repeat top /100%;color: #464646">
-                <div style=" width:600px; background-image: url('/mass_mailing/static/src/img/theme_imgs/airmail.png'); background-repeat: repeat-x; background-size: contain; height: 7px; background-position:-2% 0%; display:block"/>
-                <table width="100%" cellspacing="0" cellpadding="0" border="0" style="border-collapse:collapse;width:600px">
-                    <tbody>
-                        <tr>
-                            <td width="100%" valign="top" style="text-align:center;font-size: 30px">
-                                &amp;nbsp;
-                                <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color:#464646">
-                                    <strong>My Company</strong>
-                                </a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Logo - Social" class="airmail o_mail_block_header_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #f9f8f8 repeat top /100%;color: rgb(70,70,70)">
-                <div style=" width:600px; background-image: url('/mass_mailing/static/src/img/theme_imgs/airmail.png'); background-repeat: repeat-x; background-size: contain; height: 7px; background-position:-2% 0%; display:block"/>
-                <table width="100%" cellspacing="0" cellpadding="0" border="0" style="border-collapse:collapse;width:600px">
-                    <tr>
-                        <td width="100%" valign="top" style="font-size: 30px;padding-left: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;vertical-align:middle">
-                            <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse">
-                                <tr>
-                                    <t t-if="website.social_facebook">
-                                        <td align="right">
-                                            <a t-att-href="website.social_facebook">
-                                              <span class="fa fa-facebook-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_googleplus">
-                                              <span class="fa fa-google-plus-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_linkedin">
-                                              <span class="fa fa-linkedin-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_twitter">
-                                              <span class="fa fa-twitter-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text - Social" class="airmail o_mail_block_header_text_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #f9f8f8 repeat top /100%;color:#464646">
-                <div style=" width:600px; background-image: url('/mass_mailing/static/src/img/theme_imgs/airmail.png'); background-repeat: repeat-x; background-size: contain; height: 7px;color: rgb(70,70,70); background-position:-2% 0%; display:block "/>
-                <table width="100%" cellspacing="0" cellpadding="0" border="0" style="border-collapse:collapse">
-                    <tr>
-                        <td width="100%" valign="top" style="vertical-align: middle;padding-left:5px;font-size: 30px">
-                            &amp;nbsp;
-                            <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color:#464646">
-                                <strong>My Company</strong>
-                            </a>
-                            &amp;nbsp;
-                        </td>
-                        <td valign="center" width="270" style="padding:10px 15px 10px 10px;vertical-align:middle">
-                            <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse">
-                                <tr>
-                                    <t t-if="website.social_facebook">
-                                        <td align="right">
-                                            <a t-att-href="website.social_facebook">
-                                              <span class="fa fa-facebook-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_googleplus">
-                                              <span class="fa fa-google-plus-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_linkedin">
-                                              <span class="fa fa-linkedin-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_twitter">
-                                              <span class="fa fa-twitter-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_body']/div[2]" position="inside">
-        <div name="Title Content" class="airmail o_mail_block_title_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%">
-                <table style="width:600px">
-                    <tr>
-                        <td style="padding:10px 30px">
-                            <p style="font-size:30px;margin:20px 0 10px 0;color:#464646">Your order has been shipped!</p>
-                            <div style="text-align:left;color:#464646;font-size:14px">
-                                <p style="margin:0">Hello Bob,</p>
-                                <p style="margin:0">We would like you to know that your order has shipped! To view your order or make any changes please click the "my order" button below.</p>
-                                <div style="padding-top:20px">
-                                    <a href="#" style="-webkit-user-select: none; cursor: pointer; padding: 6px 12px; font-size: 14px; line-height: 20px; border-radius: 4px; color: rgb(255, 255, 255); border: 1px solid rgb(212, 63, 58); text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; white-space: nowrap; background-image: none; background-color: rgb(217, 83, 79);" class="btn btn-danger">Track shipping</a>
-                                    &amp;nbsp;
-                                </div>
-                            </div>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Title - Subtitle" class="airmail o_mail_block_title_sub">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;color:#464646;background: #FFFFFF repeat top /100%">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="text-align:center;padding-top: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">Apps That Help You Grow Your Business!</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Discount Coupon" class="airmail o_mail_block_discount2">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#464646">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="text-align:center; padding:20px">
-                                <p style="margin:0;font-size:26px;padding-bottom:20px;font-weight:bold">
-                                    Upgrade to Premium Account!
-                                </p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center; padding:20px;">
-                                <p style="margin:0;border:1px solid #a1a1a1;padding:10px;color:#37302d;font-size:14px"> Code: <strong>45A9E77DGW8455</strong></p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Discount Offer" class="airmail o_mail_block_discount1">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;color:#464646;background: #FFFFFF repeat top /100%">
-                <table cellpadding="0" cellspacing="0" width="100%" style="border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="font-size: 45px; font-weight: 900; text-align:center;padding-top:35px;color:#464646"><p style="margin:0">20% off!</p></td>
-                        </tr>
-                        <tr>
-                            <td style="font-size: 30px; font-weight: 600; line-height:30px; text-align:center;color:#464646"><p style="margin:0">Hurry Up</p></td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center;padding:20px 0">
-                                &amp;nbsp;
-                                <span class="fa fa-10x fa-gift"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="padding:0 75px;text-align:justify;color:#464646;font-size:14px"><br/>
-                                <p style="margin:0">We are continuing to grow and we miss seeing you be a part of it! We've increased store hours and have lot's of new brands available. To welcome you back please accept this 20% discount on you next purchase by clicking the button below.</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center; margin:0 auto;padding-bottom:35px;padding-top:25px">
-                                &amp;nbsp;
-                                <a href="#" style="-webkit-user-select: none; cursor: pointer; padding: 6px 12px; font-size: 13.63636302948px; line-height: 17.7095623016357px; 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: 0.909090876579285px solid rgb(212,63,58); text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; white-space: nowrap; background-image: none; background-color: #E56054">Redeem Discount!</a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Event" class="airmail o_mail_block_event">
-            <div style="padding:0px;width:600px;margin:auto;text-align:center;color:#fff">
-                <table style="width:100%;border-collapse:collapse;background:inherit">
-                    <tr>
-                        <td class="col_mv bg-color" style="width: 150px;height: 150px;padding: 0;margin: 0;background-color: rgb(77,107,187);text-align:center;vertical-align:middle;color:#FFFFFF">
-                            <time datetime="2014-07-20"> <span style="display: block;font-size: 50px;line-height: 1;padding-top: 10px">21</span> <span style="display: block;font-size: 30px;line-height: 1">Jul</span> <span style="display: block;font-size: 16px;line-height: 1;color: #fff;font-weight: 600">ALL DAY</span> </time>
-                        </td>
-                        <td style="width: 150px;height: 150px;padding: 0px;margin: 0px;text-align: center;background-color: rgb(229,96,84)" class="col_mv bg-color">
-                            <div style="margin:27px auto">
-                                &amp;nbsp;
-                                <span class="fa fa-calendar fa-5x"></span>
-                                &amp;nbsp;
-                            </div>
-                        </td>
-                        <td style="position: relative;text-align: left;background-color:#f5f5f5;color:#464646;vertical-align:top;width:298px;height:150px;min-width:255px" class="col_mv bg-color">
-                            <table style="width:100%;border-collapse:collapse;background:inherit;color:inherit">
-                                <tr>
-                                    <td style="padding-top:20px;padding-left:20px;float:left" width="90%">
-                                        <div style="min-height:100px;text-align:left">
-                                            <p style="margin:0;font-size:18px">Your Event Name</p>
-                                            <p style="margin:0;font-size:14px">Description</p>
-                                        </div>
-                                        <ul style="padding-left:0">
-                                            <li style="display: table-cell;cursor: pointer;color: #1e1e1e;font-size: 11px;font-weight: 300;padding: 3px 30px;text-align: center"><a href="#" style="color:#1e1e1e">Link </a></li>
-                                            <li style="display: table-cell;cursor: pointer;color: #1e1e1e;font-size: 11px;font-weight: 300;padding: 3px 30px;text-align: center"><a href="#" style="color:#1e1e1e">Info</a></li>
-                                        </ul>
-                                    </td>
-                                    <td style="width: 60px;vertical-align:middle;display: table-cell">
-                                        <ul t-if="website" style="border-left:1px solid #e6e6e6;list-style-type:none;padding-left:16px">
-                                            <t t-if="website.social_facebook">
-                                                <li style="width:33%;margin-left:0">
-                                                    <a t-att-href="website.social_facebook">
-                                                      <span style="color: rgb(75,110,168);" class="fa fa-facebook-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                            <t t-if="website.social_twitter">
-                                                <li style="width:34%;margin-left:0">
-                                                    <a t-att-href="website.social_twitter">
-                                                      <span style="color: rgb(75,110,168);" class="fa fa-twitter-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                            <t t-if="website.social_googleplus">
-                                                <li style="width:33%;margin-left:0">
-                                                    <a t-att-href="website.social_googleplus">
-                                                      <span style="color: rgb(221,75,57);" class="fa fa-google-plus-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                        </ul>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="User Profile" class="airmail o_mail_block_profile">
-            <div class="snippet_row" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#464646">
-                <table style="padding:30px 15px;border-collapse:collapse;color:inherit width:600px">
-                    <tr>
-                        <td style="padding: 0 8px 0 20px;text-align: center;font-size:14px;width:30%" class="bg-color col_mv">
-                            &amp;nbsp;
-                            <span class="fa fa-user fa-5x" style="margin: 5px 20px;"></span>
-                            &amp;nbsp;
-                            <br/>
-                            User: John Doe
-                        </td>
-                        <td style="vertical-align:middle;font-size:14px;padding:10px" class="col_mv bg-color">
-                            <p style="margin:0">Hey Bob,</p>
-                            <p style="margin:0">I set up an Odoo profile where I can do tons of really awesome stuff. I want you to follow me so we can keep in touch!</p>
-                            <p style="margin:0">See you soon!</p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td colspan="2" style="padding:12px 30px;font-size:14px" class="bg-color">
-                            <p style="margin:0">Because I've invited you, you can also use the below coupon code to receive a 50% discount on you first months subscription!</p>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Content Table" class="airmail o_mail_block_table_content">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#464646">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td>
-                                <center>
-                                    <table cellspacing="0" cellpadding="0" style="margin:20px auto;width:80%;border-collapse:collapse;background:inherit;color:inherit">
-                                        <tbody>
-                                            <tr>
-                                                <td style="text-align:left;border-left:none;font-size:14px">
-                                                    <p style="margin:0"><strong>Bob Erlicious</strong></p>
-                                                    <p style="margin:0">
-                                                        123 Flower Drive<br/>
-                                                        Victoria, BC<br/>
-                                                        V9P 2E8<br/>
-                                                        1(250)222-2232
-                                                    </p>
-                                                </td>
-                                                <td style="text-align:right; vertical-align:top;border-left:none;font-size:14px">
-                                                    <p style="margin:0"><strong>Invoice: 00234</strong></p>
-                                                    <p style="margin:0">April 3, 2014</p>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <table cellspacing="0" cellpadding="0" style="margin:20px auto;width:80%;border-collapse:collapse">
-                                        <tbody>
-                                            <tr>
-                                                <td>
-                                                    <table cellspacing="0" cellpadding="0" style="width:100%;padding-top:30px;text-indent:10px;border-collapse:collapse;background:inherit" data-max-width="500px">
-                                                        <thead>
-                                                            <tr style="color: #ffffff;background: #464646" class="row col bg-color">
-                                                                <th style="padding: 10px 0px;width:166px;border-left:none;text-align:left;font-size:14px" class="mv">Plan</th>
-                                                                <th style="padding: 10px 0px;width:166px;border-left:none;text-align:left;font-size:14px" class="mv">Period</th>
-                                                                <th style="padding: 10px 0px;width:166px;border-left:none;text-align:left;font-size:14px" class="mv">Amount</th>
-                                                            </tr>
-                                                        </thead>
-                                                        <tbody>
-                                                            <tr class="row bg-color" style="color:#464646">
-                                                                <td style="padding:10px 0px;font-size:14px">Silver Plan</td>
-                                                                <td style="padding:10px 0px;font-size:14px">August</td>
-                                                                <td style="padding:10px 0px;font-size:14px">$50.00</td>
-                                                            </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <table cellspacing="0" cellpadding="0" style="margin: 20px auto;width:80%;padding-top:30px;padding-bottom:30px;border-collapse:collapse;color:inherit">
-                                        <tbody>
-                                            <tr>
-                                                <td>
-                                                    <p style="margin:0;text-align:left;font-size:14px">
-                                                        The amount of $50.00 CAD has been charged on the credit card ending with 0123.
-                                                    </p>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </center>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Two Columns" class="airmail o_mail_block_two_cols">
-            <div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#464646">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background:inherit;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="padding:30px 10px 30px 30px;width:45%;text-align:center" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-5x fa-bookmark"></span>
-                                &amp;nbsp;
-                                <p style="margin:0;font-size:24px">Step 1</p>
-                                <p style="margin:0;text-align:justify;font-size:14px">
-                                    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 30px 10px 30px; width:45%;text-align:center" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="ffa fa-5x fa-map-marker"></span>
-                                &amp;nbsp;
-                                <p style="margin:0;font-size:24px">Step 2</p>
-                                <p style="margin:0;text-align:justify;font-size:14px">
-                                    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="Image - Text" class="airmail o_mail_block_image_text">
-            <div class="mv" style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#464646">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="width:45%;text-align:center;vertical-align:middle" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-picture-o fa-10x"></span>
-                                &amp;nbsp;
-                            </td>
-                            <td style="vertical-align:middle; padding: 30px 30px 10px 30px; width:45%;text-align:justify;font-size:14px;color:#464646" class="col_mv bg-color">
-                                <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="Image" class="airmail o_mail_block_image">
-            <div class="snippet_row bg-color" style="width:600px;margin:auto;background: #FFFFFF repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td width="100%" align="center" style="text-align:center">
-                                &amp;nbsp;
-                                <span class="fa fa-camera fa-10x"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td width="100%" style="text-align:center;padding:10px 30px;font-size:14px;color:#464646">
-                                <p style="margin:0"><strong>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.</strong></p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Button" class="airmail 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%">
-                <table style="width:90%;text-align:center;margin:0 auto;border-collapse:collapse;width:600px">
-                    <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: #E56054;border-radius:4px">My Account</a>
-                            &amp;nbsp;
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text Block" class="airmail 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:#464646">
-                <table style="width:100%;text-align:justify;margin:0 auto;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 assist 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 name="Background Image" class="airmail o_mail_block_text_on_img">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: url('/mass_mailing/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="padding:30px 30px 0 50px;text-align: left;vertical-align:middle">
-                                <p style="margin:0;padding-bottom:5px;font-size:34px">
-                                    YOUR ORDER HAS SHIPPED
-                                </p>
-                                <p style="margin:0;font-size:24px">
-                                    To track your order or make any changes please click the button below.
-                                </p>
-                                <div style="margin-bottom:35px;margin-top:30px">
-                                    <a href="#" style="-webkit-user-select: none; padding: 12px 30px; 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: #E56054">My Account</a>
-                                    &amp;nbsp;
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Steps" class="airmail o_mail_block_steps">
-            <div style="padding:0;width:600px;max-width:600px;margin:0 auto">
-                <table style="width:100%;text-align:justify;margin:0 auto;max-width:600px;border-collapse:collapse;background:inherit">
-                    <tr>
-                        <td style="padding:10px 0;background-color:#4D6BBB;color:#fff" class="col_mv bg-color">
-                            <table style="border-collapse:collapse;background:inherit">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-check fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#fff;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 1:</p>
-                                        <p style="margin:0">Place Order</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td style="padding:10px 0;background-color:#F9F8F8;color:#808080" class="col_mv bg-color">
-                            <table style="border-collapse:collapse;background:inherit">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-truck fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#808080;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 2:</p>
-                                        <p style="margin:0">Shipping</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td style="padding:10px 0;background-color:#F9F8F8;color:#808080" class="col_mv bg-color">
-                            <table style="border-collapse:collapse;background:inherit">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-usd fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#808080;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 3:</p>
-                                        <p style="margin:0">Payment</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_extra']/div[2]" position="inside">
-        <div name="Separator" class="airmail o_mail_block_footer_seprator">
-            <div style="padding:0px; margin:auto;max-width:600px;background-color:#FFFFFF">
-                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);border-collapse:collapse;background:inherit">
-                    <tbody>
-                        <tr>
-                            <td valign="top" style="width:600px">
-                                <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"/>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Tag Line" class="airmail o_mail_block_footer_tag_line">
-            <div class="bg-color" style="padding:0px; margin:auto;background:#4D6BBB;color:#FFFFFF;max-width:600px">
-                <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;font-size:18px;color:inherit">Apps That Help You Grow Your Business</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_footer']/div[2]" position="inside">
-        <div t-if="website" name="Social + Text" class="airmail o_mail_block_footer_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #E5E5E5 repeat top /100%;color:#464646">
-                <div style="padding:10px">
-                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td style="text-align:center">
-                                    &amp;nbsp;
-                                    <t t-if="website.social_facebook">
-                                        <a t-att-href="website.social_facebook">
-                                          <span class="fa fa-facebook-square fa-2x"></span>
-                                        </a>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <a t-att-href="website.social_googleplus">
-                                          <span class="fa fa-google-plus-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <a t-att-href="website.social_linkedin">
-                                          <span class="fa fa-linkedin-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <a t-att-href="website.social_twitter">
-                                          <span class="fa fa-twitter-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                            <tr>
-                                <td style="font-size:12px;text-align:center;padding:10px">
-                                    &amp;nbsp;
-                                    <a href="/unsubscribe_from_list" style="color:#464646">Unsubscribe</a> | <a href="/page/contactus" style="color:#464646">Contact</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-
-        <div name="Text + Copyright" class="airmail o_mail_block_footer_copyright">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #E5E5E5 repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding:10px;color:#464646">
-                                &amp;nbsp;
-                                <a href="/unsubscribe_from_list" style="color:#464646">Unsubscribe</a>
-                                <t t-if="website"> | <a href="/page/contactus" style="color:#464646">Contact</a> </t>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding-bottom:10px;color:#464646">
-                                <p style="margin:0">© 2014 All Rights Reserved</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text Only" class="airmail o_mail_block_footer_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #E5E5E5 repeat top /100%;color:#464646">
-                <center>
-                    <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td valign="middle" align="right" style="font-size:12px;padding:10px;text-align:center">
-                                    &amp;nbsp;
-                                    <t t-if="website">
-                                        <a href="/page/contactus" style="padding-right:3px;color:#464646">Contact Us</a> | 
-                                        <t t-if="website.social_facebook">
-                                            <a t-att-href="website.social_facebook" style="padding-right:3px;color:#464646">Facebook</a> | 
-                                        </t>
-                                        <t t-if="website.social_twitter">
-                                            <a t-att-href="website.social_twitter" style="padding-right:3px;color:#464646">Twitter</a> | 
-                                        </t>
-                                    </t>
-                                    <a href="/unsubscribe_from_list" style="color:#464646">Unsubscribe</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </center>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='snippet_options']" position="after">
-        <div class="hidden o_theme_palette airmail">
-            <div class="note-palette-title mt8"> Mail Theme Colors</div>
-            <div class="mail-colorpicker note-color-row">
-                    <t t-set="colors" t-value="['#E56054', '#4D6BBB', '#1F1F1F', '#464646', '#808080', '#E5E5E5', '#f9f8f8', '#41C534']"/>
-                    <t t-foreach="colors" t-as="c"><button type="button" class="note-color-btn" t-attf-style="background-color:#{c};" t-attf-data-value="#{c}" t-attf-title="#{c}" data-toggle="button" tabindex="-1"></button></t>
-            </div>
-        </div>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/addons/mass_mailing/views/theme/cleave_snippets.xml b/addons/mass_mailing/views/theme/cleave_snippets.xml
deleted file mode 100644
index 1ffdb22b27a..00000000000
--- a/addons/mass_mailing/views/theme/cleave_snippets.xml
+++ /dev/null
@@ -1,692 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="email_designer_snippets_cleave" inherit_id="email_designer_snippets" name="Email Cleave Snippets">
-    <xpath expr="//div[@id='email_designer_default_headers']/div[2]" position="inside">
-        <div name="Center Logo" class="cleave o_mail_block_header_center_logo">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%">
-                <table style="margin: 0 auto;border-collapse:collapse;width:600px" 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 src="/logo.png" style="padding:10px;height:auto;max-width:600px;width:200px" alt="Your Logo" />
-                                </a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Center Text" class="cleave o_mail_block_header_center_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#414141">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;width:600px">
-                    <tbody>
-                        <tr>
-                            <td style="font-size: 30px; text-align:center">
-                                &amp;nbsp;
-                                <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color:#414141">
-                                    <strong>My Company</strong>
-                                </a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Logo - Social" class="cleave o_mail_block_header_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #ffffff repeat top /100%">
-                <table width="100%" cellspacing="0" cellpadding="0" border="0" style="border-collapse:collapse;width:600px">
-                    <tr>
-                        <td width="100%" valign="top" style="font-size: 30px;padding-left:5px">
-                            &amp;nbsp;
-                            <a t-att-href="(company_id.website) or '#'" style="text-decoration:none">
-                                <img src="/logo.png" style="height:auto;max-width:600px;width:200px;padding:10px" alt="Your Logo" />
-                            </a>
-                            &amp;nbsp;
-                        </td>
-                        <td valign="center" width="270" style="padding:10px 15px 10px 10px;vertical-align:middle">
-                            <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse">
-                                <tr>
-                                    <t t-if="website.social_facebook">
-                                        <td align="right">
-                                            <a t-att-href="website.social_facebook">
-                                              <span class="fa fa-facebook-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_googleplus">
-                                              <span class="fa fa-google-plus-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_linkedin">
-                                              <span class="fa fa-linkedin-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_twitter">
-                                              <span class="fa fa-twitter-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text - Social" class="cleave o_mail_block_header_text_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#414141">
-                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse">
-                    <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;color: #414141;font-size: 30px; text-align:center">
-                                <strong>My Company</strong>
-                            </a>
-                            &amp;nbsp;
-                        </td>
-                        <td valign="center" width="270" style="padding:10px 15px 10px 10px;vertical-align:middle">
-                            <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse">
-                                <tr>
-                                    <t t-if="website.social_facebook">
-                                        <td align="right">
-                                            <a t-att-href="website.social_facebook">
-                                              <span class="fa fa-facebook-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_googleplus">
-                                              <span class="fa fa-google-plus-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_linkedin">
-                                              <span class="fa fa-linkedin-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_twitter">
-                                              <span class="fa fa-twitter-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_body']/div[2]" position="inside">
-        <div name="Title Content" class="cleave o_mail_block_title_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%">
-                <table style="color:#89898d;width:600px">
-                    <tr>
-                        <td style="padding:10px 30px">
-                            <p style="font-size:30px;margin:20px 0 10px 0">Your order has been shipped!</p>
-                            <div style="text-align:left;font-size:14px">
-                                <p style="margin:0">Hello Bob,</p>
-                                <p style="margin:0">We would like you to know that your order has shipped! To view your order or make any changes please click the "my order" button below.</p>
-                                <div style="padding-top:20px">
-                                    <a href="#" style="-webkit-user-select: none; cursor: pointer; padding: 6px 12px; font-size: 13.63636302948px; line-height: 17.7095623016357px; 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: 0.909090876579285px solid rgb(76,174,76); text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; white-space: nowrap; background-image: none; background-color: #48BE19">Track shipping</a>                                        &amp;nbsp;
-                                </div>
-                            </div>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Title - Subtitle" class="cleave o_mail_block_title_sub">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;color:#89898d;background: #FFFFFF repeat top /100%">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="text-align:center;padding-top:10px">
-                                <p style="font-size:36px;margin:0 0 10px 0">Check this out!</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="font-size:20px; text-align:center; padding: 0 5px">
-                                <p style="margin:0">Apps That Help You Grow Your Business!</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Content Table" class="cleave o_mail_block_table_content">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#F8931E">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td>
-                                <center>
-                                    <table cellspacing="0" cellpadding="0" style="margin:20px auto;width:80%;border-collapse:collapse;color:inherit">
-                                        <tbody>
-                                            <tr>
-                                                <td style="text-align:left;border-left:none;font-size:14px">
-                                                    <p style="margin:0"><strong>Bob Erlicious</strong></p>
-                                                    <p style="margin:0">
-                                                        123 Flower Drive<br/>
-                                                        Victoria, BC<br/>
-                                                        V9P 2E8<br/>
-                                                        1(250)222-2232
-                                                    </p>
-                                                </td>
-                                                <td style="text-align:right; vertical-align:top;border-left:none;font-size:14px">
-                                                    <p style="margin:0"><strong>Invoice: 00234</strong></p>
-                                                    <p style="margin:0">April 3, 2014</p>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <table cellspacing="0" cellpadding="0" style="margin:20px auto;width:80%;border-collapse:collapse">
-                                        <tbody>
-                                            <tr>
-                                                <td>
-                                                    <table cellspacing="0" cellpadding="0" style="width:100%;padding-top:30px;text-indent:10px;border-collapse:collapse" data-max-width="500px">
-                                                        <thead>
-                                                            <tr style="color: #fff;background: #89898D" class="row col bg-color">
-                                                                <th style="padding: 10px 0px;width:166px;border-left:none;text-align:left;font-size:14px" class="mv">Plan</th>
-                                                                <th style="padding: 10px 0px;width:166px;border-left:none;text-align:left;font-size:14px" class="mv">Period</th>
-                                                                <th style="padding: 10px 0px;width:166px;border-left:none;text-align:left;font-size:14px" class="mv">Amount</th>
-                                                            </tr>
-                                                        </thead>
-                                                        <tbody>
-                                                            <tr class="row bg-color" style="color:#89898D">
-                                                                <td style="padding:10px 0px;font-size:14px">Silver Plan</td>
-                                                                <td style="padding:10px 0px;font-size:14px">August</td>
-                                                                <td style="padding:10px 0px;font-size:14px">$50.00</td>
-                                                            </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <table cellspacing="0" cellpadding="0" style="margin: 20px auto;width:80%;padding-top:30px;padding-bottom:30px;border-collapse:collapse;color:inherit">
-                                        <tbody>
-                                            <tr>
-                                                <td>
-                                                    <p style="margin:0;text-align:left;font-size:14px">
-                                                        The amount of $50.00 CAD has been charged on the credit card ending with 0123.
-                                                    </p>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </center>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Event" class="cleave o_mail_block_event">
-            <div style="padding:0px;width:600px;margin:auto;text-align:center;color:#fff">
-                <table style="width:100%;border-collapse:collapse;border-collapse:collapse;background-color:inherit">
-                    <tr>
-                        <td class="col_mv bg-color" style="width: 150px;height: 150px;padding: 0;margin: 0;background-color:#1F1F1F;text-align:center;vertical-align:middle;color:#FFFFFF">
-                            <time datetime="2014-07-20"> <span style="display: block;font-size: 50px;line-height: 1;padding-top: 10px;color:#fff">21</span> <span style="display: block;font-size: 30px;line-height: 1;color:#fff">Jul</span> <span style="display: block;font-size: 16px;line-height: 1;color: #fff;font-weight: 600">ALL DAY</span> </time>
-                        </td>
-                        <td style="width: 150px;height: 150px;padding: 0px;margin: 0px;text-align: center;background-color: #89898D" class="col_mv bg-color">
-                            <div style="margin:27px auto">
-                                &amp;nbsp;
-                                <span class="fa fa-calendar fa-5x"></span>
-                                &amp;nbsp;
-                            </div>
-                        </td>
-                        <td style="position: relative;text-align: left;background-color:#f5f5f5;color:#666666;vertical-align:top;width:298px;height:150px;min-width:255px" class="col_mv bg-color">
-                            <table style="width:100%;border-collapse:collapse;background-color:inherit;color:inherit">
-                                <tr>
-                                    <td style="margin-top:20px;margin-left:20px;float:left" width="90%">
-                                        <div style="min-height:100px;text-align:left">
-                                            <p style="margin:0;font-size:18px">Your Event Name</p>
-                                            <p style="margin:0;font-size:14px">Description</p>
-                                        </div>
-                                        <ul style="padding-left:0">
-                                            <li style="display: table-cell;cursor: pointer;color: #1e1e1e;font-size: 11px;font-weight: 300;padding: 3px 30px;text-align: center"><a href="#" style="color:#1e1e1e">Link </a></li>
-                                            <li style="display: table-cell;cursor: pointer;color: #1e1e1e;font-size: 11px;font-weight: 300;padding: 3px 30px;text-align: center"><a href="#" style="color:#1e1e1e">Info</a></li>
-                                        </ul>
-                                    </td>
-                                    <td style="width: 60px;vertical-align:middle;display: table-cell">
-                                        <ul t-if="website" style="border-left:1px solid #e6e6e6;list-style-type:none;padding-left:16px">
-                                            <t t-if="website.social_facebook">
-                                                <li style="width:33%;margin-left:0">
-                                                    <a t-att-href="website.social_facebook">
-                                                      <span style="color: rgb(75,110,168);" class="fa fa-facebook-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                            <t t-if="website.social_twitter">
-                                                <li style="width:34%;margin-left:0">
-                                                    <a t-att-href="website.social_twitter">
-                                                      <span style="color: rgb(75,110,168);" class="fa fa-twitter-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                            <t t-if="website.social_googleplus">
-                                                <li style="width:33%;margin-left:0">
-                                                    <a t-att-href="website.social_googleplus">
-                                                      <span style="color: rgb(221,75,57);" class="fa fa-google-plus-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                        </ul>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="User Profile" class="cleave o_mail_block_profile">
-            <div class="snippet_row" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#89898d">
-                <table style="padding:30px 15px;border-collapse:collapse;color:inherit">
-                    <tr>
-                        <td style="padding: 0 30px 0 20px;text-align: center;font-size:14px" class="bg-color col_mv">
-                            &amp;nbsp;
-                            <span class="fa fa-user fa-5x" style="margin: 5px 20px;"></span>
-                            <br/>
-                            User: John Doe
-                        </td>
-                        <td style="vertical-align:middle;font-size:14px" class="col_mv bg-color">
-                            <p style="margin:0">Hey Bob,</p>
-                            <p style="margin:0">I set up an Odoo profile where I can do tons of really awesome stuff. I want you to follow me so we can keep in touch!</p>
-                            <p style="margin:0">See you soon!</p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td colspan="2" style="padding:12px 20px;font-size:14px">
-                            <p style="margin:0">Because I've invited you, you can also use the below coupon code to receive a 50% discount on you first months subscription!</p>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Discount Coupon" class="cleave o_mail_block_discount2">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#89898d;text-align:center">
-                <table style="width:600px">
-                    <tr>
-                    <td style="padding:10px">
-                    <p style="margin:0"><strong style="font-size:18px"> Save 20% when you upgrade now!</strong></p>
-                    &amp;nbsp;
-                    <a href="#" style="-webkit-user-select: none; cursor: pointer; padding: 6px 12px; font-size: 13.63636302948px; line-height: 17.7095623016357px; 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: 0.909090876579285px solid rgb(76,174,76); text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; white-space: nowrap; background-image: none; background-color: #48BE19">Upgrade</a>
-                    &amp;nbsp;
-                    <br/><br/>
-                    <p style="margin:0;padding-bottom:15px;color:#F8931E;font-size:14px">
-                        <span>Discount Code : </span> <strong style="border:1px solid #d1d1d1;padding:10px"> 45A9E77DGW8455</strong>
-                    </p>
-                    </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Discount Offer" class="cleave o_mail_block_discount1">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%">
-                <table cellpadding="0" cellspacing="0" width="100%" style="color:#89898d;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="font-size: 45px; font-weight: 900; text-align:center;padding-top:35px">
-                                <p style="margin:0">20% off!</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="font-size: 30px; font-weight: 600; line-height:30px; text-align:center;color:#48BE19">
-                                <p style="margin:0">Hurry Up</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center;padding:10px 0">
-                                &amp;nbsp;
-                                <span class="fa fa-10x fa-gift"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="padding:0 75px;text-align:justify;font-size:14px"><br/>
-                                <p style="margin:0">We are continuing to grow and we miss seeing you be a part of it! We've increased store hours and have lot's of new brands available. To welcome you back please accept this 20% discount on you next purchase by clicking the button below.</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center; margin:0 auto;padding-bottom:35px;padding-top:25px">
-                                &amp;nbsp;
-                                <a href="#" style="-webkit-user-select: none; cursor: pointer; padding: 6px 12px; font-size: 13.63636302948px; line-height: 17.7095623016357px; 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: 0.909090876579285px solid rgb(238,162,54); text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; white-space: nowrap; background-image: none; background-color: rgb(240,173,78)">Redeem Discount!</a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Two Columns" class="cleave o_mail_block_two_cols">
-            <div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#89898D">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background-color:inherit;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="padding:30px 10px 30px 30px;width:45%;text-align:center" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-5x fa-bookmark"></span>
-                                &amp;nbsp;
-                                <p style="margin:0;font-size:24px">Step 1</p>
-                                <p style="margin:0;text-align:justify;font-size:14px">
-                                    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 30px 10px 30px; width:45%;text-align:center" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-5x fa-map-marker"></span>
-                                &amp;nbsp;
-                                <p style="margin:0;font-size:24px">Step 2</p>
-                                <p style="margin:0;text-align:justify;font-size:14px">
-                                    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="Image Button" class="cleave o_mail_block_image">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#37302d">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:#89898d">
-                    <tbody>
-                        <tr>
-                            <td style="text-align:center;padding:20px 0" >
-                                &amp;nbsp;
-                                <span class="fa fa-picture-o fa-10x"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center;font-size:30px">
-                                <p style="margin:0">Good News!</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center;font-size:14px; margin:0 auto;padding:10px 0 25px 0">
-                                &amp;nbsp;
-                                <a href="#" style="-webkit-user-select: none; cursor: pointer; padding: 6px 12px; font-size: 13.63636302948px; line-height: 17.7095623016357px; 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: 0.909090876579285px solid rgb(76,174,76); text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; white-space: nowrap; background-image: none; background-color: #48BE19">My Account</a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Button" class="cleave 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%">
-                <table style="width:90%;text-align:center;margin:0 auto;border-collapse:collapse;width:600px">
-                    <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: #48BE19;border-radius:4px">My Account</a>
-                            &amp;nbsp;
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text Block" class="cleave 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:#89898d">
-                <table style="width:100%;text-align:justify;margin:0 auto;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 assist 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 name="Background Image" class="cleave o_mail_block_text_on_img">
-            <div class="snippet_row bg-color" style=" padding:0px;width:600px;margin:auto;background: url('/mass_mailing/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="padding:30px 30px 0 50px;text-align: left;vertical-align:middle">
-                                <p style="margin:0;padding-bottom:5px;font-size:34px">
-                                    YOUR ORDER HAS SHIPPED
-                                </p>
-                                <p style="margin:0;font-size:24px">
-                                    To track your order or make any changes please click the button below.
-                                </p>
-                                <div style="margin-bottom:35px;margin-top:30px">
-                                    <a href="#" style="-webkit-user-select: none; padding: 12px 30px; 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: #48BE19">My Account</a>
-                                    &amp;nbsp;
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Steps" class="cleave o_mail_block_steps">
-            <div style="padding:0;width:600px;max-width:600px;margin:0 auto">
-                <table style="width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;background-color:inherit">
-                    <tr>
-                        <td style="padding:10px 0;background-color:#f8931e;color:#fff" class="col_mv bg-color">
-                            <table style="border-collapse:collapse;background-color:inherit">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-check fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#fff;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 1:</p>
-                                        <p style="margin:0">Place Order</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td style="padding:10px 0;background-color:#f9f9f9;color:#808080" class="col_mv bg-color">
-                            <table style="border-collapse:collapse;background-color:inherit">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-truck fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#808080;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 2:</p>
-                                        <p style="margin:0">Shipping</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td style="padding:10px 0;background-color:#f9f9f9;color:#808080" class="col_mv bg-color">
-                            <table style="border-collapse:collapse;background-color:inherit">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-usd fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#808080;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 3:</p>
-                                        <p style="margin:0">Payment</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_extra']/div[2]" position="inside">
-        <div name="Separator" class="cleave o_mail_block_footer_seprator">
-            <div style="padding:0px; margin:auto;max-width:600px;background-color:#fff">
-                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);border-collapse:collapse;background-color:inherit">
-                    <tbody>
-                        <tr>
-                            <td valign="top" style="width:600px">
-                                <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"/>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Tag Line" class="cleave o_mail_block_footer_tag_line">
-            <div class="bg-color" style="padding:0px; margin:auto;background:#F8931E;color:#FFFFFF;max-width:600px">
-                <table style="margin: 0 auto;border-collapse:collapse;background-color:inherit;color:inherit;width:600px" cellpadding="0" cellspacing="0">
-                    <tbody>
-                        <tr>
-                            <td valign="center" style="text-align:center;padding:5px">
-                                <p style="margin:0;font-size:18px;color:inherit">Apps That Help You Grow Your Business</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_footer']/div[2]" position="inside">
-        <div t-if="website" name="Social + Text" class="cleave o_mail_block_footer_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #E6E5E5 repeat top /100%;color:#414141">
-                <div style="padding:10px">
-                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td style="text-align:center">
-                                    &amp;nbsp;
-                                    <t t-if="website.social_facebook">
-                                        <a t-att-href="website.social_facebook">
-                                          <span class="fa fa-facebook-square fa-2x"></span>
-                                        </a>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <a t-att-href="website.social_googleplus">
-                                          <span class="fa fa-google-plus-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <a t-att-href="website.social_linkedin">
-                                          <span class="fa fa-linkedin-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <a t-att-href="website.social_twitter">
-                                          <span class="fa fa-twitter-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                            <tr>
-                                <td style="font-size:12px;text-align:center;padding-top:10px;padding-bottom:5px">
-                                    <a href="/unsubscribe_from_list" style="color:#414141">Unsubscribe</a> | <a href="/page/contactus" style="color:#414141">Contact</a>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-
-        <div name="Text + Copyright" class="cleave o_mail_block_footer_copyright">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #E6E5E5 repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding-top:10px;padding-bottom:5px">
-                                &amp;nbsp;
-                                <a href="/unsubscribe_from_list" style="color:#414141">Unsubscribe</a>
-                                <t t-if="website"> | <a href="/page/contactus" style="color:#414141">Contact</a> </t>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding-bottom:10px;color:#414141">
-                                <p style="margin:0">© 2014 All Rights Reserved</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text Only" class="cleave o_mail_block_footer_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #E6E5E5 repeat top /100%;color:#414141">
-                <center>
-                    <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td valign="middle" align="right" style="font-size:12px;padding:10px;text-align:center">
-                                    &amp;nbsp;
-                                    <t t-if="website">
-                                        <a href="/page/contactus" style="color:#414141">Contact Us</a> | 
-                                        <t t-if="website.social_facebook">
-                                            <a t-att-href="website.social_facebook" style="color:#414141">Facebook</a> |
-                                        </t>
-                                        <t t-if="website.social_twitter">
-                                            <a t-att-href="website.social_twitter" style="color:#414141">Twitter</a> | 
-                                        </t>
-                                    </t>
-                                    <a href="/unsubscribe_from_list" style="color:#414141">Unsubscribe</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </center>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='snippet_options']" position="after">
-        <div class="hidden o_theme_palette cleave">
-            <div class="note-palette-title mt8"> Mail Theme Colors</div>
-            <div class="mail-colorpicker note-color-row">
-                    <t t-set="colors" t-value="['#1F1F1F', '#414141', '#808080', '#89898d', '#E5E5E5', '#f9f9f9', '#48BE19', '#f8931e']"/>
-                    <t t-foreach="colors" t-as="c"><button type="button" class="note-color-btn" t-attf-style="background-color:#{c};" t-attf-data-value="#{c}" t-attf-title="#{c}" data-toggle="button" tabindex="-1"></button></t>
-            </div>
-        </div>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/addons/mass_mailing/views/theme/go_snippets.xml b/addons/mass_mailing/views/theme/go_snippets.xml
deleted file mode 100644
index 4ec213445b7..00000000000
--- a/addons/mass_mailing/views/theme/go_snippets.xml
+++ /dev/null
@@ -1,739 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="email_designer_snippets_go" inherit_id="email_designer_snippets" name="Email Go Snippets">
-    <xpath expr="//div[@id='email_designer_default_headers']/div[2]" position="inside">
-        <div name="Center Logo" class="go o_mail_block_header_center_logo">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #282D29 repeat top /100%">
-                <table style="margin: 0 auto;border-collapse:collapse;width:600px" 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 src="/logo.png" style="padding:10px;height:auto;max-width:600px;width:200px" alt="Your Logo" />
-                                </a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Center Text" class="go o_mail_block_header_center_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #282D29 repeat top /100%;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;width:600px">
-                    <tbody>
-                        <tr>
-                            <td style="font-size: 30px; text-align:center">
-                                &amp;nbsp;
-                                <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color:#fff">
-                                    <strong>My Company</strong>
-                                </a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Logo - Social" class="go o_mail_block_header_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #282D29 repeat top /100%;color:#fff">
-                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse">
-                    <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;vertical-align:middle">
-                            <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse">
-                                <tr>
-                                    <t t-if="website.social_facebook">
-                                        <td align="right">
-                                            <a t-att-href="website.social_facebook">
-                                              <span class="fa fa-facebook-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_googleplus">
-                                              <span class="fa fa-google-plus-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_linkedin">
-                                              <span class="fa fa-linkedin-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_twitter">
-                                              <span class="fa fa-twitter-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text - Social" class="go o_mail_block_header_text_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #282D29 repeat top /100%;color:#fff">
-                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse">
-                    <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: #fff">
-                                <strong>My Company</strong>
-                            </a>
-                            &amp;nbsp;
-                        </td>
-                        <td valign="center" width="270" style="padding:10px 15px 10px 10px;vertical-align:middle">
-                            <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse">
-                                <tr>
-                                    <t t-if="website.social_facebook">
-                                        <td align="right">
-                                            <a t-att-href="website.social_facebook">
-                                              <span class="fa fa-facebook-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_googleplus">
-                                              <span class="fa fa-google-plus-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_linkedin">
-                                              <span class="fa fa-linkedin-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_twitter">
-                                              <span class="fa fa-twitter-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_body']/div[2]" position="inside">
-        <div name="Title - Subtitle" class="go o_mail_block_title_sub">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EFEFEF repeat top /100%;color:#282D29">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="text-align:center">
-                                <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="Discount Coupon" class="go o_mail_block_discount2">
-            <div style="padding:0px;width:600px;margin:auto;background-color:#EFEFEF;color:#5e5e5e">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background-color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="text-align:left; padding-left:30px;vertical-align:middle" class="col_mv bg-color">
-                                <p style="margin:0;font-size:20px;color:#232925">You get a 20% discount for signing up!</p>
-                                <p style="margin:0;color:#2B934F;font-size:14px">Discount Code: <strong>45A9E77DGW8455</strong></p>
-                            </td>
-                            <td class="col_mv bg-color" style="padding:20px;text-align:center;vertical-align:middle">
-                                &amp;nbsp;
-                                <span class="fa fa-6x fa-ticket"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Discount Offer" class="go o_mail_block_discount1">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EAEAEA repeat top /100%;color:#282D29">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="font-size: 45px; font-weight: 900; color: #282D29;text-align:center;padding-top:35px">
-                               <p style="margin:0">20% off!</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="font-size: 30px; font-weight: 600; line-height:30px; text-align:center;color:#282D29">
-                                <p style="margin:0">Hurry Up</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center;padding:20px 0">
-                                &amp;nbsp;
-                                <span class="fa fa-10x fa-gift"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="padding:0 75px;text-align:center;padding-top:20px;color:#282D29;font-size:14px">
-                                <p style="margin:0">Odoo is continuing to grow and we miss seeing you be a part of it! We've increased store hours and have lot's of new brands available. To welcome you back please accept this 20% discount on you next purchase by clicking the button below.</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center; margin:0 auto;padding-bottom:25px">
-                                <div style="margin:20px auto">
-                                    &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: #2B934F;border-radius:4px">Redeem Discount!</a>
-                                    &amp;nbsp;
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Event" class="go o_mail_block_event">
-            <div style="padding:0px;width:600px;margin:auto;text-align:center;color:#fff">
-                <table style="width:100%;border-collapse:collapse">
-                    <tr>
-                        <td class="col_mv bg-color" style="width: 150px;height: 150px;padding: 0;margin: 0;background-color: #282D29;text-align:center;vertical-align:middle;color:#FFFFFF">
-                            <time datetime="2014-07-20"> <span style="display: block;font-size: 50px;line-height: 1;padding-top: 10px">21</span> <span style="display: block;font-size: 30px;line-height: 1">Jul</span> <span style="display: block;font-size: 16px;line-height: 1;color: #fff;font-weight: 600">ALL DAY</span> </time>
-                        </td>
-                        <td style="width: 150px;height: 150px;padding: 0;margin: 0;text-align: center;background-color: rgb(43,147,79)" class="col_mv bg-color">
-                            <div style="margin:27px auto">
-                                &amp;nbsp;
-                                <span class="fa fa-calendar fa-5x"></span>
-                                &amp;nbsp;
-                            </div>
-                        </td>
-                        <td style="position: relative;text-align: left;background-color:rgb(235,235,235);color:#2B934F;vertical-align:top;width:298px;height:150px;min-width:255px" class="col_mv bg-color">
-                            <table style="width:100%;border-collapse:collapse;background-color:inherit;color:inherit">
-                                <tr>
-                                    <td style="padding-top:20px;padding-left:20px;float:left" width="90%">
-                                        <div style="min-height:100px;text-align:left">
-                                            <p style="margin:0;font-size:18px">Your Event Name</p>
-                                            <p style="margin:0;font-size:14px">Description</p>
-                                        </div>
-                                        <ul style="padding-left:0">
-                                            <li style="display: table-cell;cursor: pointer;color: #1e1e1e;font-size: 11px;font-weight: 300;padding: 3px 30px;text-align: center"><a href="#" style="color:#1e1e1e">Link </a></li>
-                                            <li style="display: table-cell;cursor: pointer;color: #1e1e1e;font-size: 11px;font-weight: 300;padding: 3px 30px;text-align: center"><a href="#" style="color:#1e1e1e">Info</a></li>
-                                        </ul>
-                                    </td>
-                                    <td style="width: 60px;vertical-align:middle;display: table-cell">
-                                        <ul t-if="website" style="border-left:1px solid #e6e6e6;list-style-type:none;padding-left:16px">
-                                            <t t-if="website.social_facebook">
-                                                <li style="width:33%;margin-left:0">
-                                                    <a t-att-href="website.social_facebook">
-                                                      <span style="color: rgb(75,110,168);" class="fa fa-facebook-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                            <t t-if="website.social_twitter">
-                                                <li style="width:34%;margin-left:0">
-                                                    <a t-att-href="website.social_twitter">
-                                                      <span style="color: rgb(75,110,168);" class="fa fa-twitter-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                            <t t-if="website.social_googleplus">
-                                                <li style="width:33%;margin-left:0">
-                                                    <a t-att-href="website.social_googleplus">
-                                                      <span style="color: rgb(221,75,57);" class="fa fa-google-plus-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                        </ul>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="User Profile" class="go o_mail_block_profile">
-            <div class="snippet_row" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#282D29">
-                <table style="padding:20px;border-collapse:collapse;color:inherit">
-                    <tr>
-                        <td style="float:left;text-align: center" class="col_mv bg-color">
-                            &amp;nbsp;
-                            <span class="fa fa-user fa-5x" style="margin: 5px 20px;"></span>
-                            <br/>
-                            User: John Doe
-                        </td>
-                        <td style="vertical-align:middle;font-size:14px" class="col_mv bg-color">
-                            <p style="margin:0">Hey Bob,</p>
-                            <p style="margin:0">I set up a profile where I can do tons of really awesome stuff. I want you to follow me so we can keep in touch!</p>
-                            <p style="margin:0">See you soon!</p>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Content Table" class="go o_mail_block_table_content">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EAEAEA repeat top /100%;color:#282D29">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td>
-                                <center>
-                                    <table cellspacing="0" cellpadding="0" style="margin:10px auto;width:80%;border-collapse:collapse;color:inherit">
-                                        <tbody>
-                                            <tr>
-                                                <td style="text-align:left;padding-top:10px;padding-bottom:10px;border-left:none;font-size:14px">
-                                                    <p style="margin:0"><strong>Bob Erlicious</strong></p>
-                                                    <p style="margin:0">
-                                                        123 Flower Drive <br/>
-                                                        Victoria, BC <br/>
-                                                        V9P 2E8 <br/>
-                                                        1(250)222-2232
-                                                    </p>
-                                                </td>
-                                                <td style="text-align:right; vertical-align:top;padding-top:10px;padding-bottom:10px;border-left:none;font-size:14px">
-                                                    <p style="margin:0"><strong>Invoice: 00234</strong></p>
-                                                    <p style="margin:0">April 3, 2014</p>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <table cellspacing="0" cellpadding="0" style="margin:20px auto;width:80%;border-collapse:collapse">
-                                        <tbody>
-                                            <tr>
-                                                <td>
-                                                    <table cellspacing="0" cellpadding="0" style="width:100%;padding-top:30px;border-collapse:collapse" data-max-width="500px">
-                                                        <thead style="color:#282D29;background-color:#DEDEDE">
-                                                            <tr class="row col bg-color">
-                                                                <th style="padding: 10px 0px;text-align:center;border-left:none;font-size:14px" class="mv">
-                                                                    Plan
-                                                                </th>
-                                                                <th style="padding: 10px 0px;text-align:center;border-left:none;font-size:14px" class="mv">
-                                                                    Period
-                                                                </th>
-                                                                <th style="padding: 10px 0px;text-align:center;border-left:none;font-size:14px" class="mv">
-                                                                    Amount
-                                                                </th>
-                                                            </tr>
-                                                        </thead>
-                                                        <tbody style="color:#282D29;background-color:#F3F3F3">
-                                                            <tr class="row bg-color">
-                                                                <td style="padding:10px 0px; text-align:center;font-size:14px">
-                                                                    Silver Plan
-                                                                </td>
-                                                                <td style="padding:10px 0px;text-align:center;font-size:14px">
-                                                                    August
-                                                                </td>
-                                                                <td style="padding:10px 0px;text-align:center;font-size:14px">
-                                                                    $50.00
-                                                                </td>
-                                                            </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:80%;border-collapse:collapse;color:inherit">
-                                        <tbody>
-                                            <tr>
-                                                <td style="padding:20px 0 20px 0">
-                                                    <p style="margin:0;text-align:left;font-size:14px">
-                                                        The amount of $50.00 CAD has been charged on the credit card ending with 0123.
-                                                    </p>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </center>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Two Columns" class="go o_mail_block_two_cols_content">
-            <div style="padding:0px;width:600px;margin:auto;background-color:#EAEAEA;color:#282D29">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background-color:inherit;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="padding:30px 10px 30px 30px;width:45%;text-align:justify;font-size:14px" class="col_mv bg-color">
-                                <p style="margin:0;font-weight:bold">Bob Erlicious</p>
-                                <p style="margin:0 0 30px 0">
-                                    123 Flower Drive<br/>
-                                    Victoria, BC<br/>
-                                    V9P 2E8<br/>
-                                    1(250)222-2232
-                                </p>
-                                <p style="margin:0;font-weight:bold">Invoice: 00234</p>
-                                <p style="margin:0">April 3, 2014</p>
-                            </td>
-                            <td style="vertical-align:top; padding: 30px 30px 10px 30px; width:45%;text-align:justify" class="col_mv row bg-color">
-                                <table class="col" style="width: 100%;max-width: 100%;margin-bottom: 20px;border:1px solid #dddddd;border-collapse:collapse;background-color:inherit;color:inherit">
-                                    <tbody>
-                                        <tr class="bg-color" style="color: #282D29; background-color:#DEDEDE">
-                                            <td style="padding:8px;font-size:14px">
-                                            ​    <strong>Plan</strong>
-                                            </td>
-                                        </tr>
-                                        <tr class="bg-color" style="background-color:#F3F3F3">
-                                            <td style="padding:8px;font-size:14px">​Gold Status</td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                                <table class="col" style="width: 100%;max-width: 100%;margin-bottom: 20px;border:1px solid #dddddd;border-collapse:collapse;background-color:inherit;color:inherit">
-                                    <tbody>
-                                        <tr class="bg-color" style="background-color:#DEDEDE">
-                                            <td style="padding:8px;font-size:14px">
-                                                <strong>​Period</strong>
-                                            </td>
-                                        </tr>
-                                        <tr class="bg-color" style="background-color:#F3F3F3">
-                                            <td style="padding:8px;font-size:14px">​
-                                                  May - June 2014
-                                            </td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                                <table class="col" style="width: 100%;max-width: 100%;margin-bottom: 20px;border:1px solid #dddddd;border-collapse:collapse;background-color:inherit;color:inherit">
-                                    <tbody>
-                                        <tr class="bg-color" style="background-color:#DEDEDE">
-                                            <td style="padding:8px;font-size:14px">​
-                                                <strong>Amount</strong>
-                                            </td>
-                                        </tr>
-                                        <tr class="bg-color" style="background-color:#F3F3F3">
-                                            <td style="padding:8px;font-size:14px">​
-                                                $39.99
-                                            </td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Image" class="go o_mail_block_image">
-            <div class="snippet_row bg-color" style="width:600px;margin:auto;background: #EAEAEA repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td width="100%" align="center" style="text-align:center">
-                                &amp;nbsp;
-                                <span class="fa fa-lock fa-10x"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td width="100%" style="text-align:center;padding:10px 30px;font-size:14px;color:#282D29">
-                                <p style="margin:0;padding-bottom:15px;font-size:24px;padding-top:10px">
-                                    Come check out my stuff!
-                                </p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Image Text" class="go o_mail_block_image_text">
-            <div style="padding:0px;width:600px;margin:auto;background-color:#282D29;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background-color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="background-color:#2B934F;padding:25px;text-align:center;vertical-align:middle;width:210px;" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-tag fa-10x"></span>
-                                &amp;nbsp;
-                            </td>
-                            <td style="text-align: left;vertical-align:middle;padding:25px 30px 0 40px" class="col_mv bg-color">
-                                <p style="margin:0;color:#fff;padding-bottom:20px;font-size:30px">Good news!</p>
-                                <p style="margin:0;color:#fff;font-size:14px">We would like to inform you that your order has shipped! More details below.</p>
-                                <div style="padding-top:30px">
-                                     <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: #2B934F;border-radius:4px">My Account</a>
-                                     &amp;nbsp;
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Button" class="go o_mail_block_button">
-            <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #EAEAEA repeat top /100%">
-                <table style="width:90%;text-align:center;margin:0 auto;border-collapse:collapse;width:600px">
-                    <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: #2B934F;border-radius:4px">My Account</a>
-                            &amp;nbsp;
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text Block" class="go o_mail_block_simple_text">
-            <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #EAEAEA repeat top /100%;color:#282D29">
-                <table style="width:100%;text-align:justify;margin:0 auto;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 assist 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 name="Background Image" class="go o_mail_block_text_on_img">
-            <div class="snippet_row bg-color" style=" padding:0px;width:600px;margin:auto;background: url('/mass_mailing/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="padding:30px 30px 0 50px;text-align: left;vertical-align:middle">
-                                <p style="margin:0;padding-bottom:5px;font-size:34px">
-                                    YOUR ORDER HAS SHIPPED
-                                </p>
-                                <p style="margin:0;font-size:24px">
-                                    To track your order or make any changes please click the button below.
-                                </p>
-                                <div style="margin-bottom:35px;margin-top:30px">
-                                    <a href="#" style="-webkit-user-select: none; padding: 12px 30px; 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: #2B934F">My Account</a>
-                                    &amp;nbsp;
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Steps" class="go o_mail_block_steps">
-            <div style="padding:0;width:600px;max-width:600px;margin:0 auto">
-                <table style="width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;background-color:inherit">
-                    <tr>
-                        <td style="padding:10px 0;background-color:#2B934F;color:#fff" class="col_mv bg-color">
-                            <table style="border-collapse:collapse;background-color:inherit">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-check fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#fff;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 1:</p>
-                                        <p style="margin:0">Place Order</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td style="padding:10px 0;background-color:#F3F3F3;color:#808080" class="col_mv bg-color">
-                            <table style="border-collapse:collapse;background-color:inherit">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-truck fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#808080;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 2:</p>
-                                        <p style="margin:0">Shipping</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td style="padding:10px 0;background-color:#F3F3F3;color:#808080" class="col_mv bg-color">
-                            <table style="border-collapse:collapse;background-color:inherit">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-usd fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#808080;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 3:</p>
-                                        <p style="margin:0">Payment</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_extra']/div[2]" position="inside">
-        <div name="Separator" class="go o_mail_block_footer_seprator">
-            <div style="padding:0px;width:600px;margin:auto;background-color:#FFFFFF">
-                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);border-collapse:collapse;background-color:inherit">
-                    <tbody>
-                        <tr>
-                            <td valign="top" style="width:600px">
-                                <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"/>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Tag Line" class="go o_mail_block_footer_tag_line">
-            <div class="bg-color" style="padding:0px;width:600px;margin:auto;background:#2B934F">
-                <table style="margin: 0 auto;border-collapse:collapse;background-color:inherit;color:inherit;width:600px" cellpadding="0" cellspacing="0">
-                    <tbody>
-                        <tr>
-                            <td valign="center" style="text-align:center;padding:5px;color:#fff">
-                                <p style="margin:0;font-size:18px;color:inherit">Apps That Help You Grow Your Business</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_footer']/div[2]" position="inside">
-        <div t-if="website" name="Social + Text" class="go o_mail_block_footer_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #2B934F repeat top /100%;color:#EEEEEE">
-                <div style="padding:10px">
-                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td style="text-align:center">
-                                    &amp;nbsp;
-                                    <t t-if="website.social_facebook">
-                                        <a t-att-href="website.social_facebook">
-                                          <span class="fa fa-facebook-square fa-2x"></span>
-                                        </a>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <a t-att-href="website.social_googleplus">
-                                          <span class="fa fa-google-plus-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <a t-att-href="website.social_linkedin">
-                                          <span class="fa fa-linkedin-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <a t-att-href="website.social_twitter">
-                                          <span class="fa fa-twitter-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                            <tr>
-                                <td style="font-size:12px;text-align:center;padding:10px">
-                                    &amp;nbsp;
-                                    <a style="color:#EEEEEE" href="/unsubscribe_from_list">Unsubscribe</a> | <a style="color:#EEEEEE" href="/page/contactus">Contact</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-
-        <div name="Text + Copyright" class="go o_mail_block_footer_copyright">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #2B934F repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding:10px;color:#fff">
-                                &amp;nbsp;
-                                <a style="color:#fff" href="/unsubscribe_from_list">Unsubscribe</a>
-                                <t t-if="website"> | <a style="color:#fff" href="/page/contactus">Contact</a> </t>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding-bottom:10px;color:#fff">
-                                <p style="margin:0">© 2014 All Rights Reserved</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text Only" class="go o_mail_block_footer_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #2B934F repeat top /100%;color:#fff">
-                <center>
-                    <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;width:100%;border-collapse:collapse;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:#fff" href="/page/contactus">Contact Us</a> | 
-                                        <t t-if="website.social_facebook">
-                                            <a style="color:#fff" t-att-href="website.social_facebook">Facebook</a> | 
-                                        </t>
-                                        <t t-if="website.social_twitter">
-                                            <a style="color:#fff" t-att-href="website.social_twitter">Twitter</a> | 
-                                        </t>
-                                    </t>
-                                    <a href="/unsubscribe_from_list" style="color:#fff">Unsubscribe</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </center>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='snippet_options']" position="after">
-        <div class="hidden o_theme_palette go">
-            <div class="note-palette-title mt8"> Mail Theme Colors</div>
-            <div class="mail-colorpicker note-color-row">
-                <t t-set="colors" t-value="['#1F1F1F', '#232925', '#282D29', '#5E5E5E', '#808080', '#DEDEDE', '#F3F3F3','#2B934F']"/>
-                <t t-foreach="colors" t-as="c"><button type="button" class="note-color-btn" t-attf-style="background-color:#{c};" t-attf-data-value="#{c}" t-attf-title="#{c}" data-toggle="button" tabindex="-1"></button></t>
-            </div>
-        </div>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/addons/mass_mailing/views/theme/narrative_snippets.xml b/addons/mass_mailing/views/theme/narrative_snippets.xml
deleted file mode 100644
index 31256b54a1d..00000000000
--- a/addons/mass_mailing/views/theme/narrative_snippets.xml
+++ /dev/null
@@ -1,711 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="email_designer_snippets_narrative" inherit_id="email_designer_snippets" name="Email narrative Snippets">
-    <xpath expr="//div[@id='email_designer_default_headers']/div[2]" position="inside">
-        <div name="Center Logo" class="narrative o_mail_block_header_center_logo">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #1F1F1F repeat top /100%">
-                <table style="margin: 0 auto;border-collapse:collapse;width:600px" 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 src="/logo.png" style="padding:10px;height:auto;max-width:600px" alt="Your Logo" />
-                                </a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Center Text" class="narrative o_mail_block_header_center_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #1F1F1F repeat top /100%;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;width:600px">
-                    <tbody>
-                        <tr>
-                            <td style="font-size: 30px; text-align:center">
-                                &amp;nbsp;
-                                <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color:#fff">
-                                    <strong>My Company</strong>
-                                </a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Logo - Social" class="narrative o_mail_block_header_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #1F1F1F repeat top /100%;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;width:600px">
-                    <tr>
-                        <td valign="center" width="270" style="padding-left:5px">
-                            &amp;nbsp;
-                            <a t-att-href="(company_id.website) or '#'" style="text-decoration:none">
-                                <img src="/logo.png" style="height:auto;max-width:600px" alt="Your Logo" />
-                            </a>
-                            &amp;nbsp;
-                        </td>
-                        <td valign="center" width="270" style="padding:10px 15px 10px 10px;vertical-align:middle">
-                            <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse">
-                                <tr>
-                                    <t t-if="website.social_facebook">
-                                        <td align="right">
-                                            <a t-att-href="website.social_facebook">
-                                                <img src="/mass_mailing/static/src/img/theme_imgs/social_facebook.png" style="height:auto;max-width:70px" alt="social icon"/>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <td align="right" style="padding-left:7px">
-                                            <a t-att-href="website.social_twitter">
-                                                <img src="/mass_mailing/static/src/img/theme_imgs/social_twitter.png" style="height:auto;max-width:70px" alt="social icon"/>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <td align="right" style="padding-left:7px">
-                                            <a t-att-href="website.social_googleplus">
-                                                <img src="/mass_mailing/static/src/img/theme_imgs/social_googleplus.png" style="height:auto;max-width:70px" alt="social icon"/>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <td align="right" style="padding-left:7px">
-                                            <a t-att-href="website.social_linkedin">
-                                                <img src="/mass_mailing/static/src/img/theme_imgs/social_linkedin.png" style="height:auto;max-width:70px" alt="social icon"/>
-                                            </a>
-                                        </td>
-                                    </t>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text - Social" class="narrative o_mail_block_header_text_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #1F1F1F repeat top /100%;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;width:600px">
-                    <tr>
-                        <td valign="center" width="270" style="padding-left:5px;font-size:30px">
-                            &amp;nbsp;
-                            <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: #fff">
-                                <strong>My Company</strong>
-                            </a>
-                            &amp;nbsp;
-                        </td>
-                        <td valign="center" width="270" style="padding:10px 15px 10px 10px;vertical-align:middle">
-                            <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse">
-                                <tr>
-                                    <t t-if="website.social_facebook">
-                                        <td align="right">
-                                            <a t-att-href="website.social_facebook">
-                                                <img src="/mass_mailing/static/src/img/theme_imgs/social_facebook.png" style="height:auto;max-width:70px" alt="social icon" />
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <td align="right" style="padding-left:7px">
-                                            <a t-att-href="website.social_twitter">
-                                                <img src="/mass_mailing/static/src/img/theme_imgs/social_twitter.png" style="height:auto;max-width:70px" alt="social icon" />
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <td align="right" style="padding-left:7px">
-                                            <a t-att-href="website.social_googleplus">
-                                                <img src="/mass_mailing/static/src/img/theme_imgs/social_googleplus.png" style="height:auto;max-width:70px" alt="social icon"/>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <td align="right" style="padding-left:7px">
-                                            <a t-att-href="website.social_linkedin">
-                                                <img src="/mass_mailing/static/src/img/theme_imgs/social_linkedin.png" style="height:auto;max-width:70px" alt="social icon"/>
-                                            </a>
-                                        </td>
-                                    </t>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_body']/div[2]" position="inside">
-        <div name="Title - Subtitle" class="narrative o_mail_block_title_sub">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#37302d">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="text-align:center">
-                                <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 new stuff!</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Image - Content" class="narrative o_mail_block_image_text">
-            <div style="padding:0px;width:600px;margin:0 auto;background-color:#fff;color:#37302d">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background-color:inherit;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="padding:20px;vertical-align:middlewidth:210px;" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-tag fa-10x"></span>
-                                &amp;nbsp;
-                            </td>
-                            <td style="padding-left: 40px;text-align: left;vertical-align:middle" class="col_mv bg-color">
-                                <p style="margin:0;color:#37302d;padding-top:25px;font-size:30px">Good news!</p>
-                                <p style="margin:0;font-size:14px">We would like to inform you that your order has shipped! More details below.</p>
-                                <div style="padding-top:25px">
-                                    <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: #D74A38;border-radius:4px">My Order</a>
-                                    &amp;nbsp;
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Content Table" class="narrative o_mail_block_table_content">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#37302d">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td>
-                                <center>
-                                    <table cellspacing="0" cellpadding="0" style="margin:20px auto;width:80%;border-collapse:collapse">
-                                        <tbody>
-                                            <tr>
-                                                <td style="text-align:left;border-left:none;color:#37302d;font-size:14px">
-                                                    <p style="margin:0"><strong>Bob Erlicious</strong></p>
-                                                    <p style="margin:0">
-                                                        123 Flower Drive<br/>
-                                                        Victoria, BC<br/>
-                                                        V9P 2E8<br/>
-                                                        1(250)222-2232
-                                                    </p>
-                                                </td>
-                                                <td style="text-align:right; vertical-align:top;border-left:none;color:#37302d;font-size:14px">
-                                                    <p style="margin:0"><strong>Invoice: 00234</strong></p>
-                                                    <p style="margin:0">April 3, 2014</p>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <table cellspacing="0" cellpadding="0" style="margin:20px auto;width:80%;border-collapse:collapse">
-                                        <tbody>
-                                            <tr>
-                                                <td>
-                                                    <table cellspacing="0" cellpadding="0" style="width:100%;padding-top:30px;text-indent:10px;border-collapse:collapse" data-max-width="500px">
-                                                        <thead>
-                                                            <tr style="color: #fff;background: #37302d" class="row col bg-color">
-                                                                <th style="padding: 10px 0px;width:166px;border-left:none;text-align:left;font-size:14px" class="mv">Plan</th>
-                                                                <th style="padding: 10px 0px;width:166px;border-left:none;text-align:left;font-size:14px" class="mv">Period</th>
-                                                                <th style="padding: 10px 0px;width:166px;border-left:none;text-align:left;font-size:14px" class="mv">Amount</th>
-                                                            </tr>
-                                                        </thead>
-                                                        <tbody>
-                                                            <tr class="row bg-color" style="color:#37302d">
-                                                                <td style="padding:10px 0px;font-size:14px">Silver Plan</td>
-                                                                <td style="padding:10px 0px;font-size:14px">August</td>
-                                                                <td style="padding:10px 0px;font-size:14px">$50.00</td>
-                                                            </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <table cellspacing="0" cellpadding="0" style="margin: 20px auto;width:80%;padding-top:30px;padding-bottom:30px;border-collapse:collapse">
-                                        <tbody>
-                                            <tr>
-                                                <td>
-                                                    <p style="margin:0;text-align:left;color:#37302d;font-size:14px">
-                                                        The amount of $50.00 CAD has been charged on the credit card ending with 0123.
-                                                    </p>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </center>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="User Profile" class="narrative o_mail_block_profile">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;color:#37302d;background: #FFFFFF repeat top /100%">
-                <table width="100%" style="border-collapse:collapse;color:inherit">
-                    <thead style="background:inherit">
-                        <tr>
-                            <th colspan="2" width="70%" style="font-size:32px;padding-left:20px;text-align:left">
-                                <p style="margin:0">Come check out new Stuff!</p>
-                            </th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td width="70%" class="col_mv" style="text-align:justify;padding-left:20px;vertical-align:middle;font-size:14px">
-                                <p style="margin:0">I set up a profile where I can do tons of really awesome stuff! So I want you to follow me and see it all. Once you join us, you'll be able to do all sorts of new stuff too.</p>
-                                <p style="margin:0">Because I've invited you, you can also use the below coupon code to receive a 30% discount on you first months subscription!</p>
-                            </td>
-                            <td width="30%" class="col_mv" style="text-align:center;font-size:14px">
-                                &amp;nbsp;
-                                <span class="fa fa-user fa-5x"></span>&amp;nbsp;<br/>
-                                User : <strong>John Doe</strong>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="padding-bottom:20px;padding-left:20px">
-                                <a href="#" style="-webkit-user-select: none; cursor: pointer; padding: 6px 12px; font-size: 13.63636302948px; line-height: 17.7095623016357px; 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: 0.909090876579285px solid rgb(212,63,58); text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; white-space: nowrap; background-image: none; background-color: #D74A38">Visit Now</a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Event" class="narrative o_mail_block_event">
-            <div style="padding:0px;width:600px;margin:auto;text-align:center;color:#fff">
-                <table style="width:100%;border-collapse:collapse;border-collapse:collapse;background-color:inherit">
-                    <tr>
-                        <td class="col_mv bg-color" style="width: 150px;height: 150px;padding: 0;margin: 0;background-color: rgb(68,68,68);text-align:center;vertical-align:middle;color:#FFFFFF">
-                            <time datetime="2014-07-20"> <span style="display: block;font-size: 50px;line-height: 1;padding-top: 10px">21</span> <span style="display: block;font-size: 30px;line-height: 1">Jul</span> <span style="display: block;font-size: 16px;line-height: 1;color: #FFFFFF;font-weight: 600">ALL DAY</span> </time>
-                        </td>
-                        <td style="width: 150px;height: 150px;padding: 0px;margin: 0px;text-align: center;background-color: rgb(215,74,56)" class="col_mv bg-color">
-                            <div style="margin:27px auto">
-                                &amp;nbsp;
-                                <span class="fa fa-calendar fa-5x"></span>
-                                &amp;nbsp;
-                            </div>
-                        </td>
-                        <td style="position: relative;text-align: left;background-color:#f5f5f5;color:#37302d;vertical-align:top;width:298px;height:150px;min-width:255px" class="col_mv bg-color">
-                            <table style="width:100%;border-collapse:collapse;background-color:inherit;color:inherit">
-                                <tr>
-                                    <td style="padding-top:20px;padding-left:20px;float:left" width="90%">
-                                        <div style="min-height:100px;text-align:left">
-                                            <p style="margin:0;font-size:18px">Your Event Name</p>
-                                            <p style="margin:0;font-size:14px">Description</p>
-                                        </div>
-                                        <ul style="padding-left:0">
-                                            <li style="display: table-cell;cursor: pointer;color: #1e1e1e;font-size: 11px;font-weight: 300;padding: 3px 30px;text-align: center"><a href="#" style="color:#1e1e1e">Link </a></li>
-                                            <li style="display: table-cell;cursor: pointer;color: #1e1e1e;font-size: 11px;font-weight: 300;padding: 3px 30px;text-align: center"><a href="#" style="color:#1e1e1e">Info</a></li>
-                                        </ul>
-                                    </td>
-                                    <td style="width: 60px;vertical-align:middle;display: table-cell">
-                                        <ul t-if="website" style="border-left:1px solid #e6e6e6;list-style-type:none;padding-left:16px">
-                                            <t t-if="website.social_facebook">
-                                                <li style="width:33%;margin-left:0">
-                                                    <a t-att-href="website.social_facebook">
-                                                      <span style="color: rgb(75,110,168);" class="fa fa-facebook-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                            <t t-if="website.social_twitter">
-                                                <li style="width:34%;margin-left:0">
-                                                    <a t-att-href="website.social_twitter">
-                                                      <span style="color: rgb(75,110,168);" class="fa fa-twitter-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                            <t t-if="website.social_googleplus">
-                                                <li style="width:33%;margin-left:0">
-                                                    <a t-att-href="website.social_googleplus">
-                                                      <span style="color: rgb(221,75,57);" class="fa fa-google-plus-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                        </ul>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-               </table>
-            </div>
-        </div>
-
-        <div name="Discount Offer" class="narrative o_mail_block_discount1">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #808080 repeat top /100%;color:#fff">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="font-size: 45px; font-weight: 900;text-align:center;padding-top:35px;color:#fff">
-                                <p style="margin:0">20% off!</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center;padding:20px 0">
-                                &amp;nbsp;
-                                <span class="fa fa-6x fa-ticket"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="padding:0 75px;text-align:center;color:#fff;font-size:14px">
-                                <p style="margin:0">We are continuing to grow and we miss seeing you be a part of it! We've increased store hours and have lot's of new brands available. To welcome you back please accept this 20% discount on you next purchase by clicking the button below.</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center; margin:0 auto;padding-bottom:25px">
-                                <div style="padding:15px 0 15px 0">
-                                    &amp;nbsp;
-                                    <a href="#" style="-webkit-user-select: none; padding: 6px 12px; font-size: 14px; line-height: 20px; color: #000; 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: #D3D3D3;border-radius:4px">Redeem Discount!</a>
-                                    &amp;nbsp;
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Discount Coupon" class="narrative o_mail_block_discount2">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #F8F8F8 repeat top /100%;color:#37302d">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td valign="top" style="padding:20px">
-                                <p style="font-size:30px;margin:0 0 10px 0">30% discount when you sign up now!</p>
-                                <p style="margin:0;font-size:14px">
-                                    You'll be the first to hear about new arrivals, exclusive promotionas, cool collaborations, and the latest in everything.
-                                    <br/>
-                                    Enter <strong>XLKIJP6887F</strong> when you sign up!<br/>
-                                    <br/>
-                                </p>
-                            </td>
-                        </tr>
-                  </tbody>
-              </table>
-            </div>
-        </div>
-
-        <div name="Two Columns" class="narrative o_mail_block_two_cols">
-            <div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#37302d">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background-color:inherit;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="padding:30px 10px 30px 30px;width:45%;text-align:center" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-5x fa-bookmark"></span>
-                                &amp;nbsp;
-                                <p style="margin:0;font-size:24px">Step 1</p>
-                                <p style="margin:0;text-align:justify;font-size:14px">
-                                    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 30px 10px 30px; width:45%;text-align:center" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-5x fa-map-marker"></span>
-                                &amp;nbsp;
-                                <br/>
-                                <p style="margin:0;font-size:24px">Step 2</p>
-                                <p style="margin:0;text-align:justify;font-size:14px">
-                                    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="Image Content Button" class="narrative o_mail_block_image">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#37302d">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:#37302d">
-                    <tbody>
-                        <tr>
-                            <td style="text-align:center;padding:20px 0" >
-                                &amp;nbsp;
-                                <span class="fa fa-tag fa-10x"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center;font-size:30px">
-                                <p style="margin:0">Good News!</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center;font-size:14px">
-                                <p style="margin:0">We would like to inform you that your order has shipped! More details below.</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center;font-size:14px; margin:0 auto;padding:10px 0 25px 0">
-                                &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: #D74A38;border-radius:4px">My Account</a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Button" class="narrative o_mail_block_button">
-            <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #FFFFFF repeat top /100%">
-                <table style="width:600px;text-align:center;margin:0 auto;border-collapse:collapse">
-                    <tr>
-                        <td class="row bg-color" 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: #D74A38;border-radius:4px">My Account</a>
-                            &amp;nbsp;
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text Block" class="narrative o_mail_block_simple_text">
-            <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #FFFFFF repeat top /100%;color:#37302d">
-                <table style="width:100%;text-align:justify;margin:0 auto;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 assist 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 name="Background Image" class="narrative o_mail_block_text_on_img">
-            <div class="snippet_row bg-color" style=" padding:0px;width:600px;margin:auto;background: url('/mass_mailing/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="padding:30px 30px 0 50px;text-align: left;vertical-align:middle">
-                                <p style="margin:0;padding-bottom:5px;font-size:34px">
-                                    YOUR ORDER HAS SHIPPED
-                                </p>
-                                <p style="margin:0;font-size:24px">
-                                    To track your order or make any changes please click the button below.
-                                </p>
-                                <div style="margin-bottom:35px;margin-top:30px">
-                                    <a href="#" style="-webkit-user-select: none; padding: 12px 30px; 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: #D74A38">My Account</a>
-                                    &amp;nbsp;
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Steps" class="narrative o_mail_block_steps">
-            <div style="padding:0;width:600px;max-width:600px;margin:0 auto">
-                <table style="width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;background-color:inherit">
-                    <tr>
-                        <td style="padding:10px 0;background-color:#D74A38;color:#fff" class="col_mv bg-color">
-                            <table style="border-collapse:collapse;background-color:inherit">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-check fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#fff;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 1:</p>
-                                        <p style="margin:0">Place Order</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td style="padding:10px 0;background-color:#F8F8F8;color:#808080" class="col_mv bg-color">
-                            <table style="border-collapse:collapse;background-color:inherit">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-truck fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#808080;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 2:</p>
-                                        <p style="margin:0">Shipping</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td style="padding:10px 0;background-color:#F8F8F8;color:#808080" class="col_mv bg-color">
-                            <table style="border-collapse:collapse;background-color:inherit">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-usd fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#808080;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 3:</p>
-                                        <p style="margin:0">Payment</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_extra']/div[2]" position="inside">
-        <div name="Separator" class="narrative o_mail_block_footer_seprator">
-            <div style="padding:0px; margin:auto;max-width:600px;background-color:#FFFFFF">
-                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);border-collapse:collapse;background-color:inherit">
-                    <tbody>
-                        <tr>
-                            <td valign="top" style="width:600px">
-                                <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"/>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Tag Line" class="narrative o_mail_block_footer_tag_line">
-            <div class="bg-color" style="padding:0px; margin:auto;background:rgb(215,74,56);color:#FFFFFF;max-width:600px">
-                <table style="margin: 0 auto;border-collapse:collapse;background-color:inherit;color:inherit;width:600px" cellpadding="0" cellspacing="0">
-                    <tbody>
-                        <tr>
-                            <td valign="center" style="text-align:center;padding:5px">
-                                <p style="margin:0;font-size:18px;color:inherit">Apps That Help You Grow Your Business</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_footer']/div[2]" position="inside">
-        <div t-if="website" name="Social + Text" class="narrative o_mail_block_footer_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #1F1F1F repeat top /100%;color:#fff">
-                <div style="padding:10px">
-                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:600px;border-collapse:collapse;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td style="text-align:center ">
-                                    &amp;nbsp;
-                                    <t t-if="website.social_facebook">
-                                        <a t-att-href="website.social_facebook">
-                                            <img src="/mass_mailing/static/src/img/theme_imgs/social_facebook.png" style="height:auto;max-width:70px;padding-right:6px" alt="social icon" />
-                                        </a>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <a t-att-href="website.social_googleplus">
-                                            <img src="/mass_mailing/static/src/img/theme_imgs/social_twitter.png" style="height:auto;max-width:70px;padding-right:6px" alt="social icon" />
-                                        </a>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <a t-att-href="website.social_linkedin">
-                                            <img src="/mass_mailing/static/src/img/theme_imgs/social_googleplus.png" style="height:auto;max-width:70px;padding-right:6px" alt="social icon" />
-                                        </a>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <a t-att-href="website.social_twitter">
-                                            <img src="/mass_mailing/static/src/img/theme_imgs/social_linkedin.png" style="height:auto;max-width:70px;padding-right:6px" alt="social icon" />
-                                        </a>
-                                    </t>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                            <tr>
-                                <td style="font-size:12px;text-align:center;padding-top:10px">
-                                    &amp;nbsp;
-                                    <a style="color:#fff" href="/unsubscribe_from_list">Unsubscribe</a> | <a style="color:#fff" href="/page/contactus">Contact</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-
-        <div name="Text + Copyright" class="narrative o_mail_block_footer_copyright">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #1F1F1F repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:600px;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding-top:10px;padding-bottom:5px;color:#fff">
-                                &amp;nbsp;
-                                <a href="/unsubscribe_from_list" style="color:#fff">Unsubscribe</a>
-                                <t t-if="website"> | <a href="/page/contactus" style="color:#fff">Contact</a> </t>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding-bottom:15px;color:#fff">
-                                <p style="margin:0">© 2014 All Rights Reserved</p>
-                            </td>
-                        </tr>
-                    </tbody>
-              </table>
-            </div>
-        </div>
-
-        <div name="Text Only" class="narrative o_mail_block_footer_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #1F1F1F repeat top /100%;color:#fff">
-                <center>
-                    <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;width:600px;border-collapse:collapse;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 href="/page/contactus" style="color:#fff">Contact Us</a> | 
-                                        <t t-if="website.social_facebook">
-                                            <a t-att-href="website.social_facebook" style="color:#fff">Facebook</a> | 
-                                        </t>
-                                        <t t-if="website.social_twitter">
-                                            <a t-att-href="website.social_twitter" style="color:#fff">Twitter</a> | 
-                                        </t>
-                                    </t>
-                                    <a href="/unsubscribe_from_list" style="color:#fff">Unsubscribe</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </center>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='snippet_options']" position="after">
-        <div class="hidden o_theme_palette narrative">
-            <div class="note-palette-title mt8"> Mail Theme Colors</div>
-            <div class="mail-colorpicker note-color-row">
-                    <t t-set="colors" t-value="['#1F1F1F', '#37302d', '#444444', '#808080', '#D74A38', '#F8F8F8', '#FFFFFF']"/>
-                    <t t-foreach="colors" t-as="c"><button type="button" class="note-color-btn" t-attf-style="background-color:#{c};" t-attf-data-value="#{c}" t-attf-title="#{c}" data-toggle="button" tabindex="-1"></button></t>
-            </div>
-        </div>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/addons/mass_mailing/views/theme/neopolitan_snippets.xml b/addons/mass_mailing/views/theme/neopolitan_snippets.xml
deleted file mode 100644
index 3fcc692dc36..00000000000
--- a/addons/mass_mailing/views/theme/neopolitan_snippets.xml
+++ /dev/null
@@ -1,677 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="email_designer_snippets_neopolitan" inherit_id="email_designer_snippets" name="Email Neopolitan Snippets">
-    <xpath expr="//div[@id='email_designer_default_headers']/div[2]" position="inside">
-        <div name="Center Logo" class="neopolitan o_mail_block_header_center_logo">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%">
-                <table style="margin: 0 auto;width:600px;" 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 src="/logo.png" style="padding:10px;height:auto;max-width:600px;" alt="Your Logo" />
-                                </a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Center Text" class="neopolitan o_mail_block_header_center_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#414141">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;width:600px">
-                    <tbody>
-                        <tr>
-                            <td style="font-size: 30px; text-align:center">
-                                &amp;nbsp;
-                                <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color:#414141">
-                                    <strong>My Company</strong>
-                                </a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Logo - Social" class="neopolitan o_mail_block_header_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #ffffff repeat top /100%">
-                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse">
-                    <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;" alt="Your Logo" />
-                            </a>
-                            &amp;nbsp;
-                        </td>
-                        <td valign="center" width="270" style="padding:10px 15px 10px 10px;vertical-align:middle">
-                            <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse">
-                                <tr>
-                                    <t t-if="website.social_facebook">
-                                        <td align="right">
-                                            <a t-att-href="website.social_facebook">
-                                              <span style="color:#44B7B7;" class="fa fa-facebook-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_googleplus">
-                                              <span style="color:#44B7B7;" class="fa fa-google-plus-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_linkedin">
-                                              <span style="color:#44B7B7;" class="fa fa-linkedin-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_twitter">
-                                              <span style="color:#44B7B7;" class="fa fa-twitter-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text - Social" class="neopolitan o_mail_block_header_text_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#414141">
-                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse">
-                    <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;color: #414141;font-size: 30px; text-align:center">
-                                <strong>My Company</strong>
-                            </a>
-                            &amp;nbsp;
-                        </td>
-                        <td valign="center" width="270" style="padding:10px 15px 10px 10px;vertical-align:middle">
-                            <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse">
-                                <tr>
-                                    <t t-if="website.social_facebook">
-                                        <td align="right">
-                                            <a t-att-href="website.social_facebook">
-                                              <span style="color:#44B7B7;" class="fa fa-facebook-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_googleplus">
-                                              <span style="color:#44B7B7;" class="fa fa-google-plus-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_linkedin">
-                                              <span style="color:#44B7B7;" class="fa fa-linkedin-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_twitter">
-                                              <span style="color:#44B7B7;" class="fa fa-twitter-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_body']/div[2]" position="inside">
-        <div name="Title - Subtitle" class="neopolitan o_mail_block_title_sub">
-            <div class="bg-color" style="padding:0px;width:600px;margin:auto;color:#414141;background-color:#FFFFFF">
-                <table width="100%" cellspacing="0" cellpadding="0" style="background-color:inherit;border-collapse:collapse;color:inherit">
-                      <tbody>
-                          <tr>
-                              <td style="text-align:center">
-                                  <p style="margin:0;font-size:36px;line-height:50px">Check this out!</p>
-                              </td>
-                          </tr>
-                          <tr>
-                              <td style="font-size:20px; text-align:center; padding: 0 5px;color:#414141">
-                                  <p style="margin:0">Come check out my stuff!</p>
-                              </td>
-                          </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Discount Coupon" class="neopolitan o_mail_block_discount2">
-            <div style="padding:0px;width:600px;margin:auto;background-color:#44B7B7;color:#168484">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="text-align:left; padding-left:20px;vertical-align:middle;font-size:14px" class="col_mv bg-color">
-                                <p style="margin:0;font-size:20px;color:#fff">You get a 20% discount for signing up!</p>
-                                <p style="margin:0">Discount Code: <strong> 45A9E77DGW8455</strong></p>
-                            </td>
-                            <td class="col_mv bg-color" style="padding:20px;text-align:center;vertical-align:middle">
-                                &amp;nbsp;
-                                <span class="fa fa-6x fa-ticket"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Discount Offer" class="neopolitan o_mail_block_discount1">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #F46B45 repeat top /100%;color:#933F24">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="font-size: 45px; font-weight: 900; color: #fff;text-align:center;padding-top:35px">
-                                <p style="margin:0">20% off!</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="font-size: 30px; font-weight: 600; line-height:30px; text-align:center">
-                                <p style="margin:0">Hurry Up</p>
-                            </td>
-                        </tr>
-                         <tr>
-                            <td style="text-align:center;padding:20px 0">
-                                &amp;nbsp;
-                                <span class="fa fa-10x fa-gift"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="padding:0 75px;text-align:center;font-size:14px;line-height:20px">
-                                <p style="margin:0">Odoo is continuing to grow and we miss seeing you be a part of it! We've increased store hours and have lot's of new brands available. To welcome you back please accept this 20% discount on you next purchase by clicking the button below.</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center; margin:0 auto;padding-bottom:35px;padding-top:25px">
-                                &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: #933F24;border-radius:4px">Redeem Discount!</a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Event" class="neopolitan o_mail_block_event">
-            <div style="padding:0px;width:600px;margin:auto;text-align:center;color:#fff;max-width:600px">
-                <table style="width:100%;border-collapse:collapse;background-color:inherit;border-collapse:collapse">
-                    <tr>
-                        <td class="col_mv" style="width: 150px;height: 150px;padding: 0;margin: 0;background-color: rgb(72,72,72);text-align:center;vertical-align:middle;color:#fff">
-                            <time datetime="2014-07-20"> <span style="display: block;font-size: 50px;line-height: 1;padding-top: 10px">21</span> <span style="display: block;font-size: 30px;line-height: 1">Jul</span> <span style="display: block;font-size: 16px;line-height: 1;color: #fff;font-weight: 600">ALL DAY</span> </time>
-                        </td>
-                        <td style="width: 150px;height: 150px;padding: 0;margin: 0;text-align: center;background-color: #44B7B7;color:#fff" class="col_mv bg-color">
-                            <div style="margin:27px auto">
-                                &amp;nbsp;
-                                <span class="fa fa-calendar fa-5x"></span>
-                                &amp;nbsp;
-                            </div>
-                        </td>
-                        <td style="background-color:#fff;color:rgb(77,191,191);position: relative;text-align: left;vertical-align:top;width:298px;height:150px;min-width:255px" class="col_mv bg-color">
-                            <table style="width:100%;border-collapse:collapse;background-color:inherit;color:inherit">
-                                <tr>
-                                    <td style="padding-top:20px;padding-left:20px;float:left" width="90%">
-                                        <div style="min-height:100px">
-                                            <p style="margin:0;font-size:18px">Your Event Name</p>
-                                            <p style="margin:0;font-size:14px">Description</p>
-                                        </div>
-                                        <ul style="padding-left:0">
-                                            <li style="display: table-cell;cursor: pointer;color: #1e1e1e;font-size: 11px;font-weight: 300;padding: 3px 30px;text-align: center"><a href="#" style="color:#1e1e1e">Link </a></li>
-                                            <li style="display: table-cell;cursor: pointer;color: #1e1e1e;font-size: 11px;font-weight: 300;padding: 3px 30px;text-align: center"><a href="#" style="color:#1e1e1e">Info</a></li>
-                                        </ul>
-                                    </td>
-                                    <td style="width: 60px;vertical-align:middle;display: table-cell">
-                                        <ul t-if="website" style="border-left:1px solid #e6e6e6;list-style-type:none;padding-left:16px">
-                                            <t t-if="website.social_facebook">
-                                                <li style="width:33%;margin-left:0">
-                                                    <a t-att-href="website.social_facebook">
-                                                      <span style="color: rgb(75,110,168);" class="fa fa-facebook-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                            <t t-if="website.social_twitter">
-                                                <li style="width:34%;margin-left:0">
-                                                    <a t-att-href="website.social_twitter">
-                                                      <span style="color: rgb(75,110,168);" class="fa fa-twitter-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                            <t t-if="website.social_googleplus">
-                                                <li style="width:33%;margin-left:0">
-                                                    <a t-att-href="website.social_googleplus">
-                                                      <span style="color: rgb(221,75,57);" class="fa fa-google-plus-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                        </ul>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Content Table" class="neopolitan o_mail_block_table_content">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #F46B45 repeat top /100%;color:#933F24">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td>
-                                <center>
-                                    <table cellspacing="0" cellpadding="0" style="margin:20px auto;width:80%;border-collapse:collapse;color:inherit;font-size:14px">
-                                        <tbody>
-                                            <tr>
-                                                <td style="text-align:left;border-left:none">
-                                                    <p style="margin:0"><strong>Bob Erlicious</strong></p>
-                                                    <p style="margin:0">123 Flower Drive <br/>
-                                                    Victoria, BC <br/>
-                                                    V9P 2E8 <br/>
-                                                    1(250)222-2232</p>
-                                                </td>
-                                                <td style="text-align:right; vertical-align:top;border-left:none">
-                                                    <p style="margin:0"><strong>Invoice: 00234</strong></p>
-                                                    <p style="margin:0">April 3, 2014</p>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <table cellspacing="0" cellpadding="0" style="margin:20px auto;width:80%;border-collapse:collapse;font-size:14px">
-                                        <tbody>
-                                            <tr>
-                                                <td>
-                                                    <table cellspacing="0" cellpadding="0" style="width:500px;padding-top:30px;border-collapse:collapse" data-max-width="500px">
-                                                        <thead style="color:#fff;background-color:#933F24">
-                                                            <tr class="row col bg-color">
-                                                                <th style="padding: 10px 0px;text-align:center;border-left:none" class="mv">
-                                                                  Plan
-                                                                </th>
-                                                                <th style="padding: 10px 0px;text-align:center;border-left:none" class="mv">
-                                                                   Period
-                                                                </th>
-                                                                <th style="padding: 10px 0px;text-align:center;border-left:none" class="mv">
-                                                                  Amount
-                                                                </th>
-                                                            </tr>
-                                                        </thead>
-                                                        <tbody style="color:#933F24;background-color:#f7a084">
-                                                            <tr class="row bg-color">
-                                                                <td style="padding:10px 0px; text-align:center">
-                                                                    Silver Plan
-                                                                </td>
-                                                                <td style="padding:10px 0px;text-align:center">
-                                                                    August
-                                                                </td>
-                                                                <td style="padding:10px 0px;text-align:center">
-                                                                    $50.00
-                                                                </td>
-                                                            </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <table cellspacing="0" cellpadding="0" style="margin: 20px auto;width:80%;padding-top:30px;padding-bottom:30px;border-collapse:collapse;color:inherit;font-size:14px">
-                                        <tbody>
-                                            <tr>
-                                                <td>
-                                                    <p style="margin:0;text-align:left">
-                                                        The amount of $50.00 CAD has been charged on the credit card ending with 0123.
-                                                    </p>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </center>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Two Columns" class="neopolitan o_mail_block_two_cols">
-            <div style="padding:0px;width:600px;margin:auto;background-color:#F46B45;color:#A2432A">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="padding:30px 15px;width:45%;text-align:center;background-color:#fff;color:#44B7B7;font-size:14px;line-height:1.4" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-5x fa-bookmark"></span>&amp;nbsp;
-                                <p style="margin:30px 0 0 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:45%;text-align:center;background-color:#44B7B7;color:#fff;font-size:14px;line-height:1.4" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-5x fa-map-marker"></span>&amp;nbsp;
-                                <p style="margin:30px 0 0 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>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Image" class="neopolitan o_mail_block_image">
-            <div class="snippet_row bg-color" style="width:600px;margin:auto;background: #44B7B7 repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td width="100%" align="center" style="text-align:center; color: #fff;">
-                                &amp;nbsp;
-                                <span class="fa fa-10x fa-github-alt"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td width="100%" style="text-align:center;padding:10px 30px;font-size:14px;color:#FFFFFF">
-                                <p style="margin:0"><strong>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.</strong></p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td width="100%" style="text-align:center;padding:25px 30px;">
-                            &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: #168484;border-radius:4px">My Account</a>
-                            &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Image - Text" class="neopolitan o_mail_block_image_text">
-            <div class="mv" style="padding:0px;width:600px;max-width:600px;margin:auto;background-color:#44B7B7;color:#168484">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="width:35%;padding-bottom:25px;padding-top:30px;background-color:rgb(72,72,72);rgb(68,183,183);text-align:center;vertical-align:middle" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-bullhorn fa-6x"></span>&amp;nbsp;
-                            </td>
-                            <td class="col_mv bg-color" style="padding-left: 40px;padding-right: 30px;text-align: left;vertical-align:middle">
-                                <p style="margin:0;color:#fff;font-size:30px">Good news!</p>
-                                <p style="font-size:14px;line-height:20px;margin:0">We would like to inform you that your order has shipped! More details below.</p>
-                                <div style="padding-top:12px;padding-bottom:0">
-                                    <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: #168484;border-radius:4px">My Account</a>
-                                    &amp;nbsp;
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Button" class="neopolitan 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:#168484">
-                <table style="width:600px;text-align:center;margin:0 auto;border-collapse:collapse">
-                    <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: #168484;border-radius:4px">My Account</a>
-                            &amp;nbsp;
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text Block" class="neopolitan 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:#168484">
-                <table style="width:100%;text-align:justify;margin:0 auto;inherit;border-collapse:collapse;color:inherit">
-                    <tr>
-                        <td style="padding:10px 30px;font-size:14px;line-height:20px">
-                            <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 assist 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 name="Background Image" class="neopolitan o_mail_block_text_on_img">
-            <div class="snippet_row" style="padding:0px;width:600px;margin:auto;background:url('/mass_mailing/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="padding:30px 30px 0 50px;text-align: left;vertical-align:middle">
-                                <p style="margin:0;padding-bottom:5px;font-size:34px">
-                                    YOUR ORDER HAS SHIPPED
-                                </p>
-                                <p style="margin:0;font-size:24px">
-                                    To track your order or make any changes please click the button below.
-                                </p>
-                                <p style="margin:30px 0 35px 0">
-                                    <a href="#" style="-webkit-user-select: none; padding: 12px 30px; 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: #168484">My Account</a>
-                                    &amp;nbsp;
-                                </p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Steps" class="neopolitan o_mail_block_steps">
-            <div style="padding:0;width:600px;max-width:600px;margin:0 auto">
-                <table style="width:100%;text-align:justify;margin:0 auto;background-color:inherit;border-collapse:collapse">
-                    <tr>
-                        <td style="padding:10px 0;background-color:#168484;color:#fff" class="col_mv bg-color">
-                            <table style="border-collapse:collapse;background-color:inherit">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-check fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#fff;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 1:</p>
-                                        <p style="margin:0">Place Order</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td style="padding:10px 0;background-color:#FFFFFF;color:#808080" class="col_mv bg-color">
-                            <table style="border-collapse:collapse;background-color:inherit">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-truck fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#808080;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 2:</p>
-                                        <p style="margin:0">Shipping</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td style="padding:10px 0;background-color:#FFFFFF;color:#808080" class="col_mv bg-color">
-                            <table style="border-collapse:collapse;background-color:inherit">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-usd fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#808080;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 3:</p>
-                                        <p style="margin:0">Payment</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_extra']/div[2]" position="inside">
-        <div name="Separator" class="neopolitan o_mail_block_footer_seprator">
-            <div style="padding:0px;width:600px;margin:auto;background-color:#FFFFFF">
-                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);background-color:inherit;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td valign="top" style="width:600px">
-                                <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"/>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Tag Line" class="neopolitan o_mail_block_footer_tag_line">
-            <div class="bg-color" style="padding:0px;width:600px;margin:auto;background:#44B7B7;color:#fff">
-                <table style="margin: 0 auto;background-color:inherit;width:600px;border-collapse:collapse;color:inherit" cellpadding="0" cellspacing="0">
-                    <tbody>
-                        <tr>
-                            <td valign="center" style="text-align:center;padding:5px">
-                                <p style="margin:0;font-size:18px;color:inherit">Apps That Help You Grow Your Business</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_footer']/div[2]" position="inside">
-        <div t-if="website" name="Social + Text" class="neopolitan o_mail_block_footer_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #414141 repeat top /100%;color:#44B7B7">
-                <div style="padding:10px">
-                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td style="text-align:center">
-                                    &amp;nbsp;
-                                    <t t-if="website.social_facebook">
-                                        <a t-att-href="website.social_facebook" style="text-decoration: none;">
-                                          <span class="fa fa-facebook-square fa-2x"></span>
-                                        </a>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <a t-att-href="website.social_googleplus" style="text-decoration: none;">
-                                          <span class="fa fa-google-plus-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <a t-att-href="website.social_linkedin" style="text-decoration: none;">
-                                          <span class="fa fa-linkedin-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <a t-att-href="website.social_twitter" style="text-decoration: none;">
-                                          <span class="fa fa-twitter-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                            <tr>
-                                <td style="font-size:12px;text-align:center;padding-top:10px;padding-bottom:5px">
-                                    &amp;nbsp;
-                                    <a href="/unsubscribe_from_list" style="color:#44B7B7">Unsubscribe</a> | <a href="/page/contactus" style="color:#44B7B7">Contact</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-
-        <div name="Text + Copyright" class="neopolitan o_mail_block_footer_copyright">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #414141 repeat top /100%;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding-top:10px;color:#44B7B7;padding-bottom:5px">
-                                &amp;nbsp;
-                                <a href="/unsubscribe_from_list" style="color:#44B7B7">Unsubscribe</a>
-                                <t t-if="website"> | <a href="/page/contactus" style="color:#44B7B7">Contact</a> </t>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding-bottom:10px;color:#44B7B7">
-                                <p style="margin:0">© 2014 All Rights Reserved</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text Only" class="neopolitan o_mail_block_footer_text">
-            <div class="snippet_row" style="padding:0px;width:600px;margin:auto;background: #414141 repeat top /100%;color:#44B7B7">
-                <center>
-                    <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td valign="middle" align="right" style="font-size:12px;padding:10px;text-align:center">
-                                    &amp;nbsp;
-                                    <t t-if="website">
-                                        <a href="/page/contactus" style="color:#44B7B7">Contact Us</a> | 
-                                        <t t-if="website.social_facebook">
-                                            <a t-att-href="website.social_facebook" style="color:#44B7B7">Facebook</a> | 
-                                        </t>
-                                        <t t-if="website.social_twitter">
-                                            <a t-att-href="website.social_twitter" style="color:#44B7B7">Twitter</a> | 
-                                        </t>
-                                    </t>
-                                    <a href="/unsubscribe_from_list" style="color:#44B7B7">Unsubscribe</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </center>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='snippet_options']" position="after">
-        <div class="hidden o_theme_palette neopolitan">
-            <div class="note-palette-title mt8"> Mail Theme Colors</div>
-            <div class="mail-colorpicker note-color-row">
-                    <t t-set="colors" t-value="['#414141', '#808080', '#168484', '#44B7B7', '#4DBFBF', '#933F24', '#F46B45', '#F5774E']"/>
-                    <t t-foreach="colors" t-as="c"><button type="button" class="note-color-btn" t-attf-style="background-color:#{c};" t-attf-data-value="#{c}" t-attf-title="#{c}" data-toggle="button" tabindex="-1"></button></t>
-            </div>
-        </div>
-    </xpath>
-</template>
-</odoo>
diff --git a/addons/mass_mailing/views/theme/skyline_snippets.xml b/addons/mass_mailing/views/theme/skyline_snippets.xml
deleted file mode 100644
index b5199ebcdfa..00000000000
--- a/addons/mass_mailing/views/theme/skyline_snippets.xml
+++ /dev/null
@@ -1,693 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="email_designer_snippets_skyline" inherit_id="email_designer_snippets" name="Email Skyline Snippets">
-    <xpath expr="//div[@id='email_designer_default_headers']/div[2]" position="inside">
-        <div name="Center Logo" class="skyline o_mail_block_header_center_logo">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;border-bottom:3px solid #3bcdc3">
-                <table style="margin: 0 auto;width:600px;" 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 src="/logo.png" style="padding:10px;height:auto;max-width:600px;width:200px" alt="Your Logo" />
-                                </a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Center Text" class="skyline o_mail_block_header_center_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;border-bottom:3px solid #3bcdc3;color:#37302d;width:600px">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;width:600px">
-                    <tbody>
-                        <tr>
-                            <td style="font-size: 30px; text-align:center">
-                                &amp;nbsp;
-                                <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color:#37302d">
-                                    <strong>My Company</strong>
-                                </a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Logo - Social" class="skyline o_mail_block_header_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;border-bottom:3px solid #3bcdc3">
-                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse; width:600px">
-                    <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;vertical-align:middle">
-                            <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse">
-                                <tr>
-                                    <t t-if="website.social_facebook">
-                                        <td align="right">
-                                            <a t-att-href="website.social_facebook">
-                                              <span class="fa fa-facebook-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_googleplus">
-                                              <span class="fa fa-google-plus-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_linkedin">
-                                              <span class="fa fa-linkedin-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_twitter">
-                                              <span class="fa fa-twitter-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text - Social" class="skyline o_mail_block_header_text_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;border-bottom:3px solid #3bcdc3;color:#37302d">
-                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse">
-                    <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;color: #37302d;font-size: 30px; text-align:center">
-                                <strong>My Company</strong>
-                            </a>
-                            &amp;nbsp;
-                        </td>
-                        <td valign="center" width="270" style="padding:10px 15px 10px 10px;vertical-align:middle">
-                            <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse">
-                                <tr>
-                                    <t t-if="website.social_facebook">
-                                        <td align="right">
-                                            <a t-att-href="website.social_facebook">
-                                              <span class="fa fa-facebook-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_googleplus">
-                                              <span class="fa fa-google-plus-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_linkedin">
-                                              <span class="fa fa-linkedin-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_twitter">
-                                              <span class="fa fa-twitter-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_body']/div[2]" position="inside">
-        <div name="Title - Subtitle" class="skyline o_mail_block_title_sub">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#3BCDC3">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="text-align:center;padding-bottom:10px">
-                                <p style="margin:0;font-size:36px;line-height:50px">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="Discount Coupon" class="skyline o_mail_block_discount2">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#37302d">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="text-align:center; padding:20px">
-                                <p style="margin:0;font-size:26px;color:#3BCDC3;padding-bottom:20px;font-weight:bold">
-                                    Enjoy 50% of your next purchase!
-                                </p>
-                                <p style="margin:0;border:1px solid #a1a1a1;padding:10px;color:#37302d;font-size:14px"> Code: <strong>45A9E77DGW8455</strong></p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Discount Offer" class="skyline o_mail_block_discount1">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#37302d">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="font-size: 45px; font-weight: 900;text-align:center;padding-top:35px">
-                                <p style="margin:0">20% off!</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="font-size: 30px; font-weight: 600; line-height:30px; text-align:center">
-                                <p style="margin:0">Hurry Up</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center;padding:20px 0" >
-                                &amp;nbsp;
-                                <span class="fa fa-10x fa-gift"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="padding:0 75px;text-align:center;font-size:14px;line-height:20px">
-                                <p style="margin:0">Odoo is continuing to grow and we miss seeing you be a part of it! We've increased store hours and have lot's of new brands available. To welcome you back please accept this 20% discount on you next purchase by clicking the button below.</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center; margin:0 auto;padding:10px 0 25px 0">
-                                &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: #11877B;border-radius:4px">Redeem Discount!</a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Event" class="skyline o_mail_block_event">
-            <div style="padding:0px;width:600px;margin:auto;text-align:center;color:#fff">
-                <table style="width:100%;border-collapse:collapse">
-                    <tr>
-                        <td class="col_mv bg-color" style="width: 150px;height: 150px;padding: 0;margin: 0;background-color: rgb(139,130,132);text-align:center;vertical-align:middle;color:#fff">
-                            <time datetime="2014-07-20"> <span style="display: block;font-size: 50px;line-height: 1;padding-top: 10px">21</span> <span style="display: block;font-size: 30px;line-height: 1">Jul</span> <span style="display: block;font-size: 16px;line-height: 1;color: #fff;font-weight: 600">ALL DAY</span> </time>
-                        </td>
-                        <td style="width: 150px;height: 150px;padding: 0;margin: 0;text-align: center;background-color: rgb(60,205,195)" class="col_mv bg-color">
-                            <div style="margin:27px auto">
-                                &amp;nbsp;
-                                <span class="fa fa-calendar fa-5x"></span>
-                                &amp;nbsp;
-                            </div>
-                        </td>
-                        <td style="position: relative;text-align: left;background-color:rgb(235,235,235);color:#37302d;vertical-align:top;width:298px;height:150px;min-width:255px" class="col_mv bg-color">
-                            <table style="width:100%;border-collapse:collapse;background-color:inherit;color:inherit">
-                                <tr>
-                                    <td style="padding-top:20px;padding-left:20px;float:left" width="90%">
-                                        <div style="min-height:100px">
-                                            <p style="margin:0;font-size:18px">Your Event Name</p>
-                                            <p style="margin:0;font-size:14px">Description</p>
-                                        </div>
-                                        <ul style="padding-left:0">
-                                            <li style="display: table-cell;cursor: pointer;color: #1e1e1e;font-size: 11px;font-weight: 300;padding: 3px 30px;text-align: center"><a href="#" style="color:#1e1e1e">Link </a></li>
-                                            <li style="display: table-cell;cursor: pointer;color: #1e1e1e;font-size: 11px;font-weight: 300;padding: 3px 30px;text-align: center"><a href="#" style="color:#1e1e1e">Info</a></li>
-                                        </ul>
-                                    </td>
-                                    <td style="width: 60px;vertical-align:middle;display: table-cell">
-                                        <ul t-if="website" style="border-left:1px solid #e6e6e6;list-style-type:none;padding-left:16px">
-                                            <t t-if="website.social_facebook">
-                                                <li style="width:33%;margin-left:0">
-                                                    <a t-att-href="website.social_facebook">
-                                                      <span style="color: rgb(75,110,168);" class="fa fa-facebook-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                            <t t-if="website.social_twitter">
-                                                <li style="width:34%;margin-left:0">
-                                                    <a t-att-href="website.social_twitter">
-                                                      <span style="color: rgb(75,110,168);" class="fa fa-twitter-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                            <t t-if="website.social_googleplus">
-                                                <li style="width:33%;margin-left:0">
-                                                    <a t-att-href="website.social_googleplus">
-                                                      <span style="color: rgb(221,75,57);" class="fa fa-google-plus-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                        </ul>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="User Profile" class="skyline o_mail_block_profile">
-            <div class="snippet_row" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#37302d">
-                <table style="padding:20px;border-collapse:collapse;color:inherit">
-                    <tr>
-                        <td style="float:left;padding: 0 30px 0 20px;text-align: center;font-size:14px" class="col_mv">
-                            &amp;nbsp;
-                            <span class="fa fa-user fa-5x" style="margin: 5px 20px;"></span>
-                            <br/>
-                            User: John Doe
-                        </td>
-                        <td style="vertical-align:middle;font-size:14px" class="col_mv">
-                            <p style="margin:0">Hey Bob,</p>
-                            <p style="margin:0">I set up profile where I can do tons of really awesome stuff. I want you to follow me so we can keep in touch!</p>
-                            <p style="margin:0">See you soon!</p>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Content Table" class="skyline o_mail_block_table_content">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#37302d">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td>
-                                <center>
-                                    <table cellspacing="0" cellpadding="0" style="margin:20px auto;width:80%;border-collapse:collapse;color:inherit;font-size:14px">
-                                        <tbody>
-                                            <tr>
-                                                <td style="text-align:left;border-left:none;padding:5px 0">
-                                                    <p style="margin:0"><strong>Bob Erlicious</strong></p>
-                                                    <p style="margin:0">123 Flower Drive <br/>
-                                                    Victoria, BC <br/>
-                                                    V9P 2E8 <br/>
-                                                    1(250)222-2232</p>
-                                                </td>
-                                                <td style="text-align:right; vertical-align:top;border-left:none;padding:5px 0">
-                                                    <p style="margin:0"><strong>Invoice: 00234</strong></p>
-                                                    <p style="margin:0">April 3, 2014</p>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <table cellspacing="0" cellpadding="0" style="margin:20px auto;width:80%;border-collapse:collapse;font-size:14px">
-                                        <tbody>
-                                            <tr>
-                                                <td>
-                                                    <table cellspacing="0" cellpadding="0" style="width:100%;padding-top:30px;background-color:inherit;border-collapse:collapse" data-max-width="500px">
-                                                        <thead style="color:#37302d;background-color:#3BCDC3">
-                                                            <tr class="row col bg-color">
-                                                                <th style="padding: 10px 0px;text-align:center;border-left:none;font-size:14px" class="mv">
-                                                                    Plan
-                                                                </th>
-                                                                <th style="padding: 10px 0px;text-align:center;border-left:none;font-size:14px" class="mv">
-                                                                    Period
-                                                                </th>
-                                                                <th style="padding: 10px 0px;text-align:center;border-left:none;font-size:14px" class="mv">
-                                                                    Amount
-                                                                </th>
-                                                            </tr>
-                                                        </thead>
-                                                        <tbody style="color:#37302d;background-color:#EBEBEB">
-                                                            <tr class="row bg-color">
-                                                                <td style="padding:10px 0px; text-align:center;font-size:14px">
-                                                                    Silver Plan
-                                                                </td>
-                                                                <td style="padding:10px 0px;text-align:center;font-size:14px">
-                                                                    August
-                                                                </td>
-                                                                <td style="padding:10px 0px;text-align:center;font-size:14px">
-                                                                    $50.00
-                                                                </td>
-                                                            </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:80%;border-collapse:collapse;color:inherit;font-size:14px">
-                                        <tbody>
-                                            <tr>
-                                                <td style="padding-top:25px;padding-bottom:25px">
-                                                    <p style="margin:0;text-align:left">
-                                                        The amount of $50.00 CAD has been charged on the credit card ending with 0123.
-                                                    </p>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </center>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Two Columns" class="skyline o_mail_block_two_cols">
-            <div style="padding:0px;width:600px;margin:auto">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="padding:30px 15px;width:45%;text-align:center;background-color:#fff;color:#37302d;font-size:14px;line-height:1.4" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-5x fa-bookmark"></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:45%;text-align:center;background-color:#fff;color:#37302d;font-size:14px;line-height:1.4" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-5x fa-map-marker"></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>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Image" class="skyline o_mail_block_image">
-            <div class="snippet_row bg-color" style="width:600px;margin:auto;background: #FFFFFF repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td width="100%" align="center" style="text-align:center">
-                                &amp;nbsp;
-                                <span class="fa fa-lock fa-10x"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td width="100%" style="text-align:center;padding:10px 30px;font-size:14px;color:#3BCDC3">
-                                <p style="margin:0;padding-bottom:15px;font-size:24px;padding-top:10px">
-                                    Come check out my stuff!
-                                </p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Image Text" class="skyline o_mail_block_image_text">
-            <div class="mv" style="padding:0px;width:600px;margin:auto;color:#000">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="width:35%;background-color:#fff;text-align:center;vertical-align:middle;width:210px;" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-tag fa-10x"></span>
-                                &amp;nbsp;
-                            </td>
-                            <td class="col_mv bg-color" style="padding-left: 40px;padding-right: 30px;text-align: left;vertical-align:middle;background-color:#fff">
-                                <p style="margin:0;color:#37302d;font-size:30px">Good news!</p>
-                                <p style="color:#37302d;font-size:14px;margin:0">We would like to inform you that your order has shipped! More details below.</p>
-                                <div style="padding-top:30px;padding-bottom:20px">
-                                    <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: #11877B;border-radius:4px">My Account</a>
-                                    &amp;nbsp;
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Button" class="skyline 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%">
-                <table style="width:600px;text-align:center;margin:0 auto;border-collapse:collapse">
-                    <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: #11877B;border-radius:4px">My Account</a>
-                            &amp;nbsp;
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text Block" class="skyline 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:#37302d">
-                <table style="width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;color:inherit">
-                    <tr>
-                        <td style="padding:10px 30px;font-size:14px;line-height:20px">
-                            <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 assist 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 name="Background Image" class="skyline o_mail_block_text_on_img">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: url('/mass_mailing/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="padding:30px 30px 0 50px;text-align: left;vertical-align:middle">
-                                <p style="margin:0;padding-bottom:5px;font-size:34px">
-                                    YOUR ORDER HAS SHIPPED
-                                </p>
-                                <p style="margin:0;font-size:24px">
-                                    To track your order or make any changes please click the button below.
-                                </p>
-                                <div style="margin-bottom:35px;margin-top:30px">
-                                    <a href="#" style="-webkit-user-select: none; padding: 12px 30px; 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: #11877B">My Account</a>
-                                    &amp;nbsp;
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Steps" class="skyline o_mail_block_steps">
-            <div style="padding:0;width:600px;max-width:600px;margin:0 auto">
-                <table style="width:600px;text-align:justify;margin:0 auto;background-color:inherit;border-collapse:collapse">
-                    <tr>
-                        <td style="padding:10px 0;background-color:#3CCDC3;color:#fff" class="col_mv bg-color">
-                            <table style="background-color:inherit;border-collapse:collapse">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-check fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#fff;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 1:</p>
-                                        <p style="margin:0">Place Order</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td style="padding:10px 0;background-color:#EBEBEB;color:#808080" class="col_mv bg-color">
-                            <table style="background-color:inherit;border-collapse:collapse">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-truck fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#808080;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 2:</p>
-                                        <p style="margin:0">Shipping</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td style="padding:10px 0;background-color:#EBEBEB;color:#808080" class="col_mv bg-color">
-                            <table style="background-color:inherit;border-collapse:collapse">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-usd fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#808080;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 3:</p>
-                                        <p style="margin:0">Payment</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_extra']/div[2]" position="inside">
-        <div name="Separator" class="skyline o_mail_block_footer_seprator">
-            <div style="padding:0px;width:600px;margin:auto;background-color:#FFFFFF">
-                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);background-color:inherit;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td valign="top" style="width:600px">
-                                <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"/>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Tag Line" class="skyline o_mail_block_footer_tag_line">
-            <div class="bg-color" style="padding:0px; margin:0 auto;background:#fff;color:#000;width:600px">
-                <table style="margin: 0 auto;background-color:inherit;border-collapse:collapse;color:inherit;color:inherit" cellpadding="0" cellspacing="0">
-                    <tbody>
-                        <tr>
-                            <td valign="center" style="text-align:center;padding:5px">
-                                <p style="margin:0;color:inherit;font-size:18px;color:inherit;width:600px">Apps That Help You Grow Your Business</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_footer']/div[2]" position="inside">
-        <div t-if="website" name="Social + Text" class="skyline o_mail_block_footer_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #C2C2C2 repeat top /100%;color:#37302d">
-                <div style="padding:10px">
-                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td style="text-align:center">
-                                    &amp;nbsp;
-                                    <t t-if="website.social_facebook">
-                                        <a t-att-href="website.social_facebook">
-                                          <span class="fa fa-facebook-square fa-2x"></span>
-                                        </a>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <a t-att-href="website.social_googleplus">
-                                          <span class="fa fa-google-plus-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <a t-att-href="website.social_linkedin">
-                                          <span class="fa fa-linkedin-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <a t-att-href="website.social_twitter">
-                                          <span class="fa fa-twitter-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                            <tr>
-                                <td style="font-size:12px;text-align:center;padding:10px">
-                                    &amp;nbsp;
-                                    <a style="color:#37302d" href="/unsubscribe_from_list">Unsubscribe</a> | <a style="color:#37302d" href="/page/contactus">Contact</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-
-        <div name="Text + Copyright" class="skyline o_mail_block_footer_copyright">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #C2C2C2 repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding:10px;color:#37302D">
-                                &amp;nbsp;
-                                <a style="color:#37302D" href="/unsubscribe_from_list">Unsubscribe</a>
-                                <t t-if="website"> | <a style="color:#37302D" href="/page/contactus">Contact</a> </t>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding-bottom:10px;color:#37302D">
-                                <p style="margin:0">© 2014 All Rights Reserved</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text Only" class="skyline o_mail_block_footer_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #C2C2C2 repeat top /100%;color:#37302D">
-                <center>
-                    <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;width:100%;background-color:inherit;border-collapse:collapse;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:#37302D" href="/page/contactus">Contact Us</a> | 
-                                        <t t-if="website.social_facebook">
-                                            <a style="color:#37302D" t-att-href="website.social_facebook">Facebook</a> | 
-                                        </t>
-                                        <t t-if="website.social_twitter">
-                                            <a style="color:#37302D" t-att-href="website.social_twitter">Twitter</a> | 
-                                        </t>
-                                    </t>
-                                    <a href="/unsubscribe_from_list" style="color:#37302D">Unsubscribe</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </center>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='snippet_options']" position="after">
-        <div class="hidden o_theme_palette skyline">
-            <div class="note-palette-title mt8"> Mail Theme Colors</div>
-            <div class="mail-colorpicker note-color-row">
-                <t t-set="colors" t-value="['#1F1F1F', '#37302d', '#808080', '#8B8284', '#C2C2C2', '#EBEBEB', '#EBEBEB','#3CCDC7']"/>
-                <t t-foreach="colors" t-as="c"><button type="button" class="note-color-btn" t-attf-style="background-color:#{c};" t-attf-data-value="#{c}" t-attf-title="#{c}" data-toggle="button" tabindex="-1"></button></t>
-            </div>
-        </div>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/addons/mass_mailing/views/theme/sunday_snippets.xml b/addons/mass_mailing/views/theme/sunday_snippets.xml
deleted file mode 100644
index 132d3a7d9ac..00000000000
--- a/addons/mass_mailing/views/theme/sunday_snippets.xml
+++ /dev/null
@@ -1,694 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="email_designer_snippets_sunday" inherit_id="email_designer_snippets" name="Email Sunday Snippets">
-    <xpath expr="//div[@id='email_designer_default_headers']/div[2]" position="inside">
-        <div name="Center Logo" class="sunday o_mail_block_header_center_logo">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EFEFEF repeat top /100%">
-                <table style="margin: 0 auto;border-collapse:collapse;width:600px" 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 src="/logo.png" style="padding:10px;height:auto;max-width:600px;width:200px" alt="Your Logo" />
-                                </a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Center Text" class="sunday o_mail_block_header_center_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EFEFEF repeat top /100%;color:#414141">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;width:600px">
-                    <tbody>
-                        <tr>
-                            <td style="font-size: 30px; text-align:center">
-                                &amp;nbsp;
-                                <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: #414141">
-                                    <strong>My Company</strong>
-                                </a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Logo - Social" class="sunday o_mail_block_header_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EFEFEF repeat top /100%">
-                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse;width:600px">
-                    <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;vertical-align:middle">
-                            <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse">
-                                <tr>
-                                    <t t-if="website.social_facebook">
-                                        <td align="right">
-                                            <a t-att-href="website.social_facebook">
-                                              <span class="fa fa-facebook-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_googleplus">
-                                              <span class="fa fa-google-plus-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_linkedin">
-                                              <span class="fa fa-linkedin-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_twitter">
-                                              <span class="fa fa-twitter-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text - Social" class="sunday o_mail_block_header_text_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EFEFEF repeat top /100%;color:#414141">
-                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse">
-                    <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;color: #414141;font-size: 30px; text-align:center">
-                                <strong>My Company</strong>
-                            </a>
-                            &amp;nbsp;
-                        </td>
-                        <td valign="center" width="270" style="padding:10px 15px 10px 10px;vertical-align:middle">
-                            <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse">
-                                <tr>
-                                    <t t-if="website.social_facebook">
-                                        <td align="right">
-                                            <a t-att-href="website.social_facebook">
-                                              <span class="fa fa-facebook-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_googleplus">
-                                              <span class="fa fa-google-plus-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_linkedin">
-                                              <span class="fa fa-linkedin-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_twitter">
-                                              <span class="fa fa-twitter-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_body']/div[2]" position="inside">
-        <div name="Title - Subtitle" class="sunday o_mail_block_title_sub">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #27aa90 repeat top /100%;color:#fff">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="text-align:center">
-                                <p style="margin:0;font-size:36px;padding:10px 0">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 new stuff!</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Discount Coupon" class="sunday o_mail_block_discount2">
-            <div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#414141">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="text-align:left; padding-left:20px;vertical-align:middle;color:#414141;font-size:14px" class="col_mv bg-color">
-                                <p style="margin:0;font-size:20px">You get a 20% discount for signing up!</p>
-                                <p style="margin:0">Discount Code: <strong>45A9E77DGW8455</strong></p>
-                            </td>
-                            <td class="col_mv bg-color" style="padding-top:20px;padding-bottom:20px;text-align:center;vertical-align:middle">
-                                &amp;nbsp;
-                                <span class="fa fa-6x fa-ticket"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Discount Offer" class="sunday o_mail_block_discount1">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%">
-                <div style="padding:0 75px">
-                    <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse">
-                        <tbody>
-                            <tr>
-                                <td style="font-size: 45px;font-weight:900;color:#414141;padding-top:35px;text-align:left">
-                                    <p style="margin:0">20% off!</p>
-                                </td>
-                                <td style="font-size: 30px; font-weight: 600; line-height:30px; text-align:right;color:#414141;padding-top:50px">
-                                    <p style="margin:0">Hurry Up!</p>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td style="text-align:center;padding:20px 0" colspan="2">
-                                    &amp;nbsp;
-                                    <span class="fa fa-10x fa-gift"></span>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                            <tr>
-                                <td style="text-align:center;padding-top:10px;color:#414141;font-size:14px" colspan="2">
-                                    <p style="margin:0">Odoo is continuing to grow and we miss seeing you be a part of it! We've increased store hours and have lot's of new brands available. To welcome you back please accept this 20% discount on you next purchase by clicking the button below.</p>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td style="text-align:center; margin:0 auto;padding-bottom:25px;padding-top:15px" colspan="2">
-                                    &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: #27AA90;border-radius:4px">Redeem Discount!</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-
-        <div name="Event" class="sunday o_mail_block_event">
-            <div style="padding:0px;width:600px;margin:auto;text-align:center;color:#fff">
-                <table style="width:100%;border-collapse:collapse;border-collapse:collapse">
-                    <tr>
-                        <td class="col_mv bg-color" style="width: 150px;height: 150px;padding: 0;margin: 0;background-color: #808080;text-align:center;vertical-align:middle;color:#fff">
-                            <time datetime="2014-07-20"> <span style="display: block;font-size: 50px;line-height: 1;padding-top: 10px">21</span> <span style="display: block;font-size: 30px;line-height: 1">Jul</span> <span style="display: block;font-size: 16px;line-height: 1;color: #fff;font-weight: 600">ALL DAY</span> </time>
-                        </td>
-                        <td style="width: 150px;height: 150px;padding: 0;margin: 0;text-align: center;background-color: #F5774E" class="col_mv bg-color">
-                            <div style="margin:27px auto">
-                                &amp;nbsp;
-                                <span class="fa fa-calendar fa-5x"></span>
-                                &amp;nbsp;
-                            </div>
-                        </td>
-                        <td style="background-color:#fff;color:#27aa90;position: relative;text-align: left;vertical-align:top;width:298px;height;150px;min-width:255px" class="col_mv bg-color">
-                            <table style="width:100%;background-color:inherit;border-collapse:collapse">
-                                <tr>
-                                    <td style="padding-top:20px;padding-left:20px;float:left;color:#27aa90" width="90%">
-                                        <div style="min-height:100px;text-align:left">
-                                            <p style="margin:0;font-size:18px">Your Event Name</p>
-                                            <p style="margin:0;font-size:14px;margin-top:0">Description</p>
-                                        </div>
-                                        <ul style="padding-left:0">
-                                            <li style="display: table-cell;cursor: pointer;color: #1e1e1e;font-size: 11px;font-weight: 300;padding: 3px 30px;text-align: center"><a href="#" style="color:#1e1e1e">Link </a></li>
-                                            <li style="display: table-cell;cursor: pointer;color: #1e1e1e;font-size: 11px;font-weight: 300;padding: 3px 30px;text-align: center"><a href="#" style="color:#1e1e1e">Info</a></li>
-                                        </ul>
-                                    </td>
-                                    <td style="width: 60px;vertical-align:middle;display: table-cell">
-                                        <ul t-if="website" style="border-left:1px solid #e6e6e6;list-style-type:none;padding-left:16px">
-                                            <t t-if="website.social_facebook">
-                                                <li style="width:33%;margin-left:0">
-                                                    <a t-att-href="website.social_facebook">
-                                                      <span style="color: rgb(75,110,168);" class="fa fa-facebook-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                            <t t-if="website.social_twitter">
-                                                <li style="width:34%;margin-left:0">
-                                                    <a t-att-href="website.social_twitter">
-                                                      <span style="color: rgb(75,110,168);" class="fa fa-twitter-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                            <t t-if="website.social_googleplus">
-                                                <li style="width:33%;margin-left:0">
-                                                    <a t-att-href="website.social_googleplus">
-                                                      <span style="color: rgb(221,75,57);" class="fa fa-google-plus-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                        </ul>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="User Profile" class="sunday o_mail_block_profile">
-            <div class="snippet_row" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;text-align:center">
-                <table style="padding:20px;border-collapse:collapse;color:inherit">
-                    <tr>
-                        <td style="float:left;text-align: center;color:#27AA90" class="col_mv bg-color">
-                            &amp;nbsp;
-                            <span class="fa fa-user fa-5x"></span>
-                            <br/>
-                            <span style="color:#282D29;font-size:12px">User: John Doe</span>
-                        </td>
-                        <td style="color:#27aa90; font-size: 28px; font-weight: 600; padding-left:30px; text-align: left; vertical-align: middle" class="col_mv bg-color">
-                            <p style="margin:0">Sign up now and receive a 20% discount!</p>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Content Table" class="sunday o_mail_block_table_content">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#414141">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td>
-                                <center>
-                                    <table cellspacing="0" cellpadding="0" style="margin:10px auto;width:80%;border-collapse:collapse;font-size:14px">
-                                        <tbody>
-                                            <tr>
-                                                <td style="text-align:left;padding-top:10px;padding-bottom:10px;border-left:none;color:#414141">
-                                                    <p style="margin:0"><strong>Bob Erlicious</strong></p>
-                                                    <p style="margin:0">
-                                                        123 Flower Drive <br/>
-                                                        Victoria, BC <br/>
-                                                        V9P 2E8 <br/>
-                                                        1(250)222-2232
-                                                    </p>
-                                                </td>
-                                                <td style="text-align:right; vertical-align:top;padding-top:10px;padding-bottom:10px;border-left:none;color:#414141">
-                                                    <p style="margin:0"><strong>Invoice: 00234</strong></p>
-                                                    <p style="margin:0">April 3, 2014</p>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <table cellspacing="0" cellpadding="0" style="margin:20px auto;width:80%;border-collapse:collapse">
-                                        <tbody>
-                                            <tr>
-                                                <td>
-                                                    <table cellspacing="0" cellpadding="0" style="width:100%;padding-top:30px;border-collapse:collapse;font-size:14px" data-max-width="500px">
-                                                        <thead style="color:#fff;background-color:#27aa90">
-                                                            <tr class="row col bg-color">
-                                                                <th style="padding: 10px 0px;text-align:center;border-left:none" class="mv">
-                                                                    Plan
-                                                                </th>
-                                                                <th style="padding: 10px 0px;text-align:center;border-left:none" class="mv">
-                                                                    Period
-                                                                </th>
-                                                                <th style="padding: 10px 0px;text-align:center;border-left:none" class="mv">
-                                                                    Amount
-                                                                </th>
-                                                            </tr>
-                                                        </thead>
-                                                        <tbody style="background-color:#3BCDB0;color:#414141">
-                                                            <tr class="row bg-color">
-                                                                <td style="padding:10px 0px; text-align:center">
-                                                                    Silver Plan
-                                                                </td>
-                                                                <td style="padding:10px 0px;text-align:center">
-                                                                    August
-                                                                </td>
-                                                                <td style="padding:10px 0px;text-align:center">
-                                                                    $50.00
-                                                                </td>
-                                                            </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:80%;color:#414141;border-collapse:collapse">
-                                        <tbody>
-                                            <tr>
-                                                <td style="padding:20px 0 20px 0">
-                                                    <p style="margin:0;text-align:left;font-size:14px">
-                                                        The amount of $50.00 CAD has been charged on the credit card ending with 0123.
-                                                    </p>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </center>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Two Columns" class="sunday o_mail_block_two_cols">
-            <div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#414141">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="padding:30px 10px 30px 30px;width:45%;text-align:center;color:#414141;font-size:14px" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-5x fa-bookmark"></span>
-                                &amp;nbsp;
-                                <p style="margin:0;font-size:24px">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 30px 10px 30px; width:45%;text-align:center;color:#414141;font-size:14px" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-5x fa-map-marker"></span>
-                                &amp;nbsp;
-                                <p style="margin:0;font-size:24px">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>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Image" class="sunday o_mail_block_image">
-            <div class="snippet_row bg-color" style="width:600px;margin:auto;background: #27aa90 repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td width="100%" align="center" style="text-align:center">
-                                &amp;nbsp;
-                                <span class="fa fa-lock fa-10x"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td width="100%" style="text-align:center;padding:10px 30px;font-size:14px;color:#EFEFEF">
-                                <p style="margin:0;padding-bottom:10px;font-size:22px;padding-top:10px">
-                                    Come check out my stuff!
-                                </p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Image Text" class="sunday o_mail_block_image_text">
-            <div style="padding:0px;width:600px;margin:auto;background-color:#27aa90;color:#414141">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="width:45%;padding-bottom:25px;background-color:#fff;text-align:center;vertical-align:middle;width:210px;" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-tag fa-10x"></span>
-                                &amp;nbsp;
-                            </td>
-                            <td style="padding-left: 40px;padding-right: 30px;text-align: left;vertical-align:middle;background-color:inherit" class="col_mv bg-color">
-                                <p style="margin:0;color:#fff;padding-top:10px;padding-bottom:10px;font-size:30px">Good news!</p>
-                                <p style="margin:0;padding-bottom:25px;color:#414141;font-size:14px">We would like to inform you that your order has shipped! More details below.</p>
-                                <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: #1D8871;border-radius:4px">My Account</a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Button" class="sunday 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%">
-                <table style="width:90%;text-align:center;margin:0 auto;border-collapse:collapse;width:600px">
-                    <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: #27AA90;border-radius:4px">My Account</a>
-                            &amp;nbsp;
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text Block" class="sunday 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:#414141">
-                <table style="width:100%;text-align:justify;margin:0 auto;color:inherit;border-collapse:collapse">
-                    <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 assist 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 name="Background Image" class="sunday o_mail_block_text_on_img">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: url('/mass_mailing/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="padding:30px 30px 0 50px;text-align: left;vertical-align:middle">
-                                <p style="margin:0;padding-bottom:5px;font-size:34px">
-                                    YOUR ORDER HAS SHIPPED
-                                </p>
-                                <p style="margin:0;font-size:24px">
-                                    To track your order or make any changes please click the button below.
-                                </p>
-                                <div style="margin-bottom:35px;margin-top:30px">
-                                    <a href="#" style="-webkit-user-select: none; padding: 12px 30px; 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: #1D8871">My Account</a>
-                                    &amp;nbsp;
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Steps" class="sunday o_mail_block_steps">
-            <div style="padding:0;width:600px;max-width:600px;margin:0 auto">
-                <table style="width:100%;text-align:justify;margin:0 auto;border-collapse:collapse">
-                    <tr>
-                        <td style="padding:10px 0;background-color:#27AA90;color:#fff" class="col_mv bg-color">
-                            <table style="background-color:inherit;border-collapse:collapse">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-check fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#fff;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 1:</p>
-                                        <p style="margin:0">Place Order</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td style="padding:10px 0;background-color:#EFEFEF;color:#808080" class="col_mv bg-color">
-                            <table style="background-color:inherit;border-collapse:collapse">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-truck fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#808080;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 2:</p>
-                                        <p style="margin:0">Shipping</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td style="padding:10px 0;background-color:#EFEFEF;color:#808080" class="col_mv bg-color">
-                            <table style="background-color:inherit;border-collapse:collapse">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-usd fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#808080;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 3:</p>
-                                        <p style="margin:0">Payment</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_extra']/div[2]" position="inside">
-        <div name="Separator" class="sunday o_mail_block_footer_seprator">
-            <div style="padding:0px;width:600px;margin:auto;background-color:#FFFFFF">
-                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);background-color:inherit;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td valign="top" style="width:600px">
-                                <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"/>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Tag Line" class="sunday o_mail_block_footer_tag_line">
-            <div class="bg-color" style="padding:0px;width:600px;margin:auto;background-color:#F5774E;color:#fff">
-                <table style="margin: 0 auto;background-color:inherit;border-collapse:collapse;color:inherit;width:600px" cellpadding="0" cellspacing="0">
-                    <tbody>
-                        <tr>
-                            <td valign="center" style="text-align:center;padding:5px">
-                                <p style="margin:0;font-size:18px;color:inherit">Apps That Help You Grow Your Business</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_footer']/div[2]" position="inside">
-        <div t-if="website" name="Social + Text" class="sunday o_mail_block_footer_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #2F2F2F repeat top /100%;color:#EEEEEE">
-                <div style="padding:10px">
-                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td style="text-align:center">
-                                    &amp;nbsp;
-                                    <t t-if="website.social_facebook">
-                                        <a t-att-href="website.social_facebook">
-                                          <span class="fa fa-facebook-square fa-2x"></span>
-                                        </a>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <a t-att-href="website.social_googleplus">
-                                          <span class="fa fa-google-plus-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <a t-att-href="website.social_linkedin">
-                                          <span class="fa fa-linkedin-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <a t-att-href="website.social_twitter">
-                                          <span class="fa fa-twitter-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                            <tr>
-                                <td style="font-size:12px;text-align:center;padding:10px">
-                                    &amp;nbsp;
-                                    <a style="color:#EEEEEE" href="/unsubscribe_from_list">Unsubscribe</a> | <a style="color:#EEEEEE" href="/page/contactus">Contact</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-
-        <div name="Text + Copyright" class="sunday o_mail_block_footer_copyright">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #2F2F2F repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding:10px;color:#fff">
-                                &amp;nbsp;
-                                <a style="color:#fff" href="/unsubscribe_from_list">Unsubscribe</a>
-                                <t t-if="website"> | <a style="color:#fff" href="/page/contactus">Contact</a> </t>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding-bottom:10px;color:#fff">
-                                <p style="margin:0">© 2014 All Rights Reserved</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text Only" class="sunday o_mail_block_footer_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #2F2F2F repeat top /100%;color:#fff">
-                <center>
-                    <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin:0 auto;width:100%;border-collapse:collapse;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:#fff" href="/page/contactus">Contact Us</a> | 
-                                        <t t-if="website.social_facebook">
-                                            <a style="color:#fff" t-att-href="website.social_facebook">Facebook</a> | 
-                                        </t>
-                                        <t t-if="website.social_twitter">
-                                            <a style="color:#fff" t-att-href="website.social_twitter">Twitter</a> | 
-                                        </t>
-                                    </t>
-                                    <a href="/unsubscribe_from_list" style="color:#fff">Unsubscribe</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </center>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='snippet_options']" position="after">
-        <div class="hidden o_theme_palette sunday">
-            <div class="note-palette-title mt8"> Mail Theme Colors</div>
-            <div class="mail-colorpicker note-color-row">
-                    <t t-set="colors" t-value="['#1F1F1F', '#2F2F2F', '#414141', '#808080', '#6f6f6f', '#3BCDB0', '#27aa90', '#F5774E']"/>
-                    <t t-foreach="colors" t-as="c"><button type="button" class="note-color-btn" t-attf-style="background-color:#{c};" t-attf-data-value="#{c}" t-attf-title="#{c}" data-toggle="button" tabindex="-1"></button></t>
-            </div>
-        </div>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/addons/mass_mailing/views/theme/zenflat_snippets.xml b/addons/mass_mailing/views/theme/zenflat_snippets.xml
deleted file mode 100644
index b9a0ef2069e..00000000000
--- a/addons/mass_mailing/views/theme/zenflat_snippets.xml
+++ /dev/null
@@ -1,714 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="email_designer_snippets_zenflat" inherit_id="email_designer_snippets" name="Email Zenflat Snippets">
-    <xpath expr="//div[@id='email_designer_default_headers']/div[2]" position="inside">
-        <div name="Center Logo" class="zenflat o_mail_block_header_center_logo">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EEEEEE repeat top /100%;color:#008000">
-                <table style="margin: 0 auto;border-collapse:collapse;width:600px" 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 src="/logo.png" style="padding:10px;height:auto;max-width:600px" alt="Your Logo" />
-                                </a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Center Text" class="zenflat o_mail_block_header_center_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EEEEEE repeat top /100%;color:#008000">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;width:600px">
-                    <tbody>
-                        <tr>
-                            <td style="font-web_editor/font_to_img: 30px; text-align:center">
-                                &amp;nbsp;
-                                <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color:#008000">
-                                    <strong>My Company</strong>
-                                </a>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Logo - Social" class="zenflat o_mail_block_header_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EEEEEE repeat top /100%;color:#008000">
-                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;width:600px">
-                    <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" alt="Your Logo" />
-                            </a>
-                            &amp;nbsp;
-                        </td>
-                        <td valign="center" width="270" style="padding:10px 15px 10px 10px;vertical-align:middle">
-                            <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse">
-                                <tr>
-                                    <t t-if="website.social_facebook">
-                                        <td align="right">
-                                              <a t-att-href="website.social_facebook">
-                                                <span class="fa fa-facebook-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_googleplus">
-                                              <span class="fa fa-google-plus-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_linkedin">
-                                              <span class="fa fa-linkedin-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_twitter">
-                                              <span class="fa fa-twitter-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text - Social" class="zenflat o_mail_block_header_text_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EEEEEE repeat top /100%;color:#008000">
-                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;width:600px">
-                    <tr>
-                        <td valign="center" width="270" style="padding-left:5px;font-size:30px">
-                            &amp;nbsp;
-                            <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: #008000">
-                                <strong>My Company</strong>
-                            </a>
-                            &amp;nbsp;
-                        </td>
-                        <td valign="center" width="270" style="padding:10px 15px 10px 10px;vertical-align:middle">
-                            <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse">
-                                <tr>
-                                    <t t-if="website.social_facebook">
-                                        <td align="right">
-                                            <a t-att-href="website.social_facebook">
-                                              <span class="fa fa-facebook-square fa-2x"></span>
-                                            </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_googleplus">
-                                              <span class="fa fa-google-plus-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_linkedin">
-                                              <span class="fa fa-linkedin-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <td align="right" style="padding-left:5px">
-                                            <a t-att-href="website.social_twitter">
-                                              <span class="fa fa-twitter-square fa-2x"></span>
-                                              </a>
-                                        </td>
-                                    </t>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_body']/div[2]" position="inside">
-        <div name="Title - Subtitle" class="zenflat o_mail_block_title_sub">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;color:#008000;background: #FFFFFF repeat top /100%">
-                <table width="100%" cellspacing="0" cellpadding="0" style="color:inherit;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="text-align:center">
-                                <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">Apps That Help You Grow Your Business!</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Content Table" class="zenflat o_mail_block_table_content">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#414141">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td>
-                                <center>
-                                    <table cellspacing="0" cellpadding="0" style="margin: 20px auto;width:80%;padding-top:30px;padding-bottom:30px;border-collapse:collapse">
-                                        <tbody>
-                                            <tr>
-                                                <td>
-                                                    <p style="margin:0;text-align:left;color:#37302d;font-size:14px">
-                                                        We would like you to know that you have successfully subscribed the news letter. Following are the details about your plan.
-                                                    </p>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <table cellspacing="0" cellpadding="0" style="margin:20px auto;width:80%;border-collapse:collapse">
-                                        <tbody>
-                                            <tr>
-                                                <td>
-                                                    <table cellspacing="0" cellpadding="0" style="width:100%;padding-top:30px;text-indent:10px;border-collapse:collapse" data-max-width="500px">
-                                                        <thead>
-                                                            <tr style="color: #fff;background: #008001" class="row col bg-color">
-                                                                <th style="padding: 10px 0px;width:166px;border-left:none;text-align:left;font-size:14px" class="mv">Plan</th>
-                                                                <th style="padding: 10px 0px;width:166px;border-left:none;text-align:left;font-size:14px" class="mv">Period</th>
-                                                                <th style="padding: 10px 0px;width:166px;border-left:none;text-align:left;font-size:14px" class="mv">Amount</th>
-                                                            </tr>
-                                                        </thead>
-                                                        <tbody>
-                                                            <tr class="row bg-color" style="color:#333333">
-                                                                <td style="padding:10px 0px;font-size:14px">Silver Plan</td>
-                                                                <td style="padding:10px 0px;font-size:14px">August</td>
-                                                                <td style="padding:10px 0px;font-size:14px">$50.00</td>
-                                                            </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <table cellspacing="0" cellpadding="0" style="margin: 20px auto;width:80%;padding-top:30px;padding-bottom:30px;border-collapse:collapse">
-                                        <tbody>
-                                            <tr>
-                                                <td>
-                                                    <p style="margin:0;text-align:left;color:#37302d;font-size:14px">
-                                                        The amount of $50.00 CAD has been charged on the credit card ending with 0123.
-                                                    </p>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </center>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Event" class="zenflat o_mail_block_event">
-            <div style="padding:0px;width:600px;margin:auto;text-align:center;color:#fff">
-                <table style="width:100%;border-collapse:collapse;border-collapse:collapse">
-                    <tr>
-                        <td class="col_mv bg-color" style="width: 150px;height: 150px;padding: 0;margin: 0;background-color:#008000;text-align:center;vertical-align:middle;color:#FFFFFF">
-                            <time datetime="2014-07-20"> <span style="display: block;font-size: 50px;line-height: 1;padding-top: 10px">21</span> <span style="display: block;font-size: 30px;line-height: 1">Jul</span> <span style="display: block;font-size: 16px;line-height: 1;color: #fff;font-weight: 600">ALL DAY</span> </time>
-                        </td>
-                        <td style="width: 150px;height: 150px;padding: 0;margin: 0;text-align: center;background-color: rgb(222,222,222)" class="col_mv bg-color">
-                            <div style="margin:27px auto">
-                                &amp;nbsp;
-                                <span class="fa fa-calendar fa-5x"></span>
-                                &amp;nbsp;
-                            </div>
-                        </td>
-                        <td style="position: relative;text-align: left;background-color:#f5f5f5;color:#666666;vertical-align:top;width:298px;height:150px;min-width:255px" class="col_mv bg-color">
-                            <table style="width:100%;background-color:inherit;border-collapse:collapse">
-                                <tr>
-                                    <td style="padding-top:20px;padding-left:20px;float:left;color:#666666" width="90%">
-                                        <div style="min-height:100px;text-align:left">
-                                            <p style="margin:0;font-size:18px">Your Event Name</p>
-                                            <p style="margin:0;font-size:14px">Description</p>
-                                        </div>
-                                        <ul style="padding-left:0">
-                                            <li style="display: table-cell;cursor: pointer;color: #1e1e1e;font-size: 11px;font-weight: 300;padding: 3px 30px;text-align: center"><a href="#" style="color:#1e1e1e">Link </a></li>
-                                            <li style="display: table-cell;cursor: pointer;color: #1e1e1e;font-size: 11px;font-weight: 300;padding: 3px 30px;text-align: center"><a href="#" style="color:#1e1e1e">Info</a></li>
-                                        </ul>
-                                    </td>
-                                    <td style="width: 60px;vertical-align:middle;display: table-cell">
-                                        <ul t-if="website" style="border-left:1px solid #e6e6e6;list-style-type:none;padding-left:16px">
-                                            <t t-if="website.social_facebook">
-                                                <li style="width:33%;margin-left:0">
-                                                    <a t-att-href="website.social_facebook">
-                                                      <span style="color: rgb(75,110,168);" class="fa fa-facebook-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                            <t t-if="website.social_twitter">
-                                                <li style="width:34%;margin-left:0">
-                                                    <a t-att-href="website.social_twitter">
-                                                      <span style="color: rgb(75,110,168);" class="fa fa-twitter-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                            <t t-if="website.social_googleplus">
-                                                <li style="width:33%;margin-left:0">
-                                                    <a t-att-href="website.social_googleplus">
-                                                      <span style="color: rgb(221,75,57);" class="fa fa-google-plus-square fa-2x"></span>
-                                                    </a>
-                                                </li>
-                                            </t>
-                                        </ul>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Discount Offer" class="zenflat o_mail_block_discount1">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#414141">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="font-size: 45px; font-weight: 900; color: #414141;text-align:center;padding-top:35px">
-                                <p style="margin:0">20% off!</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="font-size: 30px; font-weight: 600; line-height:30px; text-align:center;color:#414141">
-                                <p style="margin:0">Title</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center;padding:20px 0">
-                                &amp;nbsp;
-                                <span class="fa fa-6x fa-ticket"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="padding:0 75px;text-align:center;color:#414141;font-size:14px">
-                                <p style="margin:0">Odoo is continuing to grow and we miss seeing you be a part of it! We've increased store hours and have lot's of new brands available. To welcome you back please accept this 20% discount on you next purchase by clicking the button below.</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center; margin:0 auto;padding-bottom:25px">
-                                <div style="padding-top:15px">
-                                    &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: #008000;border-radius:4px">Redeem Discount!</a>
-                                    &amp;nbsp;
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Discount Coupon" class="zenflat o_mail_block_discount2">
-            <div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#414141">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="text-align:left; padding-left:30px;vertical-align:middle;color:#414141;font-size:14px" class="col_mv bg-color">
-                                <p style="margin:0;font-size:20px">You get a 20% discount for signing up!</p>
-                                <p style="margin:0">Discount Code: <strong>45A9E77DGW8455</strong></p>
-                            </td>
-                            <td class="col_mv bg-color" style="padding:20px;text-align:center;vertical-align:middle">
-                                &amp;nbsp;
-                                <span class="fa fa-6x fa-ticket"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Two Columns" class="zenflat o_mail_block_two_cols_content">
-            <div class="mv" style="padding:0px;width:600px;margin:auto">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="padding:30px 10px 30px 30px;width:45%;text-align:justify;background-color:#008001;color:#fff;font-size:14px" class="col_mv bg-color">
-                                <p style="margin:0;font-weight:bold;padding-top:25px">Bob Erlicious</p>
-                                <p style="margin:0">
-                                    123 Flower Drive<br/>
-                                    Victoria, BC<br/>
-                                    V9P 2E8<br/>
-                                    1(250)222-2232
-                                </p>
-                                <div style="margin-top:50px">
-                                    <p style="margin:0;font-weight:bold;padding-top:30px">Invoice: 00234</p>
-                                    <p style="margin:0">April 3, 2014</p>
-                                </div>
-                            </td>
-                            <td style="vertical-align:top; padding: 30px 30px 10px 30px; width:45%;text-align:justify;background-color:#FFFFFF" class="col_mv bg-color">
-                                <table width="80%" style="border:2px solid #008001;text-indent: 10px;margin-bottom:20px;border-collapse:collapse" class="col">
-                                    <tbody>
-                                        <tr class="bg-color" style="color: #fff; background: #008001">
-                                            <td style="padding:5px;font-size:14px">​<strong>Plan</strong></td>
-                                        </tr>
-                                        <tr class="bg-color" style="background: #FFFFFF;color:#666666">
-                                            <td style="padding:5px;font-size:14px">​Gold Status</td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                                <table  width="80%" style="border:2px solid #008001;text-indent: 10px;margin-bottom:20px;border-collapse:collapse" class="col" >
-                                    <tbody>
-                                        <tr class="bg-color" style="background-color: #008001;color:#fff">
-                                            <td style="padding:5px;font-size:14px"><strong>​Period</strong></td>
-                                        </tr>
-                                        <tr class="bg-color" style="background-color:#F3F3F3">
-                                            <td style="padding:5px;color:#666666;font-size:14px">​May - June 2014</td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                                <table  width="80%" style="border:2px solid #008001;text-indent: 10px;margin-bottom:20px;border-collapse:collapse" class="col">
-                                    <tbody>
-                                        <tr class="bg-color" style="background-color: #008001;color:#fff">
-                                            <td style="padding:5px;font-size:14px">​<strong>Amount</strong></td>
-                                        </tr>
-                                        <tr class="bg-color" style="background-color:#F3F3F3">
-                                            <td style="padding:5px;color:#666666;font-size:14px">​$39.99</td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="User Profile" class="zenflat o_mail_block_profile">
-            <div class="snippet_row" style="padding:0;width:600px;margin:auto;background: #fff repeat top /100%;color:#464646">
-                <table style="padding:10px 30px;border-collapse:collapse;width:600px">
-                    <tr>
-                        <td style="float:left;padding: 0 30px 0 20px;text-align: center;color:#008000;font-size:14px" class="col_mv bg-color">
-                            &amp;nbsp;
-                            <span class="fa fa-user fa-5x" style="margin: 5px 20px;"></span>
-                            <br/>
-                            User: John Doe
-                        </td>
-                        <td style="vertical-align:middle;color:#414141;font-size:14px" class="col_mv bg-color">
-                            <p style="margin:0">Hey Bob,</p>
-                            <p style="margin:0">I set up an Odoo profile where I can do tons of really awesome stuff. I want you to follow me so we can keep in touch!</p>
-                            <p style="margin:0">See you soon!</p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td colspan="2" style="padding-top:12px;color:#414141;font-size:14px">
-                            <p style="margin:0">Because I've invited you, you can also use the below coupon code to receive a 50% discount on you first months subscription!</p>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Image - Content" class="zenflat o_mail_block_image_text">
-            <div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#333333;max-width:600px">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="width:45%;padding:15px auto;text-align:center;vertical-align:middle;width:210px;" class="col_mv bg-color">
-                                &amp;nbsp;
-                                <span class="fa fa-tag fa-10x"></span>
-                                &amp;nbsp;
-                            </td>
-                            <td style="padding-left: 40px;padding-right: 30px;text-align: left" class="col_mv bg-color">
-                                <p style="margin:0;color:#414141;padding-bottom:10px;padding-top:20px;font-size:30px">Good news!</p>
-                                <p style="margin:0;color:#414141;font-size:14px">We would like to inform you that your order has shipped! More details below.</p>
-                                <div style="padding-top:20px;padding-bottom:20px">
-                                    <a href="#" style="-webkit-user-select: none; cursor: pointer; padding: 6px 12px; font-size: 13.63636302948px; line-height: 17.7095623016357px; 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: 0.909090876579285px solid rgb(76,174,76); text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; white-space: nowrap; background-image: none; background-color:#008000">My Account</a>
-                                    &amp;nbsp;
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Image" class="zenflat o_mail_block_image">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#414141">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:#37302d">
-                    <tbody>
-                        <tr>
-                            <td style="text-align:center;padding:20px 0" >
-                                &amp;nbsp;
-                                <span class="fa fa-camera fa-10x"></span>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="text-align:center;font-size:24px">
-                                <p style="margin:0">Apps That Help You Grow Your Business!</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Button" class="zenflat 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%">
-                <table style="width:600px;text-align:center;margin:0 auto;border-collapse:collapse">
-                    <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: #008000;border-radius:4px">My Account</a>
-                            &amp;nbsp;
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text Block" class="zenflat 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:#414141">
-                <table style="width:100%;text-align:justify;margin:0 auto;color:#414141;border-collapse:collapse">
-                    <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 assist 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 name="Background Image" class="zenflat o_mail_block_text_on_img">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: url('/mass_mailing/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="width:600px;background:inherit;border-collapse:collapse;color:inherit">
-                    <tbody>
-                        <tr>
-                            <td style="padding:30px 30px 0 50px;text-align: left;vertical-align:middle">
-                                <p style="margin:0;padding-bottom:5px;font-size:34px">
-                                    YOUR ORDER HAS SHIPPED
-                                </p>
-                                <p style="margin:0;font-size:24px">
-                                    To track your order or make any changes please click the button below.
-                                </p>
-                                <div style="margin-bottom:35px;margin-top:30px">
-                                    <a href="#" style="-webkit-user-select: none; padding: 12px 30px; 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: #008000">My Account</a>
-                                    &amp;nbsp;
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Steps" class="zenflat o_mail_block_steps">
-            <div style="padding:0;width:600px;max-width:600px;margin:0 auto">
-                <table style="width:100%;text-align:justify;margin:0 auto;border-collapse:collapse">
-                    <tr>
-                        <td style="padding:10px 0;background-color:#008000;color:#fff" class="col_mv bg-color">
-                            <table style="background-color:inherit;border-collapse:collapse">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-check fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#fff;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 1:</p>
-                                        <p style="margin:0">Place Order</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td style="padding:10px 0;background-color:#EEEEEE;color:#808080" class="col_mv bg-color">
-                            <table style="background-color:inherit;border-collapse:collapse">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-truck fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#808080;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 2:</p>
-                                        <p style="margin:0">Shipping</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td style="padding:10px 0;background-color:#EEEEEE;color:#808080" class="col_mv bg-color">
-                            <table style="background-color:inherit;border-collapse:collapse">
-                                <tr>
-                                    <td rowspan="2" style="padding-left:10px">
-                                        &amp;nbsp;
-                                        <span class="fa fa-usd fa-3x"></span>
-                                        &amp;nbsp;
-                                    </td>
-                                    <td style="padding-left:10px;color:#808080;font-size:14px">
-                                        <p style="font-weight:bold;font-size:18px;margin:0 0 3px 0">Step 3:</p>
-                                        <p style="margin:0">Payment</p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_extra']/div[2]" position="inside">
-        <div name="Separator" class="zenflat o_mail_block_footer_seprator">
-            <div style="padding:0px; margin:auto;max-width:600px;background-color:#FFFFFF">
-                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);background-color:inherit;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td valign="top" style="width:600px">
-                                <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"/>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Tag Line" class="zenflat o_mail_block_footer_tag_line">
-            <div class="bg-color" style="padding:0px; margin:auto;background-color:#008000;color:#FFFFFF;max-width:600px">
-                <table style="margin: 0 auto;background-color:inherit;border-collapse:collapse;color:inherit;width:600px" cellpadding="0" cellspacing="0">
-                    <tbody>
-                        <tr>
-                            <td valign="center" style="text-align:center;padding:5px;color:#FFFFFF">
-                                <p style="margin:0;font-size:18px;color:inherit">Apps That Help You Grow Your Business</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='email_designer_default_footer']/div[2]" position="inside">
-        <div t-if="website" name="Social + Text" class="zenflat o_mail_block_footer_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EEEEEE repeat top /100%;color:#414141">
-                <div style="padding:10px">
-                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:600px;border-collapse:collapse">
-                        <tbody>
-                            <tr>
-                                <td style="text-align:center ">
-                                    &amp;nbsp;
-                                    <t t-if="website.social_facebook">
-                                        <a t-att-href="website.social_facebook">
-                                          <span class="fa fa-facebook-square fa-2x"></span>
-                                        </a>
-                                    </t>
-                                    <t t-if="website.social_googleplus">
-                                        <a t-att-href="website.social_googleplus">
-                                          <span class="fa fa-google-plus-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    <t t-if="website.social_linkedin">
-                                        <a t-att-href="website.social_linkedin">
-                                          <span class="fa fa-linkedin-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <a t-att-href="website.social_twitter">
-                                          <span class="fa fa-twitter-square fa-2x"></span>
-                                          </a>
-                                    </t>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                            <tr>
-                                <td style="font-size:12px;text-align:center;padding-top:10px">
-                                    &amp;nbsp;
-                                    <a style="color:#414141" href="/unsubscribe_from_list">Unsubscribe</a> | <a style="color:#414141" href="/page/contactus">Contact</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-
-        <div name="Text + Copyright" class="zenflat o_mail_block_footer_copyright">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EEEEEE repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:600px;border-collapse:collapse">
-                    <tbody>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding-top:10px;padding-bottom:5px;color:#414141">
-                                &amp;nbsp;
-                                <a style="color:#414141" href="/unsubscribe_from_list">Unsubscribe</a>
-                                <t t-if="website"> | <a style="color:#414141" href="/page/contactus">Contact</a> </t>
-                                &amp;nbsp;
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="font-size:12px;text-align:center;padding-bottom:10px;color:#414141">
-                                <p style="margin:0">© 2014 All Rights Reserved</p>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div name="Text Only" class="zenflat o_mail_block_footer_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EEEEEE repeat top /100%;color:#414141">
-                <center>
-                    <table cellspacing="0" cellpadding="0" border="0" style="margin:0 auto; width:600px;border-collapse:collapse">
-                        <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:#414141" href="/page/contactus">Contact Us</a> | 
-                                        <t t-if="website.social_facebook">
-                                            <a style="color:#414141" t-att-href="website.social_facebook">Facebook</a> | 
-                                        </t>
-                                        <t t-if="website.social_twitter">
-                                            <a style="color:#414141" t-att-href="website.social_twitter">Twitter</a> | 
-                                        </t>
-                                    </t>
-                                    <a href="/unsubscribe_from_list" style="color:#414141">Unsubscribe</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </center>
-            </div>
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='snippet_options']" position="after">
-        <div class="hidden o_theme_palette zenflat">
-            <div class="note-palette-title mt8"> Mail Theme Colors</div>
-            <div class="mail-colorpicker note-color-row">
-                    <t t-set="colors" t-value="['#1F1F1F', '#232925', '#414141', '#808080', '#DEDEDE', '#EEEEEE', '#008000']"/>
-                    <t t-foreach="colors" t-as="c"><button type="button" class="note-color-btn" t-attf-style="background-color:#{c};" t-attf-data-value="#{c}" t-attf-title="#{c}" data-toggle="button" tabindex="-1"></button></t>
-            </div>
-        </div>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/addons/mass_mailing/views/theme_list.xml b/addons/mass_mailing/views/theme_list.xml
index 82feb567549..06352512daa 100644
--- a/addons/mass_mailing/views/theme_list.xml
+++ b/addons/mass_mailing/views/theme_list.xml
@@ -3,78 +3,6 @@
 
     <template id="mass_mail_theme_list">
         <div id="email_theme_list">
-            <div>
-                <div class="theme_thumbnail">
-                    <div class="overlay text-center">
-                        <p>Neopolitan</p>
-                        <a class="btn btn-primary btn-sm" data-snippet-theme="neopolitan"> Select </a>
-                    </div>
-                    <img class="img img-responsive img-thumbnail" src="/website_mail/static/src/img/thumbnail/neopolitan.png"/>
-                </div>
-            </div>
-            <div>
-                <div class="theme_thumbnail">
-                    <div class="overlay text-center">
-                        <p>Skyline</p>
-                        <a class="btn btn-primary btn-sm" data-snippet-theme="skyline"> Select </a>
-                    </div>
-                    <img class="img img-responsive img-thumbnail" src="/website_mail/static/src/img/thumbnail/skyline.png"/>
-                </div>
-            </div>
-            <div>
-                <div class="theme_thumbnail">
-                    <div class="overlay text-center">
-                        <p>Go</p>
-                        <a class="btn btn-primary btn-sm" data-snippet-theme="go"> Select </a>
-                    </div>
-                    <img class="img img-responsive img-thumbnail" src="/website_mail/static/src/img/thumbnail/go.png"/>
-                </div>
-            </div>
-            <div>
-                <div class="theme_thumbnail">
-                    <div class="overlay text-center">
-                        <p>Sunday</p>
-                        <a class="btn btn-primary btn-sm" data-snippet-theme="sunday"> Select </a>
-                    </div>
-                    <img class="img img-responsive img-thumbnail" src="/website_mail/static/src/img/thumbnail/sunday.png"/>
-                </div>
-            </div>
-            <div>
-                <div class="theme_thumbnail">
-                    <div class="overlay text-center">
-                        <p>Airmail</p>
-                        <a class="btn btn-primary btn-sm" data-snippet-theme="airmail"> Select </a>
-                    </div>
-                    <img class="img img-responsive img-thumbnail" src="/website_mail/static/src/img/thumbnail/airmail.png"/>
-                </div>
-            </div>
-            <div>
-                <div class="theme_thumbnail">
-                    <div class="overlay text-center">
-                        <p>Cleave</p>
-                        <a class="btn btn-primary btn-sm" data-snippet-theme="cleave"> Select </a>
-                    </div>
-                    <img class="img img-responsive img-thumbnail" src="/website_mail/static/src/img/thumbnail/cleave.png"/>
-                </div>
-            </div>
-            <div>
-                <div class="theme_thumbnail">
-                    <div class="overlay text-center">
-                        <p>Narrative</p>
-                        <a class="btn btn-primary btn-sm" data-snippet-theme="narrative"> Select </a>
-                    </div>
-                    <img class="img img-responsive img-thumbnail" src="/website_mail/static/src/img/thumbnail/narrative.png"/>
-                </div>
-            </div>
-            <div>
-                <div class="theme_thumbnail">
-                    <div class="overlay text-center">
-                        <p>Zen-Flat</p>
-                        <a class="btn btn-primary btn-sm" data-snippet-theme="zenflat"> Select </a>
-                    </div>
-                    <img class="img img-responsive img-thumbnail" src="/website_mail/static/src/img/thumbnail/zenflat.png"/>
-                </div>
-            </div>
             <div>
                 <div class="theme_thumbnail">
                     <div class="overlay text-center">